Commit 93561c3a by Geoff Lang Committed by Commit Bot

Regenerate the preprocessor with the latest versions of flex and bison.

BUG=648063 Change-Id: Ia90d12c8cb4ae0a694227145267e78ca02dcc2b0 Reviewed-on: https://chromium-review.googlesource.com/387114 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent d4a07fbb
diff --git a/src/compiler/preprocessor/Tokenizer.cpp b/src/compiler/preprocessor/Tokenizer.cpp
index 0d7ad58..5ef0e5e 100644
--- a/src/compiler/preprocessor/Tokenizer.cpp --- a/src/compiler/preprocessor/Tokenizer.cpp
+++ b/src/compiler/preprocessor/Tokenizer.cpp +++ b/src/compiler/preprocessor/Tokenizer.cpp
@@ -56,6 +56,7 @@ typedef int16_t flex_int16_t; @@ -1703,7 +1703,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
typedef uint16_t flex_uint16_t; else
typedef int32_t flex_int32_t; {
typedef uint32_t flex_uint32_t; int num_to_read =
+typedef uint64_t flex_uint64_t; - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
#else + static_cast<int>(YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1);
typedef signed char flex_int8_t;
typedef short int flex_int16_t; while ( num_to_read <= 0 )
@@ -179,6 +180,11 @@ typedef void* yyscan_t; { /* Not enough room in the buffer - grow it. */
typedef struct yy_buffer_state *YY_BUFFER_STATE; @@ -1737,8 +1737,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
#endif
yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+typedef size_t yy_size_t; - number_to_move - 1;
+#endif + num_to_read = static_cast<int>(YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+ + number_to_move - 1);
#define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1 }
#define EOB_ACT_LAST_MATCH 2
@@ -353,7 +354,7 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); @@ -1746,8 +1746,10 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
num_to_read = YY_READ_BUF_SIZE;
/* Read in more data. */
+ yy_size_t ret = 0;
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- yyg->yy_n_chars, num_to_read );
+ ret, num_to_read );
+ yyg->yy_n_chars = static_cast<int>(ret);
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
}
@@ -1773,13 +1775,13 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
if ((int) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
/* Extend the array by 50%, plus the number we really need. */
- int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
+ yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) pprealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
}
- yyg->yy_n_chars += number_to_move;
+ yyg->yy_n_chars += static_cast<int>(number_to_move);
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
@@ -2171,7 +2173,7 @@ void pppop_buffer_state (yyscan_t yyscanner)
*/ */
#define YY_DO_BEFORE_ACTION \ static void ppensure_buffer_stack (yyscan_t yyscanner)
yyg->yytext_ptr = yy_bp; \ {
- yyleng = (size_t) (yy_cp - yy_bp); \ - int num_to_alloc;
+ yyleng = (yy_size_t) (yy_cp - yy_bp); \ + yy_size_t num_to_alloc;
yyg->yy_hold_char = *yy_cp; \ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
*yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp; if (!yyg->yy_buffer_stack) {
@@ -2238,7 +2240,7 @@ YY_BUFFER_STATE pp_scan_buffer (char * base, yy_size_t size , yyscan_t yyscann
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in pp_scan_buffer()" );
- b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
+ b->yy_buf_size = static_cast<int>(size - 2); /* "- 2" to take care of EOB's */
b->yy_buf_pos = b->yy_ch_buf = base;
b->yy_is_our_buffer = 0;
b->yy_input_file = NULL;
@@ -2293,7 +2295,7 @@ YY_BUFFER_STATE pp_scan_bytes (yyconst char * yybytes, int _yybytes_len , yysc
if ( ! buf )
YY_FATAL_ERROR( "out of dynamic memory in pp_scan_bytes()" );
- for ( i = 0; i < _yybytes_len; ++i )
+ for ( i = 0; i < static_cast<yy_size_t>(_yybytes_len); ++i )
buf[i] = yybytes[i];
buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
...@@ -498,9 +498,12 @@ static const yytype_uint8 yytranslate[] = ...@@ -498,9 +498,12 @@ static const yytype_uint8 yytranslate[] =
#if YYDEBUG #if YYDEBUG
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] = {0, 110, 110, 117, 118, 129, 129, 150, 150, 171, static const yytype_uint16 yyrline[] =
174, 177, 180, 183, 186, 189, 192, 195, 198, 218, {
238, 241, 244, 264, 284, 287, 290, 293, 296, 299}; 0, 110, 110, 117, 118, 129, 129, 150, 150, 171,
174, 177, 180, 183, 186, 189, 192, 195, 198, 218,
238, 241, 244, 264, 284, 287, 290, 293, 296, 299
};
#endif #endif
#if YYDEBUG || YYERROR_VERBOSE || 0 #if YYDEBUG || YYERROR_VERBOSE || 0
...@@ -1500,7 +1503,8 @@ yyreduce: ...@@ -1500,7 +1503,8 @@ yyreduce:
stream << (yyvsp[-2]) << " >> " << (yyvsp[0]); stream << (yyvsp[-2]) << " >> " << (yyvsp[0]);
std::string text = stream.str(); std::string text = stream.str();
context->diagnostics->report(pp::Diagnostics::PP_UNDEFINED_SHIFT, context->diagnostics->report(pp::Diagnostics::PP_UNDEFINED_SHIFT,
context->token->location, text.c_str()); context->token->location,
text.c_str());
*(context->valid) = false; *(context->valid) = false;
} }
(yyval) = static_cast<YYSTYPE>(0); (yyval) = static_cast<YYSTYPE>(0);
...@@ -1524,7 +1528,8 @@ yyreduce: ...@@ -1524,7 +1528,8 @@ yyreduce:
stream << (yyvsp[-2]) << " << " << (yyvsp[0]); stream << (yyvsp[-2]) << " << " << (yyvsp[0]);
std::string text = stream.str(); std::string text = stream.str();
context->diagnostics->report(pp::Diagnostics::PP_UNDEFINED_SHIFT, context->diagnostics->report(pp::Diagnostics::PP_UNDEFINED_SHIFT,
context->token->location, text.c_str()); context->token->location,
text.c_str());
*(context->valid) = false; *(context->valid) = false;
} }
(yyval) = static_cast<YYSTYPE>(0); (yyval) = static_cast<YYSTYPE>(0);
......
...@@ -9,20 +9,96 @@ ...@@ -9,20 +9,96 @@
#line 13 "./Tokenizer.cpp"
#define YY_INT_ALIGNED short int #define YY_INT_ALIGNED short int
/* A lexical scanner generated by flex */ /* A lexical scanner generated by flex */
#define FLEX_SCANNER #define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5 #define YY_FLEX_MINOR_VERSION 6
#define YY_FLEX_SUBMINOR_VERSION 39 #define YY_FLEX_SUBMINOR_VERSION 1
#if YY_FLEX_SUBMINOR_VERSION > 0 #if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA #define FLEX_BETA
#endif #endif
/* First, we deal with platform-specific or compiler-specific issues. */ /* First, we deal with platform-specific or compiler-specific issues. */
/* begin standard C headers. */ /* begin standard C headers. */
...@@ -56,7 +132,6 @@ typedef int16_t flex_int16_t; ...@@ -56,7 +132,6 @@ typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t; typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t; typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t; typedef uint32_t flex_uint32_t;
typedef uint64_t flex_uint64_t;
#else #else
typedef signed char flex_int8_t; typedef signed char flex_int8_t;
typedef short int flex_int16_t; typedef short int flex_int16_t;
...@@ -98,30 +173,27 @@ typedef unsigned int flex_uint32_t; ...@@ -98,30 +173,27 @@ typedef unsigned int flex_uint32_t;
#endif /* ! FLEXINT_H */ #endif /* ! FLEXINT_H */
#ifdef __cplusplus
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
#else /* ! __cplusplus */ /* TODO: this is always defined, so inline it */
#define yyconst const
#if defined(__GNUC__) && __GNUC__ >= 3
#define yynoreturn __attribute__((__noreturn__))
#else
#define yynoreturn
#endif
/* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST
#endif /* defined (__STDC__) */
#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
#define yyconst const
#else
#define yyconst
#endif
/* Returned upon end-of-file. */ /* Returned upon end-of-file. */
#define YY_NULL 0 #define YY_NULL 0
/* Promotes a possibly negative, possibly signed char to an unsigned /* Promotes a possibly negative, possibly signed char to an unsigned
* integer for use as an array index. If the signed char is negative, * integer for use as an array index. If the signed char is negative,
* we want to instead treat it as an 8-bit unsigned char, hence the * we want to instead treat it as an 8-bit unsigned char, hence the
...@@ -129,12 +201,34 @@ typedef unsigned int flex_uint32_t; ...@@ -129,12 +201,34 @@ typedef unsigned int flex_uint32_t;
*/ */
#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) #define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
/* An opaque pointer. */ /* An opaque pointer. */
#ifndef YY_TYPEDEF_YY_SCANNER_T #ifndef YY_TYPEDEF_YY_SCANNER_T
#define YY_TYPEDEF_YY_SCANNER_T #define YY_TYPEDEF_YY_SCANNER_T
typedef void* yyscan_t; typedef void* yyscan_t;
#endif #endif
/* For convenience, these vars (plus the bison vars far below) /* For convenience, these vars (plus the bison vars far below)
are macros in the reentrant scanner. */ are macros in the reentrant scanner. */
#define yyin yyg->yyin_r #define yyin yyg->yyin_r
...@@ -146,12 +240,29 @@ typedef void* yyscan_t; ...@@ -146,12 +240,29 @@ typedef void* yyscan_t;
#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) #define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
#define yy_flex_debug yyg->yy_flex_debug_r #define yy_flex_debug yyg->yy_flex_debug_r
/* Enter a start condition. This macro really ought to take a parameter, /* Enter a start condition. This macro really ought to take a parameter,
* but we do it the disgusting crufty way forced on us by the ()-less * but we do it the disgusting crufty way forced on us by the ()-less
* definition of BEGIN. * definition of BEGIN.
*/ */
#define BEGIN yyg->yy_start = 1 + 2 * #define BEGIN yyg->yy_start = 1 + 2 *
/* Translate the current start state into a value that can be later handed /* Translate the current start state into a value that can be later handed
* to BEGIN to return to the state. The YYSTATE alias is for lex * to BEGIN to return to the state. The YYSTATE alias is for lex
* compatibility. * compatibility.
...@@ -159,23 +270,41 @@ typedef void* yyscan_t; ...@@ -159,23 +270,41 @@ typedef void* yyscan_t;
#define YY_START ((yyg->yy_start - 1) / 2) #define YY_START ((yyg->yy_start - 1) / 2)
#define YYSTATE YY_START #define YYSTATE YY_START
/* Action number for EOF rule of a given start state. */ /* Action number for EOF rule of a given start state. */
#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
/* Special action meaning "start processing a new file". */ /* Special action meaning "start processing a new file". */
#define YY_NEW_FILE pprestart(yyin ,yyscanner ) #define YY_NEW_FILE pprestart(yyin ,yyscanner )
#define YY_END_OF_BUFFER_CHAR 0 #define YY_END_OF_BUFFER_CHAR 0
/* Size of default input buffer. */ /* Size of default input buffer. */
#ifndef YY_BUF_SIZE #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 #define YY_BUF_SIZE 16384
#endif /* __ia64__ */
#endif #endif
/* The state buf must be large enough to hold one state per character in the main buffer. /* The state buf must be large enough to hold one state per character in the main buffer.
*/ */
#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) #define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
#ifndef YY_TYPEDEF_YY_BUFFER_STATE #ifndef YY_TYPEDEF_YY_BUFFER_STATE
#define YY_TYPEDEF_YY_BUFFER_STATE #define YY_TYPEDEF_YY_BUFFER_STATE
typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef struct yy_buffer_state *YY_BUFFER_STATE;
...@@ -186,18 +315,22 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; ...@@ -186,18 +315,22 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
typedef size_t yy_size_t; typedef size_t yy_size_t;
#endif #endif
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
#define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2 #define EOB_ACT_LAST_MATCH 2
#define YY_LESS_LINENO(n) #define YY_LESS_LINENO(n)
#define YY_LINENO_REWIND_TO(ptr) #define YY_LINENO_REWIND_TO(ptr)
/* Return all but the first "n" matched characters back to the input stream. */ /* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \ #define yyless(n) \
do \ do \
...@@ -212,26 +345,31 @@ typedef size_t yy_size_t; ...@@ -212,26 +345,31 @@ typedef size_t yy_size_t;
} \ } \
while ( 0 ) while ( 0 )
#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
#ifndef YY_STRUCT_YY_BUFFER_STATE #ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state struct yy_buffer_state
{ {
FILE *yy_input_file; FILE *yy_input_file;
char *yy_ch_buf; /* input buffer */ char *yy_ch_buf; /* input buffer */
char *yy_buf_pos; /* current position in input buffer */ char *yy_buf_pos; /* current position in input buffer */
/* Size of input buffer in bytes, not including room for EOB /* Size of input buffer in bytes, not including room for EOB
* characters. * characters.
*/ */
yy_size_t yy_buf_size; int yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB /* Number of characters read into yy_ch_buf, not including EOB
* characters. * characters.
*/ */
yy_size_t yy_n_chars; int yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it, /* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to * and can realloc() it to grow it, and should free() it to
...@@ -255,6 +393,7 @@ struct yy_buffer_state ...@@ -255,6 +393,7 @@ struct yy_buffer_state
int yy_bs_lineno; /**< The line count. */ int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */ int yy_bs_column; /**< The column count. */
/* Whether to try to fill the input buffer when we reach the /* Whether to try to fill the input buffer when we reach the
* end of it. * end of it.
*/ */
...@@ -279,6 +418,10 @@ struct yy_buffer_state ...@@ -279,6 +418,10 @@ struct yy_buffer_state
}; };
#endif /* !YY_STRUCT_YY_BUFFER_STATE */ #endif /* !YY_STRUCT_YY_BUFFER_STATE */
/* We provide macros for accessing buffer states in case in the /* We provide macros for accessing buffer states in case in the
* future we want to put the buffer states in a more general * future we want to put the buffer states in a more general
* "scanner state". * "scanner state".
...@@ -289,11 +432,18 @@ struct yy_buffer_state ...@@ -289,11 +432,18 @@ struct yy_buffer_state
? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \
: NULL) : NULL)
/* Same as previous macro, but useful when we know that the buffer stack is not /* Same as previous macro, but useful when we know that the buffer stack is not
* NULL or when we need an lvalue. For internal use only. * NULL or when we need an lvalue. For internal use only.
*/ */
#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] #define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]
void pprestart (FILE *input_file ,yyscan_t yyscanner ); void pprestart (FILE *input_file ,yyscan_t yyscanner );
void pp_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); void pp_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
YY_BUFFER_STATE pp_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); YY_BUFFER_STATE pp_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
...@@ -302,22 +452,30 @@ void pp_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); ...@@ -302,22 +452,30 @@ void pp_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
void pppush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); void pppush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
void pppop_buffer_state (yyscan_t yyscanner ); void pppop_buffer_state (yyscan_t yyscanner );
static void ppensure_buffer_stack (yyscan_t yyscanner ); static void ppensure_buffer_stack (yyscan_t yyscanner );
static void pp_load_buffer_state (yyscan_t yyscanner ); static void pp_load_buffer_state (yyscan_t yyscanner );
static void pp_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner ); static void pp_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner );
#define YY_FLUSH_BUFFER pp_flush_buffer(YY_CURRENT_BUFFER ,yyscanner) #define YY_FLUSH_BUFFER pp_flush_buffer(YY_CURRENT_BUFFER ,yyscanner)
YY_BUFFER_STATE pp_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); YY_BUFFER_STATE pp_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE pp_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); YY_BUFFER_STATE pp_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
YY_BUFFER_STATE pp_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); YY_BUFFER_STATE pp_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
void *ppalloc (yy_size_t ,yyscan_t yyscanner ); void *ppalloc (yy_size_t ,yyscan_t yyscanner );
void *pprealloc (void *,yy_size_t ,yyscan_t yyscanner ); void *pprealloc (void *,yy_size_t ,yyscan_t yyscanner );
void ppfree (void * ,yyscan_t yyscanner ); void ppfree (void * ,yyscan_t yyscanner );
#define yy_new_buffer pp_create_buffer #define yy_new_buffer pp_create_buffer
#define yy_set_interactive(is_interactive) \ #define yy_set_interactive(is_interactive) \
{ \ { \
if ( ! YY_CURRENT_BUFFER ){ \ if ( ! YY_CURRENT_BUFFER ){ \
...@@ -328,6 +486,8 @@ void ppfree (void * ,yyscan_t yyscanner ); ...@@ -328,6 +486,8 @@ void ppfree (void * ,yyscan_t yyscanner );
YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
} }
#define yy_set_bol(at_bol) \ #define yy_set_bol(at_bol) \
{ \ { \
if ( ! YY_CURRENT_BUFFER ){\ if ( ! YY_CURRENT_BUFFER ){\
...@@ -338,34 +498,50 @@ void ppfree (void * ,yyscan_t yyscanner ); ...@@ -338,34 +498,50 @@ void ppfree (void * ,yyscan_t yyscanner );
YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
} }
#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
/* Begin user sect3 */ /* Begin user sect3 */
#define ppwrap(yyscanner) 1 #define ppwrap(yyscanner) (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP #define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR; typedef unsigned char YY_CHAR;
typedef int yy_state_type; typedef int yy_state_type;
#define yytext_ptr yytext_r #define yytext_ptr yytext_r
static yy_state_type yy_get_previous_state (yyscan_t yyscanner ); static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner); static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner);
static int yy_get_next_buffer (yyscan_t yyscanner ); static int yy_get_next_buffer (yyscan_t yyscanner );
static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); static void yynoreturn yy_fatal_error (yyconst char* msg ,yyscan_t yyscanner );
/* Done after the current pattern has been matched and before the /* Done after the current pattern has been matched and before the
* corresponding action - sets up yytext. * corresponding action - sets up yytext.
*/ */
#define YY_DO_BEFORE_ACTION \ #define YY_DO_BEFORE_ACTION \
yyg->yytext_ptr = yy_bp; \ yyg->yytext_ptr = yy_bp; \
yyleng = (yy_size_t) (yy_cp - yy_bp); \ yyleng = (int) (yy_cp - yy_bp); \
yyg->yy_hold_char = *yy_cp; \ yyg->yy_hold_char = *yy_cp; \
*yy_cp = '\0'; \ *yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp; yyg->yy_c_buf_p = yy_cp;
#define YY_NUM_RULES 38 #define YY_NUM_RULES 38
#define YY_END_OF_BUFFER 39 #define YY_END_OF_BUFFER 39
/* This struct is not used in this scanner, /* This struct is not used in this scanner,
...@@ -390,7 +566,7 @@ static yyconst flex_int16_t yy_accept[98] = ...@@ -390,7 +566,7 @@ static yyconst flex_int16_t yy_accept[98] =
} ; } ;
static yyconst flex_int32_t yy_ec[256] = static yyconst YY_CHAR yy_ec[256] =
{ 0, { 0,
1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
2, 2, 4, 1, 1, 1, 1, 1, 1, 1, 2, 2, 4, 1, 1, 1, 1, 1, 1, 1,
...@@ -422,14 +598,14 @@ static yyconst flex_int32_t yy_ec[256] = ...@@ -422,14 +598,14 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1 1, 1, 1, 1, 1
} ; } ;
static yyconst flex_int32_t yy_meta[30] = static yyconst YY_CHAR yy_meta[30] =
{ 0, { 0,
1, 1, 2, 2, 1, 1, 1, 1, 1, 3, 1, 1, 2, 2, 1, 1, 1, 1, 1, 3,
1, 1, 4, 1, 5, 5, 5, 1, 1, 1, 1, 1, 4, 1, 5, 5, 5, 1, 1, 1,
5, 5, 5, 5, 5, 5, 1, 1, 1 5, 5, 5, 5, 5, 5, 1, 1, 1
} ; } ;
static yyconst flex_int16_t yy_base[103] = static yyconst flex_uint16_t yy_base[103] =
{ 0, { 0,
0, 0, 27, 29, 137, 194, 133, 194, 117, 100, 0, 0, 27, 29, 137, 194, 133, 194, 117, 100,
194, 98, 26, 194, 94, 24, 28, 33, 32, 39, 194, 98, 26, 194, 94, 24, 28, 33, 32, 39,
...@@ -461,7 +637,7 @@ static yyconst flex_int16_t yy_def[103] = ...@@ -461,7 +637,7 @@ static yyconst flex_int16_t yy_def[103] =
97, 97 97, 97
} ; } ;
static yyconst flex_int16_t yy_nxt[224] = static yyconst flex_uint16_t yy_nxt[224] =
{ 0, { 0,
6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 21, 22, 23, 24, 16, 17, 18, 19, 20, 21, 21, 22, 23, 24,
...@@ -596,11 +772,23 @@ typedef pp::SourceLocation YYLTYPE; ...@@ -596,11 +772,23 @@ typedef pp::SourceLocation YYLTYPE;
#define YY_INPUT(buf, result, maxSize) \ #define YY_INPUT(buf, result, maxSize) \
result = yyextra->input.read(buf, maxSize, &yylineno); result = yyextra->input.read(buf, maxSize, &yylineno);
#define INITIAL 0 #define INITIAL 0
#define COMMENT 1 #define COMMENT 1
#define YY_EXTRA_TYPE pp::Tokenizer::Context* #define YY_EXTRA_TYPE pp::Tokenizer::Context*
/* Holds the entire state of the reentrant scanner. */ /* Holds the entire state of the reentrant scanner. */
struct yyguts_t struct yyguts_t
{ {
...@@ -614,8 +802,8 @@ struct yyguts_t ...@@ -614,8 +802,8 @@ struct yyguts_t
size_t yy_buffer_stack_max; /**< capacity of stack. */ size_t yy_buffer_stack_max; /**< capacity of stack. */
YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
char yy_hold_char; char yy_hold_char;
yy_size_t yy_n_chars; int yy_n_chars;
yy_size_t yyleng_r; int yyleng_r;
char *yy_c_buf_p; char *yy_c_buf_p;
int yy_init; int yy_init;
int yy_start; int yy_start;
...@@ -629,69 +817,132 @@ struct yyguts_t ...@@ -629,69 +817,132 @@ struct yyguts_t
int yylineno_r; int yylineno_r;
int yy_flex_debug_r; int yy_flex_debug_r;
char *yytext_r; char *yytext_r;
int yy_more_flag; int yy_more_flag;
int yy_more_len; int yy_more_len;
YYSTYPE * yylval_r; YYSTYPE * yylval_r;
YYLTYPE * yylloc_r; YYLTYPE * yylloc_r;
}; /* end struct yyguts_t */ }; /* end struct yyguts_t */
static int yy_init_globals (yyscan_t yyscanner ); static int yy_init_globals (yyscan_t yyscanner );
/* This must go here because YYSTYPE and YYLTYPE are included /* This must go here because YYSTYPE and YYLTYPE are included
* from bison output in section 1.*/ * from bison output in section 1.*/
# define yylval yyg->yylval_r # define yylval yyg->yylval_r
# define yylloc yyg->yylloc_r # define yylloc yyg->yylloc_r
int pplex_init (yyscan_t* scanner); int pplex_init (yyscan_t* scanner);
int pplex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); int pplex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
/* Accessor methods to globals. /* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */ These are made visible to non-reentrant scanners for convenience. */
int pplex_destroy (yyscan_t yyscanner ); int pplex_destroy (yyscan_t yyscanner );
int ppget_debug (yyscan_t yyscanner ); int ppget_debug (yyscan_t yyscanner );
void ppset_debug (int debug_flag ,yyscan_t yyscanner ); void ppset_debug (int debug_flag ,yyscan_t yyscanner );
YY_EXTRA_TYPE ppget_extra (yyscan_t yyscanner ); YY_EXTRA_TYPE ppget_extra (yyscan_t yyscanner );
void ppset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); void ppset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
FILE *ppget_in (yyscan_t yyscanner ); FILE *ppget_in (yyscan_t yyscanner );
void ppset_in (FILE * in_str ,yyscan_t yyscanner );
void ppset_in (FILE * _in_str ,yyscan_t yyscanner );
FILE *ppget_out (yyscan_t yyscanner ); FILE *ppget_out (yyscan_t yyscanner );
void ppset_out (FILE * out_str ,yyscan_t yyscanner );
yy_size_t ppget_leng (yyscan_t yyscanner );
void ppset_out (FILE * _out_str ,yyscan_t yyscanner );
int ppget_leng (yyscan_t yyscanner );
char *ppget_text (yyscan_t yyscanner ); char *ppget_text (yyscan_t yyscanner );
int ppget_lineno (yyscan_t yyscanner ); int ppget_lineno (yyscan_t yyscanner );
void ppset_lineno (int line_number ,yyscan_t yyscanner );
void ppset_lineno (int _line_number ,yyscan_t yyscanner );
int ppget_column (yyscan_t yyscanner ); int ppget_column (yyscan_t yyscanner );
void ppset_column (int column_no ,yyscan_t yyscanner );
void ppset_column (int _column_no ,yyscan_t yyscanner );
YYSTYPE * ppget_lval (yyscan_t yyscanner ); YYSTYPE * ppget_lval (yyscan_t yyscanner );
void ppset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); void ppset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
YYLTYPE *ppget_lloc (yyscan_t yyscanner ); YYLTYPE *ppget_lloc (yyscan_t yyscanner );
void ppset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); void ppset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );
/* Macros after this point can all be overridden by user definitions in /* Macros after this point can all be overridden by user definitions in
* section 1. * section 1.
*/ */
...@@ -704,6 +955,12 @@ extern int ppwrap (yyscan_t yyscanner ); ...@@ -704,6 +955,12 @@ extern int ppwrap (yyscan_t yyscanner );
#endif #endif
#endif #endif
#ifndef YY_NO_UNPUT
#endif
#ifndef yytext_ptr #ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
#endif #endif
...@@ -722,19 +979,34 @@ static int input (yyscan_t yyscanner ); ...@@ -722,19 +979,34 @@ static int input (yyscan_t yyscanner );
#endif #endif
/* Amount of stuff to slurp up with each read. */ /* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE #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 #define YY_READ_BUF_SIZE 8192
#endif /* __ia64__ */
#endif #endif
/* Copy whatever the last rule matched to the standard output. */ /* Copy whatever the last rule matched to the standard output. */
#ifndef ECHO #ifndef ECHO
/* This used to be an fputs(), but since the string might contain NUL's, /* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite(). * we now use fwrite().
*/ */
#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) #define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
#endif #endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
* is returned in "result". * is returned in "result".
*/ */
...@@ -756,7 +1028,7 @@ static int input (yyscan_t yyscanner ); ...@@ -756,7 +1028,7 @@ static int input (yyscan_t yyscanner );
else \ else \
{ \ { \
errno=0; \ errno=0; \
while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ while ( (result = (int) fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
{ \ { \
if( errno != EINTR) \ if( errno != EINTR) \
{ \ { \
...@@ -771,6 +1043,8 @@ static int input (yyscan_t yyscanner ); ...@@ -771,6 +1043,8 @@ static int input (yyscan_t yyscanner );
#endif #endif
/* No semi-colon after return; correct usage is to write "yyterminate();" - /* No semi-colon after return; correct usage is to write "yyterminate();" -
* we don't want an extra ';' after the "return" because that will cause * we don't want an extra ';' after the "return" because that will cause
* some compilers to complain about unreachable statements. * some compilers to complain about unreachable statements.
...@@ -779,24 +1053,48 @@ static int input (yyscan_t yyscanner ); ...@@ -779,24 +1053,48 @@ static int input (yyscan_t yyscanner );
#define yyterminate() return YY_NULL #define yyterminate() return YY_NULL
#endif #endif
/* Number of entries by which start-condition stack grows. */ /* Number of entries by which start-condition stack grows. */
#ifndef YY_START_STACK_INCR #ifndef YY_START_STACK_INCR
#define YY_START_STACK_INCR 25 #define YY_START_STACK_INCR 25
#endif #endif
/* Report a fatal error. */ /* Report a fatal error. */
#ifndef YY_FATAL_ERROR #ifndef YY_FATAL_ERROR
#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner) #define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner)
#endif #endif
/* end tables serialization structures and prototypes */ /* end tables serialization structures and prototypes */
/* Default declaration of generated scanner - a define so the user can /* Default declaration of generated scanner - a define so the user can
* easily add parameters. * easily add parameters.
*/ */
#ifndef YY_DECL #ifndef YY_DECL
#define YY_DECL_IS_OURS 1 #define YY_DECL_IS_OURS 1
extern int pplex \ extern int pplex \
(YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
...@@ -804,6 +1102,7 @@ extern int pplex \ ...@@ -804,6 +1102,7 @@ extern int pplex \
(YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
#endif /* !YY_DECL */ #endif /* !YY_DECL */
/* Code executed at the beginning of each rule, after yytext and yyleng /* Code executed at the beginning of each rule, after yytext and yyleng
* have been set up. * have been set up.
*/ */
...@@ -811,27 +1110,39 @@ extern int pplex \ ...@@ -811,27 +1110,39 @@ extern int pplex \
#define YY_USER_ACTION #define YY_USER_ACTION
#endif #endif
/* Code executed at the end of each rule. */ /* Code executed at the end of each rule. */
#ifndef YY_BREAK #ifndef YY_BREAK
#define YY_BREAK break; #define YY_BREAK /*LINTED*/break;
#endif #endif
#define YY_RULE_SETUP \ #define YY_RULE_SETUP \
YY_USER_ACTION YY_USER_ACTION
/** The main scanner function which does all the work. /** The main scanner function which does all the work.
*/ */
YY_DECL YY_DECL
{ {
register yy_state_type yy_current_state; yy_state_type yy_current_state;
register char *yy_cp, *yy_bp; char *yy_cp, *yy_bp;
register int yy_act; int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
yylval = yylval_param; yylval = yylval_param;
yylloc = yylloc_param; yylloc = yylloc_param;
if ( !yyg->yy_init ) if ( !yyg->yy_init )
{ {
yyg->yy_init = 1; yyg->yy_init = 1;
...@@ -840,6 +1151,8 @@ YY_DECL ...@@ -840,6 +1151,8 @@ YY_DECL
YY_USER_INIT; YY_USER_INIT;
#endif #endif
if ( ! yyg->yy_start ) if ( ! yyg->yy_start )
yyg->yy_start = 1; /* first start state */ yyg->yy_start = 1; /* first start state */
...@@ -860,9 +1173,10 @@ YY_DECL ...@@ -860,9 +1173,10 @@ YY_DECL
{ {
/* Line comment */ /* Line comment */
while ( 1 ) /* loops until end-of-file is reached */ while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{ {
yy_cp = yyg->yy_c_buf_p; yy_cp = yyg->yy_c_buf_p;
...@@ -878,7 +1192,7 @@ YY_DECL ...@@ -878,7 +1192,7 @@ YY_DECL
yy_match: yy_match:
do do
{ {
register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
if ( yy_accept[yy_current_state] ) if ( yy_accept[yy_current_state] )
{ {
yyg->yy_last_accepting_state = yy_current_state; yyg->yy_last_accepting_state = yy_current_state;
...@@ -890,7 +1204,7 @@ yy_match: ...@@ -890,7 +1204,7 @@ yy_match:
if ( yy_current_state >= 98 ) if ( yy_current_state >= 98 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
++yy_cp; ++yy_cp;
} }
while ( yy_current_state != 97 ); while ( yy_current_state != 97 );
...@@ -902,8 +1216,11 @@ yy_find_action: ...@@ -902,8 +1216,11 @@ yy_find_action:
YY_DO_BEFORE_ACTION; YY_DO_BEFORE_ACTION;
do_action: /* This label is used only to access EOF actions. */ do_action: /* This label is used only to access EOF actions. */
switch ( yy_act ) switch ( yy_act )
{ /* beginning of action switch */ { /* beginning of action switch */
case 0: /* must back up */ case 0: /* must back up */
...@@ -1326,6 +1643,11 @@ ECHO; ...@@ -1326,6 +1643,11 @@ ECHO;
} /* end of user's declarations */ } /* end of user's declarations */
} /* end of pplex */ } /* end of pplex */
/* yy_get_next_buffer - try to read in a new buffer /* yy_get_next_buffer - try to read in a new buffer
* *
* Returns a code representing an action: * Returns a code representing an action:
...@@ -1336,9 +1658,9 @@ ECHO; ...@@ -1336,9 +1658,9 @@ ECHO;
static int yy_get_next_buffer (yyscan_t yyscanner) static int yy_get_next_buffer (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
register char *source = yyg->yytext_ptr; char *source = yyg->yytext_ptr;
register int number_to_move, i; yy_size_t number_to_move, i;
int ret_val; int ret_val;
if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
...@@ -1367,7 +1689,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1367,7 +1689,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
/* Try to read more data. */ /* Try to read more data. */
/* First move last chars to start of buffer. */ /* First move last chars to start of buffer. */
number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1; number_to_move = (yy_size_t) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
for ( i = 0; i < number_to_move; ++i ) for ( i = 0; i < number_to_move; ++i )
*(dest++) = *(source++); *(dest++) = *(source++);
...@@ -1380,8 +1702,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1380,8 +1702,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else else
{ {
yy_size_t num_to_read = int num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; static_cast<int>(YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1);
while ( num_to_read <= 0 ) while ( num_to_read <= 0 )
{ /* Not enough room in the buffer - grow it. */ { /* Not enough room in the buffer - grow it. */
...@@ -1394,7 +1716,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1394,7 +1716,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
if ( b->yy_is_our_buffer ) if ( b->yy_is_our_buffer )
{ {
yy_size_t new_size = b->yy_buf_size * 2; int new_size = b->yy_buf_size * 2;
if ( new_size <= 0 ) if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8; b->yy_buf_size += b->yy_buf_size / 8;
...@@ -1407,7 +1729,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1407,7 +1729,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
} }
else else
/* Can't grow it, we don't own it. */ /* Can't grow it, we don't own it. */
b->yy_ch_buf = 0; b->yy_ch_buf = NULL;
if ( ! b->yy_ch_buf ) if ( ! b->yy_ch_buf )
YY_FATAL_ERROR( YY_FATAL_ERROR(
...@@ -1415,8 +1737,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1415,8 +1737,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - num_to_read = static_cast<int>(YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
number_to_move - 1; number_to_move - 1);
} }
...@@ -1424,8 +1746,10 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1424,8 +1746,10 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
num_to_read = YY_READ_BUF_SIZE; num_to_read = YY_READ_BUF_SIZE;
/* Read in more data. */ /* Read in more data. */
yy_size_t ret = 0;
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
yyg->yy_n_chars, num_to_read ); ret, num_to_read );
yyg->yy_n_chars = static_cast<int>(ret);
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
} }
...@@ -1449,7 +1773,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1449,7 +1773,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else else
ret_val = EOB_ACT_CONTINUE_SCAN; ret_val = EOB_ACT_CONTINUE_SCAN;
if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { if ((int) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
/* Extend the array by 50%, plus the number we really need. */ /* Extend the array by 50%, plus the number we really need. */
yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) pprealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner ); YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) pprealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
...@@ -1457,7 +1781,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1457,7 +1781,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
} }
yyg->yy_n_chars += number_to_move; yyg->yy_n_chars += static_cast<int>(number_to_move);
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
...@@ -1466,19 +1790,21 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1466,19 +1790,21 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
return ret_val; return ret_val;
} }
/* yy_get_previous_state - get the state just before the EOB char was reached */ /* yy_get_previous_state - get the state just before the EOB char was reached */
static yy_state_type yy_get_previous_state (yyscan_t yyscanner) static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
{ {
register yy_state_type yy_current_state; yy_state_type yy_current_state;
register char *yy_cp; char *yy_cp;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
yy_current_state = yyg->yy_start; yy_current_state = yyg->yy_start;
for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
{ {
register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
if ( yy_accept[yy_current_state] ) if ( yy_accept[yy_current_state] )
{ {
yyg->yy_last_accepting_state = yy_current_state; yyg->yy_last_accepting_state = yy_current_state;
...@@ -1490,12 +1816,13 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1490,12 +1816,13 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
if ( yy_current_state >= 98 ) if ( yy_current_state >= 98 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
} }
return yy_current_state; return yy_current_state;
} }
/* yy_try_NUL_trans - try to make a transition on the NUL character /* yy_try_NUL_trans - try to make a transition on the NUL character
* *
* synopsis * synopsis
...@@ -1503,11 +1830,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1503,11 +1830,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
*/ */
static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner)
{ {
register int yy_is_jam; int yy_is_jam;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
register char *yy_cp = yyg->yy_c_buf_p; char *yy_cp = yyg->yy_c_buf_p;
register YY_CHAR yy_c = 1; YY_CHAR yy_c = 1;
if ( yy_accept[yy_current_state] ) if ( yy_accept[yy_current_state] )
{ {
yyg->yy_last_accepting_state = yy_current_state; yyg->yy_last_accepting_state = yy_current_state;
...@@ -1519,13 +1846,18 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1519,13 +1846,18 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
if ( yy_current_state >= 98 ) if ( yy_current_state >= 98 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
yy_is_jam = (yy_current_state == 97); yy_is_jam = (yy_current_state == 97);
(void)yyg; (void)yyg;
return yy_is_jam ? 0 : yy_current_state; return yy_is_jam ? 0 : yy_current_state;
} }
#ifndef YY_NO_UNPUT
#endif
#ifndef YY_NO_INPUT #ifndef YY_NO_INPUT
#ifdef __cplusplus #ifdef __cplusplus
static int yyinput (yyscan_t yyscanner) static int yyinput (yyscan_t yyscanner)
...@@ -1551,7 +1883,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1551,7 +1883,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else else
{ /* need more input */ { /* need more input */
yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr; int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
++yyg->yy_c_buf_p; ++yyg->yy_c_buf_p;
switch ( yy_get_next_buffer( yyscanner ) ) switch ( yy_get_next_buffer( yyscanner ) )
...@@ -1575,7 +1907,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1575,7 +1907,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
case EOB_ACT_END_OF_FILE: case EOB_ACT_END_OF_FILE:
{ {
if ( ppwrap(yyscanner ) ) if ( ppwrap(yyscanner ) )
return EOF; return 0;
if ( ! yyg->yy_did_buffer_switch_on_eof ) if ( ! yyg->yy_did_buffer_switch_on_eof )
YY_NEW_FILE; YY_NEW_FILE;
...@@ -1597,6 +1929,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1597,6 +1929,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
*yyg->yy_c_buf_p = '\0'; /* preserve yytext */ *yyg->yy_c_buf_p = '\0'; /* preserve yytext */
yyg->yy_hold_char = *++yyg->yy_c_buf_p; yyg->yy_hold_char = *++yyg->yy_c_buf_p;
return c; return c;
} }
#endif /* ifndef YY_NO_INPUT */ #endif /* ifndef YY_NO_INPUT */
...@@ -1620,6 +1953,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1620,6 +1953,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
pp_load_buffer_state(yyscanner ); pp_load_buffer_state(yyscanner );
} }
/** Switch to a different input buffer. /** Switch to a different input buffer.
* @param new_buffer The new input buffer. * @param new_buffer The new input buffer.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
...@@ -1656,6 +1990,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -1656,6 +1990,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
yyg->yy_did_buffer_switch_on_eof = 1; yyg->yy_did_buffer_switch_on_eof = 1;
} }
static void pp_load_buffer_state (yyscan_t yyscanner) static void pp_load_buffer_state (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
...@@ -1679,7 +2014,7 @@ static void pp_load_buffer_state (yyscan_t yyscanner) ...@@ -1679,7 +2014,7 @@ static void pp_load_buffer_state (yyscan_t yyscanner)
if ( ! b ) if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in pp_create_buffer()" ); YY_FATAL_ERROR( "out of dynamic memory in pp_create_buffer()" );
b->yy_buf_size = size; b->yy_buf_size = (yy_size_t)size;
/* yy_ch_buf has to be 2 characters longer than the size given because /* yy_ch_buf has to be 2 characters longer than the size given because
* we need to put in 2 end-of-buffer characters. * we need to put in 2 end-of-buffer characters.
...@@ -1695,6 +2030,7 @@ static void pp_load_buffer_state (yyscan_t yyscanner) ...@@ -1695,6 +2030,7 @@ static void pp_load_buffer_state (yyscan_t yyscanner)
return b; return b;
} }
/** Destroy the buffer. /** Destroy the buffer.
* @param b a buffer created with pp_create_buffer() * @param b a buffer created with pp_create_buffer()
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
...@@ -1715,6 +2051,7 @@ static void pp_load_buffer_state (yyscan_t yyscanner) ...@@ -1715,6 +2051,7 @@ static void pp_load_buffer_state (yyscan_t yyscanner)
ppfree((void *) b ,yyscanner ); ppfree((void *) b ,yyscanner );
} }
/* Initializes or reinitializes a buffer. /* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer, * This function is sometimes called more than once on the same buffer,
* such as during a pprestart() or at EOF. * such as during a pprestart() or at EOF.
...@@ -1739,8 +2076,11 @@ static void pp_load_buffer_state (yyscan_t yyscanner) ...@@ -1739,8 +2076,11 @@ static void pp_load_buffer_state (yyscan_t yyscanner)
b->yy_bs_column = 0; b->yy_bs_column = 0;
} }
b->yy_is_interactive = 0; b->yy_is_interactive = 0;
errno = oerrno; errno = oerrno;
} }
...@@ -1805,6 +2145,7 @@ void pppush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) ...@@ -1805,6 +2145,7 @@ void pppush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
yyg->yy_did_buffer_switch_on_eof = 1; yyg->yy_did_buffer_switch_on_eof = 1;
} }
/** Removes and deletes the top of the stack, if present. /** Removes and deletes the top of the stack, if present.
* The next element becomes the new top. * The next element becomes the new top.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
...@@ -1826,6 +2167,7 @@ void pppop_buffer_state (yyscan_t yyscanner) ...@@ -1826,6 +2167,7 @@ void pppop_buffer_state (yyscan_t yyscanner)
} }
} }
/* Allocates the stack if it does not exist. /* Allocates the stack if it does not exist.
* Guarantees space for at least one push. * Guarantees space for at least one push.
*/ */
...@@ -1840,13 +2182,14 @@ static void ppensure_buffer_stack (yyscan_t yyscanner) ...@@ -1840,13 +2182,14 @@ static void ppensure_buffer_stack (yyscan_t yyscanner)
* scanner will even need a stack. We use 2 instead of 1 to avoid an * scanner will even need a stack. We use 2 instead of 1 to avoid an
* immediate realloc on the next call. * immediate realloc on the next call.
*/ */
num_to_alloc = 1; num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
yyg->yy_buffer_stack = (struct yy_buffer_state**)ppalloc yyg->yy_buffer_stack = (struct yy_buffer_state**)ppalloc
(num_to_alloc * sizeof(struct yy_buffer_state*) (num_to_alloc * sizeof(struct yy_buffer_state*)
, yyscanner); , yyscanner);
if ( ! yyg->yy_buffer_stack ) if ( ! yyg->yy_buffer_stack )
YY_FATAL_ERROR( "out of dynamic memory in ppensure_buffer_stack()" ); YY_FATAL_ERROR( "out of dynamic memory in ppensure_buffer_stack()" );
memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
yyg->yy_buffer_stack_max = num_to_alloc; yyg->yy_buffer_stack_max = num_to_alloc;
...@@ -1857,7 +2200,7 @@ static void ppensure_buffer_stack (yyscan_t yyscanner) ...@@ -1857,7 +2200,7 @@ static void ppensure_buffer_stack (yyscan_t yyscanner)
if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){ if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
/* Increase the buffer to prepare for a possible push. */ /* Increase the buffer to prepare for a possible push. */
int grow_size = 8 /* arbitrary grow size */; yy_size_t grow_size = 8 /* arbitrary grow size */;
num_to_alloc = yyg->yy_buffer_stack_max + grow_size; num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
yyg->yy_buffer_stack = (struct yy_buffer_state**)pprealloc yyg->yy_buffer_stack = (struct yy_buffer_state**)pprealloc
...@@ -1873,6 +2216,10 @@ static void ppensure_buffer_stack (yyscan_t yyscanner) ...@@ -1873,6 +2216,10 @@ static void ppensure_buffer_stack (yyscan_t yyscanner)
} }
} }
/** Setup the input buffer state to scan directly from a user-specified character buffer. /** Setup the input buffer state to scan directly from a user-specified character buffer.
* @param base the character buffer * @param base the character buffer
* @param size the size in bytes of the character buffer * @param size the size in bytes of the character buffer
...@@ -1887,16 +2234,16 @@ YY_BUFFER_STATE pp_scan_buffer (char * base, yy_size_t size , yyscan_t yyscann ...@@ -1887,16 +2234,16 @@ YY_BUFFER_STATE pp_scan_buffer (char * base, yy_size_t size , yyscan_t yyscann
base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-2] != YY_END_OF_BUFFER_CHAR ||
base[size-1] != YY_END_OF_BUFFER_CHAR ) base[size-1] != YY_END_OF_BUFFER_CHAR )
/* They forgot to leave room for the EOB's. */ /* They forgot to leave room for the EOB's. */
return 0; return NULL;
b = (YY_BUFFER_STATE) ppalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); b = (YY_BUFFER_STATE) ppalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
if ( ! b ) if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in pp_scan_buffer()" ); YY_FATAL_ERROR( "out of dynamic memory in pp_scan_buffer()" );
b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ b->yy_buf_size = static_cast<int>(size - 2); /* "- 2" to take care of EOB's */
b->yy_buf_pos = b->yy_ch_buf = base; b->yy_buf_pos = b->yy_ch_buf = base;
b->yy_is_our_buffer = 0; b->yy_is_our_buffer = 0;
b->yy_input_file = 0; b->yy_input_file = NULL;
b->yy_n_chars = b->yy_buf_size; b->yy_n_chars = b->yy_buf_size;
b->yy_is_interactive = 0; b->yy_is_interactive = 0;
b->yy_at_bol = 1; b->yy_at_bol = 1;
...@@ -1908,6 +2255,9 @@ YY_BUFFER_STATE pp_scan_buffer (char * base, yy_size_t size , yyscan_t yyscann ...@@ -1908,6 +2255,9 @@ YY_BUFFER_STATE pp_scan_buffer (char * base, yy_size_t size , yyscan_t yyscann
return b; return b;
} }
/** Setup the input buffer state to scan a string. The next call to pplex() will /** Setup the input buffer state to scan a string. The next call to pplex() will
* scan from a @e copy of @a str. * scan from a @e copy of @a str.
* @param yystr a NUL-terminated string to scan * @param yystr a NUL-terminated string to scan
...@@ -1919,9 +2269,12 @@ YY_BUFFER_STATE pp_scan_buffer (char * base, yy_size_t size , yyscan_t yyscann ...@@ -1919,9 +2269,12 @@ YY_BUFFER_STATE pp_scan_buffer (char * base, yy_size_t size , yyscan_t yyscann
YY_BUFFER_STATE pp_scan_string (yyconst char * yystr , yyscan_t yyscanner) YY_BUFFER_STATE pp_scan_string (yyconst char * yystr , yyscan_t yyscanner)
{ {
return pp_scan_bytes(yystr,strlen(yystr) ,yyscanner); return pp_scan_bytes(yystr,(int) strlen(yystr) ,yyscanner);
} }
/** Setup the input buffer state to scan the given bytes. The next call to pplex() will /** Setup the input buffer state to scan the given bytes. The next call to pplex() will
* scan from a @e copy of @a bytes. * scan from a @e copy of @a bytes.
* @param yybytes the byte buffer to scan * @param yybytes the byte buffer to scan
...@@ -1929,7 +2282,7 @@ YY_BUFFER_STATE pp_scan_string (yyconst char * yystr , yyscan_t yyscanner) ...@@ -1929,7 +2282,7 @@ YY_BUFFER_STATE pp_scan_string (yyconst char * yystr , yyscan_t yyscanner)
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
* @return the newly allocated buffer state object. * @return the newly allocated buffer state object.
*/ */
YY_BUFFER_STATE pp_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner) YY_BUFFER_STATE pp_scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner)
{ {
YY_BUFFER_STATE b; YY_BUFFER_STATE b;
char *buf; char *buf;
...@@ -1937,12 +2290,12 @@ YY_BUFFER_STATE pp_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ...@@ -1937,12 +2290,12 @@ YY_BUFFER_STATE pp_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len
yy_size_t i; yy_size_t i;
/* Get memory for full buffer, including space for trailing EOB's. */ /* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2; n = (yy_size_t) _yybytes_len + 2;
buf = (char *) ppalloc(n ,yyscanner ); buf = (char *) ppalloc(n ,yyscanner );
if ( ! buf ) if ( ! buf )
YY_FATAL_ERROR( "out of dynamic memory in pp_scan_bytes()" ); YY_FATAL_ERROR( "out of dynamic memory in pp_scan_bytes()" );
for ( i = 0; i < _yybytes_len; ++i ) for ( i = 0; i < static_cast<yy_size_t>(_yybytes_len); ++i )
buf[i] = yybytes[i]; buf[i] = yybytes[i];
buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
...@@ -1959,13 +2312,25 @@ YY_BUFFER_STATE pp_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ...@@ -1959,13 +2312,25 @@ YY_BUFFER_STATE pp_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len
return b; return b;
} }
#ifndef YY_EXIT_FAILURE #ifndef YY_EXIT_FAILURE
#define YY_EXIT_FAILURE 2 #define YY_EXIT_FAILURE 2
#endif #endif
static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) static void yynoreturn yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
{ {
(void) fprintf( stderr, "%s\n", msg ); struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
(void)yyg;
(void) fprintf( stderr, "%s\n", msg );
exit( YY_EXIT_FAILURE ); exit( YY_EXIT_FAILURE );
} }
...@@ -1986,8 +2351,11 @@ static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) ...@@ -1986,8 +2351,11 @@ static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
} \ } \
while ( 0 ) while ( 0 )
/* Accessor methods (get/set functions) to struct members. */ /* Accessor methods (get/set functions) to struct members. */
/** Get the user-defined data for this scanner. /** Get the user-defined data for this scanner.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
...@@ -1997,6 +2365,8 @@ YY_EXTRA_TYPE ppget_extra (yyscan_t yyscanner) ...@@ -1997,6 +2365,8 @@ YY_EXTRA_TYPE ppget_extra (yyscan_t yyscanner)
return yyextra; return yyextra;
} }
/** Get the current line number. /** Get the current line number.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
...@@ -2004,12 +2374,16 @@ int ppget_lineno (yyscan_t yyscanner) ...@@ -2004,12 +2374,16 @@ int ppget_lineno (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (! YY_CURRENT_BUFFER) if (! YY_CURRENT_BUFFER)
return 0; return 0;
return yylineno; return yylineno;
} }
/** Get the current column number. /** Get the current column number.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
...@@ -2017,12 +2391,16 @@ int ppget_column (yyscan_t yyscanner) ...@@ -2017,12 +2391,16 @@ int ppget_column (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (! YY_CURRENT_BUFFER) if (! YY_CURRENT_BUFFER)
return 0; return 0;
return yycolumn; return yycolumn;
} }
/** Get the input stream. /** Get the input stream.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
...@@ -2032,6 +2410,8 @@ FILE *ppget_in (yyscan_t yyscanner) ...@@ -2032,6 +2410,8 @@ FILE *ppget_in (yyscan_t yyscanner)
return yyin; return yyin;
} }
/** Get the output stream. /** Get the output stream.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
...@@ -2041,15 +2421,18 @@ FILE *ppget_out (yyscan_t yyscanner) ...@@ -2041,15 +2421,18 @@ FILE *ppget_out (yyscan_t yyscanner)
return yyout; return yyout;
} }
/** Get the length of the current token. /** Get the length of the current token.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
yy_size_t ppget_leng (yyscan_t yyscanner) int ppget_leng (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yyleng; return yyleng;
} }
/** Get the current token. /** Get the current token.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
...@@ -2060,6 +2443,8 @@ char *ppget_text (yyscan_t yyscanner) ...@@ -2060,6 +2443,8 @@ char *ppget_text (yyscan_t yyscanner)
return yytext; return yytext;
} }
/** Set the user-defined data. This data is never touched by the scanner. /** Set the user-defined data. This data is never touched by the scanner.
* @param user_defined The data to be associated with this scanner. * @param user_defined The data to be associated with this scanner.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
...@@ -2070,92 +2455,123 @@ void ppset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) ...@@ -2070,92 +2455,123 @@ void ppset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner)
yyextra = user_defined ; yyextra = user_defined ;
} }
/** Set the current line number. /** Set the current line number.
* @param line_number * @param _line_number line number
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
void ppset_lineno (int line_number , yyscan_t yyscanner) void ppset_lineno (int _line_number , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
/* lineno is only valid if an input buffer exists. */ /* lineno is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER ) if (! YY_CURRENT_BUFFER )
YY_FATAL_ERROR( "ppset_lineno called with no buffer" ); YY_FATAL_ERROR( "ppset_lineno called with no buffer" );
yylineno = line_number; yylineno = _line_number;
} }
/** Set the current column. /** Set the current column.
* @param line_number * @param _column_no column number
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
void ppset_column (int column_no , yyscan_t yyscanner) void ppset_column (int _column_no , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
/* column is only valid if an input buffer exists. */ /* column is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER ) if (! YY_CURRENT_BUFFER )
YY_FATAL_ERROR( "ppset_column called with no buffer" ); YY_FATAL_ERROR( "ppset_column called with no buffer" );
yycolumn = column_no; yycolumn = _column_no;
} }
/** Set the input stream. This does not discard the current /** Set the input stream. This does not discard the current
* input buffer. * input buffer.
* @param in_str A readable stream. * @param _in_str A readable stream.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
* @see pp_switch_to_buffer * @see pp_switch_to_buffer
*/ */
void ppset_in (FILE * in_str , yyscan_t yyscanner) void ppset_in (FILE * _in_str , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
yyin = in_str ; yyin = _in_str ;
} }
void ppset_out (FILE * out_str , yyscan_t yyscanner)
void ppset_out (FILE * _out_str , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
yyout = out_str ; yyout = _out_str ;
} }
int ppget_debug (yyscan_t yyscanner) int ppget_debug (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yy_flex_debug; return yy_flex_debug;
} }
void ppset_debug (int bdebug , yyscan_t yyscanner)
void ppset_debug (int _bdebug , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
yy_flex_debug = bdebug ; yy_flex_debug = _bdebug ;
} }
/* Accessor methods for yylval and yylloc */ /* Accessor methods for yylval and yylloc */
YYSTYPE * ppget_lval (yyscan_t yyscanner) YYSTYPE * ppget_lval (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yylval; return yylval;
} }
void ppset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) void ppset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
yylval = yylval_param; yylval = yylval_param;
} }
YYLTYPE *ppget_lloc (yyscan_t yyscanner) YYLTYPE *ppget_lloc (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yylloc; return yylloc;
} }
void ppset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) void ppset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
yylloc = yylloc_param; yylloc = yylloc_param;
} }
/* User-visible API */ /* User-visible API */
/* pplex_init is special because it creates the scanner itself, so it is /* pplex_init is special because it creates the scanner itself, so it is
...@@ -2184,6 +2600,7 @@ int pplex_init(yyscan_t* ptr_yy_globals) ...@@ -2184,6 +2600,7 @@ int pplex_init(yyscan_t* ptr_yy_globals)
return yy_init_globals ( *ptr_yy_globals ); return yy_init_globals ( *ptr_yy_globals );
} }
/* pplex_init_extra has the same functionality as pplex_init, but follows the /* pplex_init_extra has the same functionality as pplex_init, but follows the
* convention of taking the scanner as the last argument. Note however, that * convention of taking the scanner as the last argument. Note however, that
* this is a *pointer* to a scanner, as it will be allocated by this call (and * this is a *pointer* to a scanner, as it will be allocated by this call (and
...@@ -2220,6 +2637,7 @@ int pplex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) ...@@ -2220,6 +2637,7 @@ int pplex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )
return yy_init_globals ( *ptr_yy_globals ); return yy_init_globals ( *ptr_yy_globals );
} }
static int yy_init_globals (yyscan_t yyscanner) static int yy_init_globals (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
...@@ -2227,24 +2645,31 @@ static int yy_init_globals (yyscan_t yyscanner) ...@@ -2227,24 +2645,31 @@ static int yy_init_globals (yyscan_t yyscanner)
* This function is called from pplex_destroy(), so don't allocate here. * This function is called from pplex_destroy(), so don't allocate here.
*/ */
yyg->yy_buffer_stack = 0;
yyg->yy_buffer_stack = NULL;
yyg->yy_buffer_stack_top = 0; yyg->yy_buffer_stack_top = 0;
yyg->yy_buffer_stack_max = 0; yyg->yy_buffer_stack_max = 0;
yyg->yy_c_buf_p = (char *) 0; yyg->yy_c_buf_p = NULL;
yyg->yy_init = 0; yyg->yy_init = 0;
yyg->yy_start = 0; yyg->yy_start = 0;
yyg->yy_start_stack_ptr = 0; yyg->yy_start_stack_ptr = 0;
yyg->yy_start_stack_depth = 0; yyg->yy_start_stack_depth = 0;
yyg->yy_start_stack = NULL; yyg->yy_start_stack = NULL;
/* Defined in main.c */ /* Defined in main.c */
#ifdef YY_STDINIT #ifdef YY_STDINIT
yyin = stdin; yyin = stdin;
yyout = stdout; yyout = stdout;
#else #else
yyin = (FILE *) 0; yyin = NULL;
yyout = (FILE *) 0; yyout = NULL;
#endif #endif
/* For future reference: Set errno on error, since we are called by /* For future reference: Set errno on error, since we are called by
...@@ -2253,6 +2678,7 @@ static int yy_init_globals (yyscan_t yyscanner) ...@@ -2253,6 +2678,7 @@ static int yy_init_globals (yyscan_t yyscanner)
return 0; return 0;
} }
/* pplex_destroy is for both reentrant and non-reentrant scanners. */ /* pplex_destroy is for both reentrant and non-reentrant scanners. */
int pplex_destroy (yyscan_t yyscanner) int pplex_destroy (yyscan_t yyscanner)
{ {
...@@ -2269,10 +2695,14 @@ int pplex_destroy (yyscan_t yyscanner) ...@@ -2269,10 +2695,14 @@ int pplex_destroy (yyscan_t yyscanner)
ppfree(yyg->yy_buffer_stack ,yyscanner); ppfree(yyg->yy_buffer_stack ,yyscanner);
yyg->yy_buffer_stack = NULL; yyg->yy_buffer_stack = NULL;
/* Destroy the start condition stack. */ /* Destroy the start condition stack. */
ppfree(yyg->yy_start_stack ,yyscanner ); ppfree(yyg->yy_start_stack ,yyscanner );
yyg->yy_start_stack = NULL; yyg->yy_start_stack = NULL;
/* Reset the globals. This is important in a non-reentrant scanner so the next time /* Reset the globals. This is important in a non-reentrant scanner so the next time
* pplex() is called, initialization will occur. */ * pplex() is called, initialization will occur. */
yy_init_globals( yyscanner); yy_init_globals( yyscanner);
...@@ -2283,23 +2713,32 @@ int pplex_destroy (yyscan_t yyscanner) ...@@ -2283,23 +2713,32 @@ int pplex_destroy (yyscan_t yyscanner)
return 0; return 0;
} }
/* /*
* Internal utility routines. * Internal utility routines.
*/ */
#ifndef yytext_ptr #ifndef yytext_ptr
static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)
{ {
register int i; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
(void)yyg;
int i;
for ( i = 0; i < n; ++i ) for ( i = 0; i < n; ++i )
s1[i] = s2[i]; s1[i] = s2[i];
} }
#endif #endif
#ifdef YY_NEED_STRLEN #ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
{ {
register int n; int n;
for ( n = 0; s[n]; ++n ) for ( n = 0; s[n]; ++n )
; ;
...@@ -2307,13 +2746,22 @@ static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) ...@@ -2307,13 +2746,22 @@ static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
} }
#endif #endif
void *ppalloc (yy_size_t size , yyscan_t yyscanner) void *ppalloc (yy_size_t size , yyscan_t yyscanner)
{ {
return (void *) malloc( size ); struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
(void)yyg;
return malloc(size);
} }
void *pprealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) void *pprealloc (void * ptr, yy_size_t size , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
(void)yyg;
/* The cast to (char *) in the following accommodates both /* The cast to (char *) in the following accommodates both
* implementations that use char* generic pointers, and those * implementations that use char* generic pointers, and those
* that use void* generic pointers. It works with the latter * that use void* generic pointers. It works with the latter
...@@ -2321,16 +2769,29 @@ void *pprealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) ...@@ -2321,16 +2769,29 @@ void *pprealloc (void * ptr, yy_size_t size , yyscan_t yyscanner)
* any pointer type to void*, and deal with argument conversions * any pointer type to void*, and deal with argument conversions
* as though doing an assignment. * as though doing an assignment.
*/ */
return (void *) realloc( (char *) ptr, size ); return realloc(ptr, size);
} }
void ppfree (void * ptr , yyscan_t yyscanner) void ppfree (void * ptr , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
(void)yyg;
free( (char *) ptr ); /* see pprealloc() for (char *) cast */ free( (char *) ptr ); /* see pprealloc() for (char *) cast */
} }
#define YYTABLES_NAME "yytables" #define YYTABLES_NAME "yytables"
namespace pp { namespace pp {
Tokenizer::Tokenizer(Diagnostics *diagnostics) Tokenizer::Tokenizer(Diagnostics *diagnostics)
...@@ -2410,3 +2871,4 @@ void Tokenizer::destroyScanner() ...@@ -2410,3 +2871,4 @@ void Tokenizer::destroyScanner()
} // namespace pp } // namespace pp
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment