From: Francis Dupont Date: Tue, 20 Dec 2016 17:31:28 +0000 (+0000) Subject: trac5017: regen dhcp4 lexer X-Git-Tag: trac5088_base~1^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a86b2f8bb333e76d3639e71badbdac791adbd383;p=thirdparty%2Fkea.git trac5017: regen dhcp4 lexer --- diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc index 31ee62cd62..a1c0802923 100644 --- a/src/bin/dhcp4/dhcp4_lexer.cc +++ b/src/bin/dhcp4/dhcp4_lexer.cc @@ -36,7 +36,7 @@ #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 1 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -136,25 +136,13 @@ typedef unsigned int flex_uint32_t; /* %if-c++-only */ /* %endif */ -#ifdef __cplusplus - -/* 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 /* %not-for-header */ @@ -229,7 +217,7 @@ typedef size_t yy_size_t; #endif /* %if-not-reentrant */ -extern yy_size_t parser4_leng; +extern int parser4_leng; /* %endif */ /* %if-c-only */ @@ -278,7 +266,7 @@ 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. @@ -339,7 +327,7 @@ struct yy_buffer_state /* Stack of input buffers. */ static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ +static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ /* %endif */ /* %ok-for-header */ @@ -368,10 +356,10 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when parser4_text is formed. */ static char yy_hold_char; static int yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t parser4_leng; +int parser4_leng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; +static char *yy_c_buf_p = NULL; static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ @@ -399,7 +387,7 @@ static void parser4__init_buffer (YY_BUFFER_STATE b,FILE *file ); YY_BUFFER_STATE parser4__scan_buffer (char *base,yy_size_t size ); YY_BUFFER_STATE parser4__scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE parser4__scan_bytes (yyconst char *bytes,yy_size_t len ); +YY_BUFFER_STATE parser4__scan_bytes (yyconst char *bytes,int len ); /* %endif */ @@ -441,7 +429,7 @@ void parser4_free (void * ); typedef unsigned char YY_CHAR; -FILE *parser4_in = (FILE *) 0, *parser4_out = (FILE *) 0; +FILE *parser4_in = NULL, *parser4_out = NULL; typedef int yy_state_type; @@ -462,10 +450,7 @@ extern char *parser4_text; 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[] ); +static void yynoreturn yy_fatal_error (yyconst char* msg ); /* %endif */ @@ -475,7 +460,7 @@ static void yy_fatal_error (yyconst char msg[] ); #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ /* %% [2.0] code to fiddle parser4_text and parser4_leng for yymore() goes here \ */\ - parser4_leng = (size_t) (yy_cp - yy_bp); \ + parser4_leng = (int) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ /* %% [3.0] code to copy yytext_ptr to parser4_text[] goes here, if %array \ */\ @@ -1156,7 +1141,7 @@ unsigned int comment_start_line = 0; // by moving it ahead by parser4_leng bytes. parser4_leng specifies the length of the // currently matched token. #define YY_USER_ACTION driver.loc_.columns(parser4_leng); -#line 1160 "dhcp4_lexer.cc" +#line 1145 "dhcp4_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -1212,7 +1197,7 @@ FILE *parser4_get_out (void ); void parser4_set_out (FILE * _out_str ); -yy_size_t parser4_get_leng (void ); + int parser4_get_leng (void ); char *parser4_get_text (void ); @@ -1286,7 +1271,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( parser4_text, parser4_leng, 1, parser4_out )) {} } while (0) +#define ECHO do { if (fwrite( parser4_text, (size_t) parser4_leng, 1, parser4_out )) {} } while (0) /* %endif */ /* %if-c++-only C++ definition */ /* %endif */ @@ -1314,7 +1299,7 @@ static int input (void ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, parser4_in))==0 && ferror(parser4_in)) \ + while ( (result = (int) fread(buf, 1, max_size, parser4_in))==0 && ferror(parser4_in)) \ { \ if( errno != EINTR) \ { \ @@ -1480,7 +1465,7 @@ YY_DECL } -#line 1484 "dhcp4_lexer.cc" +#line 1469 "dhcp4_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1512,7 +1497,7 @@ yy_match: if ( yy_current_state >= 780 ) yy_c = yy_meta[(unsigned int) yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; ++yy_cp; } while ( yy_current_state != 779 ); @@ -2881,7 +2866,7 @@ YY_RULE_SETUP #line 1110 "dhcp4_lexer.ll" ECHO; YY_BREAK -#line 2885 "dhcp4_lexer.cc" +#line 2870 "dhcp4_lexer.cc" case YY_END_OF_BUFFER: { @@ -3084,7 +3069,7 @@ static int yy_get_next_buffer (void) 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 ) @@ -3098,7 +3083,7 @@ static int yy_get_next_buffer (void) 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; @@ -3111,7 +3096,7 @@ static int yy_get_next_buffer (void) } 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( @@ -3201,7 +3186,7 @@ static int yy_get_next_buffer (void) if ( yy_current_state >= 780 ) yy_c = yy_meta[(unsigned int) yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; } return yy_current_state; @@ -3234,7 +3219,7 @@ static int yy_get_next_buffer (void) if ( yy_current_state >= 780 ) yy_c = yy_meta[(unsigned int) yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; yy_is_jam = (yy_current_state == 779); return yy_is_jam ? 0 : yy_current_state; @@ -3274,7 +3259,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (yy_c_buf_p) - (yytext_ptr); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -3298,7 +3283,7 @@ static int yy_get_next_buffer (void) case EOB_ACT_END_OF_FILE: { if ( parser4_wrap( ) ) - return EOF; + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -3614,7 +3599,7 @@ static void parser4_ensure_buffer_stack (void) /* %if-c++-only */ /* %endif */ { - yy_size_t num_to_alloc; + int num_to_alloc; if (!(yy_buffer_stack)) { @@ -3622,7 +3607,7 @@ static void parser4_ensure_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; /* After all that talk, this was set to 1 anyways... */ + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ (yy_buffer_stack) = (struct yy_buffer_state**)parser4_alloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); @@ -3671,7 +3656,7 @@ YY_BUFFER_STATE parser4__scan_buffer (char * base, yy_size_t size ) 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) parser4_alloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) @@ -3680,7 +3665,7 @@ YY_BUFFER_STATE parser4__scan_buffer (char * base, yy_size_t size ) b->yy_buf_size = 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; @@ -3705,7 +3690,7 @@ YY_BUFFER_STATE parser4__scan_buffer (char * base, yy_size_t size ) YY_BUFFER_STATE parser4__scan_string (yyconst char * yystr ) { - return parser4__scan_bytes(yystr,strlen(yystr) ); + return parser4__scan_bytes(yystr,(int) strlen(yystr) ); } /* %endif */ @@ -3717,7 +3702,7 @@ YY_BUFFER_STATE parser4__scan_string (yyconst char * yystr ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE parser4__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE parser4__scan_bytes (yyconst char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; @@ -3725,7 +3710,7 @@ YY_BUFFER_STATE parser4__scan_bytes (yyconst char * yybytes, yy_size_t _yybyte yy_size_t i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; + n = (yy_size_t) _yybytes_len + 2; buf = (char *) parser4_alloc(n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in parser4__scan_bytes()" ); @@ -3753,7 +3738,7 @@ YY_BUFFER_STATE parser4__scan_bytes (yyconst char * yybytes, yy_size_t _yybyte #endif /* %if-c-only */ -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (yyconst char* msg ) { (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); @@ -3813,7 +3798,7 @@ FILE *parser4_get_out (void) /** Get the length of the current token. * */ -yy_size_t parser4_get_leng (void) +int parser4_get_leng (void) { return parser4_leng; } @@ -3880,10 +3865,10 @@ static int yy_init_globals (void) * This function is called from parser4_lex_destroy(), so don't allocate here. */ - (yy_buffer_stack) = 0; + (yy_buffer_stack) = NULL; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; + (yy_c_buf_p) = NULL; (yy_init) = 0; (yy_start) = 0; @@ -3892,8 +3877,8 @@ static int yy_init_globals (void) parser4_in = stdin; parser4_out = stdout; #else - parser4_in = (FILE *) 0; - parser4_out = (FILE *) 0; + parser4_in = NULL; + parser4_out = NULL; #endif /* For future reference: Set errno on error, since we are called by @@ -3956,7 +3941,7 @@ static int yy_flex_strlen (yyconst char * s ) void *parser4_alloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } void *parser4_realloc (void * ptr, yy_size_t size ) @@ -3969,7 +3954,7 @@ void *parser4_realloc (void * ptr, yy_size_t size ) * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void *) realloc( (char *) ptr, size ); + return realloc(ptr, size); } void parser4_free (void * ptr )