summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Scanner.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/Scanner.cpp')
-rw-r--r--cpp/src/IceGrid/Scanner.cpp54
1 files changed, 26 insertions, 28 deletions
diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp
index d4bc68b5140..2c831ddb927 100644
--- a/cpp/src/IceGrid/Scanner.cpp
+++ b/cpp/src/IceGrid/Scanner.cpp
@@ -10,7 +10,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 35
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -48,6 +48,7 @@ typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t;
+typedef uint64_t flex_uint64_t;
#else
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
@@ -55,6 +56,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
@@ -85,8 +87,6 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
-#endif /* ! C99 */
-
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
@@ -334,7 +334,7 @@ void yyfree (void * );
/* Begin user sect3 */
-#define yywrap() 1
+#define yywrap(n) 1
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
@@ -360,7 +360,7 @@ static void yy_fatal_error (yyconst char msg[] );
*/
#define YY_DO_BEFORE_ACTION \
(yytext_ptr) = yy_bp; \
- yyleng = (size_t) (yy_cp - yy_bp); \
+ yyleng = (yy_size_t) (yy_cp - yy_bp); \
(yy_hold_char) = *yy_cp; \
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
@@ -526,7 +526,7 @@ std::string parseSingleQuotedString();
}
#define YY_USER_INIT initScanner();
-#line 534 "src/IceGrid/Scanner.cpp"
+#line 529 "src/IceGrid/Scanner.cpp"
#define INITIAL 0
@@ -615,7 +615,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,
@@ -626,7 +626,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- size_t n; \
+ yy_size_t n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -708,10 +708,10 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 81 "src/IceGrid/Scanner.l"
+#line 76 "src/IceGrid/Scanner.l"
-#line 719 "src/IceGrid/Scanner.cpp"
+#line 714 "src/IceGrid/Scanner.cpp"
if ( !(yy_init) )
{
@@ -796,7 +796,7 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 83 "src/IceGrid/Scanner.l"
+#line 78 "src/IceGrid/Scanner.l"
{
// C++-style comment
int c;
@@ -809,7 +809,7 @@ YY_RULE_SETUP
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 93 "src/IceGrid/Scanner.l"
+#line 88 "src/IceGrid/Scanner.l"
{
// C-style comment
while(true)
@@ -838,7 +838,7 @@ YY_RULE_SETUP
case 3:
/* rule 3 can match eol */
YY_RULE_SETUP
-#line 118 "src/IceGrid/Scanner.l"
+#line 113 "src/IceGrid/Scanner.l"
{
size_t len = strlen(yytext);
for(size_t i = 0; i < len; ++i)
@@ -853,14 +853,14 @@ YY_RULE_SETUP
case 4:
/* rule 4 can match eol */
YY_RULE_SETUP
-#line 129 "src/IceGrid/Scanner.l"
+#line 124 "src/IceGrid/Scanner.l"
{
return ';';
}
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 133 "src/IceGrid/Scanner.l"
+#line 128 "src/IceGrid/Scanner.l"
{
// "..."-type strings
string s = parseDoubleQuotedString();
@@ -871,7 +871,7 @@ YY_RULE_SETUP
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 141 "src/IceGrid/Scanner.l"
+#line 136 "src/IceGrid/Scanner.l"
{
// '...'-type strings
string s;
@@ -899,7 +899,7 @@ YY_RULE_SETUP
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 166 "src/IceGrid/Scanner.l"
+#line 161 "src/IceGrid/Scanner.l"
{
// Simple strings
string s;
@@ -938,10 +938,10 @@ YY_RULE_SETUP
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 202 "src/IceGrid/Scanner.l"
+#line 197 "src/IceGrid/Scanner.l"
ECHO;
YY_BREAK
-#line 949 "src/IceGrid/Scanner.cpp"
+#line 944 "src/IceGrid/Scanner.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1134,7 +1134,7 @@ static int yy_get_next_buffer (void)
{ /* Not enough room in the buffer - grow it. */
/* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+ YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
int yy_c_buf_p_offset =
(int) ((yy_c_buf_p) - b->yy_ch_buf);
@@ -1267,7 +1267,7 @@ static int yy_get_next_buffer (void)
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 18);
- return yy_is_jam ? 0 : yy_current_state;
+ return yy_is_jam ? 0 : yy_current_state;
}
static void yyunput (int c, register char * yy_bp )
@@ -1355,7 +1355,7 @@ static int yy_get_next_buffer (void)
case EOB_ACT_END_OF_FILE:
{
if ( yywrap( ) )
- return EOF;
+ return 0;
if ( ! (yy_did_buffer_switch_on_eof) )
YY_NEW_FILE;
@@ -1695,8 +1695,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.
*/
@@ -1704,8 +1704,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len
{
YY_BUFFER_STATE b;
char *buf;
- yy_size_t n;
- int i;
+ yy_size_t n, i;
/* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2;
@@ -1935,7 +1934,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 202 "src/IceGrid/Scanner.l"
+#line 197 "src/IceGrid/Scanner.l"
@@ -1965,7 +1964,6 @@ initScanner()
keywordMap["pid"] = ICE_GRID_PID;
keywordMap["endpoints"] = ICE_GRID_ENDPOINTS;
keywordMap["start"] = ICE_GRID_START;
- keywordMap["patch"] = ICE_GRID_PATCH;
keywordMap["stop"] = ICE_GRID_STOP;
keywordMap["signal"] = ICE_GRID_SIGNAL;
keywordMap["stdout"] = ICE_GRID_STDOUT;