X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22ba4591733497be9741e3ff520c5dcd69caab0d..d242b4378ef1768a5a0f505f523e87d40aecbbb6:/src/simdag/dax_dtd.c diff --git a/src/simdag/dax_dtd.c b/src/simdag/dax_dtd.c index a9f46f3d1d..85c4f99acc 100644 --- a/src/simdag/dax_dtd.c +++ b/src/simdag/dax_dtd.c @@ -1,6 +1,4 @@ -#line 3 "src/simdag/dax_dtd.c" - #define YY_INT_ALIGNED short int /* A lexical scanner generated by flex */ @@ -26,8 +24,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 1 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -106,25 +104,13 @@ typedef unsigned int flex_uint32_t; #endif /* ! FLEXINT_H */ -#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 /* Returned upon end-of-file. */ @@ -185,7 +171,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef size_t yy_size_t; #endif -extern yy_size_t dax_leng; +extern unsigned int dax_leng; extern FILE *dax_in, *dax_out; @@ -195,7 +181,7 @@ extern FILE *dax_in, *dax_out; /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires * access to the local variable yy_act. Since yyless() is a macro, it would break - * existing scanners that call yyless() from OUTSIDE dax_lex. + * existing scanners that call yyless() from OUTSIDE dax_lex. * One obvious solution it to make yy_act a global. I tried that, and saw * a 5% performance hit in a non-dax_lineno scanner, because yy_act is * normally declared as a register variable-- so it is not worth it. @@ -243,12 +229,12 @@ 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. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -271,7 +257,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -299,7 +285,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. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general @@ -318,11 +304,11 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when dax_text is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t dax_leng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +unsigned int dax_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 */ @@ -347,7 +333,7 @@ static void dax__init_buffer (YY_BUFFER_STATE b,FILE *file ); YY_BUFFER_STATE dax__scan_buffer (char *base,yy_size_t size ); YY_BUFFER_STATE dax__scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE dax__scan_bytes (yyconst char *bytes,yy_size_t len ); +YY_BUFFER_STATE dax__scan_bytes (yyconst char *bytes,int len ); void *dax_alloc (yy_size_t ); void *dax_realloc (void *,yy_size_t ); @@ -379,12 +365,12 @@ void dax_free (void * ); /* Begin user sect3 */ -#define dax_wrap() 1 +#define dax_wrap() (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; -FILE *dax_in = (FILE *) 0, *dax_out = (FILE *) 0; +FILE *dax_in = NULL, *dax_out = NULL; typedef int yy_state_type; @@ -393,19 +379,22 @@ extern int dax_lineno; int dax_lineno = 1; extern char *dax_text; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr dax_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 ); -static void yy_fatal_error (yyconst char msg[] ); +static void yynoreturn yy_fatal_error (yyconst char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up dax_text. */ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ - dax_leng = (size_t) (yy_cp - yy_bp); \ + dax_leng = (int) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; @@ -508,7 +497,7 @@ static yyconst flex_int16_t yy_accept[775] = 0, 0, 13, 0 } ; -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, 2, 4, 1, 1, 1, 1, 1, 1, 1, @@ -540,7 +529,7 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[60] = +static yyconst YY_CHAR yy_meta[60] = { 0, 1, 2, 2, 2, 1, 1, 1, 1, 1, 3, 3, 1, 4, 5, 1, 1, 1, 6, 1, 7, @@ -550,7 +539,7 @@ static yyconst flex_int32_t yy_meta[60] = 5, 5, 5, 5, 5, 5, 5, 5, 5 } ; -static yyconst flex_int16_t yy_base[814] = +static yyconst flex_uint16_t yy_base[814] = { 0, 0, 0, 0, 3, 6, 9, 24, 27, 11, 14, 15, 17, 29, 38, 45, 52, 59, 61, 67, 70, @@ -738,7 +727,7 @@ static yyconst flex_int16_t yy_def[814] = 774, 774, 774 } ; -static yyconst flex_int16_t yy_nxt[2195] = +static yyconst flex_uint16_t yy_nxt[2195] = { 0, 774, 70, 71, 70, 70, 71, 70, 70, 71, 70, 70, 71, 70, 78, 240, 72, 78, 81, 72, 81, @@ -1313,7 +1302,7 @@ const char dax__flexml_version[] = "1.9.6"; #include #include -#if defined(_XBT_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__) +#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__) # ifndef __STRICT_ANSI__ # include # include @@ -1601,7 +1590,7 @@ const char* *dax__statenames=NULL; * down here because we want the user's section 1 to have been scanned first. * The user has a chance to override it with an option. */ -#if defined(_XBT_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__) +#if defined(_WIN32) # ifndef __STRICT_ANSI__ # include # include @@ -1632,19 +1621,19 @@ void dax_set_extra (YY_EXTRA_TYPE user_defined ); FILE *dax_get_in (void ); -void dax_set_in (FILE * in_str ); +void dax_set_in (FILE * _in_str ); FILE *dax_get_out (void ); -void dax_set_out (FILE * out_str ); +void dax_set_out (FILE * _out_str ); -yy_size_t dax_get_leng (void ); + int dax_get_leng (void ); char *dax_get_text (void ); int dax_get_lineno (void ); -void dax_set_lineno (int line_number ); +void dax_set_lineno (int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1658,6 +1647,10 @@ extern int dax_wrap (void ); #endif #endif +#ifndef YY_NO_UNPUT + +#endif + #ifndef yytext_ptr static void yy_flex_strncpy (char *,yyconst char *,int ); #endif @@ -1680,7 +1673,7 @@ static int input (void ); static int yy_start_stack_depth = 0; static int *yy_start_stack = NULL; - static void yy_push_state (int new_state ); + static void yy_push_state (int _new_state ); static void yy_pop_state (void ); @@ -1699,7 +1692,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( dax_text, dax_leng, 1, dax_out )) {} } while (0) +#define ECHO do { if (fwrite( dax_text, (size_t) dax_leng, 1, dax_out )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1710,7 +1703,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + ssize_t n; \ for ( n = 0; n < max_size && \ (c = getc( dax_in )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1723,7 +1716,7 @@ static int input (void ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, dax_in))==0 && ferror(dax_in)) \ + while ( (result = (int) fread(buf, 1, max_size, dax_in))==0 && ferror(dax_in)) \ { \ if( errno != EINTR) \ { \ @@ -1778,7 +1771,7 @@ extern int dax_lex (void); /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -1788,9 +1781,9 @@ extern int dax_lex (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; if ( !(yy_init) ) { @@ -1882,7 +1875,7 @@ YY_DECL /* COMMENTS and PIs: handled uniformly for efficiency. */ - while ( 1 ) /* loops until end-of-file is reached */ + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -1898,7 +1891,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)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1910,7 +1903,7 @@ yy_match: if ( yy_current_state >= 775 ) 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_base[yy_current_state] != 2135 ); @@ -1928,10 +1921,10 @@ yy_find_action: if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) { - yy_size_t yyl; + unsigned int yyl; for ( yyl = 0; yyl < dax_leng; ++yyl ) if ( dax_text[yyl] == '\n' ) - + dax_lineno++; ; } @@ -2955,9 +2948,9 @@ case YY_STATE_EOF(IMPOSSIBLE): */ static int yy_get_next_buffer (void) { - 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); + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -2986,7 +2979,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 = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -2999,7 +2992,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 ) @@ -3013,7 +3006,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; @@ -3026,7 +3019,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( @@ -3068,9 +3061,9 @@ 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) { + if (((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); + int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) dax_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()" ); @@ -3089,14 +3082,14 @@ static int yy_get_next_buffer (void) static yy_state_type yy_get_previous_state (void) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = (yy_start); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { - 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); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -3108,7 +3101,7 @@ static int yy_get_next_buffer (void) if ( yy_current_state >= 775 ) 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; @@ -3121,10 +3114,10 @@ static int yy_get_next_buffer (void) */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); + int yy_is_jam; + char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -3136,12 +3129,16 @@ static int yy_get_next_buffer (void) if ( yy_current_state >= 775 ) 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 == 774); return yy_is_jam ? 0 : yy_current_state; } +#ifndef YY_NO_UNPUT + +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (void) @@ -3166,7 +3163,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( ) ) @@ -3190,7 +3187,7 @@ static int yy_get_next_buffer (void) case EOB_ACT_END_OF_FILE: { if ( dax_wrap( ) ) - return EOF; + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -3213,7 +3210,7 @@ static int yy_get_next_buffer (void) (yy_hold_char) = *++(yy_c_buf_p); if ( c == '\n' ) - + dax_lineno++; ; @@ -3296,7 +3293,7 @@ static void dax__load_buffer_state (void) if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in dax__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. @@ -3443,7 +3440,7 @@ void dax_pop_buffer_state (void) */ static void dax_ensure_buffer_stack (void) { - yy_size_t num_to_alloc; + int num_to_alloc; if (!(yy_buffer_stack)) { @@ -3451,15 +3448,15 @@ static void dax_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; + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ (yy_buffer_stack) = (struct yy_buffer_state**)dax_alloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in dax_ensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -3468,7 +3465,7 @@ static void dax_ensure_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**)dax_realloc @@ -3488,7 +3485,7 @@ static void dax_ensure_buffer_stack (void) * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE dax__scan_buffer (char * base, yy_size_t size ) { @@ -3498,7 +3495,7 @@ YY_BUFFER_STATE dax__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) dax_alloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) @@ -3507,7 +3504,7 @@ YY_BUFFER_STATE dax__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; @@ -3530,7 +3527,7 @@ YY_BUFFER_STATE dax__scan_buffer (char * base, yy_size_t size ) YY_BUFFER_STATE dax__scan_string (yyconst char * yystr ) { - return dax__scan_bytes(yystr,strlen(yystr) ); + return dax__scan_bytes(yystr,(int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to dax_lex() will @@ -3540,15 +3537,15 @@ YY_BUFFER_STATE dax__scan_string (yyconst char * yystr ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE dax__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE dax__scan_bytes (yyconst char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - yy_size_t i; + int 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 *) dax_alloc(n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in dax__scan_bytes()" ); @@ -3570,14 +3567,14 @@ YY_BUFFER_STATE dax__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_le return b; } - static void yy_push_state (int new_state ) + static void yy_push_state (int _new_state ) { if ( (yy_start_stack_ptr) >= (yy_start_stack_depth) ) { yy_size_t new_size; (yy_start_stack_depth) += YY_START_STACK_INCR; - new_size = (yy_start_stack_depth) * sizeof( int ); + new_size = (yy_size_t) (yy_start_stack_depth) * sizeof( int ); if ( ! (yy_start_stack) ) (yy_start_stack) = (int *) dax_alloc(new_size ); @@ -3591,7 +3588,7 @@ YY_BUFFER_STATE dax__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_le (yy_start_stack)[(yy_start_stack_ptr)++] = YY_START; - BEGIN(new_state); + BEGIN(_new_state); } static void yy_pop_state (void) @@ -3606,9 +3603,9 @@ YY_BUFFER_STATE dax__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_le #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (yyconst char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -3636,7 +3633,7 @@ static void yy_fatal_error (yyconst char* msg ) */ int dax_get_lineno (void) { - + return dax_lineno; } @@ -3659,7 +3656,7 @@ FILE *dax_get_out (void) /** Get the length of the current token. * */ -yy_size_t dax_get_leng (void) +int dax_get_leng (void) { return dax_leng; } @@ -3674,29 +3671,29 @@ char *dax_get_text (void) } /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void dax_set_lineno (int line_number ) +void dax_set_lineno (int _line_number ) { - dax_lineno = line_number; + dax_lineno = _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 dax__switch_to_buffer */ -void dax_set_in (FILE * in_str ) +void dax_set_in (FILE * _in_str ) { - dax_in = in_str ; + dax_in = _in_str ; } -void dax_set_out (FILE * out_str ) +void dax_set_out (FILE * _out_str ) { - dax_out = out_str ; + dax_out = _out_str ; } int dax_get_debug (void) @@ -3704,9 +3701,9 @@ int dax_get_debug (void) return dax__flex_debug; } -void dax_set_debug (int bdebug ) +void dax_set_debug (int _bdebug ) { - dax__flex_debug = bdebug ; + dax__flex_debug = _bdebug ; } static int yy_init_globals (void) @@ -3718,10 +3715,10 @@ static int yy_init_globals (void) /* We do not touch dax_lineno unless the option is enabled. */ dax_lineno = 1; - (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; @@ -3734,8 +3731,8 @@ static int yy_init_globals (void) dax_in = stdin; dax_out = stdout; #else - dax_in = (FILE *) 0; - dax_out = (FILE *) 0; + dax_in = NULL; + dax_out = NULL; #endif /* For future reference: Set errno on error, since we are called by @@ -3777,7 +3774,8 @@ int dax_lex_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]; } @@ -3786,7 +3784,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 ) ; @@ -3796,11 +3794,12 @@ static int yy_flex_strlen (yyconst char * s ) void *dax_alloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } void *dax_realloc (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 @@ -3808,12 +3807,12 @@ void *dax_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 dax_free (void * ptr ) { - free( (char *) ptr ); /* see dax_realloc() for (char *) cast */ + free( (char *) ptr ); /* see dax_realloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" @@ -3891,11 +3890,11 @@ static int fail(const char* fmt, ...) int chars_left, used; va_list ap; va_start(ap, fmt); #ifdef FLEXML_yylineno - used = sprintf(flexml_err_msg, + used = snprintf(flexml_err_msg,flexml_max_err_msg_size, "Invalid XML (XML input line %d, state %d): ", dax_lineno, YY_START); #else - used = sprintf(flexml_err_msg, + used = snprintf(flexml_err_msg,flexml_max_err_msg_size, "Invalid XML (state %d): ", YY_START); #endif