From 01655fc9992dab503fc66a0000d38500eee54256 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Wed, 31 May 2017 23:06:55 -0400 Subject: regen parser --- src/parser.c | 713 +++++++++++++++++++++++++++++++++++++---------------------- src/parser.h | 433 ++++++++++++++++++++++++++++++------ 2 files changed, 812 insertions(+), 334 deletions(-) diff --git a/src/parser.c b/src/parser.c index 0b86ef8..870ec71 100644 --- a/src/parser.c +++ b/src/parser.c @@ -1,6 +1,6 @@ -#line 2 "src/parser.c" +#line 1 "src/parser.c" -#line 4 "src/parser.c" +#line 3 "src/parser.c" #define YY_INT_ALIGNED short int @@ -9,11 +9,221 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 0 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif +#ifdef yy_create_buffer +#define vt100_parser_yy_create_buffer_ALREADY_DEFINED +#else +#define yy_create_buffer vt100_parser_yy_create_buffer +#endif + +#ifdef yy_delete_buffer +#define vt100_parser_yy_delete_buffer_ALREADY_DEFINED +#else +#define yy_delete_buffer vt100_parser_yy_delete_buffer +#endif + +#ifdef yy_scan_buffer +#define vt100_parser_yy_scan_buffer_ALREADY_DEFINED +#else +#define yy_scan_buffer vt100_parser_yy_scan_buffer +#endif + +#ifdef yy_scan_string +#define vt100_parser_yy_scan_string_ALREADY_DEFINED +#else +#define yy_scan_string vt100_parser_yy_scan_string +#endif + +#ifdef yy_scan_bytes +#define vt100_parser_yy_scan_bytes_ALREADY_DEFINED +#else +#define yy_scan_bytes vt100_parser_yy_scan_bytes +#endif + +#ifdef yy_init_buffer +#define vt100_parser_yy_init_buffer_ALREADY_DEFINED +#else +#define yy_init_buffer vt100_parser_yy_init_buffer +#endif + +#ifdef yy_flush_buffer +#define vt100_parser_yy_flush_buffer_ALREADY_DEFINED +#else +#define yy_flush_buffer vt100_parser_yy_flush_buffer +#endif + +#ifdef yy_load_buffer_state +#define vt100_parser_yy_load_buffer_state_ALREADY_DEFINED +#else +#define yy_load_buffer_state vt100_parser_yy_load_buffer_state +#endif + +#ifdef yy_switch_to_buffer +#define vt100_parser_yy_switch_to_buffer_ALREADY_DEFINED +#else +#define yy_switch_to_buffer vt100_parser_yy_switch_to_buffer +#endif + +#ifdef yypush_buffer_state +#define vt100_parser_yypush_buffer_state_ALREADY_DEFINED +#else +#define yypush_buffer_state vt100_parser_yypush_buffer_state +#endif + +#ifdef yypop_buffer_state +#define vt100_parser_yypop_buffer_state_ALREADY_DEFINED +#else +#define yypop_buffer_state vt100_parser_yypop_buffer_state +#endif + +#ifdef yyensure_buffer_stack +#define vt100_parser_yyensure_buffer_stack_ALREADY_DEFINED +#else +#define yyensure_buffer_stack vt100_parser_yyensure_buffer_stack +#endif + +#ifdef yylex +#define vt100_parser_yylex_ALREADY_DEFINED +#else +#define yylex vt100_parser_yylex +#endif + +#ifdef yyrestart +#define vt100_parser_yyrestart_ALREADY_DEFINED +#else +#define yyrestart vt100_parser_yyrestart +#endif + +#ifdef yylex_init +#define vt100_parser_yylex_init_ALREADY_DEFINED +#else +#define yylex_init vt100_parser_yylex_init +#endif + +#ifdef yylex_init_extra +#define vt100_parser_yylex_init_extra_ALREADY_DEFINED +#else +#define yylex_init_extra vt100_parser_yylex_init_extra +#endif + +#ifdef yylex_destroy +#define vt100_parser_yylex_destroy_ALREADY_DEFINED +#else +#define yylex_destroy vt100_parser_yylex_destroy +#endif + +#ifdef yyget_debug +#define vt100_parser_yyget_debug_ALREADY_DEFINED +#else +#define yyget_debug vt100_parser_yyget_debug +#endif + +#ifdef yyset_debug +#define vt100_parser_yyset_debug_ALREADY_DEFINED +#else +#define yyset_debug vt100_parser_yyset_debug +#endif + +#ifdef yyget_extra +#define vt100_parser_yyget_extra_ALREADY_DEFINED +#else +#define yyget_extra vt100_parser_yyget_extra +#endif + +#ifdef yyset_extra +#define vt100_parser_yyset_extra_ALREADY_DEFINED +#else +#define yyset_extra vt100_parser_yyset_extra +#endif + +#ifdef yyget_in +#define vt100_parser_yyget_in_ALREADY_DEFINED +#else +#define yyget_in vt100_parser_yyget_in +#endif + +#ifdef yyset_in +#define vt100_parser_yyset_in_ALREADY_DEFINED +#else +#define yyset_in vt100_parser_yyset_in +#endif + +#ifdef yyget_out +#define vt100_parser_yyget_out_ALREADY_DEFINED +#else +#define yyget_out vt100_parser_yyget_out +#endif + +#ifdef yyset_out +#define vt100_parser_yyset_out_ALREADY_DEFINED +#else +#define yyset_out vt100_parser_yyset_out +#endif + +#ifdef yyget_leng +#define vt100_parser_yyget_leng_ALREADY_DEFINED +#else +#define yyget_leng vt100_parser_yyget_leng +#endif + +#ifdef yyget_text +#define vt100_parser_yyget_text_ALREADY_DEFINED +#else +#define yyget_text vt100_parser_yyget_text +#endif + +#ifdef yyget_lineno +#define vt100_parser_yyget_lineno_ALREADY_DEFINED +#else +#define yyget_lineno vt100_parser_yyget_lineno +#endif + +#ifdef yyset_lineno +#define vt100_parser_yyset_lineno_ALREADY_DEFINED +#else +#define yyset_lineno vt100_parser_yyset_lineno +#endif + +#ifdef yyget_column +#define vt100_parser_yyget_column_ALREADY_DEFINED +#else +#define yyget_column vt100_parser_yyget_column +#endif + +#ifdef yyset_column +#define vt100_parser_yyset_column_ALREADY_DEFINED +#else +#define yyset_column vt100_parser_yyset_column +#endif + +#ifdef yywrap +#define vt100_parser_yywrap_ALREADY_DEFINED +#else +#define yywrap vt100_parser_yywrap +#endif + +#ifdef yyalloc +#define vt100_parser_yyalloc_ALREADY_DEFINED +#else +#define yyalloc vt100_parser_yyalloc +#endif + +#ifdef yyrealloc +#define vt100_parser_yyrealloc_ALREADY_DEFINED +#else +#define yyrealloc vt100_parser_yyrealloc +#endif + +#ifdef yyfree +#define vt100_parser_yyfree_ALREADY_DEFINED +#else +#define yyfree vt100_parser_yyfree +#endif + /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -84,40 +294,32 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus +/* begin standard C++ headers. */ -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * 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 - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* An opaque pointer. */ #ifndef YY_TYPEDEF_YY_SCANNER_T @@ -141,20 +343,16 @@ typedef void* yyscan_t; * definition of BEGIN. */ #define BEGIN yyg->yy_start = 1 + 2 * - /* 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 * compatibility. */ #define YY_START ((yyg->yy_start - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE vt100_parser_yyrestart(yyin ,yyscanner ) - +#define YY_NEW_FILE yyrestart( yyin , yyscanner ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -187,7 +385,7 @@ typedef size_t yy_size_t; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) #define YY_LINENO_REWIND_TO(ptr) @@ -204,7 +402,6 @@ typedef size_t yy_size_t; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -219,12 +416,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -247,7 +444,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -264,7 +461,7 @@ struct yy_buffer_state * possible backing-up. * * When we actually see the EOF, we change the status to "new" - * (via vt100_parser_yyrestart()), so that the user can continue scanning by + * (via yyrestart()), so that the user can continue scanning by * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 @@ -281,87 +478,77 @@ struct yy_buffer_state #define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ : NULL) - /* 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. */ #define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] -void vt100_parser_yyrestart (FILE *input_file ,yyscan_t yyscanner ); -void vt100_parser_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE vt100_parser_yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void vt100_parser_yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void vt100_parser_yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void vt100_parser_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void vt100_parser_yypop_buffer_state (yyscan_t yyscanner ); - -static void vt100_parser_yyensure_buffer_stack (yyscan_t yyscanner ); -static void vt100_parser_yy_load_buffer_state (yyscan_t yyscanner ); -static void vt100_parser_yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner ); - -#define YY_FLUSH_BUFFER vt100_parser_yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner) +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); -YY_BUFFER_STATE vt100_parser_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE vt100_parser_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE vt100_parser_yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); +static void yyensure_buffer_stack ( yyscan_t yyscanner ); +static void yy_load_buffer_state ( yyscan_t yyscanner ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file , yyscan_t yyscanner ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER , yyscanner) -void *vt100_parser_yyalloc (yy_size_t ,yyscan_t yyscanner ); -void *vt100_parser_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); -void vt100_parser_yyfree (void * ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); -#define yy_new_buffer vt100_parser_yy_create_buffer +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); +#define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ - vt100_parser_yyensure_buffer_stack (yyscanner); \ + yyensure_buffer_stack (yyscanner); \ YY_CURRENT_BUFFER_LVALUE = \ - vt100_parser_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ - vt100_parser_yyensure_buffer_stack (yyscanner); \ + yyensure_buffer_stack (yyscanner); \ YY_CURRENT_BUFFER_LVALUE = \ - vt100_parser_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ #define vt100_parser_yywrap(yyscanner) (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP - -typedef unsigned char YY_CHAR; +typedef flex_uint8_t YY_CHAR; typedef int yy_state_type; #define yytext_ptr yytext_r -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 int yy_get_next_buffer (yyscan_t yyscanner ); -#if defined(__GNUC__) && __GNUC__ >= 3 -__attribute__((__noreturn__)) -#endif -static void yy_fatal_error (yyconst char msg[] ,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 int yy_get_next_buffer ( yyscan_t yyscanner ); +static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ yyg->yytext_ptr = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ + yyleng = (int) (yy_cp - yy_bp); \ yyg->yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; - #define YY_NUM_RULES 62 #define YY_END_OF_BUFFER 63 /* This struct is not used in this scanner, @@ -371,7 +558,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[158] = +static const flex_int16_t yy_accept[158] = { 0, 0, 0, 63, 60, 1, 2, 3, 4, 5, 6, 7, 8, 54, 47, 61, 49, 50, 51, 58, 59, @@ -392,7 +579,7 @@ static yyconst flex_int16_t yy_accept[158] = 52, 52, 52, 52, 52, 52, 0 } ; -static yyconst YY_CHAR yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 2, 3, 4, 5, 6, 7, 8, 1, 9, 1, 1, 1, 1, 1, @@ -424,7 +611,7 @@ static yyconst YY_CHAR yy_ec[256] = 57, 57, 57, 57, 57 } ; -static yyconst YY_CHAR yy_meta[58] = +static const YY_CHAR yy_meta[58] = { 0, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, @@ -434,7 +621,7 @@ static yyconst YY_CHAR yy_meta[58] = 3, 3, 7, 8, 8, 8, 7 } ; -static yyconst flex_uint16_t yy_base[177] = +static const flex_int16_t yy_base[177] = { 0, 0, 57, 428, 717, 717, 717, 717, 717, 717, 717, 717, 717, 114, 14, 717, 374, 373, 372, 717, 717, @@ -457,7 +644,7 @@ static yyconst flex_uint16_t yy_base[177] = 696, 699, 702, 704, 707, 710 } ; -static yyconst flex_int16_t yy_def[177] = +static const flex_int16_t yy_def[177] = { 0, 158, 158, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 159, 157, 157, 157, 157, 157, 157, @@ -480,7 +667,7 @@ static yyconst flex_int16_t yy_def[177] = 157, 157, 157, 157, 157, 157 } ; -static yyconst flex_uint16_t yy_nxt[775] = +static const flex_int16_t yy_nxt[775] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 44, 44, 44, 44, 44, 46, 46, 46, 46, 46, @@ -569,7 +756,7 @@ static yyconst flex_uint16_t yy_nxt[775] = 157, 157, 157, 157 } ; -static yyconst flex_int16_t yy_chk[775] = +static const flex_int16_t yy_chk[775] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, @@ -676,6 +863,7 @@ static yyconst flex_int16_t yy_chk[775] = #define VT100_PARSER_CSI_MAX_PARAMS 256 #define YY_EXIT_FAILURE (UNUSED(yyscanner), 2) +#line 866 "src/parser.c" #define YY_NO_INPUT 1 #line 93 "src/parser.l" static void vt100_parser_handle_bel(VT100Screen *vt); @@ -721,7 +909,8 @@ static void vt100_parser_handle_osc1(VT100Screen *vt, char *buf, size_t len); static void vt100_parser_handle_osc2(VT100Screen *vt, char *buf, size_t len); static void vt100_parser_handle_ascii(VT100Screen *vt, char *text, size_t len); static void vt100_parser_handle_text(VT100Screen *vt, char *text, size_t len); -#line 725 "src/parser.c" +#line 912 "src/parser.c" +#line 913 "src/parser.c" #define INITIAL 0 @@ -748,8 +937,8 @@ struct yyguts_t size_t yy_buffer_stack_max; /**< capacity of stack. */ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ char yy_hold_char; - yy_size_t yy_n_chars; - yy_size_t yyleng_r; + int yy_n_chars; + int yyleng_r; char *yy_c_buf_p; int yy_init; int yy_start; @@ -769,44 +958,44 @@ struct yyguts_t }; /* end struct yyguts_t */ -static int yy_init_globals (yyscan_t yyscanner ); +static int yy_init_globals ( yyscan_t yyscanner ); -int vt100_parser_yylex_init (yyscan_t* scanner); +int yylex_init (yyscan_t* scanner); -int vt100_parser_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int vt100_parser_yylex_destroy (yyscan_t yyscanner ); +int yylex_destroy ( yyscan_t yyscanner ); -int vt100_parser_yyget_debug (yyscan_t yyscanner ); +int yyget_debug ( yyscan_t yyscanner ); -void vt100_parser_yyset_debug (int debug_flag ,yyscan_t yyscanner ); +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); -YY_EXTRA_TYPE vt100_parser_yyget_extra (yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); -void vt100_parser_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); -FILE *vt100_parser_yyget_in (yyscan_t yyscanner ); +FILE *yyget_in ( yyscan_t yyscanner ); -void vt100_parser_yyset_in (FILE * _in_str ,yyscan_t yyscanner ); +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); -FILE *vt100_parser_yyget_out (yyscan_t yyscanner ); +FILE *yyget_out ( yyscan_t yyscanner ); -void vt100_parser_yyset_out (FILE * _out_str ,yyscan_t yyscanner ); +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); -yy_size_t vt100_parser_yyget_leng (yyscan_t yyscanner ); + int yyget_leng ( yyscan_t yyscanner ); -char *vt100_parser_yyget_text (yyscan_t yyscanner ); +char *yyget_text ( yyscan_t yyscanner ); -int vt100_parser_yyget_lineno (yyscan_t yyscanner ); +int yyget_lineno ( yyscan_t yyscanner ); -void vt100_parser_yyset_lineno (int _line_number ,yyscan_t yyscanner ); +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); -int vt100_parser_yyget_column (yyscan_t yyscanner ); +int yyget_column ( yyscan_t yyscanner ); -void vt100_parser_yyset_column (int _column_no ,yyscan_t yyscanner ); +void yyset_column ( int _column_no , yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -814,9 +1003,9 @@ void vt100_parser_yyset_column (int _column_no ,yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int vt100_parser_yywrap (yyscan_t yyscanner ); +extern "C" int yywrap ( yyscan_t yyscanner ); #else -extern int vt100_parser_yywrap (yyscan_t yyscanner ); +extern int yywrap ( yyscan_t yyscanner ); #endif #endif @@ -825,19 +1014,18 @@ extern int vt100_parser_yywrap (yyscan_t yyscanner ); #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (yyscan_t yyscanner ); +static int yyinput ( yyscan_t yyscanner ); #else -static int input (yyscan_t yyscanner ); +static int input ( yyscan_t yyscanner ); #endif #endif @@ -857,7 +1045,7 @@ static int input (yyscan_t yyscanner ); /* 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 do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -868,7 +1056,7 @@ static int input (yyscan_t yyscanner ); 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; \ @@ -881,7 +1069,7 @@ static int input (yyscan_t yyscanner ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -922,9 +1110,9 @@ static int input (yyscan_t yyscanner ); #ifndef YY_DECL #define YY_DECL_IS_OURS 1 -extern int vt100_parser_yylex (yyscan_t yyscanner); +extern int yylex (yyscan_t yyscanner); -#define YY_DECL int vt100_parser_yylex (yyscan_t yyscanner) +#define YY_DECL int yylex (yyscan_t yyscanner) #endif /* !YY_DECL */ /* Code executed at the beginning of each rule, after yytext and yyleng @@ -969,19 +1157,19 @@ YY_DECL yyout = stdout; if ( ! YY_CURRENT_BUFFER ) { - vt100_parser_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); YY_CURRENT_BUFFER_LVALUE = - vt100_parser_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); } - vt100_parser_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); } { #line 138 "src/parser.l" -#line 985 "src/parser.c" +#line 1172 "src/parser.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1009,9 +1197,9 @@ yy_match: { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 158 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[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] + yy_c]; ++yy_cp; } while ( yy_current_state != 157 ); @@ -1355,7 +1543,7 @@ YY_RULE_SETUP #line 253 "src/parser.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1359 "src/parser.c" +#line 1546 "src/parser.c" case YY_END_OF_BUFFER: { @@ -1371,7 +1559,7 @@ YY_FATAL_ERROR( "flex scanner jammed" ); /* We're scanning a new file or input source. It's * possible that this happened because the user * just pointed yyin at a new source and called - * vt100_parser_yylex(). If so, then we have to assure + * yylex(). If so, then we have to assure * consistency between YY_CURRENT_BUFFER and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a @@ -1432,7 +1620,7 @@ YY_FATAL_ERROR( "flex scanner jammed" ); { yyg->yy_did_buffer_switch_on_eof = 0; - if ( vt100_parser_yywrap(yyscanner ) ) + if ( yywrap( yyscanner ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1486,7 +1674,7 @@ YY_FATAL_ERROR( "flex scanner jammed" ); } /* end of action switch */ } /* end of scanning one token */ } /* end of user's declarations */ -} /* end of vt100_parser_yylex */ +} /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer * @@ -1500,7 +1688,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; char *source = yyg->yytext_ptr; - yy_size_t number_to_move, i; + int number_to_move, i; int ret_val; if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) @@ -1529,7 +1717,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (yy_size_t) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1; + number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1542,7 +1730,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { - yy_size_t num_to_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -1556,7 +1744,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) 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 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1565,11 +1753,12 @@ static int yy_get_next_buffer (yyscan_t yyscanner) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - vt100_parser_yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) , yyscanner ); } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + b->yy_ch_buf = NULL; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -1597,7 +1786,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - vt100_parser_yyrestart(yyin ,yyscanner); + yyrestart( yyin , yyscanner); } else @@ -1611,12 +1800,15 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else 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 ((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. */ - 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 *) vt100_parser_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner ); + int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size , yyscanner ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } yyg->yy_n_chars += number_to_move; @@ -1650,9 +1842,9 @@ static int yy_get_next_buffer (yyscan_t yyscanner) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 158 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[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] + yy_c]; } return yy_current_state; @@ -1679,9 +1871,9 @@ static int yy_get_next_buffer (yyscan_t yyscanner) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 158 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[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] + yy_c]; yy_is_jam = (yy_current_state == 157); (void)yyg; @@ -1717,7 +1909,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { /* need more input */ - yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr; + int offset = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr); ++yyg->yy_c_buf_p; switch ( yy_get_next_buffer( yyscanner ) ) @@ -1734,14 +1926,14 @@ static int yy_get_next_buffer (yyscan_t yyscanner) */ /* Reset buffer status. */ - vt100_parser_yyrestart(yyin ,yyscanner); + yyrestart( yyin , yyscanner); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( vt100_parser_yywrap(yyscanner ) ) - return EOF; + if ( yywrap( yyscanner ) ) + return 0; if ( ! yyg->yy_did_buffer_switch_on_eof ) YY_NEW_FILE; @@ -1772,34 +1964,34 @@ static int yy_get_next_buffer (yyscan_t yyscanner) * @param yyscanner The scanner object. * @note This function does not reset the start condition to @c INITIAL . */ - void vt100_parser_yyrestart (FILE * input_file , yyscan_t yyscanner) + void yyrestart (FILE * input_file , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( ! YY_CURRENT_BUFFER ){ - vt100_parser_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); YY_CURRENT_BUFFER_LVALUE = - vt100_parser_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); } - vt100_parser_yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); - vt100_parser_yy_load_buffer_state(yyscanner ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file , yyscanner); + yy_load_buffer_state( yyscanner ); } /** Switch to a different input buffer. * @param new_buffer The new input buffer. * @param yyscanner The scanner object. */ - void vt100_parser_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* TODO. We should be able to replace this entire function body * with - * vt100_parser_yypop_buffer_state(); - * vt100_parser_yypush_buffer_state(new_buffer); + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); */ - vt100_parser_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); if ( YY_CURRENT_BUFFER == new_buffer ) return; @@ -1812,17 +2004,17 @@ static int yy_get_next_buffer (yyscan_t yyscanner) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - vt100_parser_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); /* We don't actually know whether we did this switch during - * EOF (vt100_parser_yywrap()) processing, but the only time this flag - * is looked at is after vt100_parser_yywrap() is called, so it's safe + * EOF (yywrap()) processing, but the only time this flag + * is looked at is after yywrap() is called, so it's safe * to go ahead and always set it. */ yyg->yy_did_buffer_switch_on_eof = 1; } -static void vt100_parser_yy_load_buffer_state (yyscan_t yyscanner) +static void yy_load_buffer_state (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; @@ -1837,35 +2029,35 @@ static void vt100_parser_yy_load_buffer_state (yyscan_t yyscanner) * @param yyscanner The scanner object. * @return the allocated buffer state. */ - YY_BUFFER_STATE vt100_parser_yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) vt100_parser_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in vt100_parser_yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_buf_size = (yy_size_t)size; + b->yy_buf_size = size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) vt100_parser_yyalloc(b->yy_buf_size + 2 ,yyscanner ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) , yyscanner ); if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in vt100_parser_yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - vt100_parser_yy_init_buffer(b,file ,yyscanner); + yy_init_buffer( b, file , yyscanner); return b; } /** Destroy the buffer. - * @param b a buffer created with vt100_parser_yy_create_buffer() + * @param b a buffer created with yy_create_buffer() * @param yyscanner The scanner object. */ - void vt100_parser_yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) + void yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -1876,28 +2068,28 @@ static void vt100_parser_yy_load_buffer_state (yyscan_t yyscanner) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - vt100_parser_yyfree((void *) b->yy_ch_buf ,yyscanner ); + yyfree( (void *) b->yy_ch_buf , yyscanner ); - vt100_parser_yyfree((void *) b ,yyscanner ); + yyfree( (void *) b , yyscanner ); } /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, - * such as during a vt100_parser_yyrestart() or at EOF. + * such as during a yyrestart() or at EOF. */ - static void vt100_parser_yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) { int oerrno = errno; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - vt100_parser_yy_flush_buffer(b ,yyscanner); + yy_flush_buffer( b , yyscanner); b->yy_input_file = file; b->yy_fill_buffer = 1; - /* If b is the current buffer, then vt100_parser_yy_init_buffer was _probably_ - * called from vt100_parser_yyrestart() or through yy_get_next_buffer. + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. * In that case, we don't want to reset the lineno or column. */ if (b != YY_CURRENT_BUFFER){ @@ -1914,7 +2106,7 @@ static void vt100_parser_yy_load_buffer_state (yyscan_t yyscanner) * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. * @param yyscanner The scanner object. */ - void vt100_parser_yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) + void yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( ! b ) @@ -1935,7 +2127,7 @@ static void vt100_parser_yy_load_buffer_state (yyscan_t yyscanner) b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - vt100_parser_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); } /** Pushes the new state onto the stack. The new state becomes @@ -1944,15 +2136,15 @@ static void vt100_parser_yy_load_buffer_state (yyscan_t yyscanner) * @param new_buffer The new state. * @param yyscanner The scanner object. */ -void vt100_parser_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (new_buffer == NULL) return; - vt100_parser_yyensure_buffer_stack(yyscanner); + yyensure_buffer_stack(yyscanner); - /* This block is copied from vt100_parser_yy_switch_to_buffer. */ + /* This block is copied from yy_switch_to_buffer. */ if ( YY_CURRENT_BUFFER ) { /* Flush out information for old buffer. */ @@ -1966,8 +2158,8 @@ void vt100_parser_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yys yyg->yy_buffer_stack_top++; YY_CURRENT_BUFFER_LVALUE = new_buffer; - /* copied from vt100_parser_yy_switch_to_buffer. */ - vt100_parser_yy_load_buffer_state(yyscanner ); + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state( yyscanner ); yyg->yy_did_buffer_switch_on_eof = 1; } @@ -1975,19 +2167,19 @@ void vt100_parser_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yys * The next element becomes the new top. * @param yyscanner The scanner object. */ -void vt100_parser_yypop_buffer_state (yyscan_t yyscanner) +void yypop_buffer_state (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (!YY_CURRENT_BUFFER) return; - vt100_parser_yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner); + yy_delete_buffer(YY_CURRENT_BUFFER , yyscanner); YY_CURRENT_BUFFER_LVALUE = NULL; if (yyg->yy_buffer_stack_top > 0) --yyg->yy_buffer_stack_top; if (YY_CURRENT_BUFFER) { - vt100_parser_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); yyg->yy_did_buffer_switch_on_eof = 1; } } @@ -1995,7 +2187,7 @@ void vt100_parser_yypop_buffer_state (yyscan_t yyscanner) /* Allocates the stack if it does not exist. * Guarantees space for at least one push. */ -static void vt100_parser_yyensure_buffer_stack (yyscan_t yyscanner) +static void yyensure_buffer_stack (yyscan_t yyscanner) { yy_size_t num_to_alloc; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -2007,14 +2199,14 @@ static void vt100_parser_yyensure_buffer_stack (yyscan_t yyscanner) * immediate realloc on the next call. */ num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ - yyg->yy_buffer_stack = (struct yy_buffer_state**)vt100_parser_yyalloc + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in vt100_parser_yyensure_buffer_stack()" ); - + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + 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_top = 0; return; @@ -2026,12 +2218,12 @@ static void vt100_parser_yyensure_buffer_stack (yyscan_t yyscanner) yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = yyg->yy_buffer_stack_max + grow_size; - yyg->yy_buffer_stack = (struct yy_buffer_state**)vt100_parser_yyrealloc + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc (yyg->yy_buffer_stack, num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in vt100_parser_yyensure_buffer_stack()" ); + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); /* zero only the new slots.*/ memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); @@ -2043,9 +2235,9 @@ static void vt100_parser_yyensure_buffer_stack (yyscan_t yyscanner) * @param base the character buffer * @param size the size in bytes of the character buffer * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE vt100_parser_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) { YY_BUFFER_STATE b; @@ -2053,69 +2245,69 @@ YY_BUFFER_STATE vt100_parser_yy_scan_buffer (char * base, yy_size_t size , yys base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return NULL; - b = (YY_BUFFER_STATE) vt100_parser_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in vt100_parser_yy_scan_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (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 = 0; + b->yy_input_file = NULL; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - vt100_parser_yy_switch_to_buffer(b ,yyscanner ); + yy_switch_to_buffer( b , yyscanner ); return b; } -/** Setup the input buffer state to scan a string. The next call to vt100_parser_yylex() will +/** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. * @param yystr a NUL-terminated string to scan * @param yyscanner The scanner object. * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use - * vt100_parser_yy_scan_bytes() instead. + * yy_scan_bytes() instead. */ -YY_BUFFER_STATE vt100_parser_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner) { - return vt100_parser_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner); + return yy_scan_bytes( yystr, (int) strlen(yystr) , yyscanner); } -/** Setup the input buffer state to scan the given bytes. The next call to vt100_parser_yylex() will +/** 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 yyscanner The scanner object. * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE vt100_parser_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len , yyscan_t yyscanner) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - yy_size_t i; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) vt100_parser_yyalloc(n ,yyscanner ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n , yyscanner ); if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in vt100_parser_yy_scan_bytes()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); for ( i = 0; i < _yybytes_len; ++i ) buf[i] = yybytes[i]; buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = vt100_parser_yy_scan_buffer(buf,n ,yyscanner); + b = yy_scan_buffer( buf, n , yyscanner); if ( ! b ) - YY_FATAL_ERROR( "bad buffer in vt100_parser_yy_scan_bytes()" ); + YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); /* It's okay to grow etc. this buffer, and we should throw it * away when we're done. @@ -2129,11 +2321,11 @@ YY_BUFFER_STATE vt100_parser_yy_scan_bytes (yyconst char * yybytes, yy_size_t #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) +static void yynoreturn yy_fatal_error (const char* msg , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; (void)yyg; - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -2159,7 +2351,7 @@ static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) /** Get the user-defined data for this scanner. * @param yyscanner The scanner object. */ -YY_EXTRA_TYPE vt100_parser_yyget_extra (yyscan_t yyscanner) +YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyextra; @@ -2168,10 +2360,10 @@ YY_EXTRA_TYPE vt100_parser_yyget_extra (yyscan_t yyscanner) /** Get the current line number. * @param yyscanner The scanner object. */ -int vt100_parser_yyget_lineno (yyscan_t yyscanner) +int yyget_lineno (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; @@ -2181,10 +2373,10 @@ int vt100_parser_yyget_lineno (yyscan_t yyscanner) /** Get the current column number. * @param yyscanner The scanner object. */ -int vt100_parser_yyget_column (yyscan_t yyscanner) +int yyget_column (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; @@ -2194,7 +2386,7 @@ int vt100_parser_yyget_column (yyscan_t yyscanner) /** Get the input stream. * @param yyscanner The scanner object. */ -FILE *vt100_parser_yyget_in (yyscan_t yyscanner) +FILE *yyget_in (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyin; @@ -2203,7 +2395,7 @@ FILE *vt100_parser_yyget_in (yyscan_t yyscanner) /** Get the output stream. * @param yyscanner The scanner object. */ -FILE *vt100_parser_yyget_out (yyscan_t yyscanner) +FILE *yyget_out (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyout; @@ -2212,7 +2404,7 @@ FILE *vt100_parser_yyget_out (yyscan_t yyscanner) /** Get the length of the current token. * @param yyscanner The scanner object. */ -yy_size_t vt100_parser_yyget_leng (yyscan_t yyscanner) +int yyget_leng (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyleng; @@ -2222,7 +2414,7 @@ yy_size_t vt100_parser_yyget_leng (yyscan_t yyscanner) * @param yyscanner The scanner object. */ -char *vt100_parser_yyget_text (yyscan_t yyscanner) +char *yyget_text (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yytext; @@ -2232,7 +2424,7 @@ char *vt100_parser_yyget_text (yyscan_t yyscanner) * @param user_defined The data to be associated with this scanner. * @param yyscanner The scanner object. */ -void vt100_parser_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) +void yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyextra = user_defined ; @@ -2242,13 +2434,13 @@ void vt100_parser_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) * @param _line_number line number * @param yyscanner The scanner object. */ -void vt100_parser_yyset_lineno (int _line_number , yyscan_t yyscanner) +void yyset_lineno (int _line_number , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* lineno is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "vt100_parser_yyset_lineno called with no buffer" ); + YY_FATAL_ERROR( "yyset_lineno called with no buffer" ); yylineno = _line_number; } @@ -2257,13 +2449,13 @@ void vt100_parser_yyset_lineno (int _line_number , yyscan_t yyscanner) * @param _column_no column number * @param yyscanner The scanner object. */ -void vt100_parser_yyset_column (int _column_no , yyscan_t yyscanner) +void yyset_column (int _column_no , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* column is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "vt100_parser_yyset_column called with no buffer" ); + YY_FATAL_ERROR( "yyset_column called with no buffer" ); yycolumn = _column_no; } @@ -2272,27 +2464,27 @@ void vt100_parser_yyset_column (int _column_no , yyscan_t yyscanner) * input buffer. * @param _in_str A readable stream. * @param yyscanner The scanner object. - * @see vt100_parser_yy_switch_to_buffer + * @see yy_switch_to_buffer */ -void vt100_parser_yyset_in (FILE * _in_str , yyscan_t yyscanner) +void yyset_in (FILE * _in_str , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyin = _in_str ; } -void vt100_parser_yyset_out (FILE * _out_str , yyscan_t yyscanner) +void yyset_out (FILE * _out_str , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyout = _out_str ; } -int vt100_parser_yyget_debug (yyscan_t yyscanner) +int yyget_debug (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yy_flex_debug; } -void vt100_parser_yyset_debug (int _bdebug , yyscan_t yyscanner) +void yyset_debug (int _bdebug , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yy_flex_debug = _bdebug ; @@ -2302,20 +2494,18 @@ void vt100_parser_yyset_debug (int _bdebug , yyscan_t yyscanner) /* User-visible API */ -/* vt100_parser_yylex_init is special because it creates the scanner itself, so it is +/* yylex_init is special because it creates the scanner itself, so it is * the ONLY reentrant function that doesn't take the scanner as the last argument. * That's why we explicitly handle the declaration, instead of using our macros. */ - -int vt100_parser_yylex_init(yyscan_t* ptr_yy_globals) - +int yylex_init(yyscan_t* ptr_yy_globals) { if (ptr_yy_globals == NULL){ errno = EINVAL; return 1; } - *ptr_yy_globals = (yyscan_t) vt100_parser_yyalloc ( sizeof( struct yyguts_t ), NULL ); + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL ); if (*ptr_yy_globals == NULL){ errno = ENOMEM; @@ -2328,39 +2518,37 @@ int vt100_parser_yylex_init(yyscan_t* ptr_yy_globals) return yy_init_globals ( *ptr_yy_globals ); } -/* vt100_parser_yylex_init_extra has the same functionality as vt100_parser_yylex_init, but follows the +/* yylex_init_extra has the same functionality as yylex_init, but follows the * 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 * is the reason, too, why this function also must handle its own declaration). - * The user defined value in the first argument will be available to vt100_parser_yyalloc in + * The user defined value in the first argument will be available to yyalloc in * the yyextra field. */ - -int vt100_parser_yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) - +int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals ) { struct yyguts_t dummy_yyguts; - vt100_parser_yyset_extra (yy_user_defined, &dummy_yyguts); + yyset_extra (yy_user_defined, &dummy_yyguts); if (ptr_yy_globals == NULL){ errno = EINVAL; return 1; } - - *ptr_yy_globals = (yyscan_t) vt100_parser_yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); - + + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); + if (*ptr_yy_globals == NULL){ errno = ENOMEM; return 1; } - + /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - vt100_parser_yyset_extra (yy_user_defined, *ptr_yy_globals); - + + yyset_extra (yy_user_defined, *ptr_yy_globals); + return yy_init_globals ( *ptr_yy_globals ); } @@ -2368,13 +2556,13 @@ static int yy_init_globals (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* Initialization is the same as for the non-reentrant scanner. - * This function is called from vt100_parser_yylex_destroy(), so don't allocate here. + * This function is called from yylex_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_max = 0; - yyg->yy_c_buf_p = (char *) 0; + yyg->yy_c_buf_p = NULL; yyg->yy_init = 0; yyg->yy_start = 0; @@ -2387,42 +2575,42 @@ static int yy_init_globals (yyscan_t yyscanner) yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by - * vt100_parser_yylex_init() + * yylex_init() */ return 0; } -/* vt100_parser_yylex_destroy is for both reentrant and non-reentrant scanners. */ -int vt100_parser_yylex_destroy (yyscan_t yyscanner) +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - vt100_parser_yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner ); + yy_delete_buffer( YY_CURRENT_BUFFER , yyscanner ); YY_CURRENT_BUFFER_LVALUE = NULL; - vt100_parser_yypop_buffer_state(yyscanner); + yypop_buffer_state(yyscanner); } /* Destroy the stack itself. */ - vt100_parser_yyfree(yyg->yy_buffer_stack ,yyscanner); + yyfree(yyg->yy_buffer_stack , yyscanner); yyg->yy_buffer_stack = NULL; /* Destroy the start condition stack. */ - vt100_parser_yyfree(yyg->yy_start_stack ,yyscanner ); + yyfree( yyg->yy_start_stack , yyscanner ); yyg->yy_start_stack = NULL; /* Reset the globals. This is important in a non-reentrant scanner so the next time - * vt100_parser_yylex() is called, initialization will occur. */ + * yylex() is called, initialization will occur. */ yy_init_globals( yyscanner); /* Destroy the main struct (reentrant only). */ - vt100_parser_yyfree ( yyscanner , yyscanner ); + yyfree ( yyscanner , yyscanner ); yyscanner = NULL; return 0; } @@ -2432,7 +2620,7 @@ int vt100_parser_yylex_destroy (yyscan_t yyscanner) */ #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, const char * s2, int n , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; (void)yyg; @@ -2444,7 +2632,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yysca #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) +static int yy_flex_strlen (const char * s , yyscan_t yyscanner) { int n; for ( n = 0; s[n]; ++n ) @@ -2459,7 +2647,6 @@ static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) #line 253 "src/parser.l" - #ifdef VT100_DEBUG_TRACE #define DEBUG_TRACE1(x) do { \ fputs(x"\n", stderr); \ diff --git a/src/parser.h b/src/parser.h index 48d44cd..e2e24c8 100644 --- a/src/parser.h +++ b/src/parser.h @@ -13,80 +13,220 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 3 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif - #define yy_create_buffer vt100_parser_yy_create_buffer +#ifdef yy_create_buffer +#define vt100_parser_yy_create_buffer_ALREADY_DEFINED +#else +#define yy_create_buffer vt100_parser_yy_create_buffer +#endif - #define yy_delete_buffer vt100_parser_yy_delete_buffer +#ifdef yy_delete_buffer +#define vt100_parser_yy_delete_buffer_ALREADY_DEFINED +#else +#define yy_delete_buffer vt100_parser_yy_delete_buffer +#endif - #define yy_scan_buffer vt100_parser_yy_scan_buffer +#ifdef yy_scan_buffer +#define vt100_parser_yy_scan_buffer_ALREADY_DEFINED +#else +#define yy_scan_buffer vt100_parser_yy_scan_buffer +#endif - #define yy_scan_string vt100_parser_yy_scan_string +#ifdef yy_scan_string +#define vt100_parser_yy_scan_string_ALREADY_DEFINED +#else +#define yy_scan_string vt100_parser_yy_scan_string +#endif - #define yy_scan_bytes vt100_parser_yy_scan_bytes +#ifdef yy_scan_bytes +#define vt100_parser_yy_scan_bytes_ALREADY_DEFINED +#else +#define yy_scan_bytes vt100_parser_yy_scan_bytes +#endif - #define yy_init_buffer vt100_parser_yy_init_buffer +#ifdef yy_init_buffer +#define vt100_parser_yy_init_buffer_ALREADY_DEFINED +#else +#define yy_init_buffer vt100_parser_yy_init_buffer +#endif - #define yy_flush_buffer vt100_parser_yy_flush_buffer +#ifdef yy_flush_buffer +#define vt100_parser_yy_flush_buffer_ALREADY_DEFINED +#else +#define yy_flush_buffer vt100_parser_yy_flush_buffer +#endif - #define yy_load_buffer_state vt100_parser_yy_load_buffer_state +#ifdef yy_load_buffer_state +#define vt100_parser_yy_load_buffer_state_ALREADY_DEFINED +#else +#define yy_load_buffer_state vt100_parser_yy_load_buffer_state +#endif - #define yy_switch_to_buffer vt100_parser_yy_switch_to_buffer +#ifdef yy_switch_to_buffer +#define vt100_parser_yy_switch_to_buffer_ALREADY_DEFINED +#else +#define yy_switch_to_buffer vt100_parser_yy_switch_to_buffer +#endif - #define yypush_buffer_state vt100_parser_yypush_buffer_state +#ifdef yypush_buffer_state +#define vt100_parser_yypush_buffer_state_ALREADY_DEFINED +#else +#define yypush_buffer_state vt100_parser_yypush_buffer_state +#endif - #define yypop_buffer_state vt100_parser_yypop_buffer_state +#ifdef yypop_buffer_state +#define vt100_parser_yypop_buffer_state_ALREADY_DEFINED +#else +#define yypop_buffer_state vt100_parser_yypop_buffer_state +#endif - #define yyensure_buffer_stack vt100_parser_yyensure_buffer_stack +#ifdef yyensure_buffer_stack +#define vt100_parser_yyensure_buffer_stack_ALREADY_DEFINED +#else +#define yyensure_buffer_stack vt100_parser_yyensure_buffer_stack +#endif - #define yylex vt100_parser_yylex +#ifdef yylex +#define vt100_parser_yylex_ALREADY_DEFINED +#else +#define yylex vt100_parser_yylex +#endif - #define yyrestart vt100_parser_yyrestart +#ifdef yyrestart +#define vt100_parser_yyrestart_ALREADY_DEFINED +#else +#define yyrestart vt100_parser_yyrestart +#endif - #define yylex_init vt100_parser_yylex_init +#ifdef yylex_init +#define vt100_parser_yylex_init_ALREADY_DEFINED +#else +#define yylex_init vt100_parser_yylex_init +#endif - #define yylex_init_extra vt100_parser_yylex_init_extra +#ifdef yylex_init_extra +#define vt100_parser_yylex_init_extra_ALREADY_DEFINED +#else +#define yylex_init_extra vt100_parser_yylex_init_extra +#endif - #define yylex_destroy vt100_parser_yylex_destroy +#ifdef yylex_destroy +#define vt100_parser_yylex_destroy_ALREADY_DEFINED +#else +#define yylex_destroy vt100_parser_yylex_destroy +#endif - #define yyget_debug vt100_parser_yyget_debug +#ifdef yyget_debug +#define vt100_parser_yyget_debug_ALREADY_DEFINED +#else +#define yyget_debug vt100_parser_yyget_debug +#endif - #define yyset_debug vt100_parser_yyset_debug +#ifdef yyset_debug +#define vt100_parser_yyset_debug_ALREADY_DEFINED +#else +#define yyset_debug vt100_parser_yyset_debug +#endif - #define yyget_extra vt100_parser_yyget_extra +#ifdef yyget_extra +#define vt100_parser_yyget_extra_ALREADY_DEFINED +#else +#define yyget_extra vt100_parser_yyget_extra +#endif - #define yyset_extra vt100_parser_yyset_extra +#ifdef yyset_extra +#define vt100_parser_yyset_extra_ALREADY_DEFINED +#else +#define yyset_extra vt100_parser_yyset_extra +#endif - #define yyget_in vt100_parser_yyget_in +#ifdef yyget_in +#define vt100_parser_yyget_in_ALREADY_DEFINED +#else +#define yyget_in vt100_parser_yyget_in +#endif - #define yyset_in vt100_parser_yyset_in +#ifdef yyset_in +#define vt100_parser_yyset_in_ALREADY_DEFINED +#else +#define yyset_in vt100_parser_yyset_in +#endif - #define yyget_out vt100_parser_yyget_out +#ifdef yyget_out +#define vt100_parser_yyget_out_ALREADY_DEFINED +#else +#define yyget_out vt100_parser_yyget_out +#endif - #define yyset_out vt100_parser_yyset_out +#ifdef yyset_out +#define vt100_parser_yyset_out_ALREADY_DEFINED +#else +#define yyset_out vt100_parser_yyset_out +#endif - #define yyget_leng vt100_parser_yyget_leng +#ifdef yyget_leng +#define vt100_parser_yyget_leng_ALREADY_DEFINED +#else +#define yyget_leng vt100_parser_yyget_leng +#endif - #define yyget_text vt100_parser_yyget_text +#ifdef yyget_text +#define vt100_parser_yyget_text_ALREADY_DEFINED +#else +#define yyget_text vt100_parser_yyget_text +#endif - #define yyget_lineno vt100_parser_yyget_lineno +#ifdef yyget_lineno +#define vt100_parser_yyget_lineno_ALREADY_DEFINED +#else +#define yyget_lineno vt100_parser_yyget_lineno +#endif - #define yyset_lineno vt100_parser_yyset_lineno +#ifdef yyset_lineno +#define vt100_parser_yyset_lineno_ALREADY_DEFINED +#else +#define yyset_lineno vt100_parser_yyset_lineno +#endif - #define yyget_column vt100_parser_yyget_column +#ifdef yyget_column +#define vt100_parser_yyget_column_ALREADY_DEFINED +#else +#define yyget_column vt100_parser_yyget_column +#endif - #define yyset_column vt100_parser_yyset_column +#ifdef yyset_column +#define vt100_parser_yyset_column_ALREADY_DEFINED +#else +#define yyset_column vt100_parser_yyset_column +#endif - #define yywrap vt100_parser_yywrap +#ifdef yywrap +#define vt100_parser_yywrap_ALREADY_DEFINED +#else +#define yywrap vt100_parser_yywrap +#endif - #define yyalloc vt100_parser_yyalloc +#ifdef yyalloc +#define vt100_parser_yyalloc_ALREADY_DEFINED +#else +#define yyalloc vt100_parser_yyalloc +#endif - #define yyrealloc vt100_parser_yyrealloc +#ifdef yyrealloc +#define vt100_parser_yyrealloc_ALREADY_DEFINED +#else +#define yyrealloc vt100_parser_yyrealloc +#endif - #define yyfree vt100_parser_yyfree +#ifdef yyfree +#define vt100_parser_yyfree_ALREADY_DEFINED +#else +#define yyfree vt100_parser_yyfree +#endif /* First, we deal with platform-specific or compiler-specific issues. */ @@ -158,10 +298,16 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ +/* begin standard C++ headers. */ + /* TODO: this is always defined, so inline it */ #define yyconst const @@ -262,21 +408,21 @@ struct yy_buffer_state }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ -void vt100_parser_yyrestart ( FILE *input_file , yyscan_t yyscanner ); -void vt100_parser_yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -YY_BUFFER_STATE vt100_parser_yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); -void vt100_parser_yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void vt100_parser_yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void vt100_parser_yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -void vt100_parser_yypop_buffer_state ( yyscan_t yyscanner ); +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); -YY_BUFFER_STATE vt100_parser_yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); -YY_BUFFER_STATE vt100_parser_yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); -YY_BUFFER_STATE vt100_parser_yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); -void *vt100_parser_yyalloc ( yy_size_t , yyscan_t yyscanner ); -void *vt100_parser_yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); -void vt100_parser_yyfree ( void * , yyscan_t yyscanner ); +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); /* Begin user sect3 */ @@ -300,42 +446,42 @@ void vt100_parser_yyfree ( void * , yyscan_t yyscanner ); #define YY_EXTRA_TYPE VT100Screen * -int vt100_parser_yylex_init (yyscan_t* scanner); +int yylex_init (yyscan_t* scanner); -int vt100_parser_yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int vt100_parser_yylex_destroy ( yyscan_t yyscanner ); +int yylex_destroy ( yyscan_t yyscanner ); -int vt100_parser_yyget_debug ( yyscan_t yyscanner ); +int yyget_debug ( yyscan_t yyscanner ); -void vt100_parser_yyset_debug ( int debug_flag , yyscan_t yyscanner ); +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); -YY_EXTRA_TYPE vt100_parser_yyget_extra ( yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); -void vt100_parser_yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); -FILE *vt100_parser_yyget_in ( yyscan_t yyscanner ); +FILE *yyget_in ( yyscan_t yyscanner ); -void vt100_parser_yyset_in ( FILE * _in_str , yyscan_t yyscanner ); +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); -FILE *vt100_parser_yyget_out ( yyscan_t yyscanner ); +FILE *yyget_out ( yyscan_t yyscanner ); -void vt100_parser_yyset_out ( FILE * _out_str , yyscan_t yyscanner ); +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); - int vt100_parser_yyget_leng ( yyscan_t yyscanner ); + int yyget_leng ( yyscan_t yyscanner ); -char *vt100_parser_yyget_text ( yyscan_t yyscanner ); +char *yyget_text ( yyscan_t yyscanner ); -int vt100_parser_yyget_lineno ( yyscan_t yyscanner ); +int yyget_lineno ( yyscan_t yyscanner ); -void vt100_parser_yyset_lineno ( int _line_number , yyscan_t yyscanner ); +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); -int vt100_parser_yyget_column ( yyscan_t yyscanner ); +int yyget_column ( yyscan_t yyscanner ); -void vt100_parser_yyset_column ( int _column_no , yyscan_t yyscanner ); +void yyset_column ( int _column_no , yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -343,9 +489,9 @@ void vt100_parser_yyset_column ( int _column_no , yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int vt100_parser_yywrap ( yyscan_t yyscanner ); +extern "C" int yywrap ( yyscan_t yyscanner ); #else -extern int vt100_parser_yywrap ( yyscan_t yyscanner ); +extern int yywrap ( yyscan_t yyscanner ); #endif #endif @@ -382,9 +528,9 @@ static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #ifndef YY_DECL #define YY_DECL_IS_OURS 1 -extern int vt100_parser_yylex (yyscan_t yyscanner); +extern int yylex (yyscan_t yyscanner); -#define YY_DECL int vt100_parser_yylex (yyscan_t yyscanner) +#define YY_DECL int yylex (yyscan_t yyscanner) #endif /* !YY_DECL */ /* yy_get_previous_state - get the state just before the EOB char was reached */ @@ -401,9 +547,154 @@ extern int vt100_parser_yylex (yyscan_t yyscanner); #undef YY_DECL #endif +#ifndef vt100_parser_yy_create_buffer_ALREADY_DEFINED +#undef yy_create_buffer +#endif +#ifndef vt100_parser_yy_delete_buffer_ALREADY_DEFINED +#undef yy_delete_buffer +#endif +#ifndef vt100_parser_yy_scan_buffer_ALREADY_DEFINED +#undef yy_scan_buffer +#endif +#ifndef vt100_parser_yy_scan_string_ALREADY_DEFINED +#undef yy_scan_string +#endif +#ifndef vt100_parser_yy_scan_bytes_ALREADY_DEFINED +#undef yy_scan_bytes +#endif +#ifndef vt100_parser_yy_init_buffer_ALREADY_DEFINED +#undef yy_init_buffer +#endif +#ifndef vt100_parser_yy_flush_buffer_ALREADY_DEFINED +#undef yy_flush_buffer +#endif +#ifndef vt100_parser_yy_load_buffer_state_ALREADY_DEFINED +#undef yy_load_buffer_state +#endif +#ifndef vt100_parser_yy_switch_to_buffer_ALREADY_DEFINED +#undef yy_switch_to_buffer +#endif +#ifndef vt100_parser_yypush_buffer_state_ALREADY_DEFINED +#undef yypush_buffer_state +#endif +#ifndef vt100_parser_yypop_buffer_state_ALREADY_DEFINED +#undef yypop_buffer_state +#endif +#ifndef vt100_parser_yyensure_buffer_stack_ALREADY_DEFINED +#undef yyensure_buffer_stack +#endif +#ifndef vt100_parser_yylex_ALREADY_DEFINED +#undef yylex +#endif +#ifndef vt100_parser_yyrestart_ALREADY_DEFINED +#undef yyrestart +#endif +#ifndef vt100_parser_yylex_init_ALREADY_DEFINED +#undef yylex_init +#endif +#ifndef vt100_parser_yylex_init_extra_ALREADY_DEFINED +#undef yylex_init_extra +#endif +#ifndef vt100_parser_yylex_destroy_ALREADY_DEFINED +#undef yylex_destroy +#endif +#ifndef vt100_parser_yyget_debug_ALREADY_DEFINED +#undef yyget_debug +#endif +#ifndef vt100_parser_yyset_debug_ALREADY_DEFINED +#undef yyset_debug +#endif +#ifndef vt100_parser_yyget_extra_ALREADY_DEFINED +#undef yyget_extra +#endif +#ifndef vt100_parser_yyset_extra_ALREADY_DEFINED +#undef yyset_extra +#endif +#ifndef vt100_parser_yyget_in_ALREADY_DEFINED +#undef yyget_in +#endif +#ifndef vt100_parser_yyset_in_ALREADY_DEFINED +#undef yyset_in +#endif +#ifndef vt100_parser_yyget_out_ALREADY_DEFINED +#undef yyget_out +#endif +#ifndef vt100_parser_yyset_out_ALREADY_DEFINED +#undef yyset_out +#endif +#ifndef vt100_parser_yyget_leng_ALREADY_DEFINED +#undef yyget_leng +#endif +#ifndef vt100_parser_yyget_text_ALREADY_DEFINED +#undef yyget_text +#endif +#ifndef vt100_parser_yyget_lineno_ALREADY_DEFINED +#undef yyget_lineno +#endif +#ifndef vt100_parser_yyset_lineno_ALREADY_DEFINED +#undef yyset_lineno +#endif +#ifndef vt100_parser_yyget_column_ALREADY_DEFINED +#undef yyget_column +#endif +#ifndef vt100_parser_yyset_column_ALREADY_DEFINED +#undef yyset_column +#endif +#ifndef vt100_parser_yywrap_ALREADY_DEFINED +#undef yywrap +#endif +#ifndef vt100_parser_yyget_lval_ALREADY_DEFINED +#undef yyget_lval +#endif +#ifndef vt100_parser_yyset_lval_ALREADY_DEFINED +#undef yyset_lval +#endif +#ifndef vt100_parser_yyget_lloc_ALREADY_DEFINED +#undef yyget_lloc +#endif +#ifndef vt100_parser_yyset_lloc_ALREADY_DEFINED +#undef yyset_lloc +#endif +#ifndef vt100_parser_yyalloc_ALREADY_DEFINED +#undef yyalloc +#endif +#ifndef vt100_parser_yyrealloc_ALREADY_DEFINED +#undef yyrealloc +#endif +#ifndef vt100_parser_yyfree_ALREADY_DEFINED +#undef yyfree +#endif +#ifndef vt100_parser_yytext_ALREADY_DEFINED +#undef yytext +#endif +#ifndef vt100_parser_yyleng_ALREADY_DEFINED +#undef yyleng +#endif +#ifndef vt100_parser_yyin_ALREADY_DEFINED +#undef yyin +#endif +#ifndef vt100_parser_yyout_ALREADY_DEFINED +#undef yyout +#endif +#ifndef vt100_parser_yy_flex_debug_ALREADY_DEFINED +#undef yy_flex_debug +#endif +#ifndef vt100_parser_yylineno_ALREADY_DEFINED +#undef yylineno +#endif +#ifndef vt100_parser_yytables_fload_ALREADY_DEFINED +#undef yytables_fload +#endif +#ifndef vt100_parser_yytables_destroy_ALREADY_DEFINED +#undef yytables_destroy +#endif +#ifndef vt100_parser_yyTABLES_NAME_ALREADY_DEFINED +#undef yyTABLES_NAME +#endif + #line 253 "src/parser.l" -#line 407 "src/parser.h" +#line 698 "src/parser.h" #undef vt100_parser_yyIN_HEADER #endif /* vt100_parser_yyHEADER_H */ -- cgit v1.2.3