Changeset 53654 in vbox for trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_lex.l

Timestamp:

Jan 2, 2015 12:27:36 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: dt_lex.l and dt_grammar.y. (r30)

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_lex.l (modified) (10 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_lex.l

@@ -25 +25 @@
  */
 
+#ifndef VBOX
 #include <string.h>
 #include <stdlib.h>
@@ -31 +32 @@
 #include <ctype.h>
 #include <errno.h>
+#else  /* VBOX */
+# include <iprt/ctype.h>
+# define isdigit(a_ch) RT_C_IS_DIGIT(a_ch)
+#endif /* VBOX */
 
 #include <dt_impl.h>
@@ -37 +42 @@
 #include <dt_string.h>
 
+#ifndef USING_FLEX
 /*
  * We need to undefine lex's input and unput macros so that references to these
@@ -43 +49 @@
 #undef input
 #undef unput
+#else  /* USING_FLEX */
+# define YY_INPUT(buf, result, max_size) \
+        do { \
+                if (yypcb->pcb_fileptr != NULL) { \
+                        result = (int)fread(buf, 1, max_size, yypcb->pcb_fileptr); \
+                        if (!result && ferror(yypcb->pcb_fileptr)) \
+                                YY_FATAL_ERROR("input in flex scanner failed"); \
+                } else { \
+                        size_t off = yypcb->pcb_strptr - yypcb->pcb_string; \
+                        if (off < yypcb->pcb_strlen) { \
+                                result = max_size; \
+                                if ((size_t)result > yypcb->pcb_strlen) \
+                                        result = (int)yypcb->pcb_strlen; \
+                                memcpy(buf, yypcb->pcb_strptr, result); \
+                                yypcb->pcb_strptr += result; \
+                        } else \
+                                result = 0; \
+                } \
+        } while (0)
+#endif /* USING_FLEX */
 
 static int id_or_type(const char *);
+#ifndef USING_FLEX
 static int input(void);
 static void unput(int);
+#endif
 
 /*
@@ -249 +277 @@
                          */
                         if (isdigit(v[0]) || v[0] == '-' || v[0] == '+') {
+#ifdef VBOX
+                                int rc;
+#endif
                                 if (isdigit(v[0]))
                                         yyintprefix = 0;
@@ -254 +285 @@
                                         yyintprefix = *v++;
 
+#ifndef VBOX
                                 errno = 0;
                                 yylval.l_int = strtoull(v, &p, 0);
+#else
+                                rc = RTStrToUInt64Ex(v, &p, 0, &yylval.l_int);
+#endif
                                 (void) strncpy(yyintsuffix, p,
                                     sizeof (yyintsuffix));
                                 yyintdecimal = *v != '0';
 
-                                if (errno == ERANGE) {
+#ifndef VBOX
+                                if (errno == ERANGE)
+#else
+                                if (rc == VWRN_NUMBER_TOO_BIG || rc == VWRN_NEGATIVE_UNSIGNED)
+#endif
                                         xyerror(D_MACRO_OFLOW, "macro argument"
                                             " %s constant %s results in integer"
                                             " overflow\n", yytext, v);
-                                }
 
                                 return (DT_TOK_INT);
@@ -336 +374 @@
                         char *p;
 
+#ifndef VBOX
                         errno = 0;
                         yylval.l_int = strtoull(yytext, &p, 0);
+#else
+                        int rc = RTStrToUInt64Ex(yytext, &p, 0, &yylval.l_int);
+#endif
                         yyintprefix = 0;
                         (void) strncpy(yyintsuffix, p, sizeof (yyintsuffix));
                         yyintdecimal = yytext[0] != '0';
 
-                        if (errno == ERANGE) {
+#ifndef VBOX
+                        if (errno == ERANGE)
+#else
+                        if (rc == VWRN_NUMBER_TOO_BIG || rc == VWRN_NEGATIVE_UNSIGNED)
+#endif
                                 xyerror(D_INT_OFLOW, "constant %s results in "
                                     "integer overflow\n", yytext);
-                        }
 
                         if (*p != '\0' && strchr("uUlL", *p) == NULL) {
@@ -697 +742 @@
         yylineno = 1;
         yypragma = NULL;
+#ifndef USING_FLEX
         yysptr = yysbuf;
+#endif
 }
 
@@ -793 +840 @@
 }
 
+#ifndef USING_FLEX
+
 static int
 input(void)
@@ -834 +883 @@
         yytchar = c;
 }
+
+#endif /* USING_FLEX */