From 4dd89d5811921816e0e8d0323dd7feba2c926edf Mon Sep 17 00:00:00 2001 From: mquinson Date: Thu, 13 Jul 2006 22:21:47 +0000 Subject: [PATCH] flexml 1.5.1 will save the world git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2564 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/surf/surfxml.h | 6 +-- include/xbt/graphxml.h | 2 +- src/surf/surfxml.c | 105 +++++++++++++---------------------------- src/xbt/graphxml.c | 4 +- 4 files changed, 38 insertions(+), 79 deletions(-) diff --git a/include/surf/surfxml.h b/include/surf/surfxml.h index dbc2f88b5b..ebac11ba29 100644 --- a/include/surf/surfxml.h +++ b/include/surf/surfxml.h @@ -1,9 +1,9 @@ -/* XML processor/application API for ../../src/surf/surfxml.dtd. - * Generated 2006/05/29 23:03:04. +/* XML processor/application API for surf/surfxml.dtd. + * Generated 2006/07/13 20:43:20. * * This program was generated with the FleXML XML processor generator. * FleXML is Copyright © 1999-2005 Kristoffer Rose. All rights reserved. - * (Id: flexml.pl,v 1.48 2006/03/21 13:09:12 mquinson Exp). + * (Id: flexml.pl,v 1.49 2006/04/21 23:35:51 mquinson Exp). * * There are two, intertwined parts to this program, part A and part B. * diff --git a/include/xbt/graphxml.h b/include/xbt/graphxml.h index 76057bfab9..b5fcd3833e 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/04/22 01:36:54. + * Generated 2006/07/13 17:15:43. * * 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 fb270e84ae..b6b555be97 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 33 +#define YY_FLEX_SUBMINOR_VERSION 31 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -31,15 +31,7 @@ /* C99 systems have . Non-C99 systems may or may not. */ -#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 - +#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L #include typedef int8_t flex_int8_t; typedef uint8_t flex_uint8_t; @@ -143,10 +135,6 @@ 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; @@ -293,7 +281,7 @@ int surf_parse_leng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; -static int yy_init = 0; /* whether we need to initialize */ +static int yy_init = 1; /* 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 @@ -1972,7 +1960,7 @@ static char* popbuffer(void) #line 240 "surf/surfxml.l" /* State names. */ const char* *surfxml_statenames=NULL; -#line 1976 "surf/surfxml.c" +#line 1964 "surf/surfxml.c" #define INITIAL 0 #define PROLOG 1 @@ -2033,8 +2021,6 @@ 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. */ @@ -2067,7 +2053,7 @@ static int input (void ); static int yy_start_stack_ptr = 0; static int yy_start_stack_depth = 0; - static int *yy_start_stack = NULL; + static int *yy_start_stack = 0; static void yy_push_state (int new_state ); @@ -2232,11 +2218,11 @@ YY_DECL /* COMMENTS and PIs: handled uniformly for efficiency. */ -#line 2236 "surf/surfxml.c" +#line 2222 "surf/surfxml.c" - if ( !(yy_init) ) + if ( (yy_init) ) { - (yy_init) = 1; + (yy_init) = 0; #ifdef YY_USER_INIT YY_USER_INIT; @@ -3663,7 +3649,7 @@ YY_RULE_SETUP #line 845 "surf/surfxml.l" ECHO; YY_BREAK -#line 3667 "surf/surfxml.c" +#line 3653 "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): @@ -3907,7 +3893,7 @@ static int yy_get_next_buffer (void) /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), (size_t) num_to_read ); + (yy_n_chars), num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } @@ -4376,16 +4362,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 yystr a NUL-terminated string to scan + * @param str 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 * yystr ) +YY_BUFFER_STATE surf_parse__scan_string (yyconst char * yy_str ) { - return surf_parse__scan_bytes(yystr,strlen(yystr) ); + return surf_parse__scan_bytes(yy_str,strlen(yy_str) ); } /** Setup the input buffer state to scan the given bytes. The next call to surf_parse_lex() will @@ -4395,7 +4381,7 @@ YY_BUFFER_STATE surf_parse__scan_string (yyconst char * yystr ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE surf_parse__scan_bytes (yyconst char * yybytes, int _yybytes_len ) +YY_BUFFER_STATE surf_parse__scan_bytes (yyconst char * bytes, int len ) { YY_BUFFER_STATE b; char *buf; @@ -4403,15 +4389,15 @@ YY_BUFFER_STATE surf_parse__scan_bytes (yyconst char * yybytes, int _yybytes_l int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; + n = 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 < _yybytes_len; ++i ) - buf[i] = yybytes[i]; + for ( i = 0; i < len; ++i ) + buf[i] = bytes[i]; - buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; + buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; b = surf_parse__scan_buffer(buf,n ); if ( ! b ) @@ -4565,41 +4551,6 @@ 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) { @@ -4619,10 +4570,6 @@ 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; } @@ -4634,7 +4581,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 @@ -4643,7 +4590,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; @@ -4674,6 +4621,18 @@ 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 845 "surf/surfxml.l" diff --git a/src/xbt/graphxml.c b/src/xbt/graphxml.c index fd1bb3a84b..a5f9d081df 100644 --- a/src/xbt/graphxml.c +++ b/src/xbt/graphxml.c @@ -337,7 +337,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; @@ -2352,7 +2352,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 ) -- 2.20.1