From 076d269ffe3817780c1740e29f55cc08557015ca Mon Sep 17 00:00:00 2001 From: alegrand Date: Tue, 21 Mar 2006 12:06:40 +0000 Subject: [PATCH] Make last version of flex (2.5.33-2) happy. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1969 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/surf/surfxml.h | 2 +- include/xbt/graphxml.h | 2 +- src/surf/surfxml.c | 111 ++++++++++++++++++++++++++++------------- src/surf/surfxml.l | 4 +- src/xbt/graphxml.c | 111 ++++++++++++++++++++++++++++------------- src/xbt/graphxml.l | 4 +- 6 files changed, 158 insertions(+), 76 deletions(-) diff --git a/include/surf/surfxml.h b/include/surf/surfxml.h index 69355b7859..eceedf807f 100644 --- a/include/surf/surfxml.h +++ b/include/surf/surfxml.h @@ -1,5 +1,5 @@ /* XML processor/application API for ../../src/surf/surfxml.dtd. - * Generated 2006/03/21 11:12:31. + * Generated 2006/03/21 12:59:32. * * This program was generated with the FleXML XML processor generator. * FleXML is Copyright © 1999-2005 Kristoffer Rose. All rights reserved. diff --git a/include/xbt/graphxml.h b/include/xbt/graphxml.h index 3cf3b9d12e..354d999570 100644 --- a/include/xbt/graphxml.h +++ b/include/xbt/graphxml.h @@ -1,5 +1,5 @@ /* XML processor/application API for ../../src/xbt/graphxml.dtd. - * Generated 2006/03/21 11:12:32. + * Generated 2006/03/21 12:59:32. * * This program was generated with the FleXML XML processor generator. * FleXML is Copyright © 1999-2005 Kristoffer Rose. All rights reserved. diff --git a/src/surf/surfxml.c b/src/surf/surfxml.c index c04f9b87b6..5037f121c8 100644 --- a/src/surf/surfxml.c +++ b/src/surf/surfxml.c @@ -9,7 +9,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 31 +#define YY_FLEX_SUBMINOR_VERSION 33 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -31,7 +31,15 @@ /* C99 systems have . Non-C99 systems may or may not. */ -#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +#if __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + #include typedef int8_t flex_int8_t; typedef uint8_t flex_uint8_t; @@ -135,6 +143,10 @@ typedef unsigned int flex_uint32_t; #define YY_BUF_SIZE 16384 #endif +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) + #ifndef YY_TYPEDEF_YY_BUFFER_STATE #define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; @@ -281,7 +293,7 @@ int surf_parse_leng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; -static int yy_init = 1; /* whether we need to initialize */ +static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ /* Flag which is used to allow surf_parse_wrap()'s to do buffer switches @@ -337,7 +349,7 @@ void surf_parse_free (void * ); /* Begin user sect3 */ -#define surf_parse_wrap(n) 1 +#define surf_parse_wrap() 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -1738,7 +1750,7 @@ int surf_parse__flex_debug = 0; char *surf_parse_text; #line 1 "surf/surfxml.l" /* Validating XML processor for surfxml.dtd. - * Generated 2006/03/21 11:12:31. + * Generated 2006/03/21 12:59:32. * * This program was generated with the FleXML XML processor generator. * FleXML is Copyright © 1999-2005 Kristoffer Rose. All rights reserved. @@ -1931,7 +1943,7 @@ static char* popbuffer(void) * INPI inside an XML PI * VALUE1 inside a '...'-delimited literal * VALUE2 inside a "..."-delimited literal - * CDATA inside a section. + * CDATA inside a section. * ROOT_ expect root element * AL_ inside the attribute list for * IN_ inside a with element contents (ready for end tag) @@ -1950,7 +1962,7 @@ static char* popbuffer(void) #line 239 "surf/surfxml.l" /* State names. */ const char* *surfxml_statenames=NULL; -#line 1954 "surf/surfxml.c" +#line 1966 "surf/surfxml.c" #define INITIAL 0 #define PROLOG 1 @@ -2011,6 +2023,8 @@ const char* *surfxml_statenames=NULL; #define YY_EXTRA_TYPE void * #endif +static int yy_init_globals (void ); + /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -2043,7 +2057,7 @@ static int input (void ); static int yy_start_stack_ptr = 0; static int yy_start_stack_depth = 0; - static int *yy_start_stack = 0; + static int *yy_start_stack = NULL; static void yy_push_state (int new_state ); @@ -2208,11 +2222,11 @@ YY_DECL /* COMMENTS and PIs: handled uniformly for efficiency. */ -#line 2212 "surf/surfxml.c" +#line 2226 "surf/surfxml.c" - if ( (yy_init) ) + if ( !(yy_init) ) { - (yy_init) = 0; + (yy_init) = 1; #ifdef YY_USER_INIT YY_USER_INIT; @@ -3626,7 +3640,7 @@ YY_RULE_SETUP #line 840 "surf/surfxml.l" ECHO; YY_BREAK -#line 3630 "surf/surfxml.c" +#line 3644 "surf/surfxml.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(ROOT_surfxml_platform_description): case YY_STATE_EOF(S_surfxml_platform_description_1): @@ -3825,7 +3839,7 @@ static int yy_get_next_buffer (void) else { - 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 ) @@ -4339,16 +4353,16 @@ YY_BUFFER_STATE surf_parse__scan_buffer (char * base, yy_size_t size ) /** Setup the input buffer state to scan a string. The next call to surf_parse_lex() will * scan from a @e copy of @a str. - * @param str a NUL-terminated string to scan + * @param yystr a NUL-terminated string to scan * * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use * surf_parse__scan_bytes() instead. */ -YY_BUFFER_STATE surf_parse__scan_string (yyconst char * yy_str ) +YY_BUFFER_STATE surf_parse__scan_string (yyconst char * yystr ) { - return surf_parse__scan_bytes(yy_str,strlen(yy_str) ); + return surf_parse__scan_bytes(yystr,strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to surf_parse_lex() will @@ -4358,7 +4372,7 @@ YY_BUFFER_STATE surf_parse__scan_string (yyconst char * yy_str ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE surf_parse__scan_bytes (yyconst char * bytes, int len ) +YY_BUFFER_STATE surf_parse__scan_bytes (yyconst char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; @@ -4366,15 +4380,15 @@ YY_BUFFER_STATE surf_parse__scan_bytes (yyconst char * bytes, int len ) int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = len + 2; + n = _yybytes_len + 2; buf = (char *) surf_parse_alloc(n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in surf_parse__scan_bytes()" ); - for ( i = 0; i < len; ++i ) - buf[i] = bytes[i]; + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; - buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; b = surf_parse__scan_buffer(buf,n ); if ( ! b ) @@ -4528,6 +4542,41 @@ void surf_parse_set_debug (int bdebug ) surf_parse__flex_debug = bdebug ; } +static int yy_init_globals (void) +{ + /* Initialization is the same as for the non-reentrant scanner. + * This function is called from surf_parse_lex_destroy(), so don't allocate here. + */ + + /* We do not touch surf_parse_lineno unless the option is enabled. */ + surf_parse_lineno = 1; + + (yy_buffer_stack) = 0; + (yy_buffer_stack_top) = 0; + (yy_buffer_stack_max) = 0; + (yy_c_buf_p) = (char *) 0; + (yy_init) = 0; + (yy_start) = 0; + + (yy_start_stack_ptr) = 0; + (yy_start_stack_depth) = 0; + (yy_start_stack) = NULL; + +/* Defined in main.c */ +#ifdef YY_STDINIT + surf_parse_in = stdin; + surf_parse_out = stdout; +#else + surf_parse_in = (FILE *) 0; + surf_parse_out = (FILE *) 0; +#endif + + /* For future reference: Set errno on error, since we are called by + * surf_parse_lex_init() + */ + return 0; +} + /* surf_parse_lex_destroy is for both reentrant and non-reentrant scanners. */ int surf_parse_lex_destroy (void) { @@ -4547,6 +4596,10 @@ int surf_parse_lex_destroy (void) surf_parse_free((yy_start_stack) ); (yy_start_stack) = NULL; + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * surf_parse_lex() is called, initialization will occur. */ + yy_init_globals( ); + return 0; } @@ -4558,7 +4611,7 @@ int surf_parse_lex_destroy (void) static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) { register int i; - for ( i = 0; i < n; ++i ) + for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } #endif @@ -4567,7 +4620,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) static int yy_flex_strlen (yyconst char * s ) { register int n; - for ( n = 0; s[n]; ++n ) + for ( n = 0; s[n]; ++n ) ; return n; @@ -4598,18 +4651,6 @@ void surf_parse_free (void * ptr ) #define YYTABLES_NAME "yytables" -#undef YY_NEW_FILE -#undef YY_FLUSH_BUFFER -#undef yy_set_bol -#undef yy_new_buffer -#undef yy_set_interactive -#undef yytext_ptr -#undef YY_DO_BEFORE_ACTION - -#ifdef YY_DECL_IS_OURS -#undef YY_DECL_IS_OURS -#undef YY_DECL -#endif #line 840 "surf/surfxml.l" diff --git a/src/surf/surfxml.l b/src/surf/surfxml.l index 30b56c5879..eb39f52489 100644 --- a/src/surf/surfxml.l +++ b/src/surf/surfxml.l @@ -1,5 +1,5 @@ /* Validating XML processor for surfxml.dtd. - * Generated 2006/03/21 11:12:31. + * Generated 2006/03/21 12:59:32. * * This program was generated with the FleXML XML processor generator. * FleXML is Copyright © 1999-2005 Kristoffer Rose. All rights reserved. @@ -218,7 +218,7 @@ Literal \'[^'']*\'|\"[^""]*\" * INPI inside an XML PI * VALUE1 inside a '...'-delimited literal * VALUE2 inside a "..."-delimited literal - * CDATA inside a section. + * CDATA inside a section. * ROOT_ expect root element * AL_ inside the attribute list for * IN_ inside a with element contents (ready for end tag) diff --git a/src/xbt/graphxml.c b/src/xbt/graphxml.c index 5706006cf5..fca82c1ed5 100644 --- a/src/xbt/graphxml.c +++ b/src/xbt/graphxml.c @@ -9,7 +9,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 31 +#define YY_FLEX_SUBMINOR_VERSION 33 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -31,7 +31,15 @@ /* C99 systems have . Non-C99 systems may or may not. */ -#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +#if __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + #include typedef int8_t flex_int8_t; typedef uint8_t flex_uint8_t; @@ -135,6 +143,10 @@ typedef unsigned int flex_uint32_t; #define YY_BUF_SIZE 16384 #endif +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) + #ifndef YY_TYPEDEF_YY_BUFFER_STATE #define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; @@ -281,7 +293,7 @@ int xbt_graph_parse_leng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; -static int yy_init = 1; /* whether we need to initialize */ +static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ /* Flag which is used to allow xbt_graph_parse_wrap()'s to do buffer switches @@ -337,7 +349,7 @@ void xbt_graph_parse_free (void * ); /* Begin user sect3 */ -#define xbt_graph_parse_wrap(n) 1 +#define xbt_graph_parse_wrap() 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -959,7 +971,7 @@ int xbt_graph_parse__flex_debug = 0; char *xbt_graph_parse_text; #line 1 "xbt/graphxml.l" /* Validating XML processor for graphxml.dtd. - * Generated 2006/03/21 11:12:32. + * Generated 2006/03/21 12:59:33. * * This program was generated with the FleXML XML processor generator. * FleXML is Copyright © 1999-2005 Kristoffer Rose. All rights reserved. @@ -1128,7 +1140,7 @@ static char* popbuffer(void) * INPI inside an XML PI * VALUE1 inside a '...'-delimited literal * VALUE2 inside a "..."-delimited literal - * CDATA inside a section. + * CDATA inside a section. * ROOT_ expect root element * AL_ inside the attribute list for * IN_ inside a with element contents (ready for end tag) @@ -1142,7 +1154,7 @@ static char* popbuffer(void) #line 210 "xbt/graphxml.l" /* State names. */ const char* *graphxml_statenames=NULL; -#line 1146 "xbt/graphxml.c" +#line 1158 "xbt/graphxml.c" #define INITIAL 0 #define PROLOG 1 @@ -1182,6 +1194,8 @@ const char* *graphxml_statenames=NULL; #define YY_EXTRA_TYPE void * #endif +static int yy_init_globals (void ); + /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -1214,7 +1228,7 @@ static int input (void ); static int yy_start_stack_ptr = 0; static int yy_start_stack_depth = 0; - static int *yy_start_stack = 0; + static int *yy_start_stack = NULL; static void yy_push_state (int new_state ); @@ -1358,11 +1372,11 @@ YY_DECL /* COMMENTS and PIs: handled uniformly for efficiency. */ -#line 1362 "xbt/graphxml.c" +#line 1376 "xbt/graphxml.c" - if ( (yy_init) ) + if ( !(yy_init) ) { - (yy_init) = 0; + (yy_init) = 1; #ifdef YY_USER_INIT YY_USER_INIT; @@ -2041,7 +2055,7 @@ YY_RULE_SETUP #line 500 "xbt/graphxml.l" ECHO; YY_BREAK -#line 2045 "xbt/graphxml.c" +#line 2059 "xbt/graphxml.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(ROOT_graphxml_graph): case YY_STATE_EOF(S_graphxml_graph_2): @@ -2233,7 +2247,7 @@ static int yy_get_next_buffer (void) else { - 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 ) @@ -2747,16 +2761,16 @@ YY_BUFFER_STATE xbt_graph_parse__scan_buffer (char * base, yy_size_t size ) /** Setup the input buffer state to scan a string. The next call to xbt_graph_parse_lex() will * scan from a @e copy of @a str. - * @param str a NUL-terminated string to scan + * @param yystr a NUL-terminated string to scan * * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use * xbt_graph_parse__scan_bytes() instead. */ -YY_BUFFER_STATE xbt_graph_parse__scan_string (yyconst char * yy_str ) +YY_BUFFER_STATE xbt_graph_parse__scan_string (yyconst char * yystr ) { - return xbt_graph_parse__scan_bytes(yy_str,strlen(yy_str) ); + return xbt_graph_parse__scan_bytes(yystr,strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to xbt_graph_parse_lex() will @@ -2766,7 +2780,7 @@ YY_BUFFER_STATE xbt_graph_parse__scan_string (yyconst char * yy_str ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE xbt_graph_parse__scan_bytes (yyconst char * bytes, int len ) +YY_BUFFER_STATE xbt_graph_parse__scan_bytes (yyconst char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; @@ -2774,15 +2788,15 @@ YY_BUFFER_STATE xbt_graph_parse__scan_bytes (yyconst char * bytes, int len ) int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = len + 2; + n = _yybytes_len + 2; buf = (char *) xbt_graph_parse_alloc(n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse__scan_bytes()" ); - for ( i = 0; i < len; ++i ) - buf[i] = bytes[i]; + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; - buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; b = xbt_graph_parse__scan_buffer(buf,n ); if ( ! b ) @@ -2936,6 +2950,41 @@ void xbt_graph_parse_set_debug (int bdebug ) xbt_graph_parse__flex_debug = bdebug ; } +static int yy_init_globals (void) +{ + /* Initialization is the same as for the non-reentrant scanner. + * This function is called from xbt_graph_parse_lex_destroy(), so don't allocate here. + */ + + /* We do not touch xbt_graph_parse_lineno unless the option is enabled. */ + xbt_graph_parse_lineno = 1; + + (yy_buffer_stack) = 0; + (yy_buffer_stack_top) = 0; + (yy_buffer_stack_max) = 0; + (yy_c_buf_p) = (char *) 0; + (yy_init) = 0; + (yy_start) = 0; + + (yy_start_stack_ptr) = 0; + (yy_start_stack_depth) = 0; + (yy_start_stack) = NULL; + +/* Defined in main.c */ +#ifdef YY_STDINIT + xbt_graph_parse_in = stdin; + xbt_graph_parse_out = stdout; +#else + xbt_graph_parse_in = (FILE *) 0; + xbt_graph_parse_out = (FILE *) 0; +#endif + + /* For future reference: Set errno on error, since we are called by + * xbt_graph_parse_lex_init() + */ + return 0; +} + /* xbt_graph_parse_lex_destroy is for both reentrant and non-reentrant scanners. */ int xbt_graph_parse_lex_destroy (void) { @@ -2955,6 +3004,10 @@ int xbt_graph_parse_lex_destroy (void) xbt_graph_parse_free((yy_start_stack) ); (yy_start_stack) = NULL; + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * xbt_graph_parse_lex() is called, initialization will occur. */ + yy_init_globals( ); + return 0; } @@ -2966,7 +3019,7 @@ int xbt_graph_parse_lex_destroy (void) static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) { register int i; - for ( i = 0; i < n; ++i ) + for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } #endif @@ -2975,7 +3028,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) static int yy_flex_strlen (yyconst char * s ) { register int n; - for ( n = 0; s[n]; ++n ) + for ( n = 0; s[n]; ++n ) ; return n; @@ -3006,18 +3059,6 @@ void xbt_graph_parse_free (void * ptr ) #define YYTABLES_NAME "yytables" -#undef YY_NEW_FILE -#undef YY_FLUSH_BUFFER -#undef yy_set_bol -#undef yy_new_buffer -#undef yy_set_interactive -#undef yytext_ptr -#undef YY_DO_BEFORE_ACTION - -#ifdef YY_DECL_IS_OURS -#undef YY_DECL_IS_OURS -#undef YY_DECL -#endif #line 500 "xbt/graphxml.l" diff --git a/src/xbt/graphxml.l b/src/xbt/graphxml.l index 16e8bac4da..423adbc7c9 100644 --- a/src/xbt/graphxml.l +++ b/src/xbt/graphxml.l @@ -1,5 +1,5 @@ /* Validating XML processor for graphxml.dtd. - * Generated 2006/03/21 11:12:32. + * Generated 2006/03/21 12:59:33. * * This program was generated with the FleXML XML processor generator. * FleXML is Copyright © 1999-2005 Kristoffer Rose. All rights reserved. @@ -194,7 +194,7 @@ Literal \'[^'']*\'|\"[^""]*\" * INPI inside an XML PI * VALUE1 inside a '...'-delimited literal * VALUE2 inside a "..."-delimited literal - * CDATA inside a section. + * CDATA inside a section. * ROOT_ expect root element * AL_ inside the attribute list for * IN_ inside a with element contents (ready for end tag) -- 2.20.1