diff options
Diffstat (limited to 'cpp/src/IceGrid/Scanner.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Scanner.cpp | 60 |
1 files changed, 28 insertions, 32 deletions
diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp index 7a5103303c3..9716be00a08 100644 --- a/cpp/src/IceGrid/Scanner.cpp +++ b/cpp/src/IceGrid/Scanner.cpp @@ -54,6 +54,7 @@ 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 @@ -84,8 +85,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -142,15 +141,7 @@ 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. @@ -507,6 +498,16 @@ using namespace IceGrid; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) namespace IceGrid @@ -522,7 +523,7 @@ std::string parseSingleQuotedString(); } #define YY_USER_INIT initScanner(); -#line 525 "lex.yy.c" +#line 526 "lex.yy.c" #define INITIAL 0 @@ -603,12 +604,7 @@ 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. */ @@ -616,7 +612,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -627,7 +623,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -709,10 +705,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 65 "Scanner.l" +#line 75 "Scanner.l" -#line 715 "lex.yy.c" +#line 711 "lex.yy.c" if ( !(yy_init) ) { @@ -797,7 +793,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 67 "Scanner.l" +#line 77 "Scanner.l" { // C++-style comment int c; @@ -810,7 +806,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 77 "Scanner.l" +#line 87 "Scanner.l" { // C-style comment while(true) @@ -839,7 +835,7 @@ YY_RULE_SETUP case 3: /* rule 3 can match eol */ YY_RULE_SETUP -#line 102 "Scanner.l" +#line 112 "Scanner.l" { size_t len = strlen(yytext); for(size_t i = 0; i < len; ++i) @@ -854,14 +850,14 @@ YY_RULE_SETUP case 4: /* rule 4 can match eol */ YY_RULE_SETUP -#line 113 "Scanner.l" +#line 123 "Scanner.l" { return ';'; } YY_BREAK case 5: YY_RULE_SETUP -#line 117 "Scanner.l" +#line 127 "Scanner.l" { // "..."-type strings string s = parseDoubleQuotedString(); @@ -872,7 +868,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 125 "Scanner.l" +#line 135 "Scanner.l" { // '...'-type strings string s; @@ -900,7 +896,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 150 "Scanner.l" +#line 160 "Scanner.l" { // Simple strings string s; @@ -939,10 +935,10 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 186 "Scanner.l" +#line 196 "Scanner.l" ECHO; YY_BREAK -#line 945 "lex.yy.c" +#line 941 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1696,8 +1692,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 yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -1936,7 +1932,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 186 "Scanner.l" +#line 196 "Scanner.l" |