diff options
Diffstat (limited to 'cpp/src/IceGrid/Scanner.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Scanner.cpp | 62 |
1 files changed, 44 insertions, 18 deletions
diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp index 379cb9e8788..3c7df338064 100644 --- a/cpp/src/IceGrid/Scanner.cpp +++ b/cpp/src/IceGrid/Scanner.cpp @@ -55,7 +55,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -86,6 +85,8 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#endif /* ! C99 */ + #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -142,7 +143,15 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -470,13 +479,17 @@ char *yytext; // // ********************************************************************** -#include <IceUtil/ScannerConfig.h> #include <Ice/Ice.h> #include <IceGrid/Parser.h> #include <IceGrid/Grammar.h> #if defined(_MSC_VER) && defined(ICE_64) // +// '=' : conversion from 'size_t' to 'int', possible loss of data +// The result of fread() is a size_t and gets inserted into an int +// +# pragma warning( 4 : 4267 ) +// // 'initializing' : conversion from '__int64' to 'int', possible loss of data // Puts a pointer-difference into an int // @@ -487,6 +500,14 @@ using namespace std; using namespace Ice; using namespace IceGrid; +#ifdef _MSC_VER +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# define YY_NO_UNISTD_H +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) namespace IceGrid @@ -502,7 +523,7 @@ std::string parseSingleQuotedString(); } #define YY_USER_INIT initScanner(); -#line 504 "lex.yy.c" +#line 525 "lex.yy.c" #define INITIAL 0 @@ -583,7 +604,12 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -602,7 +628,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - unsigned n; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -684,10 +710,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 53 "Scanner.l" +#line 65 "Scanner.l" -#line 689 "lex.yy.c" +#line 715 "lex.yy.c" if ( !(yy_init) ) { @@ -772,7 +798,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 55 "Scanner.l" +#line 67 "Scanner.l" { // C++-style comment int c; @@ -785,7 +811,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 65 "Scanner.l" +#line 77 "Scanner.l" { // C-style comment while(true) @@ -814,7 +840,7 @@ YY_RULE_SETUP case 3: /* rule 3 can match eol */ YY_RULE_SETUP -#line 90 "Scanner.l" +#line 102 "Scanner.l" { size_t len = strlen(yytext); for(size_t i = 0; i < len; ++i) @@ -829,14 +855,14 @@ YY_RULE_SETUP case 4: /* rule 4 can match eol */ YY_RULE_SETUP -#line 101 "Scanner.l" +#line 113 "Scanner.l" { return ';'; } YY_BREAK case 5: YY_RULE_SETUP -#line 105 "Scanner.l" +#line 117 "Scanner.l" { // "..."-type strings string s = parseDoubleQuotedString(); @@ -847,7 +873,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 113 "Scanner.l" +#line 125 "Scanner.l" { // '...'-type strings string s; @@ -875,7 +901,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 138 "Scanner.l" +#line 150 "Scanner.l" { // Simple strings string s; @@ -914,10 +940,10 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 174 "Scanner.l" +#line 186 "Scanner.l" ECHO; YY_BREAK -#line 919 "lex.yy.c" +#line 945 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1671,8 +1697,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -1911,7 +1937,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 174 "Scanner.l" +#line 186 "Scanner.l" |