From df683c7a96702e432d272face6679f856c90d2b6 Mon Sep 17 00:00:00 2001 From: mquinson Date: Thu, 6 Mar 2008 08:04:44 +0000 Subject: [PATCH] Regenerate all flexml-generated files to fix a FTBFS on buildbots git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5264 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/surf/simgrid_dtd.h | 21 +++++++-------- include/xbt/graphxml.h | 4 +-- src/surf/simgrid_dtd.c | 55 ++++++++++++++++++++++++++++++-------- src/xbt/graphxml.c | 55 ++++++++++++++++++++++++++++++-------- 4 files changed, 99 insertions(+), 36 deletions(-) diff --git a/include/surf/simgrid_dtd.h b/include/surf/simgrid_dtd.h index 397c5a2b51..8de48eeeea 100644 --- a/include/surf/simgrid_dtd.h +++ b/include/surf/simgrid_dtd.h @@ -1,5 +1,5 @@ /* XML processor/application API for surf/simgrid.dtd. - * Generated 2007/12/18 12:04:40. + * Generated 2008/03/06 08:58:39. * * This program was generated with the FleXML XML processor generator. * FleXML is Copyright (C) 1999-2005 Kristoffer Rose. All rights reserved. @@ -127,7 +127,8 @@ typedef int AT_surfxml_process_kill_time; #define AU_surfxml_process_kill_time NULL typedef int AT_surfxml_cluster_bb_bw; #define AU_surfxml_cluster_bb_bw NULL -typedef enum { AU_surfxml_trace_c_connect_element, A_surfxml_trace_c_connect_element_HOST,A_surfxml_trace_c_connect_element_LINK } AT_surfxml_trace_c_connect_element; +typedef int AT_surfxml_trace_c_connect_element; +#define AU_surfxml_trace_c_connect_element NULL typedef int AT_surfxml_argument_value; #define AU_surfxml_argument_value NULL typedef enum { AU_surfxml_link_state, A_surfxml_link_state_ON,A_surfxml_link_state_OFF } AT_surfxml_link_state; @@ -143,8 +144,6 @@ typedef int AT_surfxml_cluster_bb_lat; #define AU_surfxml_cluster_bb_lat NULL typedef int AT_surfxml_link_latency; #define AU_surfxml_link_latency NULL -typedef int AT_surfxml_trace_c_connect_trace_id; -#define AU_surfxml_trace_c_connect_trace_id NULL typedef int AT_surfxml_platform_xmlns_c_link; #define AU_surfxml_platform_xmlns_c_link NULL typedef int AT_surfxml_link_bandwidth_file; @@ -192,6 +191,8 @@ typedef int AT_surfxml_route_src; typedef int AT_surfxml_route_c_multi_src; #define AU_surfxml_route_c_multi_src NULL typedef enum { AU_surfxml_route_c_multi_action, A_surfxml_route_c_multi_action_POSTPEND,A_surfxml_route_c_multi_action_PREPEND,A_surfxml_route_c_multi_action_OVERRIDE } AT_surfxml_route_c_multi_action; +typedef int AT_surfxml_trace_c_connect_trace; +#define AU_surfxml_trace_c_connect_trace NULL typedef int AT_surfxml_trace_id; #define AU_surfxml_trace_id NULL typedef int AT_surfxml_cluster_radical; @@ -200,9 +201,7 @@ typedef int AT_surfxml_include_file; #define AU_surfxml_include_file NULL typedef int AT_surfxml_random_std_deviation; #define AU_surfxml_random_std_deviation NULL -typedef enum { AU_surfxml_trace_c_connect_kind, A_surfxml_trace_c_connect_kind_AVAILABILITY,A_surfxml_trace_c_connect_kind_BANDWIDTH,A_surfxml_trace_c_connect_kind_LATENCY,A_surfxml_trace_c_connect_kind_POWER } AT_surfxml_trace_c_connect_kind; -typedef int AT_surfxml_trace_c_connect_connector_id; -#define AU_surfxml_trace_c_connect_connector_id NULL +typedef enum { AU_surfxml_trace_c_connect_kind, A_surfxml_trace_c_connect_kind_HOST_AVAIL,A_surfxml_trace_c_connect_kind_POWER,A_surfxml_trace_c_connect_kind_LINK_AVAIL,A_surfxml_trace_c_connect_kind_BANDWIDTH,A_surfxml_trace_c_connect_kind_LATENCY } AT_surfxml_trace_c_connect_kind; typedef int AT_surfxml_route_c_multi_dst; #define AU_surfxml_route_c_multi_dst NULL typedef int AT_surfxml_host_state_file; @@ -266,7 +265,7 @@ XBT_PUBLIC_DATA(AT_surfxml_process_kill_time ) AX_surfxml_process_kill_time; XBT_PUBLIC_DATA(AT_surfxml_cluster_bb_bw ) AX_surfxml_cluster_bb_bw; #define A_surfxml_cluster_bb_bw (surfxml_bufferstack + AX_surfxml_cluster_bb_bw) XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_element ) AX_surfxml_trace_c_connect_element; -#define A_surfxml_trace_c_connect_element AX_surfxml_trace_c_connect_element +#define A_surfxml_trace_c_connect_element (surfxml_bufferstack + AX_surfxml_trace_c_connect_element) XBT_PUBLIC_DATA(AT_surfxml_argument_value ) AX_surfxml_argument_value; #define A_surfxml_argument_value (surfxml_bufferstack + AX_surfxml_argument_value) XBT_PUBLIC_DATA(AT_surfxml_link_state ) AX_surfxml_link_state; @@ -283,8 +282,6 @@ XBT_PUBLIC_DATA(AT_surfxml_cluster_bb_lat ) AX_surfxml_cluster_bb_lat; #define A_surfxml_cluster_bb_lat (surfxml_bufferstack + AX_surfxml_cluster_bb_lat) XBT_PUBLIC_DATA(AT_surfxml_link_latency ) AX_surfxml_link_latency; #define A_surfxml_link_latency (surfxml_bufferstack + AX_surfxml_link_latency) -XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_trace_id ) AX_surfxml_trace_c_connect_trace_id; -#define A_surfxml_trace_c_connect_trace_id (surfxml_bufferstack + AX_surfxml_trace_c_connect_trace_id) XBT_PUBLIC_DATA(AT_surfxml_platform_xmlns_c_link ) AX_surfxml_platform_xmlns_c_link; #define A_surfxml_platform_xmlns_c_link (surfxml_bufferstack + AX_surfxml_platform_xmlns_c_link) XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth_file ) AX_surfxml_link_bandwidth_file; @@ -333,6 +330,8 @@ XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_src ) AX_surfxml_route_c_multi_src; #define A_surfxml_route_c_multi_src (surfxml_bufferstack + AX_surfxml_route_c_multi_src) XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_action ) AX_surfxml_route_c_multi_action; #define A_surfxml_route_c_multi_action AX_surfxml_route_c_multi_action +XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_trace ) AX_surfxml_trace_c_connect_trace; +#define A_surfxml_trace_c_connect_trace (surfxml_bufferstack + AX_surfxml_trace_c_connect_trace) XBT_PUBLIC_DATA(AT_surfxml_trace_id ) AX_surfxml_trace_id; #define A_surfxml_trace_id (surfxml_bufferstack + AX_surfxml_trace_id) XBT_PUBLIC_DATA(AT_surfxml_cluster_radical ) AX_surfxml_cluster_radical; @@ -343,8 +342,6 @@ XBT_PUBLIC_DATA(AT_surfxml_random_std_deviation ) AX_surfxml_random_std_deviatio #define A_surfxml_random_std_deviation (surfxml_bufferstack + AX_surfxml_random_std_deviation) XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_kind ) AX_surfxml_trace_c_connect_kind; #define A_surfxml_trace_c_connect_kind AX_surfxml_trace_c_connect_kind -XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_connector_id ) AX_surfxml_trace_c_connect_connector_id; -#define A_surfxml_trace_c_connect_connector_id (surfxml_bufferstack + AX_surfxml_trace_c_connect_connector_id) XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_dst ) AX_surfxml_route_c_multi_dst; #define A_surfxml_route_c_multi_dst (surfxml_bufferstack + AX_surfxml_route_c_multi_dst) XBT_PUBLIC_DATA(AT_surfxml_host_state_file ) AX_surfxml_host_state_file; diff --git a/include/xbt/graphxml.h b/include/xbt/graphxml.h index b8c8d77fa7..4150440ae6 100644 --- a/include/xbt/graphxml.h +++ b/include/xbt/graphxml.h @@ -1,10 +1,10 @@ /* XML processor/application API for xbt/graphxml.dtd. - * Generated 2007/08/09 10:57:49. + * Generated 2008/03/06 08:55:12. * * This program was generated with the FleXML XML processor generator. * FleXML is Copyright (C) 1999-2005 Kristoffer Rose. All rights reserved. * FleXML is Copyright (C) 2003-2006 Martin Quinson. All rights reserved. - * (Id: flexml.pl,v 1.61 2006/09/13 16:34:33 wdowling Exp). + * (Id: flexml.pl,v 1.63 2007/10/11 14:46:08 mquinson Exp). * * There are two, intertwined parts to this program, part A and part B. * diff --git a/src/surf/simgrid_dtd.c b/src/surf/simgrid_dtd.c index 0fb964c25a..0ab3656c4c 100644 --- a/src/surf/simgrid_dtd.c +++ b/src/surf/simgrid_dtd.c @@ -5,10 +5,29 @@ /* A lexical scanner generated by flex */ +#define yy_create_buffer surf_parse__create_buffer +#define yy_delete_buffer surf_parse__delete_buffer +#define yy_flex_debug surf_parse__flex_debug +#define yy_init_buffer surf_parse__init_buffer +#define yy_flush_buffer surf_parse__flush_buffer +#define yy_load_buffer_state surf_parse__load_buffer_state +#define yy_switch_to_buffer surf_parse__switch_to_buffer +#define yyin surf_parse_in +#define yyleng surf_parse_leng +#define yylex surf_parse_lex +#define yylineno surf_parse_lineno +#define yyout surf_parse_out +#define yyrestart surf_parse_restart +#define yytext surf_parse_text +#define yywrap surf_parse_wrap +#define yyalloc surf_parse_alloc +#define yyrealloc surf_parse_realloc +#define yyfree surf_parse_free + #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 34 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -30,7 +49,7 @@ /* C99 systems have . Non-C99 systems may or may not. */ -#if __STDC_VERSION__ >= 199901L +#if defined (__STDC_VERSION__) && __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. @@ -93,11 +112,12 @@ typedef unsigned int flex_uint32_t; #else /* ! __cplusplus */ -#if __STDC__ +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) #define YY_USE_CONST -#endif /* __STDC__ */ +#endif /* defined (__STDC__) */ #endif /* ! __cplusplus */ #ifdef YY_USE_CONST @@ -193,11 +213,13 @@ extern FILE *surf_parse_in, *surf_parse_out; /* The following is because we cannot portably get our hands on size_t * (without autoconf's help, which isn't available because we want * flex-generated scanners to compile on their own). + * Given that the standard has decreed that size_t exists since 1989, + * I guess we can afford to depend on it. Manoj. */ #ifndef YY_TYPEDEF_YY_SIZE_T #define YY_TYPEDEF_YY_SIZE_T -typedef unsigned int yy_size_t; +typedef size_t yy_size_t; #endif #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -348,7 +370,7 @@ void surf_parse_free (void * ); /* Begin user sect3 */ -#define surf_parse_wrap() 1 +#define surf_parse_wrap(n) 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -3283,7 +3305,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 (void) fwrite( surf_parse_text, surf_parse_leng, 1, surf_parse_out ) +#define ECHO fwrite( surf_parse_text, surf_parse_leng, 1, surf_parse_out ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -3294,7 +3316,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( surf_parse_in )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -6052,6 +6074,14 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; + if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + /* Extend the array by 50%, plus the number we really need. */ + yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) surf_parse_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + } + (yy_n_chars) += number_to_move; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; @@ -6435,7 +6465,9 @@ static void surf_parse_ensure_buffer_stack (void) (yy_buffer_stack) = (struct yy_buffer_state**)surf_parse_alloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); - + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in surf_parse_ensure_buffer_stack()" ); + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); (yy_buffer_stack_max) = num_to_alloc; @@ -6453,6 +6485,8 @@ static void surf_parse_ensure_buffer_stack (void) ((yy_buffer_stack), num_to_alloc * sizeof(struct yy_buffer_state*) ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in surf_parse_ensure_buffer_stack()" ); /* zero only the new slots.*/ memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); @@ -6562,8 +6596,7 @@ YY_BUFFER_STATE surf_parse__scan_bytes (yyconst char * yybytes, int _yybytes_l (yy_start_stack) = (int *) surf_parse_realloc((void *) (yy_start_stack),new_size ); if ( ! (yy_start_stack) ) - YY_FATAL_ERROR( - "out of memory expanding start-condition stack" ); + YY_FATAL_ERROR( "out of memory expanding start-condition stack" ); } (yy_start_stack)[(yy_start_stack_ptr)++] = YY_START; diff --git a/src/xbt/graphxml.c b/src/xbt/graphxml.c index 61372b865e..9338fd60c1 100644 --- a/src/xbt/graphxml.c +++ b/src/xbt/graphxml.c @@ -5,10 +5,29 @@ /* A lexical scanner generated by flex */ +#define yy_create_buffer xbt_graph_parse__create_buffer +#define yy_delete_buffer xbt_graph_parse__delete_buffer +#define yy_flex_debug xbt_graph_parse__flex_debug +#define yy_init_buffer xbt_graph_parse__init_buffer +#define yy_flush_buffer xbt_graph_parse__flush_buffer +#define yy_load_buffer_state xbt_graph_parse__load_buffer_state +#define yy_switch_to_buffer xbt_graph_parse__switch_to_buffer +#define yyin xbt_graph_parse_in +#define yyleng xbt_graph_parse_leng +#define yylex xbt_graph_parse_lex +#define yylineno xbt_graph_parse_lineno +#define yyout xbt_graph_parse_out +#define yyrestart xbt_graph_parse_restart +#define yytext xbt_graph_parse_text +#define yywrap xbt_graph_parse_wrap +#define yyalloc xbt_graph_parse_alloc +#define yyrealloc xbt_graph_parse_realloc +#define yyfree xbt_graph_parse_free + #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 34 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -30,7 +49,7 @@ /* C99 systems have . Non-C99 systems may or may not. */ -#if __STDC_VERSION__ >= 199901L +#if defined (__STDC_VERSION__) && __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. @@ -93,11 +112,12 @@ typedef unsigned int flex_uint32_t; #else /* ! __cplusplus */ -#if __STDC__ +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) #define YY_USE_CONST -#endif /* __STDC__ */ +#endif /* defined (__STDC__) */ #endif /* ! __cplusplus */ #ifdef YY_USE_CONST @@ -193,11 +213,13 @@ extern FILE *xbt_graph_parse_in, *xbt_graph_parse_out; /* The following is because we cannot portably get our hands on size_t * (without autoconf's help, which isn't available because we want * flex-generated scanners to compile on their own). + * Given that the standard has decreed that size_t exists since 1989, + * I guess we can afford to depend on it. Manoj. */ #ifndef YY_TYPEDEF_YY_SIZE_T #define YY_TYPEDEF_YY_SIZE_T -typedef unsigned int yy_size_t; +typedef size_t yy_size_t; #endif #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -348,7 +370,7 @@ void xbt_graph_parse_free (void * ); /* Begin user sect3 */ -#define xbt_graph_parse_wrap() 1 +#define xbt_graph_parse_wrap(n) 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -1372,7 +1394,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 (void) fwrite( xbt_graph_parse_text, xbt_graph_parse_leng, 1, xbt_graph_parse_out ) +#define ECHO fwrite( xbt_graph_parse_text, xbt_graph_parse_leng, 1, xbt_graph_parse_out ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1383,7 +1405,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( xbt_graph_parse_in )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -2432,6 +2454,14 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; + if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + /* Extend the array by 50%, plus the number we really need. */ + yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) xbt_graph_parse_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + } + (yy_n_chars) += number_to_move; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; @@ -2815,7 +2845,9 @@ static void xbt_graph_parse_ensure_buffer_stack (void) (yy_buffer_stack) = (struct yy_buffer_state**)xbt_graph_parse_alloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); - + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse_ensure_buffer_stack()" ); + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); (yy_buffer_stack_max) = num_to_alloc; @@ -2833,6 +2865,8 @@ static void xbt_graph_parse_ensure_buffer_stack (void) ((yy_buffer_stack), num_to_alloc * sizeof(struct yy_buffer_state*) ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse_ensure_buffer_stack()" ); /* zero only the new slots.*/ memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); @@ -2942,8 +2976,7 @@ YY_BUFFER_STATE xbt_graph_parse__scan_bytes (yyconst char * yybytes, int _yyby (yy_start_stack) = (int *) xbt_graph_parse_realloc((void *) (yy_start_stack),new_size ); if ( ! (yy_start_stack) ) - YY_FATAL_ERROR( - "out of memory expanding start-condition stack" ); + YY_FATAL_ERROR( "out of memory expanding start-condition stack" ); } (yy_start_stack)[(yy_start_stack_ptr)++] = YY_START; -- 2.20.1