From 11655484d0003d821a6821cd1bc716b51ea317cd Mon Sep 17 00:00:00 2001 From: Greg Eisenhauer Date: Mon, 14 Aug 2023 14:38:44 -0400 Subject: [PATCH] Update cod.l to eliminate lex compat --- CMakeLists.txt | 2 +- cod/cod.l | 63 --- cod/pregen_source/Linux/lex.yy.c | 748 ++++++++++++++----------------- 3 files changed, 344 insertions(+), 469 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b426801a..7d8589f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) # The directory label is used for CDash to treat FFS as a subproject of GTKorvo set(CMAKE_DIRECTORY_LABELS FFS) diff --git a/cod/cod.l b/cod/cod.l index fd5517b5..92d92c81 100644 --- a/cod/cod.l +++ b/cod/cod.l @@ -359,70 +359,9 @@ yywrap YY_PROTO(( void )) } -#ifndef input /* flex, not lex */ void yy_delete_buffer YY_PROTO((YY_BUFFER_STATE b)); -#ifdef WINNT -/* old Windows code for MKS Toolkit version of flex */ - -static void -terminate_string_parse() -{ - yyrestart(NULL); -} - -#ifdef YY_USE_PROTOS -static void *yy_flex_alloc( yy_size_t size ) -#else -static void *yy_flex_alloc( size ) -yy_size_t size; -#endif - { - return (void *) malloc( size ); - } - -static char* current_input_string; - -int my_yy_input(buf,result,max_size) { - - if (current_input_string == NULL) - { - - result = 0; - } - else - if (max_size < strlen(current_input_string)) - { - memcpy((void*)buf, current_input_string, max_size); - current_input_string += max_size; - result = max_size; - } else { - int n = strlen(current_input_string); - memcpy((void*)buf, current_input_string, n+1); - current_input_string = NULL; - result = n; - } - -/* printf("my_yy_input buf[%s],result[%d]\n",buf,result);*/ - return result; -} - -static void -setup_for_string_parse(string, defined_types, enum_constants) -const char *string; -char **defined_types; -char **enum_constants; -{ - type_count = defined_type_count; - types = defined_types; - enums = enum_constants; - - current_input_string = string; - lex_offset = 1; - line_count = 1; -} -#else static YY_BUFFER_STATE bb = NULL; @@ -455,5 +394,3 @@ terminate_string_parse() } } -#endif -#endif diff --git a/cod/pregen_source/Linux/lex.yy.c b/cod/pregen_source/Linux/lex.yy.c index e754ca5f..87e6fbf9 100644 --- a/cod/pregen_source/Linux/lex.yy.c +++ b/cod/pregen_source/Linux/lex.yy.c @@ -1,6 +1,6 @@ -#line 2 "/Users/eisen/prog/ffs/build/lex.yy.c" +#line 1 "/ccs/home/eisen/ffs/build/lex.yy.c" -#line 4 "/Users/eisen/prog/ffs/build/lex.yy.c" +#line 3 "/ccs/home/eisen/ffs/build/lex.yy.c" #define YY_INT_ALIGNED short int @@ -8,8 +8,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -47,7 +47,6 @@ typedef int16_t flex_int16_t; typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; -typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -55,7 +54,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -86,63 +84,61 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) +#endif /* ! C99 */ -#define YY_USE_CONST +#endif /* ! FLEXINT_H */ -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ +/* begin standard C++ headers. */ -#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. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -159,15 +155,16 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef size_t yy_size_t; #endif -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) + #define YY_LINENO_REWIND_TO(ptr) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -182,7 +179,6 @@ extern FILE *yyin, *yyout; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -197,12 +193,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 @@ -225,7 +221,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. */ @@ -253,7 +249,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 @@ -264,7 +260,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ @@ -272,11 +267,11 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when yytext 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 yyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int yyleng; /* 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 */ @@ -285,82 +280,78 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); #define yy_new_buffer yy_create_buffer - #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ +typedef flex_uint8_t YY_CHAR; -typedef unsigned char YY_CHAR; - -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; extern int yylineno; - int yylineno = 1; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext -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 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 yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ - yyleng = (yy_size_t) (yy_cp - yy_bp); \ + yyleng = (int) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; - #define YY_NUM_RULES 107 #define YY_END_OF_BUFFER 108 /* This struct is not used in this scanner, @@ -370,7 +361,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[284] = +static const flex_int16_t yy_accept[284] = { 0, 0, 0, 0, 0, 90, 90, 108, 107, 105, 106, 72, 76, 12, 38, 107, 2, 3, 9, 13, 8, @@ -405,7 +396,7 @@ static yyconst flex_int16_t yy_accept[284] = 61, 48, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -437,7 +428,7 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[68] = +static const YY_CHAR yy_meta[68] = { 0, 1, 1, 2, 1, 3, 1, 1, 4, 1, 1, 5, 1, 1, 1, 6, 1, 7, 7, 7, 8, @@ -448,7 +439,7 @@ static yyconst flex_int32_t yy_meta[68] = 11, 10, 10, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[299] = +static const flex_int16_t yy_base[299] = { 0, 0, 0, 65, 66, 69, 70, 614, 615, 615, 615, 589, 615, 588, 67, 574, 615, 615, 586, 63, 615, @@ -485,7 +476,7 @@ static yyconst flex_int16_t yy_base[299] = } ; -static yyconst flex_int16_t yy_def[299] = +static const flex_int16_t yy_def[299] = { 0, 283, 1, 284, 284, 285, 285, 283, 283, 283, 283, 283, 283, 283, 283, 286, 283, 283, 283, 283, 283, @@ -522,7 +513,7 @@ static yyconst flex_int16_t yy_def[299] = } ; -static yyconst flex_int16_t yy_nxt[683] = +static const flex_int16_t yy_nxt[683] = { 0, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 25, 25, @@ -601,7 +592,7 @@ static yyconst flex_int16_t yy_nxt[683] = 283, 283 } ; -static yyconst flex_int16_t yy_chk[683] = +static const flex_int16_t yy_chk[683] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -752,8 +743,7 @@ extern int my_yy_input(); #endif static int -is_defined_type(id) -char *id; +is_defined_type(char *id) { int i = 0; while(types && types[i]) { @@ -764,8 +754,7 @@ char *id; } static int -is_enumeration_constant(id) -char *id; +is_enumeration_constant(char *id) { int i = 0; while(enums && enums[i]) { @@ -778,8 +767,9 @@ static void check_strbuf(); static int buffer_len; static char *string_buffer; static char *string_buf_ptr; +#line 770 "/ccs/home/eisen/ffs/build/lex.yy.c" -#line 783 "/Users/eisen/prog/ffs/build/lex.yy.c" +#line 772 "/ccs/home/eisen/ffs/build/lex.yy.c" #define INITIAL 0 #define string_cond 1 @@ -797,36 +787,36 @@ static char *string_buf_ptr; #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * out_str ); +void yyset_out ( FILE * _out_str ); -yy_size_t yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -834,35 +824,43 @@ void yyset_lineno (int line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif - static void yyunput (int c,char *buf_ptr ); +#ifndef YY_NO_UNPUT + + static void yyunput ( int c, char *buf_ptr ); +#endif + #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif #endif /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -870,7 +868,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 fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -881,7 +879,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - yy_size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -894,7 +892,7 @@ static int input (void ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -949,7 +947,7 @@ extern int yylex (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 \ @@ -959,16 +957,10 @@ extern int yylex (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; -#line 103 "cod/cod.l" - - - -#line 971 "/Users/eisen/prog/ffs/build/lex.yy.c" - if ( !(yy_init) ) { (yy_init) = 1; @@ -989,13 +981,20 @@ YY_DECL if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } - while ( 1 ) /* loops until end-of-file is reached */ + { +#line 101 "cod/cod.l" + + + +#line 995 "/ccs/home/eisen/ffs/build/lex.yy.c" + + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -1011,7 +1010,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; @@ -1021,9 +1020,9 @@ YY_DECL { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 284 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[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] + yy_c]; ++yy_cp; } while ( yy_base[yy_current_state] != 615 ); @@ -1052,352 +1051,352 @@ YY_DECL case 1: YY_RULE_SETUP -#line 106 "cod/cod.l" +#line 104 "cod/cod.l" {RETURN(ARROW);} YY_BREAK case 2: YY_RULE_SETUP -#line 107 "cod/cod.l" +#line 105 "cod/cod.l" {RETURN(LPAREN);} YY_BREAK case 3: YY_RULE_SETUP -#line 108 "cod/cod.l" +#line 106 "cod/cod.l" {RETURN(RPAREN);} YY_BREAK case 4: YY_RULE_SETUP -#line 109 "cod/cod.l" +#line 107 "cod/cod.l" {RETURN(LBRACKET);} YY_BREAK case 5: YY_RULE_SETUP -#line 110 "cod/cod.l" +#line 108 "cod/cod.l" {RETURN(RBRACKET);} YY_BREAK case 6: YY_RULE_SETUP -#line 111 "cod/cod.l" +#line 109 "cod/cod.l" {RETURN(DOTDOTDOT);} YY_BREAK case 7: YY_RULE_SETUP -#line 112 "cod/cod.l" +#line 110 "cod/cod.l" {RETURN(DOT);} YY_BREAK case 8: YY_RULE_SETUP -#line 113 "cod/cod.l" +#line 111 "cod/cod.l" {RETURN(COMMA);} YY_BREAK case 9: YY_RULE_SETUP -#line 114 "cod/cod.l" +#line 112 "cod/cod.l" {RETURN(STAR);} YY_BREAK case 10: YY_RULE_SETUP -#line 115 "cod/cod.l" +#line 113 "cod/cod.l" {RETURN(AT);} YY_BREAK case 11: YY_RULE_SETUP -#line 116 "cod/cod.l" +#line 114 "cod/cod.l" {RETURN(SLASH);} YY_BREAK case 12: YY_RULE_SETUP -#line 117 "cod/cod.l" +#line 115 "cod/cod.l" {RETURN(MODULUS);} YY_BREAK case 13: YY_RULE_SETUP -#line 118 "cod/cod.l" +#line 116 "cod/cod.l" {RETURN(PLUS);} YY_BREAK case 14: YY_RULE_SETUP -#line 119 "cod/cod.l" +#line 117 "cod/cod.l" {RETURN(MINUS);} YY_BREAK case 15: YY_RULE_SETUP -#line 120 "cod/cod.l" +#line 118 "cod/cod.l" {RETURN(TILDE);} YY_BREAK case 16: YY_RULE_SETUP -#line 121 "cod/cod.l" +#line 119 "cod/cod.l" {RETURN(LEQ);} YY_BREAK case 17: YY_RULE_SETUP -#line 122 "cod/cod.l" +#line 120 "cod/cod.l" {RETURN(LT);} YY_BREAK case 18: YY_RULE_SETUP -#line 123 "cod/cod.l" +#line 121 "cod/cod.l" {RETURN(GEQ);} YY_BREAK case 19: YY_RULE_SETUP -#line 124 "cod/cod.l" +#line 122 "cod/cod.l" {RETURN(GT);} YY_BREAK case 20: YY_RULE_SETUP -#line 125 "cod/cod.l" +#line 123 "cod/cod.l" {RETURN(LEFT_SHIFT);} YY_BREAK case 21: YY_RULE_SETUP -#line 126 "cod/cod.l" +#line 124 "cod/cod.l" {RETURN(RIGHT_SHIFT);} YY_BREAK case 22: YY_RULE_SETUP -#line 127 "cod/cod.l" +#line 125 "cod/cod.l" {RETURN(EQ);} YY_BREAK case 23: YY_RULE_SETUP -#line 128 "cod/cod.l" +#line 126 "cod/cod.l" {RETURN(NEQ);} YY_BREAK case 24: YY_RULE_SETUP -#line 129 "cod/cod.l" +#line 127 "cod/cod.l" {RETURN(ASSIGN);} YY_BREAK case 25: YY_RULE_SETUP -#line 130 "cod/cod.l" +#line 128 "cod/cod.l" {RETURN(MUL_ASSIGN);} YY_BREAK case 26: YY_RULE_SETUP -#line 131 "cod/cod.l" +#line 129 "cod/cod.l" {RETURN(DIV_ASSIGN);} YY_BREAK case 27: YY_RULE_SETUP -#line 132 "cod/cod.l" +#line 130 "cod/cod.l" {RETURN(MOD_ASSIGN);} YY_BREAK case 28: YY_RULE_SETUP -#line 133 "cod/cod.l" +#line 131 "cod/cod.l" {RETURN(ADD_ASSIGN);} YY_BREAK case 29: YY_RULE_SETUP -#line 134 "cod/cod.l" +#line 132 "cod/cod.l" {RETURN(SUB_ASSIGN);} YY_BREAK case 30: YY_RULE_SETUP -#line 135 "cod/cod.l" +#line 133 "cod/cod.l" {RETURN(LEFT_ASSIGN);} YY_BREAK case 31: YY_RULE_SETUP -#line 136 "cod/cod.l" +#line 134 "cod/cod.l" {RETURN(RIGHT_ASSIGN);} YY_BREAK case 32: YY_RULE_SETUP -#line 137 "cod/cod.l" +#line 135 "cod/cod.l" {RETURN(AND_ASSIGN);} YY_BREAK case 33: YY_RULE_SETUP -#line 138 "cod/cod.l" +#line 136 "cod/cod.l" {RETURN(XOR_ASSIGN);} YY_BREAK case 34: YY_RULE_SETUP -#line 139 "cod/cod.l" +#line 137 "cod/cod.l" {RETURN(OR_ASSIGN);} YY_BREAK case 35: YY_RULE_SETUP -#line 140 "cod/cod.l" +#line 138 "cod/cod.l" {RETURN(LOG_OR);} YY_BREAK case 36: YY_RULE_SETUP -#line 141 "cod/cod.l" +#line 139 "cod/cod.l" {RETURN(LOG_AND);} YY_BREAK case 37: YY_RULE_SETUP -#line 142 "cod/cod.l" +#line 140 "cod/cod.l" {RETURN(ARITH_OR);} YY_BREAK case 38: YY_RULE_SETUP -#line 143 "cod/cod.l" +#line 141 "cod/cod.l" {RETURN(ARITH_AND);} YY_BREAK case 39: YY_RULE_SETUP -#line 144 "cod/cod.l" +#line 142 "cod/cod.l" {RETURN(ARITH_XOR);} YY_BREAK case 40: YY_RULE_SETUP -#line 145 "cod/cod.l" +#line 143 "cod/cod.l" {RETURN(INC_OP);} YY_BREAK case 41: YY_RULE_SETUP -#line 146 "cod/cod.l" +#line 144 "cod/cod.l" {RETURN(DEC_OP);} YY_BREAK case 42: YY_RULE_SETUP -#line 147 "cod/cod.l" +#line 145 "cod/cod.l" {RETURN(SEMI);} YY_BREAK case 43: YY_RULE_SETUP -#line 148 "cod/cod.l" +#line 146 "cod/cod.l" {RETURN(IF);} YY_BREAK case 44: YY_RULE_SETUP -#line 149 "cod/cod.l" +#line 147 "cod/cod.l" {RETURN(ELSE);} YY_BREAK case 45: YY_RULE_SETUP -#line 150 "cod/cod.l" +#line 148 "cod/cod.l" {RETURN(FOR);} YY_BREAK case 46: YY_RULE_SETUP -#line 151 "cod/cod.l" +#line 149 "cod/cod.l" {RETURN(WHILE);} YY_BREAK case 47: YY_RULE_SETUP -#line 152 "cod/cod.l" +#line 150 "cod/cod.l" {RETURN(DO);} YY_BREAK case 48: YY_RULE_SETUP -#line 153 "cod/cod.l" +#line 151 "cod/cod.l" {RETURN(UNSIGNED);} YY_BREAK case 49: YY_RULE_SETUP -#line 154 "cod/cod.l" +#line 152 "cod/cod.l" {RETURN(SIGNED);} YY_BREAK case 50: YY_RULE_SETUP -#line 155 "cod/cod.l" +#line 153 "cod/cod.l" {RETURN(SHORT);} YY_BREAK case 51: YY_RULE_SETUP -#line 156 "cod/cod.l" +#line 154 "cod/cod.l" {RETURN(INT);} YY_BREAK case 52: YY_RULE_SETUP -#line 157 "cod/cod.l" +#line 155 "cod/cod.l" {RETURN(LONG);} YY_BREAK case 53: YY_RULE_SETUP -#line 158 "cod/cod.l" +#line 156 "cod/cod.l" {RETURN(CHAR);} YY_BREAK case 54: YY_RULE_SETUP -#line 159 "cod/cod.l" +#line 157 "cod/cod.l" {RETURN(STRING);} YY_BREAK case 55: YY_RULE_SETUP -#line 160 "cod/cod.l" +#line 158 "cod/cod.l" {RETURN(FLOAT);} YY_BREAK case 56: YY_RULE_SETUP -#line 161 "cod/cod.l" +#line 159 "cod/cod.l" {RETURN(DOUBLE);} YY_BREAK case 57: YY_RULE_SETUP -#line 162 "cod/cod.l" +#line 160 "cod/cod.l" {RETURN(VOID);} YY_BREAK case 58: YY_RULE_SETUP -#line 163 "cod/cod.l" +#line 161 "cod/cod.l" {RETURN(STATIC);} YY_BREAK case 59: YY_RULE_SETUP -#line 164 "cod/cod.l" +#line 162 "cod/cod.l" {RETURN(EXTERN_TOKEN);} YY_BREAK case 60: YY_RULE_SETUP -#line 165 "cod/cod.l" +#line 163 "cod/cod.l" {RETURN(TYPEDEF);} YY_BREAK case 61: YY_RULE_SETUP -#line 166 "cod/cod.l" +#line 164 "cod/cod.l" {RETURN(CONTINUE);} YY_BREAK case 62: YY_RULE_SETUP -#line 167 "cod/cod.l" +#line 165 "cod/cod.l" {RETURN(BREAK);} YY_BREAK case 63: YY_RULE_SETUP -#line 168 "cod/cod.l" +#line 166 "cod/cod.l" {RETURN(GOTO);} YY_BREAK case 64: YY_RULE_SETUP -#line 169 "cod/cod.l" +#line 167 "cod/cod.l" {RETURN(CONST);} YY_BREAK case 65: YY_RULE_SETUP -#line 170 "cod/cod.l" +#line 168 "cod/cod.l" {RETURN(SIZEOF);} YY_BREAK case 66: YY_RULE_SETUP -#line 171 "cod/cod.l" +#line 169 "cod/cod.l" {RETURN(STRUCT);} YY_BREAK case 67: YY_RULE_SETUP -#line 172 "cod/cod.l" +#line 170 "cod/cod.l" {RETURN(ENUM);} YY_BREAK case 68: YY_RULE_SETUP -#line 173 "cod/cod.l" +#line 171 "cod/cod.l" {RETURN(UNION);} YY_BREAK case 69: YY_RULE_SETUP -#line 174 "cod/cod.l" +#line 172 "cod/cod.l" {RETURN(RETURN_TOKEN);} YY_BREAK case 70: YY_RULE_SETUP -#line 175 "cod/cod.l" +#line 173 "cod/cod.l" { int count = 0; while(types && types[count]) count++; @@ -1407,27 +1406,27 @@ YY_RULE_SETUP YY_BREAK case 71: YY_RULE_SETUP -#line 181 "cod/cod.l" +#line 179 "cod/cod.l" {RETURN(RCURLY);} YY_BREAK case 72: YY_RULE_SETUP -#line 182 "cod/cod.l" +#line 180 "cod/cod.l" {RETURN(BANG);} YY_BREAK case 73: YY_RULE_SETUP -#line 183 "cod/cod.l" +#line 181 "cod/cod.l" {RETURN(COLON);} YY_BREAK case 74: YY_RULE_SETUP -#line 184 "cod/cod.l" +#line 182 "cod/cod.l" {RETURN(QUESTION);} YY_BREAK case 75: YY_RULE_SETUP -#line 185 "cod/cod.l" +#line 183 "cod/cod.l" { yylval.info.string = create_string_from_yytext(); if (is_defined_type(yylval.info.string)) { @@ -1441,7 +1440,7 @@ YY_RULE_SETUP YY_BREAK case 76: YY_RULE_SETUP -#line 196 "cod/cod.l" +#line 194 "cod/cod.l" { buffer_len = 20; string_buffer = malloc(20 + 1); @@ -1450,7 +1449,7 @@ YY_RULE_SETUP YY_BREAK case 77: YY_RULE_SETUP -#line 202 "cod/cod.l" +#line 200 "cod/cod.l" { /* saw closing quote - all done */ BEGIN(INITIAL); *string_buf_ptr = '\0'; @@ -1464,14 +1463,14 @@ YY_RULE_SETUP case 78: /* rule 78 can match eol */ YY_RULE_SETUP -#line 212 "cod/cod.l" +#line 210 "cod/cod.l" { yyerror("Unterminated string constant"); } YY_BREAK case 79: YY_RULE_SETUP -#line 216 "cod/cod.l" +#line 214 "cod/cod.l" { /* hex escape sequence */ int result; @@ -1488,7 +1487,7 @@ YY_RULE_SETUP YY_BREAK case 80: YY_RULE_SETUP -#line 230 "cod/cod.l" +#line 228 "cod/cod.l" { /* octal escape sequence */ int result; @@ -1505,45 +1504,45 @@ YY_RULE_SETUP YY_BREAK case 81: YY_RULE_SETUP -#line 244 "cod/cod.l" +#line 242 "cod/cod.l" { yyerror("bad character escape"); } YY_BREAK case 82: YY_RULE_SETUP -#line 248 "cod/cod.l" +#line 246 "cod/cod.l" {check_strbuf();*string_buf_ptr++ = '\n';} YY_BREAK case 83: YY_RULE_SETUP -#line 249 "cod/cod.l" +#line 247 "cod/cod.l" {check_strbuf();*string_buf_ptr++ = '\t';} YY_BREAK case 84: YY_RULE_SETUP -#line 250 "cod/cod.l" +#line 248 "cod/cod.l" {check_strbuf();*string_buf_ptr++ = '\r';} YY_BREAK case 85: YY_RULE_SETUP -#line 251 "cod/cod.l" +#line 249 "cod/cod.l" {check_strbuf();*string_buf_ptr++ = '\b';} YY_BREAK case 86: YY_RULE_SETUP -#line 252 "cod/cod.l" +#line 250 "cod/cod.l" {check_strbuf();*string_buf_ptr++ = '\f';} YY_BREAK case 87: /* rule 87 can match eol */ YY_RULE_SETUP -#line 254 "cod/cod.l" +#line 252 "cod/cod.l" {check_strbuf();*string_buf_ptr++ = yytext[1];} YY_BREAK case 88: YY_RULE_SETUP -#line 256 "cod/cod.l" +#line 254 "cod/cod.l" { char *yptr = yytext; @@ -1555,38 +1554,38 @@ YY_RULE_SETUP YY_BREAK case 89: YY_RULE_SETUP -#line 267 "cod/cod.l" +#line 265 "cod/cod.l" BEGIN(comment); YY_BREAK case 90: YY_RULE_SETUP -#line 269 "cod/cod.l" +#line 267 "cod/cod.l" {lex_offset += yyleng;} /* eat anything that's not a '*' */ YY_BREAK case 91: YY_RULE_SETUP -#line 270 "cod/cod.l" +#line 268 "cod/cod.l" {lex_offset += yyleng;} /* eat up '*'s not followed by '/'s */ YY_BREAK case 92: /* rule 92 can match eol */ YY_RULE_SETUP -#line 271 "cod/cod.l" +#line 269 "cod/cod.l" {++line_count;lex_offset = 1;} YY_BREAK case 93: YY_RULE_SETUP -#line 272 "cod/cod.l" +#line 270 "cod/cod.l" {lex_offset += yyleng;BEGIN(INITIAL);} YY_BREAK case 94: YY_RULE_SETUP -#line 273 "cod/cod.l" +#line 271 "cod/cod.l" { /* consume //-comment */ } YY_BREAK case 95: YY_RULE_SETUP -#line 275 "cod/cod.l" +#line 273 "cod/cod.l" { yylval.info.string = create_string_from_yytext(); RETURN(character_constant); @@ -1594,7 +1593,7 @@ YY_RULE_SETUP YY_BREAK case 96: YY_RULE_SETUP -#line 279 "cod/cod.l" +#line 277 "cod/cod.l" { yylval.info.string = create_string_from_yytext(); RETURN(integer_constant); @@ -1602,7 +1601,7 @@ YY_RULE_SETUP YY_BREAK case 97: YY_RULE_SETUP -#line 283 "cod/cod.l" +#line 281 "cod/cod.l" { yylval.info.string = create_string_from_yytext(); RETURN(integer_constant); @@ -1610,7 +1609,7 @@ YY_RULE_SETUP YY_BREAK case 98: YY_RULE_SETUP -#line 288 "cod/cod.l" +#line 286 "cod/cod.l" { yylval.info.string = create_string_from_yytext(); RETURN(integer_constant); @@ -1618,7 +1617,7 @@ YY_RULE_SETUP YY_BREAK case 99: YY_RULE_SETUP -#line 293 "cod/cod.l" +#line 291 "cod/cod.l" { yylval.info.string = create_string_from_yytext(); RETURN(floating_constant); @@ -1626,7 +1625,7 @@ YY_RULE_SETUP YY_BREAK case 100: YY_RULE_SETUP -#line 297 "cod/cod.l" +#line 295 "cod/cod.l" { yylval.info.string = create_string_from_yytext(); RETURN(floating_constant); @@ -1634,7 +1633,7 @@ YY_RULE_SETUP YY_BREAK case 101: YY_RULE_SETUP -#line 301 "cod/cod.l" +#line 299 "cod/cod.l" { yylval.info.string = create_string_from_yytext(); RETURN(floating_constant); @@ -1642,7 +1641,7 @@ YY_RULE_SETUP YY_BREAK case 102: YY_RULE_SETUP -#line 305 "cod/cod.l" +#line 303 "cod/cod.l" { yylval.info.string = create_string_from_yytext(); RETURN(floating_constant); @@ -1650,7 +1649,7 @@ YY_RULE_SETUP YY_BREAK case 103: YY_RULE_SETUP -#line 310 "cod/cod.l" +#line 308 "cod/cod.l" { yylval.info.string = create_string_from_yytext(); RETURN(floating_constant); @@ -1658,7 +1657,7 @@ YY_RULE_SETUP YY_BREAK case 104: YY_RULE_SETUP -#line 315 "cod/cod.l" +#line 313 "cod/cod.l" { yylval.info.string = create_string_from_yytext(); RETURN(floating_constant); @@ -1666,21 +1665,21 @@ YY_RULE_SETUP YY_BREAK case 105: YY_RULE_SETUP -#line 320 "cod/cod.l" +#line 318 "cod/cod.l" {lex_offset += yyleng;} YY_BREAK case 106: /* rule 106 can match eol */ YY_RULE_SETUP -#line 321 "cod/cod.l" +#line 319 "cod/cod.l" {lex_offset = 1; line_count++;} YY_BREAK case 107: YY_RULE_SETUP -#line 322 "cod/cod.l" +#line 320 "cod/cod.l" ECHO; YY_BREAK -#line 1684 "/Users/eisen/prog/ffs/build/lex.yy.c" +#line 1682 "/ccs/home/eisen/ffs/build/lex.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(string_cond): case YY_STATE_EOF(comment): @@ -1760,7 +1759,7 @@ case YY_STATE_EOF(comment): { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1813,6 +1812,7 @@ case YY_STATE_EOF(comment): "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ + } /* end of user's declarations */ } /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer @@ -1824,9 +1824,9 @@ case YY_STATE_EOF(comment): */ 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] ) @@ -1855,7 +1855,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++); @@ -1868,21 +1868,21 @@ 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 ) { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); 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; @@ -1891,11 +1891,12 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); } 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( @@ -1923,7 +1924,7 @@ static int yy_get_next_buffer (void) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin ); } else @@ -1937,12 +1938,15 @@ 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); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -1958,14 +1962,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; @@ -1975,9 +1979,9 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 284 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[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] + yy_c]; } return yy_current_state; @@ -1990,10 +1994,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; @@ -2003,17 +2007,19 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 284 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[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] + yy_c]; yy_is_jam = (yy_current_state == 283); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } - static void yyunput (int c, register char * yy_bp ) +#ifndef YY_NO_UNPUT + + static void yyunput (int c, char * yy_bp ) { - register char *yy_cp; + char *yy_cp; yy_cp = (yy_c_buf_p); @@ -2023,10 +2029,10 @@ static int yy_get_next_buffer (void) if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register yy_size_t number_to_move = (yy_n_chars) + 2; - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + int number_to_move = (yy_n_chars) + 2; + char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; - register char *source = + char *source = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) @@ -2035,7 +2041,7 @@ static int yy_get_next_buffer (void) yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; + (yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size; if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); @@ -2048,6 +2054,8 @@ static int yy_get_next_buffer (void) (yy_c_buf_p) = yy_cp; } +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (void) @@ -2072,7 +2080,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -2089,13 +2097,13 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) + if ( yywrap( ) ) return 0; if ( ! (yy_did_buffer_switch_on_eof) ) @@ -2133,11 +2141,11 @@ static int yy_get_next_buffer (void) if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. @@ -2165,7 +2173,7 @@ static int yy_get_next_buffer (void) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -2193,7 +2201,7 @@ static void yy_load_buffer_state (void) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -2202,13 +2210,13 @@ static void yy_load_buffer_state (void) /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file ); return b; } @@ -2227,15 +2235,11 @@ static void yy_load_buffer_state (void) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yyfree( (void *) b->yy_ch_buf ); - yyfree((void *) b ); + yyfree( (void *) b ); } -#ifndef __cplusplus -extern int isatty (int ); -#endif /* __cplusplus */ - /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a yyrestart() or at EOF. @@ -2245,7 +2249,7 @@ extern int isatty (int ); { int oerrno = errno; - yy_flush_buffer(b ); + yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; @@ -2288,7 +2292,7 @@ extern int isatty (int ); b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -2319,7 +2323,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } @@ -2338,7 +2342,7 @@ void yypop_buffer_state (void) --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -2356,15 +2360,15 @@ static void yyensure_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**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_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; @@ -2373,7 +2377,7 @@ static void yyensure_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**)yyrealloc @@ -2393,7 +2397,7 @@ static void yyensure_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 yy_scan_buffer (char * base, yy_size_t size ) { @@ -2403,23 +2407,23 @@ YY_BUFFER_STATE yy_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) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (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; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b ); return b; } @@ -2432,28 +2436,29 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes(yystr,strlen(yystr) ); + return yy_scan_bytes( yystr, (int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; - yy_size_t n, i; + yy_size_t n; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -2462,7 +2467,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -2478,9 +2483,9 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -2508,7 +2513,7 @@ static void yy_fatal_error (yyconst char* msg ) */ int yyget_lineno (void) { - + return yylineno; } @@ -2531,7 +2536,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -yy_size_t yyget_leng (void) +int yyget_leng (void) { return yyleng; } @@ -2546,29 +2551,29 @@ char *yyget_text (void) } /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - yylineno = line_number; + yylineno = _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 yy_switch_to_buffer */ -void yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (void) @@ -2576,9 +2581,9 @@ int yyget_debug (void) return yy_flex_debug; } -void yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } static int yy_init_globals (void) @@ -2587,10 +2592,10 @@ static int yy_init_globals (void) * This function is called from yylex_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; @@ -2599,8 +2604,8 @@ static int yy_init_globals (void) yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by @@ -2615,7 +2620,7 @@ int yylex_destroy (void) /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); + yy_delete_buffer( YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -2636,18 +2641,19 @@ int yylex_destroy (void) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { - register int i; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -2657,11 +2663,12 @@ static int yy_flex_strlen (yyconst char * s ) void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } void *yyrealloc (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 @@ -2669,18 +2676,17 @@ void *yyrealloc (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 yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" -#line 322 "cod/cod.l" - +#line 320 "cod/cod.l" static char *create_string_from_yytext() { @@ -2691,7 +2697,7 @@ static char *create_string_from_yytext() static void check_strbuf() { - int cur_len = string_buf_ptr - string_buffer; + intptr_t cur_len = string_buf_ptr - string_buffer; if ((cur_len + 1) == buffer_len) { buffer_len += 20; string_buffer = realloc(string_buffer, buffer_len + 1); @@ -2723,87 +2729,21 @@ yywrap YY_PROTO(( void )) } -#ifndef input /* flex, not lex */ void yy_delete_buffer YY_PROTO((YY_BUFFER_STATE b)); -#ifdef WINNT -/* old Windows code for MKS Toolkit version of flex */ - -static void -terminate_string_parse() -{ - yyrestart(NULL); -} - -#ifdef YY_USE_PROTOS -static void *yy_flex_alloc( yy_size_t size ) -#else -static void *yy_flex_alloc( size ) -yy_size_t size; -#endif - { - return (void *) malloc( size ); - } - -static char* current_input_string; - -int my_yy_input(buf,result,max_size) { - - if (current_input_string == NULL) - { - - result = 0; - } - else - if (max_size < strlen(current_input_string)) - { - memcpy((void*)buf, current_input_string, max_size); - current_input_string += max_size; - result = max_size; - } else { - int n = strlen(current_input_string); - memcpy((void*)buf, current_input_string, n+1); - current_input_string = NULL; - result = n; - } - -/* printf("my_yy_input buf[%s],result[%d]\n",buf,result);*/ - return result; -} - -static void -setup_for_string_parse(string, defined_types, enum_constants) -const char *string; -char **defined_types; -char **enum_constants; -{ - type_count = defined_type_count; - types = defined_types; - enums = enum_constants; - - current_input_string = string; - lex_offset = 1; - line_count = 1; -} -#else static YY_BUFFER_STATE bb = NULL; static void -reset_types_table(defined_types, enumerated_constants) -char **defined_types; -char **enumerated_constants; +reset_types_table(char **defined_types, char **enumerated_constants) { types = defined_types; enums = enumerated_constants; } static void -setup_for_string_parse(string, defined_types, enum_constants) -const char *string; -char **defined_types; -char **enum_constants; +setup_for_string_parse(const char *string, char **defined_types, char **enum_constants) { types = defined_types; enums = enum_constants; @@ -2824,6 +2764,4 @@ terminate_string_parse() } } -#endif -#endif