From: Francis Dupont Date: Wed, 16 Mar 2016 13:40:31 +0000 (+0000) Subject: regen flex/bison X-Git-Tag: trac4248_base~12 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87397fd75215b69ad79708aaa1d7505aca299fb5;p=thirdparty%2Fkea.git regen flex/bison --- diff --git a/src/lib/eval/lexer.cc b/src/lib/eval/lexer.cc index 96ae790dc9..1be686c8bc 100644 --- a/src/lib/eval/lexer.cc +++ b/src/lib/eval/lexer.cc @@ -17,8 +17,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 0 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -72,7 +72,6 @@ typedef int16_t flex_int16_t; typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; -typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -80,7 +79,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -111,6 +109,8 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#endif /* ! C99 */ + #endif /* ! FLEXINT_H */ /* %endif */ @@ -185,7 +185,15 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -225,11 +233,18 @@ extern FILE *yyin, *yyout; */ #define YY_LESS_LINENO(n) \ do { \ - yy_size_t yyl;\ + int yyl;\ for ( yyl = n; yyl < yyleng; ++yyl )\ if ( yytext[yyl] == '\n' )\ --yylineno;\ }while(0) + #define YY_LINENO_REWIND_TO(dst) \ + do {\ + const char *p;\ + for ( p = yy_cp-1; p >= (dst); --p)\ + if ( *p == '\n' )\ + --yylineno;\ + }while(0) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -420,7 +435,7 @@ void yyfree (void * ); /* %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here */ /* Begin user sect3 */ -#define yywrap(n) 1 +#define yywrap() (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP #define FLEX_DEBUG @@ -436,13 +451,21 @@ extern int yylineno; int yylineno = 1; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext +/* %% [1.5] DFA */ + /* %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 ); +#if defined(__GNUC__) && __GNUC__ >= 3 +__attribute__((__noreturn__)) +#endif static void yy_fatal_error (yyconst char msg[] ); /* %endif */ @@ -453,7 +476,7 @@ static void yy_fatal_error (yyconst char msg[] ); #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ /* %% [2.0] code to fiddle yytext and yyleng for yymore() goes here \ */\ - yyleng = (yy_size_t) (yy_cp - yy_bp); \ + yyleng = (size_t) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ /* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\ @@ -500,7 +523,7 @@ static yyconst flex_int16_t yy_accept[82] = 128 } ; -static yyconst flex_int32_t yy_ec[256] = +static yyconst 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, @@ -532,7 +555,7 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[38] = +static yyconst YY_CHAR yy_meta[38] = { 0, 1, 2, 3, 1, 1, 1, 1, 2, 1, 4, 4, 4, 1, 4, 2, 2, 1, 2, 2, 4, @@ -540,7 +563,7 @@ static yyconst flex_int32_t yy_meta[38] = 2, 2, 2, 2, 2, 2, 2 } ; -static yyconst flex_int16_t yy_base[84] = +static yyconst flex_uint16_t yy_base[84] = { 0, 0, 0, 202, 219, 167, 155, 138, 219, 219, 219, 28, 219, 31, 34, 94, 46, 219, 219, 66, 22, @@ -566,7 +589,7 @@ static yyconst flex_int16_t yy_def[84] = 80, 80, 80 } ; -static yyconst flex_int16_t yy_nxt[257] = +static yyconst flex_uint16_t yy_nxt[257] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 14, 15, 16, 16, 16, 17, 18, 4, 19, @@ -720,7 +743,7 @@ static isc::eval::location loc; // by moving it ahead by yyleng bytes. yyleng specifies the length of the // currently matched token. #define YY_USER_ACTION loc.columns(yyleng); -#line 724 "lexer.cc" +#line 747 "lexer.cc" #define INITIAL 0 @@ -766,11 +789,11 @@ void yyset_extra (YY_EXTRA_TYPE user_defined ); FILE *yyget_in (void ); -void yyset_in (FILE * in_str ); +void yyset_in (FILE * _in_str ); FILE *yyget_out (void ); -void yyset_out (FILE * out_str ); +void yyset_out (FILE * _out_str ); yy_size_t yyget_leng (void ); @@ -778,7 +801,7 @@ char *yyget_text (void ); int yyget_lineno (void ); -void yyset_lineno (int line_number ); +void yyset_lineno (int _line_number ); /* %if-bison-bridge */ /* %endif */ @@ -797,6 +820,9 @@ extern int yywrap (void ); /* %not-for-header */ +#ifndef YY_NO_UNPUT + +#endif /* %ok-for-header */ /* %endif */ @@ -829,7 +855,12 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -838,7 +869,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) /* %endif */ /* %if-c++-only C++ definition */ /* %endif */ @@ -853,7 +884,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - yy_size_t n; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -942,7 +973,7 @@ extern int yylex (void); /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif /* %% [6.0] YY_RULE_SETUP definition goes here */ @@ -955,21 +986,10 @@ extern int yylex (void); */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; -/* %% [7.0] user's declarations go here */ -#line 71 "lexer.ll" - - - - // Code run each time yylex is called. - loc.step(); - - -#line 972 "lexer.cc" - if ( !(yy_init) ) { (yy_init) = 1; @@ -1010,7 +1030,19 @@ YY_DECL yy_load_buffer_state( ); } - while ( 1 ) /* loops until end-of-file is reached */ + { +/* %% [7.0] user's declarations go here */ +#line 71 "lexer.ll" + + + + // Code run each time yylex is called. + loc.step(); + + +#line 1044 "lexer.cc" + + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { /* %% [8.0] yymore()-related code goes here */ yy_cp = (yy_c_buf_p); @@ -1032,7 +1064,7 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; @@ -1049,7 +1081,6 @@ yy_find_action: /* %% [10.0] code to find the action number goes here */ yy_current_state = *--(yy_state_ptr); (yy_lp) = yy_accept[yy_current_state]; -goto find_rule; /* Shut up GCC warning -Wall */ find_rule: /* we branch to this label when backing up */ for ( ; ; ) /* until we find what rule we matched */ { @@ -1294,7 +1325,7 @@ YY_RULE_SETUP #line 146 "lexer.ll" ECHO; YY_BREAK -#line 1298 "lexer.cc" +#line 1329 "lexer.cc" case YY_END_OF_BUFFER: { @@ -1317,7 +1348,11 @@ ECHO; * back-up) that will match for the new input source. */ (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; +/* %if-c-only */ YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; +/* %endif */ +/* %if-c++-only */ +/* %endif */ YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; } @@ -1424,6 +1459,7 @@ ECHO; "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ + } /* end of user's declarations */ } /* end of yylex */ /* %ok-for-header */ @@ -1447,9 +1483,9 @@ static int yy_get_next_buffer (void) /* %if-c++-only */ /* %endif */ { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + yy_size_t number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -1478,7 +1514,7 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1558,8 +1594,8 @@ static int yy_get_next_buffer (void) /* %if-c++-only */ /* %endif */ { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; /* %% [15.0] code to get the start state into yy_current_state goes here */ yy_current_state = (yy_start); @@ -1570,7 +1606,7 @@ static int yy_get_next_buffer (void) for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { /* %% [16.0] code to find the next state goes here */ - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; @@ -1595,10 +1631,10 @@ static int yy_get_next_buffer (void) /* %if-c++-only */ /* %endif */ { - register int yy_is_jam; + int yy_is_jam; /* %% [17.0] code to find the next state, and perhaps do backing up, goes here */ - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; @@ -1610,12 +1646,14 @@ static int yy_get_next_buffer (void) if ( ! yy_is_jam ) *(yy_state_ptr)++ = yy_current_state; - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } +#ifndef YY_NO_UNPUT /* %if-c-only */ /* %endif */ +#endif /* %if-c-only */ #ifndef YY_NO_INPUT @@ -1669,7 +1707,7 @@ static int yy_get_next_buffer (void) case EOB_ACT_END_OF_FILE: { if ( yywrap( ) ) - return 0; + return EOF; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -1725,6 +1763,9 @@ static int yy_get_next_buffer (void) yy_load_buffer_state( ); } +/* %if-c++-only */ +/* %endif */ + /** Switch to a different input buffer. * @param new_buffer The new input buffer. * @@ -1772,7 +1813,11 @@ static void yy_load_buffer_state (void) { (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; +/* %if-c-only */ yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; +/* %endif */ +/* %if-c++-only */ +/* %endif */ (yy_hold_char) = *(yy_c_buf_p); } @@ -1794,7 +1839,7 @@ static void yy_load_buffer_state (void) if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_buf_size = size; + b->yy_buf_size = (yy_size_t)size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. @@ -1810,6 +1855,9 @@ static void yy_load_buffer_state (void) return b; } +/* %if-c++-only */ +/* %endif */ + /** Destroy the buffer. * @param b a buffer created with yy_create_buffer() * @@ -1833,17 +1881,6 @@ static void yy_load_buffer_state (void) yyfree((void *) b ); } -/* %if-c-only */ - -#ifndef __cplusplus -extern int isatty (int ); -#endif /* __cplusplus */ - -/* %endif */ - -/* %if-c++-only */ -/* %endif */ - /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a yyrestart() or at EOF. @@ -1859,7 +1896,11 @@ extern int isatty (int ); yy_flush_buffer(b ); +/* %if-c-only */ b->yy_input_file = file; +/* %endif */ +/* %if-c++-only */ +/* %endif */ b->yy_fill_buffer = 1; /* If b is the current buffer, then yy_init_buffer was _probably_ @@ -1994,7 +2035,7 @@ static void yyensure_buffer_stack (void) * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; + num_to_alloc = 1; // After all that talk, this was set to 1 anyways... (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); @@ -2011,7 +2052,7 @@ static void yyensure_buffer_stack (void) if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -2084,8 +2125,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /* %if-c-only */ /** 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 bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -2093,7 +2134,8 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len { YY_BUFFER_STATE b; char *buf; - yy_size_t n, i; + yy_size_t n; + yy_size_t i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; @@ -2126,7 +2168,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len /* %if-c-only */ static void yy_fatal_error (yyconst char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } /* %endif */ @@ -2202,29 +2244,29 @@ char *yyget_text (void) /* %endif */ /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - yylineno = line_number; + yylineno = _line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * * @see yy_switch_to_buffer */ -void yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (void) @@ -2232,9 +2274,9 @@ int yyget_debug (void) return yy_flex_debug; } -void yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } /* %endif */ @@ -2318,7 +2360,8 @@ int yylex_destroy (void) #ifndef yytext_ptr static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) { - register int i; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } @@ -2327,7 +2370,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) #ifdef YY_NEED_STRLEN static int yy_flex_strlen (yyconst char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -2337,11 +2380,12 @@ static int yy_flex_strlen (yyconst char * s ) void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return (void *) malloc( size ); } void *yyrealloc (void * ptr, yy_size_t size ) { + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -2354,7 +2398,7 @@ void *yyrealloc (void * ptr, yy_size_t size ) void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } /* %if-tables-serialization definitions */ diff --git a/src/lib/eval/location.hh b/src/lib/eval/location.hh index 92744a61cb..effaa15add 100644 --- a/src/lib/eval/location.hh +++ b/src/lib/eval/location.hh @@ -1,9 +1,8 @@ -// Generated 20160227 // A Bison parser, made by GNU Bison 3.0.4. // Locations for Bison parsers in C++ -// Copyright (C) 2002-2013 Free Software Foundation, Inc. +// Copyright (C) 2002-2015 Free Software Foundation, Inc. // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -41,9 +40,9 @@ # include "position.hh" -#line 13 "parser.yy" // location.cc:291 +#line 13 "parser.yy" // location.cc:296 namespace isc { namespace eval { -#line 46 "location.hh" // location.cc:291 +#line 46 "location.hh" // location.cc:296 /// Abstract a location. class location { @@ -112,36 +111,42 @@ namespace isc { namespace eval { position end; }; - /// Join two location objects to create a location. - inline location operator+ (location res, const location& end) + /// Join two locations, in place. + inline location& operator+= (location& res, const location& end) { res.end = end.end; return res; } - /// Change end position in place. + /// Join two locations. + inline location operator+ (location res, const location& end) + { + return res += end; + } + + /// Add \a width columns to the end position, in place. inline location& operator+= (location& res, int width) { res.columns (width); return res; } - /// Change end position. + /// Add \a width columns to the end position. inline location operator+ (location res, int width) { return res += width; } - /// Change end position in place. + /// Subtract \a width columns to the end position, in place. inline location& operator-= (location& res, int width) { return res += -width; } - /// Change end position. - inline location operator- (const location& begin, int width) + /// Subtract \a width columns to the end position. + inline location operator- (location res, int width) { - return begin + -width; + return res -= width; } /// Compare two location objects. @@ -169,8 +174,7 @@ namespace isc { namespace eval { operator<< (std::basic_ostream& ostr, const location& loc) { unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0; - ostr << loc.begin// << "(" << loc.end << ") " -; + ostr << loc.begin; if (loc.end.filename && (!loc.begin.filename || *loc.begin.filename != *loc.end.filename)) @@ -182,7 +186,7 @@ namespace isc { namespace eval { return ostr; } -#line 13 "parser.yy" // location.cc:291 +#line 13 "parser.yy" // location.cc:296 } } // isc::eval -#line 187 "location.hh" // location.cc:291 +#line 192 "location.hh" // location.cc:296 #endif // !YY_YY_LOCATION_HH_INCLUDED diff --git a/src/lib/eval/parser.cc b/src/lib/eval/parser.cc index 9a23709473..0effbea998 100644 --- a/src/lib/eval/parser.cc +++ b/src/lib/eval/parser.cc @@ -334,42 +334,42 @@ namespace isc { namespace eval { { case 21: // "constant string" -#line 71 "parser.yy" // lalr1.cc:636 +#line 72 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< std::string > (); } #line 340 "parser.cc" // lalr1.cc:636 break; case 22: // "integer" -#line 71 "parser.yy" // lalr1.cc:636 +#line 72 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< std::string > (); } #line 347 "parser.cc" // lalr1.cc:636 break; case 23: // "constant hexstring" -#line 71 "parser.yy" // lalr1.cc:636 +#line 72 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< std::string > (); } #line 354 "parser.cc" // lalr1.cc:636 break; case 24: // "option name" -#line 71 "parser.yy" // lalr1.cc:636 +#line 72 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< std::string > (); } #line 361 "parser.cc" // lalr1.cc:636 break; case 29: // option_code -#line 71 "parser.yy" // lalr1.cc:636 +#line 72 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< uint16_t > (); } #line 368 "parser.cc" // lalr1.cc:636 break; case 30: // option_repr_type -#line 71 "parser.yy" // lalr1.cc:636 +#line 72 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< TokenOption::RepresentationType > (); } #line 375 "parser.cc" // lalr1.cc:636 break; @@ -604,7 +604,7 @@ namespace isc { namespace eval { switch (yyn) { case 4: -#line 85 "parser.yy" // lalr1.cc:859 +#line 86 "parser.yy" // lalr1.cc:859 { TokenPtr neg(new TokenNot()); ctx.expression.push_back(neg); @@ -613,7 +613,7 @@ namespace isc { namespace eval { break; case 5: -#line 90 "parser.yy" // lalr1.cc:859 +#line 91 "parser.yy" // lalr1.cc:859 { TokenPtr neg(new TokenAnd()); ctx.expression.push_back(neg); @@ -622,7 +622,7 @@ namespace isc { namespace eval { break; case 6: -#line 95 "parser.yy" // lalr1.cc:859 +#line 96 "parser.yy" // lalr1.cc:859 { TokenPtr neg(new TokenOr()); ctx.expression.push_back(neg); @@ -631,7 +631,7 @@ namespace isc { namespace eval { break; case 7: -#line 100 "parser.yy" // lalr1.cc:859 +#line 101 "parser.yy" // lalr1.cc:859 { TokenPtr eq(new TokenEqual()); ctx.expression.push_back(eq); @@ -640,7 +640,7 @@ namespace isc { namespace eval { break; case 8: -#line 105 "parser.yy" // lalr1.cc:859 +#line 106 "parser.yy" // lalr1.cc:859 { TokenPtr opt(new TokenOption(yystack_[3].value.as< uint16_t > (), TokenOption::EXISTS)); ctx.expression.push_back(opt); @@ -649,7 +649,7 @@ namespace isc { namespace eval { break; case 9: -#line 110 "parser.yy" // lalr1.cc:859 +#line 111 "parser.yy" // lalr1.cc:859 { switch (ctx.getUniverse()) { case Option::V4: @@ -673,7 +673,7 @@ namespace isc { namespace eval { break; case 10: -#line 132 "parser.yy" // lalr1.cc:859 +#line 133 "parser.yy" // lalr1.cc:859 { TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ())); ctx.expression.push_back(str); @@ -682,7 +682,7 @@ namespace isc { namespace eval { break; case 11: -#line 137 "parser.yy" // lalr1.cc:859 +#line 138 "parser.yy" // lalr1.cc:859 { TokenPtr hex(new TokenHexString(yystack_[0].value.as< std::string > ())); ctx.expression.push_back(hex); @@ -691,7 +691,7 @@ namespace isc { namespace eval { break; case 12: -#line 142 "parser.yy" // lalr1.cc:859 +#line 143 "parser.yy" // lalr1.cc:859 { TokenPtr opt(new TokenOption(yystack_[3].value.as< uint16_t > (), yystack_[0].value.as< TokenOption::RepresentationType > ())); ctx.expression.push_back(opt); @@ -700,7 +700,7 @@ namespace isc { namespace eval { break; case 13: -#line 147 "parser.yy" // lalr1.cc:859 +#line 148 "parser.yy" // lalr1.cc:859 { switch (ctx.getUniverse()) { case Option::V4: @@ -724,7 +724,7 @@ namespace isc { namespace eval { break; case 14: -#line 167 "parser.yy" // lalr1.cc:859 +#line 168 "parser.yy" // lalr1.cc:859 { TokenPtr sub(new TokenSubstring()); ctx.expression.push_back(sub); @@ -733,7 +733,7 @@ namespace isc { namespace eval { break; case 15: -#line 172 "parser.yy" // lalr1.cc:859 +#line 173 "parser.yy" // lalr1.cc:859 { TokenPtr conc(new TokenConcat()); ctx.expression.push_back(conc); @@ -742,7 +742,7 @@ namespace isc { namespace eval { break; case 16: -#line 179 "parser.yy" // lalr1.cc:859 +#line 180 "parser.yy" // lalr1.cc:859 { yylhs.value.as< uint16_t > () = ctx.convertOptionCode(yystack_[0].value.as< std::string > (), yystack_[0].location); } @@ -750,7 +750,7 @@ namespace isc { namespace eval { break; case 17: -#line 183 "parser.yy" // lalr1.cc:859 +#line 184 "parser.yy" // lalr1.cc:859 { yylhs.value.as< uint16_t > () = ctx.convertOptionName(yystack_[0].value.as< std::string > (), yystack_[0].location); } @@ -758,7 +758,7 @@ namespace isc { namespace eval { break; case 18: -#line 189 "parser.yy" // lalr1.cc:859 +#line 190 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenOption::RepresentationType > () = TokenOption::TEXTUAL; } @@ -766,7 +766,7 @@ namespace isc { namespace eval { break; case 19: -#line 193 "parser.yy" // lalr1.cc:859 +#line 194 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenOption::RepresentationType > () = TokenOption::HEXADECIMAL; } @@ -774,7 +774,7 @@ namespace isc { namespace eval { break; case 20: -#line 199 "parser.yy" // lalr1.cc:859 +#line 200 "parser.yy" // lalr1.cc:859 { TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ())); ctx.expression.push_back(str); @@ -783,7 +783,7 @@ namespace isc { namespace eval { break; case 21: -#line 206 "parser.yy" // lalr1.cc:859 +#line 207 "parser.yy" // lalr1.cc:859 { TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ())); ctx.expression.push_back(str); @@ -792,7 +792,7 @@ namespace isc { namespace eval { break; case 22: -#line 211 "parser.yy" // lalr1.cc:859 +#line 212 "parser.yy" // lalr1.cc:859 { TokenPtr str(new TokenString("all")); ctx.expression.push_back(str); @@ -1170,9 +1170,9 @@ namespace isc { namespace eval { const unsigned char EvalParser::yyrline_[] = { - 0, 80, 80, 83, 84, 89, 94, 99, 104, 109, - 131, 136, 141, 146, 166, 171, 178, 182, 188, 192, - 198, 205, 210 + 0, 81, 81, 84, 85, 90, 95, 100, 105, 110, + 132, 137, 142, 147, 167, 172, 179, 183, 189, 193, + 199, 206, 211 }; // Print the state stack on the debug stream. @@ -1208,7 +1208,7 @@ namespace isc { namespace eval { #line 13 "parser.yy" // lalr1.cc:1167 } } // isc::eval #line 1211 "parser.cc" // lalr1.cc:1167 -#line 217 "parser.yy" // lalr1.cc:1168 +#line 218 "parser.yy" // lalr1.cc:1168 void isc::eval::EvalParser::error(const location_type& loc, diff --git a/src/lib/eval/parser.h b/src/lib/eval/parser.h index a5e714d613..27e4a4320b 100644 --- a/src/lib/eval/parser.h +++ b/src/lib/eval/parser.h @@ -40,7 +40,7 @@ #ifndef YY_YY_PARSER_H_INCLUDED # define YY_YY_PARSER_H_INCLUDED // // "%code requires" blocks. -#line 16 "parser.yy" // lalr1.cc:392 +#line 16 "parser.yy" // lalr1.cc:377 #include #include @@ -51,7 +51,7 @@ using namespace isc::dhcp; using namespace isc::eval; -#line 55 "parser.h" // lalr1.cc:392 +#line 55 "parser.h" // lalr1.cc:377 # include # include // std::abort @@ -126,9 +126,9 @@ using namespace isc::eval; # define YYDEBUG 1 #endif -#line 13 "parser.yy" // lalr1.cc:392 +#line 13 "parser.yy" // lalr1.cc:377 namespace isc { namespace eval { -#line 132 "parser.h" // lalr1.cc:392 +#line 132 "parser.h" // lalr1.cc:377 @@ -1205,9 +1205,9 @@ namespace isc { namespace eval { } -#line 13 "parser.yy" // lalr1.cc:392 +#line 13 "parser.yy" // lalr1.cc:377 } } // isc::eval -#line 1211 "parser.h" // lalr1.cc:392 +#line 1211 "parser.h" // lalr1.cc:377 diff --git a/src/lib/eval/position.hh b/src/lib/eval/position.hh index 5055601da3..b3eebe04f6 100644 --- a/src/lib/eval/position.hh +++ b/src/lib/eval/position.hh @@ -1,9 +1,8 @@ -// Generated 20160227 // A Bison parser, made by GNU Bison 3.0.4. // Positions for Bison parsers in C++ -// Copyright (C) 2002-2013 Free Software Foundation, Inc. +// Copyright (C) 2002-2015 Free Software Foundation, Inc. // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -51,9 +50,9 @@ # endif # endif -#line 13 "parser.yy" // location.cc:291 +#line 13 "parser.yy" // location.cc:296 namespace isc { namespace eval { -#line 56 "position.hh" // location.cc:291 +#line 56 "position.hh" // location.cc:296 /// Abstract a position. class position { @@ -115,7 +114,7 @@ namespace isc { namespace eval { } }; - /// Add and assign a position. + /// Add \a width columns, in place. inline position& operator+= (position& res, int width) { @@ -123,21 +122,21 @@ namespace isc { namespace eval { return res; } - /// Add two position objects. + /// Add \a width columns. inline position operator+ (position res, int width) { return res += width; } - /// Add and assign a position. + /// Subtract \a width columns, in place. inline position& operator-= (position& res, int width) { return res += -width; } - /// Add two position objects. + /// Subtract \a width columns. inline position operator- (position res, int width) { @@ -175,7 +174,7 @@ namespace isc { namespace eval { return ostr << pos.line << '.' << pos.column; } -#line 13 "parser.yy" // location.cc:291 +#line 13 "parser.yy" // location.cc:296 } } // isc::eval -#line 180 "position.hh" // location.cc:291 +#line 180 "position.hh" // location.cc:296 #endif // !YY_YY_POSITION_HH_INCLUDED diff --git a/src/lib/eval/stack.hh b/src/lib/eval/stack.hh index 71e91c2652..6bda37bbcf 100644 --- a/src/lib/eval/stack.hh +++ b/src/lib/eval/stack.hh @@ -1,9 +1,8 @@ -// Generated 20160227 // A Bison parser, made by GNU Bison 3.0.4. // Stack handling for Bison parsers in C++ -// Copyright (C) 2002-2013 Free Software Foundation, Inc. +// Copyright (C) 2002-2015 Free Software Foundation, Inc. // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -41,9 +40,9 @@ # include -#line 13 "parser.yy" // stack.hh:133 +#line 13 "parser.yy" // stack.hh:132 namespace isc { namespace eval { -#line 46 "stack.hh" // stack.hh:133 +#line 46 "stack.hh" // stack.hh:132 template > class stack { @@ -55,12 +54,12 @@ namespace isc { namespace eval { stack () : seq_ () { + seq_.reserve (200); } stack (unsigned int n) : seq_ (n) - { - } + {} inline T& @@ -137,8 +136,7 @@ namespace isc { namespace eval { slice (const S& stack, unsigned int range) : stack_ (stack) , range_ (range) - { - } + {} inline const T& @@ -152,8 +150,8 @@ namespace isc { namespace eval { unsigned int range_; }; -#line 13 "parser.yy" // stack.hh:133 +#line 13 "parser.yy" // stack.hh:132 } } // isc::eval -#line 157 "stack.hh" // stack.hh:133 +#line 156 "stack.hh" // stack.hh:132 #endif // !YY_YY_STACK_HH_INCLUDED