From 371a5b0b7ab74d9772dd16eb840097cd6e9c7320 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Wed, 1 Feb 2017 14:21:05 +0000 Subject: [PATCH] [master] regen flex/bison files using flex 2.6.3 --- src/lib/eval/lexer.cc | 422 ++++++++++++++++++++++----------------- src/lib/eval/location.hh | 2 +- src/lib/eval/position.hh | 2 +- src/lib/eval/stack.hh | 2 +- 4 files changed, 240 insertions(+), 188 deletions(-) diff --git a/src/lib/eval/lexer.cc b/src/lib/eval/lexer.cc index 9984c9f716..e8d987f81b 100644 --- a/src/lib/eval/lexer.cc +++ b/src/lib/eval/lexer.cc @@ -1,13 +1,12 @@ -#line 2 "lexer.cc" +#line 1 "lexer.cc" -#line 4 "lexer.cc" +#line 3 "lexer.cc" #define YY_INT_ALIGNED short int /* A lexical scanner generated by flex */ /* %not-for-header */ - /* %if-c-only */ /* %if-not-reentrant */ #define yy_create_buffer eval_create_buffer @@ -36,7 +35,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 1 +#define YY_FLEX_SUBMINOR_VERSION 3 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -45,11 +44,88 @@ /* %endif */ /* %if-c-only */ - + #define yy_create_buffer eval_create_buffer + + #define yy_delete_buffer eval_delete_buffer + + #define yy_scan_buffer eval_scan_buffer + + #define yy_scan_string eval_scan_string + + #define yy_scan_bytes eval_scan_bytes + + #define yy_init_buffer eval_init_buffer + + #define yy_flush_buffer eval_flush_buffer + + #define yy_load_buffer_state eval_load_buffer_state + + #define yy_switch_to_buffer eval_switch_to_buffer + + #define yypush_buffer_state evalpush_buffer_state + + #define yypop_buffer_state evalpop_buffer_state + + #define yyensure_buffer_stack evalensure_buffer_stack + + #define yylex evallex + + #define yyrestart evalrestart + + #define yylex_init evallex_init + + #define yylex_init_extra evallex_init_extra + + #define yylex_destroy evallex_destroy + + #define yyget_debug evalget_debug + + #define yyset_debug evalset_debug + + #define yyget_extra evalget_extra + + #define yyset_extra evalset_extra + + #define yyget_in evalget_in + + #define yyset_in evalset_in + + #define yyget_out evalget_out + + #define yyset_out evalset_out + + #define yyget_leng evalget_leng + + #define yyget_text evalget_text + + #define yyget_lineno evalget_lineno + + #define yyset_lineno evalset_lineno + + #define yywrap evalwrap + /* %endif */ + #define yyalloc evalalloc + + #define yyrealloc evalrealloc + + #define yyfree evalfree + /* %if-c-only */ + #define yytext evaltext + + #define yyleng evalleng + + #define yyin evalin + + #define yyout evalout + + #define yy_flex_debug eval_flex_debug + + #define yylineno evallineno + /* %endif */ /* First, we deal with platform-specific or compiler-specific issues. */ @@ -146,19 +222,15 @@ typedef unsigned int flex_uint32_t; #endif /* %not-for-header */ - /* Returned upon end-of-file. */ #define YY_NULL 0 /* %ok-for-header */ /* %not-for-header */ - -/* 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)) /* %ok-for-header */ /* %if-reentrant */ @@ -173,20 +245,16 @@ typedef unsigned int flex_uint32_t; * definition of BEGIN. */ #define BEGIN (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 (((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 evalrestart(evalin ) - #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -229,10 +297,10 @@ extern FILE *evalin, *evalout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires * access to the local variable yy_act. Since yyless() is a macro, it would break - * existing scanners that call yyless() from OUTSIDE evallex. + * existing scanners that call yyless() from OUTSIDE evallex. * One obvious solution it to make yy_act a global. I tried that, and saw * a 5% performance hit in a non-evallineno scanner, because yy_act is * normally declared as a register variable-- so it is not worth it. @@ -265,7 +333,6 @@ extern FILE *evalin, *evalout; YY_DO_BEFORE_ACTION; /* set up evaltext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -313,7 +380,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. */ @@ -340,7 +407,6 @@ struct yy_buffer_state /* %if-c-only Standard (non-C++) definition */ /* %not-for-header */ - /* %if-not-reentrant */ /* Stack of input buffers. */ @@ -361,7 +427,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(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. */ @@ -371,7 +436,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ /* %if-not-reentrant */ /* %not-for-header */ - /* yy_hold_char holds the character lost when evaltext is formed. */ static char yy_hold_char; static int yy_n_chars; /* number of characters read into yy_ch_buf */ @@ -390,32 +454,30 @@ static int yy_did_buffer_switch_on_eof; /* %endif */ -void evalrestart (FILE *input_file ); -void eval_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE eval_create_buffer (FILE *file,int size ); -void eval_delete_buffer (YY_BUFFER_STATE b ); -void eval_flush_buffer (YY_BUFFER_STATE b ); -void evalpush_buffer_state (YY_BUFFER_STATE new_buffer ); -void evalpop_buffer_state (void ); - -static void evalensure_buffer_stack (void ); -static void eval_load_buffer_state (void ); -static void eval_init_buffer (YY_BUFFER_STATE b,FILE *file ); +void evalrestart ( FILE *input_file ); +void eval_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE eval_create_buffer ( FILE *file, int size ); +void eval_delete_buffer ( YY_BUFFER_STATE b ); +void eval_flush_buffer ( YY_BUFFER_STATE b ); +void evalpush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void evalpop_buffer_state ( void ); +static void evalensure_buffer_stack ( void ); +static void eval_load_buffer_state ( void ); +static void eval_init_buffer ( YY_BUFFER_STATE b, FILE *file ); #define YY_FLUSH_BUFFER eval_flush_buffer(YY_CURRENT_BUFFER ) -YY_BUFFER_STATE eval_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE eval_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE eval_scan_bytes (yyconst char *bytes,int len ); +YY_BUFFER_STATE eval_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE eval_scan_string ( const char *yy_str ); +YY_BUFFER_STATE eval_scan_bytes ( const char *bytes, int len ); /* %endif */ -void *evalalloc (yy_size_t ); -void *evalrealloc (void *,yy_size_t ); -void evalfree (void * ); +void *evalalloc ( yy_size_t ); +void *evalrealloc ( void *, yy_size_t ); +void evalfree ( void * ); #define yy_new_buffer eval_create_buffer - #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ @@ -425,7 +487,6 @@ void evalfree (void * ); } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ @@ -435,7 +496,6 @@ void evalfree (void * ); } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* %% [1.0] evaltext/evalin/evalout/yy_state_type/evallineno etc. def's & init go here */ @@ -445,15 +505,13 @@ void evalfree (void * ); #define YY_SKIP_YYWRAP #define FLEX_DEBUG - -typedef unsigned char YY_CHAR; +typedef flex_uint8_t YY_CHAR; FILE *evalin = NULL, *evalout = NULL; typedef int yy_state_type; extern int evallineno; - int evallineno = 1; extern char *evaltext; @@ -466,10 +524,10 @@ extern char *evaltext; /* %if-c-only Standard (non-C++) definition */ -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yynoreturn yy_fatal_error (yyconst char* msg ); +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); /* %endif */ @@ -484,7 +542,6 @@ static void yynoreturn yy_fatal_error (yyconst char* msg ); *yy_cp = '\0'; \ /* %% [3.0] code to copy yytext_ptr to evaltext[] goes here, if %array \ */\ (yy_c_buf_p) = yy_cp; - /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ #define YY_NUM_RULES 51 #define YY_END_OF_BUFFER 52 @@ -495,7 +552,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_acclist[280] = +static const flex_int16_t yy_acclist[280] = { 0, 52, 50, 51, 1, 50, 51, 2, 51, 50, 51, 44, 50, 51, 45, 50, 51, 49, 50, 51, 48, @@ -529,7 +586,7 @@ static yyconst flex_int16_t yy_acclist[280] = 37,16390,16390, 36,16390,16390,16390, 34,16390 } ; -static yyconst flex_int16_t yy_accept[199] = +static const flex_int16_t yy_accept[199] = { 0, 1, 1, 1, 2, 4, 7, 9, 11, 14, 17, 20, 23, 25, 28, 31, 34, 36, 38, 41, 44, @@ -555,7 +612,7 @@ static yyconst flex_int16_t yy_accept[199] = } ; -static yyconst YY_CHAR yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -587,7 +644,7 @@ static yyconst YY_CHAR yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst YY_CHAR yy_meta[45] = +static const YY_CHAR yy_meta[45] = { 0, 1, 1, 2, 1, 1, 1, 1, 1, 1, 3, 4, 4, 4, 4, 5, 1, 4, 1, 1, 1, @@ -596,7 +653,7 @@ static yyconst YY_CHAR yy_meta[45] = 1, 1, 1, 1 } ; -static yyconst flex_uint16_t yy_base[203] = +static const flex_int16_t yy_base[203] = { 0, 0, 0, 310, 311, 307, 305, 303, 311, 311, 311, 311, 34, 311, 39, 36, 291, 289, 81, 115, 311, @@ -623,7 +680,7 @@ static yyconst flex_uint16_t yy_base[203] = 71, 215 } ; -static yyconst flex_int16_t yy_def[203] = +static const flex_int16_t yy_def[203] = { 0, 197, 1, 197, 197, 197, 197, 198, 197, 197, 197, 197, 197, 197, 197, 14, 199, 197, 197, 18, 197, @@ -650,7 +707,7 @@ static yyconst flex_int16_t yy_def[203] = 197, 197 } ; -static yyconst flex_uint16_t yy_nxt[356] = +static const flex_int16_t yy_nxt[356] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 16, 17, 18, 19, 19, 20, @@ -693,7 +750,7 @@ static yyconst flex_uint16_t yy_nxt[356] = 197, 197, 197, 197, 197 } ; -static yyconst flex_int16_t yy_chk[356] = +static const flex_int16_t yy_chk[356] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -737,7 +794,7 @@ static yyconst flex_int16_t yy_chk[356] = } ; /* Table of booleans, true if rule could match eol. */ -static yyconst flex_int32_t yy_rule_can_match_eol[52] = +static const flex_int32_t yy_rule_can_match_eol[52] = { 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -746,13 +803,13 @@ static yyconst flex_int32_t yy_rule_can_match_eol[52] = extern int eval_flex_debug; int eval_flex_debug = 1; -static yyconst flex_int16_t yy_rule_linenum[51] = +static const flex_int16_t yy_rule_linenum[51] = { 0, - 82, 87, 93, 103, 109, 127, 134, 148, 149, 150, - 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, - 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 189, 190 + 83, 88, 94, 104, 110, 128, 135, 149, 150, 151, + 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, + 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, + 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 } ; static yy_state_type *yy_state_buf=0, *yy_state_ptr=0; @@ -798,8 +855,8 @@ char *evaltext; // 2.5.31 through 2.5.33): it generates code that does // not conform to C89. See Debian bug 333231 // . -# undef evalwrap -# define evalwrap() 1 +# undef yywrap +# define yywrap() 1 // The location of the current token. The lexer will keep updating it. This // variable will be useful for logging errors. @@ -807,9 +864,10 @@ static isc::eval::location loc; // To avoid the call to exit... oops! #define YY_FATAL_ERROR(msg) isc::eval::EvalContext::fatal(msg) +#line 867 "lexer.cc" /* noyywrap disables automatic rewinding for the next file to parse. Since we always parse only a single string, there's no need to do any wraps. And - using evalwrap requires linking with -lfl, which provides the default evalwrap + using yywrap requires linking with -lfl, which provides the default yywrap implementation that always returns 1 anyway. */ /* nounput simplifies the lexer, by removing support for putting a character back into the input stream. We never use such capability anyway. */ @@ -828,10 +886,11 @@ static isc::eval::location loc; incorrect inputs (e.g., IP addresses) which must be checked. */ #line 69 "lexer.ll" // This code run each time a pattern is matched. It updates the location -// by moving it ahead by evalleng bytes. evalleng specifies the length of the +// by moving it ahead by yyleng bytes. yyleng specifies the length of the // currently matched token. #define YY_USER_ACTION loc.columns(evalleng); -#line 835 "lexer.cc" +#line 892 "lexer.cc" +#line 893 "lexer.cc" #define INITIAL 0 @@ -855,7 +914,7 @@ static isc::eval::location loc; /* %if-reentrant */ /* %if-c-only */ -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* %endif */ /* %if-reentrant */ @@ -865,31 +924,31 @@ static int yy_init_globals (void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int evallex_destroy (void ); +int evallex_destroy ( void ); -int evalget_debug (void ); +int evalget_debug ( void ); -void evalset_debug (int debug_flag ); +void evalset_debug ( int debug_flag ); -YY_EXTRA_TYPE evalget_extra (void ); +YY_EXTRA_TYPE evalget_extra ( void ); -void evalset_extra (YY_EXTRA_TYPE user_defined ); +void evalset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *evalget_in (void ); +FILE *evalget_in ( void ); -void evalset_in (FILE * _in_str ); +void evalset_in ( FILE * _in_str ); -FILE *evalget_out (void ); +FILE *evalget_out ( void ); -void evalset_out (FILE * _out_str ); +void evalset_out ( FILE * _out_str ); - int evalget_leng (void ); + int evalget_leng ( void ); -char *evalget_text (void ); +char *evalget_text ( void ); -int evalget_lineno (void ); +int evalget_lineno ( void ); -void evalset_lineno (int _line_number ); +void evalset_lineno ( int _line_number ); /* %if-bison-bridge */ /* %endif */ @@ -900,14 +959,13 @@ void evalset_lineno (int _line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int evalwrap (void ); +extern "C" int evalwrap ( void ); #else -extern int evalwrap (void ); +extern int evalwrap ( void ); #endif #endif /* %not-for-header */ - #ifndef YY_NO_UNPUT #endif @@ -916,21 +974,20 @@ extern int evalwrap (void ); /* %endif */ #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT /* %if-c-only Standard (non-C++) definition */ /* %not-for-header */ - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif /* %ok-for-header */ @@ -972,7 +1029,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( evalin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -985,7 +1042,7 @@ static int input (void ); else \ { \ errno=0; \ - while ( (result = (int) fread(buf, 1, max_size, evalin))==0 && ferror(evalin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, evalin)) == 0 && ferror(evalin)) \ { \ if( errno != EINTR) \ { \ @@ -1026,11 +1083,9 @@ static int input (void ); /* %if-tables-serialization structures and prototypes */ /* %not-for-header */ - /* %ok-for-header */ /* %not-for-header */ - /* %tables-yydmap generated elements */ /* %endif */ /* end tables serialization structures and prototypes */ @@ -1069,7 +1124,6 @@ extern int evallex (void); YY_USER_ACTION /* %not-for-header */ - /** The main scanner function which does all the work. */ YY_DECL @@ -1124,11 +1178,12 @@ YY_DECL +#line 79 "lexer.ll" // Code run each time evallex is called. loc.step(); -#line 1132 "lexer.cc" +#line 1186 "lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1157,9 +1212,9 @@ yy_match: { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 198 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; *(yy_state_ptr)++ = yy_current_state; ++yy_cp; } @@ -1211,10 +1266,10 @@ find_rule: /* we branch to this label when backing up */ if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) { - yy_size_t yyl; + int yyl; for ( yyl = 0; yyl < evalleng; ++yyl ) if ( evaltext[yyl] == '\n' ) - + evallineno++; ; } @@ -1243,7 +1298,7 @@ do_action: /* This label is used only to access EOF actions. */ /* %% [13.0] actions go here */ case 1: YY_RULE_SETUP -#line 82 "lexer.ll" +#line 83 "lexer.ll" { // Ok, we found a with space. Let's ignore it and update loc variable. loc.step(); @@ -1252,7 +1307,7 @@ YY_RULE_SETUP case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 87 "lexer.ll" +#line 88 "lexer.ll" { // Newline found. Let's update the location and continue. loc.lines(evalleng); @@ -1261,7 +1316,7 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP -#line 93 "lexer.ll" +#line 94 "lexer.ll" { // A string has been matched. It contains the actual string and single quotes. // We need to get those quotes out of the way and just use its content, e.g. @@ -1274,7 +1329,7 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 103 "lexer.ll" +#line 104 "lexer.ll" { // A hex string has been matched. It contains the '0x' or '0X' header // followed by at least one hexadecimal digit. @@ -1283,7 +1338,7 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 109 "lexer.ll" +#line 110 "lexer.ll" { // An integer was found. std::string tmp(evaltext); @@ -1305,7 +1360,7 @@ YY_RULE_SETUP case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 127 "lexer.ll" +#line 128 "lexer.ll" { // This string specifies option name starting with a letter // and further containing letters, digits, hyphens and @@ -1315,7 +1370,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 134 "lexer.ll" +#line 135 "lexer.ll" { // IPv4 or IPv6 address std::string tmp(evaltext); @@ -1332,229 +1387,229 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 148 "lexer.ll" +#line 149 "lexer.ll" return isc::eval::EvalParser::make_EQUAL(loc); YY_BREAK case 9: YY_RULE_SETUP -#line 149 "lexer.ll" +#line 150 "lexer.ll" return isc::eval::EvalParser::make_OPTION(loc); YY_BREAK case 10: YY_RULE_SETUP -#line 150 "lexer.ll" +#line 151 "lexer.ll" return isc::eval::EvalParser::make_RELAY4(loc); YY_BREAK case 11: YY_RULE_SETUP -#line 151 "lexer.ll" +#line 152 "lexer.ll" return isc::eval::EvalParser::make_RELAY6(loc); YY_BREAK case 12: YY_RULE_SETUP -#line 152 "lexer.ll" +#line 153 "lexer.ll" return isc::eval::EvalParser::make_PEERADDR(loc); YY_BREAK case 13: YY_RULE_SETUP -#line 153 "lexer.ll" +#line 154 "lexer.ll" return isc::eval::EvalParser::make_LINKADDR(loc); YY_BREAK case 14: YY_RULE_SETUP -#line 154 "lexer.ll" +#line 155 "lexer.ll" return isc::eval::EvalParser::make_TEXT(loc); YY_BREAK case 15: YY_RULE_SETUP -#line 155 "lexer.ll" +#line 156 "lexer.ll" return isc::eval::EvalParser::make_HEX(loc); YY_BREAK case 16: YY_RULE_SETUP -#line 156 "lexer.ll" +#line 157 "lexer.ll" return isc::eval::EvalParser::make_EXISTS(loc); YY_BREAK case 17: YY_RULE_SETUP -#line 157 "lexer.ll" +#line 158 "lexer.ll" return isc::eval::EvalParser::make_PKT(loc); YY_BREAK case 18: YY_RULE_SETUP -#line 158 "lexer.ll" +#line 159 "lexer.ll" return isc::eval::EvalParser::make_IFACE(loc); YY_BREAK case 19: YY_RULE_SETUP -#line 159 "lexer.ll" +#line 160 "lexer.ll" return isc::eval::EvalParser::make_SRC(loc); YY_BREAK case 20: YY_RULE_SETUP -#line 160 "lexer.ll" +#line 161 "lexer.ll" return isc::eval::EvalParser::make_DST(loc); YY_BREAK case 21: YY_RULE_SETUP -#line 161 "lexer.ll" +#line 162 "lexer.ll" return isc::eval::EvalParser::make_LEN(loc); YY_BREAK case 22: YY_RULE_SETUP -#line 162 "lexer.ll" +#line 163 "lexer.ll" return isc::eval::EvalParser::make_PKT4(loc); YY_BREAK case 23: YY_RULE_SETUP -#line 163 "lexer.ll" +#line 164 "lexer.ll" return isc::eval::EvalParser::make_CHADDR(loc); YY_BREAK case 24: YY_RULE_SETUP -#line 164 "lexer.ll" +#line 165 "lexer.ll" return isc::eval::EvalParser::make_HLEN(loc); YY_BREAK case 25: YY_RULE_SETUP -#line 165 "lexer.ll" +#line 166 "lexer.ll" return isc::eval::EvalParser::make_HTYPE(loc); YY_BREAK case 26: YY_RULE_SETUP -#line 166 "lexer.ll" +#line 167 "lexer.ll" return isc::eval::EvalParser::make_CIADDR(loc); YY_BREAK case 27: YY_RULE_SETUP -#line 167 "lexer.ll" +#line 168 "lexer.ll" return isc::eval::EvalParser::make_GIADDR(loc); YY_BREAK case 28: YY_RULE_SETUP -#line 168 "lexer.ll" +#line 169 "lexer.ll" return isc::eval::EvalParser::make_YIADDR(loc); YY_BREAK case 29: YY_RULE_SETUP -#line 169 "lexer.ll" +#line 170 "lexer.ll" return isc::eval::EvalParser::make_SIADDR(loc); YY_BREAK case 30: YY_RULE_SETUP -#line 170 "lexer.ll" +#line 171 "lexer.ll" return isc::eval::EvalParser::make_PKT6(loc); YY_BREAK case 31: YY_RULE_SETUP -#line 171 "lexer.ll" +#line 172 "lexer.ll" return isc::eval::EvalParser::make_MSGTYPE(loc); YY_BREAK case 32: YY_RULE_SETUP -#line 172 "lexer.ll" +#line 173 "lexer.ll" return isc::eval::EvalParser::make_TRANSID(loc); YY_BREAK case 33: YY_RULE_SETUP -#line 173 "lexer.ll" +#line 174 "lexer.ll" return isc::eval::EvalParser::make_VENDOR(loc); YY_BREAK case 34: YY_RULE_SETUP -#line 174 "lexer.ll" +#line 175 "lexer.ll" return isc::eval::EvalParser::make_VENDOR_CLASS(loc); YY_BREAK case 35: YY_RULE_SETUP -#line 175 "lexer.ll" +#line 176 "lexer.ll" return isc::eval::EvalParser::make_DATA(loc); YY_BREAK case 36: YY_RULE_SETUP -#line 176 "lexer.ll" +#line 177 "lexer.ll" return isc::eval::EvalParser::make_ENTERPRISE(loc); YY_BREAK case 37: YY_RULE_SETUP -#line 177 "lexer.ll" +#line 178 "lexer.ll" return isc::eval::EvalParser::make_SUBSTRING(loc); YY_BREAK case 38: YY_RULE_SETUP -#line 178 "lexer.ll" +#line 179 "lexer.ll" return isc::eval::EvalParser::make_ALL(loc); YY_BREAK case 39: YY_RULE_SETUP -#line 179 "lexer.ll" +#line 180 "lexer.ll" return isc::eval::EvalParser::make_CONCAT(loc); YY_BREAK case 40: YY_RULE_SETUP -#line 180 "lexer.ll" +#line 181 "lexer.ll" return isc::eval::EvalParser::make_NOT(loc); YY_BREAK case 41: YY_RULE_SETUP -#line 181 "lexer.ll" +#line 182 "lexer.ll" return isc::eval::EvalParser::make_AND(loc); YY_BREAK case 42: YY_RULE_SETUP -#line 182 "lexer.ll" +#line 183 "lexer.ll" return isc::eval::EvalParser::make_OR(loc); YY_BREAK case 43: YY_RULE_SETUP -#line 183 "lexer.ll" +#line 184 "lexer.ll" return isc::eval::EvalParser::make_DOT(loc); YY_BREAK case 44: YY_RULE_SETUP -#line 184 "lexer.ll" +#line 185 "lexer.ll" return isc::eval::EvalParser::make_LPAREN(loc); YY_BREAK case 45: YY_RULE_SETUP -#line 185 "lexer.ll" +#line 186 "lexer.ll" return isc::eval::EvalParser::make_RPAREN(loc); YY_BREAK case 46: YY_RULE_SETUP -#line 186 "lexer.ll" +#line 187 "lexer.ll" return isc::eval::EvalParser::make_LBRACKET(loc); YY_BREAK case 47: YY_RULE_SETUP -#line 187 "lexer.ll" +#line 188 "lexer.ll" return isc::eval::EvalParser::make_RBRACKET(loc); YY_BREAK case 48: YY_RULE_SETUP -#line 188 "lexer.ll" +#line 189 "lexer.ll" return isc::eval::EvalParser::make_COMA(loc); YY_BREAK case 49: YY_RULE_SETUP -#line 189 "lexer.ll" +#line 190 "lexer.ll" return isc::eval::EvalParser::make_ANY(loc); YY_BREAK case 50: YY_RULE_SETUP -#line 190 "lexer.ll" +#line 191 "lexer.ll" driver.error (loc, "Invalid character: " + std::string(evaltext)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 191 "lexer.ll" +#line 192 "lexer.ll" return isc::eval::EvalParser::make_END(loc); YY_BREAK case 51: YY_RULE_SETUP -#line 192 "lexer.ll" +#line 193 "lexer.ll" ECHO; YY_BREAK -#line 1558 "lexer.cc" +#line 1612 "lexer.cc" case YY_END_OF_BUFFER: { @@ -1694,7 +1749,6 @@ ECHO; /* %if-c++-only */ /* %not-for-header */ - /* %ok-for-header */ /* %endif */ @@ -1714,7 +1768,7 @@ static int yy_get_next_buffer (void) { char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; char *source = (yytext_ptr); - yy_size_t number_to_move, i; + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -1743,7 +1797,7 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1796,10 +1850,10 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((int) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if (((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 = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) evalrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) evalrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,(yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); } @@ -1817,7 +1871,6 @@ static int yy_get_next_buffer (void) /* %if-c-only */ /* %not-for-header */ - static yy_state_type yy_get_previous_state (void) /* %endif */ /* %if-c++-only */ @@ -1840,9 +1893,9 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 198 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; *(yy_state_ptr)++ = yy_current_state; } @@ -1868,9 +1921,9 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 198 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_is_jam = (yy_current_state == 197); if ( ! yy_is_jam ) *(yy_state_ptr)++ = yy_current_state; @@ -1912,7 +1965,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -1960,7 +2013,7 @@ static int yy_get_next_buffer (void) /* %% [19.0] update BOL and evallineno */ if ( c == '\n' ) - + evallineno++; ; @@ -2068,12 +2121,12 @@ static void eval_load_buffer_state (void) if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in eval_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 *) evalalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) evalalloc((yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in eval_create_buffer()" ); @@ -2256,7 +2309,7 @@ static void evalensure_buffer_stack (void) /* %if-c++-only */ /* %endif */ { - int num_to_alloc; + yy_size_t num_to_alloc; if (!(yy_buffer_stack)) { @@ -2270,9 +2323,9 @@ static void evalensure_buffer_stack (void) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in evalensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -2303,7 +2356,7 @@ static void evalensure_buffer_stack (void) * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE eval_scan_buffer (char * base, yy_size_t size ) { @@ -2319,7 +2372,7 @@ YY_BUFFER_STATE eval_scan_buffer (char * base, yy_size_t size ) if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in eval_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 = NULL; @@ -2344,7 +2397,7 @@ YY_BUFFER_STATE eval_scan_buffer (char * base, yy_size_t size ) * @note If you want to scan bytes that may contain NUL values, then use * eval_scan_bytes() instead. */ -YY_BUFFER_STATE eval_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE eval_scan_string (const char * yystr ) { return eval_scan_bytes(yystr,(int) strlen(yystr) ); @@ -2359,15 +2412,15 @@ YY_BUFFER_STATE eval_scan_string (yyconst char * yystr ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE eval_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +YY_BUFFER_STATE eval_scan_bytes (const char * yybytes, int _yybytes_len ) { 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 = (yy_size_t) _yybytes_len + 2; + n = (yy_size_t) (_yybytes_len + 2); buf = (char *) evalalloc(n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in eval_scan_bytes()" ); @@ -2395,7 +2448,7 @@ YY_BUFFER_STATE eval_scan_bytes (yyconst char * yybytes, int _yybytes_len ) #endif /* %if-c-only */ -static void yynoreturn yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); @@ -2432,7 +2485,7 @@ static void yynoreturn yy_fatal_error (yyconst char* msg ) */ int evalget_lineno (void) { - + return evallineno; } @@ -2587,7 +2640,7 @@ int evallex_destroy (void) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { int i; @@ -2597,7 +2650,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { int n; for ( n = 0; s[n]; ++n ) @@ -2637,8 +2690,7 @@ void evalfree (void * ptr ) /* %ok-for-header */ -#line 192 "lexer.ll" - +#line 193 "lexer.ll" using namespace isc::eval; diff --git a/src/lib/eval/location.hh b/src/lib/eval/location.hh index a445cdf807..35e5da8dd7 100644 --- a/src/lib/eval/location.hh +++ b/src/lib/eval/location.hh @@ -1,4 +1,4 @@ -// Generated 201611011345 +// Generated 201702011420 // A Bison parser, made by GNU Bison 3.0.4. // Locations for Bison parsers in C++ diff --git a/src/lib/eval/position.hh b/src/lib/eval/position.hh index b775b5ce57..7be7a75107 100644 --- a/src/lib/eval/position.hh +++ b/src/lib/eval/position.hh @@ -1,4 +1,4 @@ -// Generated 201611011345 +// Generated 201702011420 // A Bison parser, made by GNU Bison 3.0.4. // Positions for Bison parsers in C++ diff --git a/src/lib/eval/stack.hh b/src/lib/eval/stack.hh index 71853729b2..75f1692f93 100644 --- a/src/lib/eval/stack.hh +++ b/src/lib/eval/stack.hh @@ -1,4 +1,4 @@ -// Generated 201611011345 +// Generated 201702011420 // A Bison parser, made by GNU Bison 3.0.4. // Stack handling for Bison parsers in C++ -- 2.47.3