diff --git a/src/debug.c b/src/debug.c index 094b5fa..9a6aacf 100644 --- a/src/debug.c +++ b/src/debug.c @@ -8,6 +8,7 @@ #include #include "debug.h" #include "system.h" +#include "error.h" static int debuglevel; @@ -45,7 +46,7 @@ debug (int level, char *string) if (debugCond (level)) { indent (); - fprintf (stderr, "DEBUG [%i]: %s\n", level, string); + printfstderr ("DEBUG [%i]: %s\n", level, string); } #endif } diff --git a/src/error.c b/src/error.c index 2377513..f176222 100644 --- a/src/error.c +++ b/src/error.c @@ -10,6 +10,27 @@ error_die (void) exit (EXIT_ERROR); } +//! print to stderror (must be generic to capture linux variants) +void +vprintfstderr (char *fmt, va_list args) +{ +#ifdef linux + vfprintf (stderr, fmt, args); +#else + // nothing for non-linux yet +#endif +} + +void +printfstderr (char *fmt, ...) +{ + va_list args; + + va_start (args, fmt); + vprintfstderr (fmt, args); + va_end (args); +} + //! Print error message header /** * Adapted from [K&R2], p. 174 @@ -18,7 +39,7 @@ error_die (void) void error_pre (void) { - fprintf (stderr, "error: "); + printfstderr ("error: "); } //! Print post-error message and die. @@ -32,8 +53,8 @@ error_post (char *fmt, ...) va_list args; va_start (args, fmt); - vfprintf (stderr, fmt, args); - fprintf (stderr, "\n"); + vprintfstderr (fmt, args); + printfstderr ("\n"); va_end (args); exit (EXIT_ERROR); } @@ -50,8 +71,8 @@ error (char *fmt, ...) error_pre (); va_start (args, fmt); - vfprintf (stderr, fmt, args); - fprintf (stderr, "\n"); + vprintfstderr (fmt, args); + printfstderr ("\n"); va_end (args); error_die (); } @@ -66,8 +87,8 @@ warning (char *fmt, ...) va_list args; va_start (args, fmt); - fprintf (stderr, "warning: "); - vfprintf (stderr, fmt, args); - fprintf (stderr, "\n"); + printfstderr ("warning: "); + vprintfstderr (fmt, args); + printfstderr ("\n"); va_end (args); } diff --git a/src/error.h b/src/error.h index 31facbc..ad6a8f2 100644 --- a/src/error.h +++ b/src/error.h @@ -5,6 +5,8 @@ enum exittypes { EXIT_NOATTACK = 0, EXIT_ERROR = 1, EXIT_NOCLAIM = 2, EXIT_ATTACK = 3 }; +void vprintfstderr (char *fmt, va_list args); +void printfstderr (char *fmt, ...); void error_die (void); void error_pre (void); void error_post (char *fmt, ...); diff --git a/src/main.c b/src/main.c index 00e043e..9910da7 100644 --- a/src/main.c +++ b/src/main.c @@ -258,7 +258,7 @@ modelCheck (const System sys) if (switches.reportStates > 0) { // States: 1.000e+06 - fprintf (stderr, " \r"); + printfstderr (" \r"); } if (claimcount == 0) diff --git a/src/scanner.c b/src/scanner.c index 2597333..1ca8c8e 100644 --- a/src/scanner.c +++ b/src/scanner.c @@ -42,7 +42,7 @@ typedef uint32_t flex_uint32_t; typedef signed char flex_int8_t; typedef short int flex_int16_t; typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; +typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; #endif /* ! C99 */ @@ -83,14 +83,14 @@ typedef unsigned int flex_uint32_t; /* The "const" storage-class-modifier is valid. */ #define YY_USE_CONST -#else /* ! __cplusplus */ +#else /* ! __cplusplus */ #if __STDC__ #define YY_USE_CONST -#endif /* __STDC__ */ -#endif /* ! __cplusplus */ +#endif /* __STDC__ */ +#endif /* ! __cplusplus */ #ifdef YY_USE_CONST #define yyconst const @@ -154,14 +154,14 @@ extern FILE *yyin, *yyout; * a 5% performance hit in a non-yylineno scanner, because yy_act is * normally declared as a register variable-- so it is not worth it. */ - #define YY_LESS_LINENO(n) \ +#define YY_LESS_LINENO(n) \ do { \ int yyl;\ for ( yyl = n; yyl < yyleng; ++yyl )\ if ( yytext[yyl] == '\n' )\ --yylineno;\ }while(0) - + /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ @@ -191,72 +191,72 @@ typedef unsigned int yy_size_t; #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state - { - FILE *yy_input_file; +{ + FILE *yy_input_file; - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - yy_size_t yy_buf_size; + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - int yy_n_chars; + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + 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 - * delete it. - */ - int yy_is_our_buffer; + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; - 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. - */ - int yy_fill_buffer; + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ - int yy_buffer_status; + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; #define YY_BUFFER_NEW 0 #define YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via yyrestart()), so that the user can continue scanning by - * just pointing yyin at a new input file. - */ + /* When an EOF's been seen but there's still some text to process + * then we mark the buffer as YY_EOF_PENDING, to indicate that we + * shouldn't try reading from the input source any more. We might + * still have a bunch of tokens to match, though, because of + * possible backing-up. + * + * When we actually see the EOF, we change the status to "new" + * (via yyrestart()), so that the user can continue scanning by + * just pointing yyin at a new input file. + */ #define YY_BUFFER_EOF_PENDING 2 - }; +}; #endif /* !YY_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 = 0; /**< 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 @@ -288,27 +288,27 @@ 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 ); +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 ); +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,int len ); +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, 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 @@ -349,10 +349,10 @@ int yylineno = 1; extern char *yytext; #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 yy_fatal_error (yyconst char msg[]); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. @@ -369,173 +369,166 @@ static void yy_fatal_error (yyconst char msg[] ); /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info - { - flex_int32_t yy_verify; - flex_int32_t yy_nxt; - }; -static yyconst flex_int16_t yy_accept[148] = - { 0, - 0, 0, 0, 0, 0, 0, 31, 29, 7, 6, - 28, 9, 29, 29, 28, 28, 28, 28, 28, 28, - 28, 28, 28, 28, 28, 3, 3, 2, 30, 4, - 7, 28, 9, 5, 8, 28, 28, 28, 28, 28, - 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, - 28, 3, 3, 2, 4, 8, 28, 28, 28, 28, - 28, 28, 28, 28, 28, 28, 28, 17, 28, 28, - 28, 28, 28, 28, 14, 28, 28, 28, 28, 28, - 28, 28, 28, 28, 12, 11, 28, 13, 28, 28, - 28, 28, 16, 28, 15, 28, 28, 28, 28, 26, +{ + flex_int32_t yy_verify; + flex_int32_t yy_nxt; +}; +static yyconst flex_int16_t yy_accept[148] = { 0, + 0, 0, 0, 0, 0, 0, 31, 29, 7, 6, + 28, 9, 29, 29, 28, 28, 28, 28, 28, 28, + 28, 28, 28, 28, 28, 3, 3, 2, 30, 4, + 7, 28, 9, 5, 8, 28, 28, 28, 28, 28, + 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, + 28, 3, 3, 2, 4, 8, 28, 28, 28, 28, + 28, 28, 28, 28, 28, 28, 28, 17, 28, 28, + 28, 28, 28, 28, 14, 28, 28, 28, 28, 28, + 28, 28, 28, 28, 12, 11, 28, 13, 28, 28, + 28, 28, 16, 28, 15, 28, 28, 28, 28, 26, - 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, - 28, 28, 18, 28, 28, 28, 28, 28, 28, 28, - 1, 28, 28, 28, 27, 28, 28, 28, 24, 28, - 28, 10, 23, 28, 22, 28, 28, 28, 20, 28, - 28, 28, 21, 28, 19, 25, 0 - } ; + 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, + 28, 28, 18, 28, 28, 28, 28, 28, 28, 28, + 1, 28, 28, 28, 27, 28, 28, 28, 24, 28, + 28, 10, 23, 28, 22, 28, 28, 28, 20, 28, + 28, 28, 21, 28, 19, 25, 0 +}; -static yyconst flex_int32_t yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, - 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 5, 6, 7, 1, 1, 1, 5, 1, - 1, 8, 1, 1, 5, 1, 9, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 1, 11, 1, - 1, 1, 1, 12, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 1, 1, 1, 5, 1, 1, 14, 15, 16, 17, +static yyconst flex_int32_t yy_ec[256] = { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, + 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 5, 6, 7, 1, 1, 1, 5, 1, + 1, 8, 1, 1, 5, 1, 9, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 1, 11, 1, + 1, 1, 1, 12, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 1, 1, 1, 5, 1, 1, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 15, 23, 24, 25, 26, - 27, 28, 15, 29, 30, 31, 32, 33, 34, 15, - 35, 15, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 18, 19, 20, 21, 22, 15, 23, 24, 25, 26, + 27, 28, 15, 29, 30, 31, 32, 33, 34, 15, + 35, 15, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1 +}; -static yyconst flex_int32_t yy_meta[36] = - { 0, - 1, 1, 2, 1, 3, 4, 1, 1, 1, 3, - 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3 - } ; +static yyconst flex_int32_t yy_meta[36] = { 0, + 1, 1, 2, 1, 3, 4, 1, 1, 1, 3, + 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3 +}; -static yyconst flex_int16_t yy_base[154] = - { 0, - 0, 0, 34, 35, 176, 175, 180, 183, 40, 43, - 0, 0, 30, 0, 24, 147, 164, 151, 150, 146, - 31, 32, 145, 26, 159, 0, 51, 183, 183, 161, - 57, 0, 0, 183, 0, 157, 39, 144, 139, 39, - 141, 140, 152, 141, 138, 50, 137, 130, 130, 142, - 130, 0, 65, 183, 183, 0, 136, 129, 126, 139, - 133, 129, 134, 117, 119, 132, 130, 0, 118, 129, - 125, 114, 114, 113, 0, 116, 111, 108, 107, 118, - 104, 106, 104, 106, 0, 0, 114, 0, 99, 99, - 97, 97, 0, 100, 0, 104, 93, 107, 93, 0, +static yyconst flex_int16_t yy_base[154] = { 0, + 0, 0, 34, 35, 176, 175, 180, 183, 40, 43, + 0, 0, 30, 0, 24, 147, 164, 151, 150, 146, + 31, 32, 145, 26, 159, 0, 51, 183, 183, 161, + 57, 0, 0, 183, 0, 157, 39, 144, 139, 39, + 141, 140, 152, 141, 138, 50, 137, 130, 130, 142, + 130, 0, 65, 183, 183, 0, 136, 129, 126, 139, + 133, 129, 134, 117, 119, 132, 130, 0, 118, 129, + 125, 114, 114, 113, 0, 116, 111, 108, 107, 118, + 104, 106, 104, 106, 0, 0, 114, 0, 99, 99, + 97, 97, 0, 100, 0, 104, 93, 107, 93, 0, - 106, 90, 96, 101, 88, 82, 91, 88, 88, 95, - 94, 84, 0, 96, 92, 77, 79, 84, 79, 88, - 0, 80, 78, 72, 0, 82, 81, 68, 0, 66, - 78, 0, 0, 76, 0, 68, 53, 39, 0, 56, - 43, 39, 0, 42, 0, 0, 183, 76, 80, 59, - 84, 88, 91 - } ; + 106, 90, 96, 101, 88, 82, 91, 88, 88, 95, + 94, 84, 0, 96, 92, 77, 79, 84, 79, 88, + 0, 80, 78, 72, 0, 82, 81, 68, 0, 66, + 78, 0, 0, 76, 0, 68, 53, 39, 0, 56, + 43, 39, 0, 42, 0, 0, 183, 76, 80, 59, + 84, 88, 91 +}; -static yyconst flex_int16_t yy_def[154] = - { 0, - 147, 1, 148, 148, 149, 149, 147, 147, 147, 147, - 150, 151, 147, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 152, 152, 147, 147, 147, - 147, 150, 151, 147, 153, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 152, 152, 147, 147, 153, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, +static yyconst flex_int16_t yy_def[154] = { 0, + 147, 1, 148, 148, 149, 149, 147, 147, 147, 147, + 150, 151, 147, 150, 150, 150, 150, 150, 150, 150, + 150, 150, 150, 150, 150, 152, 152, 147, 147, 147, + 147, 150, 151, 147, 153, 150, 150, 150, 150, 150, + 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, + 150, 152, 152, 147, 147, 153, 150, 150, 150, 150, + 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, + 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, + 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, + 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 150, 150, 150, 150, 150, 150, 0, 147, 147, 147, - 147, 147, 147 - } ; + 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, + 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, + 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, + 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, + 150, 150, 150, 150, 150, 150, 0, 147, 147, 147, + 147, 147, 147 +}; -static yyconst flex_int16_t yy_nxt[219] = - { 0, - 8, 9, 10, 9, 11, 8, 12, 8, 13, 11, - 8, 14, 11, 11, 11, 15, 11, 11, 16, 11, - 17, 18, 19, 11, 11, 11, 11, 20, 21, 22, - 23, 24, 25, 11, 11, 27, 27, 34, 35, 28, - 28, 31, 31, 31, 31, 31, 31, 36, 43, 46, - 37, 49, 53, 47, 62, 50, 54, 44, 31, 31, - 31, 32, 45, 58, 59, 69, 53, 146, 145, 144, - 54, 63, 143, 142, 141, 70, 26, 26, 26, 26, - 29, 29, 29, 29, 33, 140, 33, 33, 52, 52, - 52, 56, 139, 56, 56, 138, 137, 136, 135, 134, +static yyconst flex_int16_t yy_nxt[219] = { 0, + 8, 9, 10, 9, 11, 8, 12, 8, 13, 11, + 8, 14, 11, 11, 11, 15, 11, 11, 16, 11, + 17, 18, 19, 11, 11, 11, 11, 20, 21, 22, + 23, 24, 25, 11, 11, 27, 27, 34, 35, 28, + 28, 31, 31, 31, 31, 31, 31, 36, 43, 46, + 37, 49, 53, 47, 62, 50, 54, 44, 31, 31, + 31, 32, 45, 58, 59, 69, 53, 146, 145, 144, + 54, 63, 143, 142, 141, 70, 26, 26, 26, 26, + 29, 29, 29, 29, 33, 140, 33, 33, 52, 52, + 52, 56, 139, 56, 56, 138, 137, 136, 135, 134, - 133, 132, 131, 130, 129, 128, 127, 126, 125, 124, - 123, 122, 121, 120, 119, 118, 117, 116, 115, 114, - 113, 112, 111, 110, 109, 108, 107, 106, 105, 104, - 103, 102, 101, 100, 99, 98, 97, 96, 95, 94, - 93, 92, 91, 90, 89, 88, 87, 86, 85, 84, - 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, - 73, 72, 71, 68, 67, 66, 65, 64, 61, 60, - 57, 55, 51, 48, 42, 41, 40, 39, 38, 147, - 30, 30, 7, 147, 147, 147, 147, 147, 147, 147, - 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 133, 132, 131, 130, 129, 128, 127, 126, 125, 124, + 123, 122, 121, 120, 119, 118, 117, 116, 115, 114, + 113, 112, 111, 110, 109, 108, 107, 106, 105, 104, + 103, 102, 101, 100, 99, 98, 97, 96, 95, 94, + 93, 92, 91, 90, 89, 88, 87, 86, 85, 84, + 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, + 73, 72, 71, 68, 67, 66, 65, 64, 61, 60, + 57, 55, 51, 48, 42, 41, 40, 39, 38, 147, + 30, 30, 7, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, - 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, - 147, 147, 147, 147, 147, 147, 147, 147 - } ; + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147 +}; -static yyconst flex_int16_t yy_chk[219] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 3, 4, 13, 13, 3, - 4, 9, 9, 9, 10, 10, 10, 15, 21, 22, - 15, 24, 27, 22, 40, 24, 27, 21, 31, 31, - 31, 150, 21, 37, 37, 46, 53, 144, 142, 141, - 53, 40, 140, 138, 137, 46, 148, 148, 148, 148, - 149, 149, 149, 149, 151, 136, 151, 151, 152, 152, - 152, 153, 134, 153, 153, 131, 130, 128, 127, 126, +static yyconst flex_int16_t yy_chk[219] = { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 3, 4, 13, 13, 3, + 4, 9, 9, 9, 10, 10, 10, 15, 21, 22, + 15, 24, 27, 22, 40, 24, 27, 21, 31, 31, + 31, 150, 21, 37, 37, 46, 53, 144, 142, 141, + 53, 40, 140, 138, 137, 46, 148, 148, 148, 148, + 149, 149, 149, 149, 151, 136, 151, 151, 152, 152, + 152, 153, 134, 153, 153, 131, 130, 128, 127, 126, - 124, 123, 122, 120, 119, 118, 117, 116, 115, 114, - 112, 111, 110, 109, 108, 107, 106, 105, 104, 103, - 102, 101, 99, 98, 97, 96, 94, 92, 91, 90, - 89, 87, 84, 83, 82, 81, 80, 79, 78, 77, - 76, 74, 73, 72, 71, 70, 69, 67, 66, 65, - 64, 63, 62, 61, 60, 59, 58, 57, 51, 50, - 49, 48, 47, 45, 44, 43, 42, 41, 39, 38, - 36, 30, 25, 23, 20, 19, 18, 17, 16, 7, - 6, 5, 147, 147, 147, 147, 147, 147, 147, 147, - 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 124, 123, 122, 120, 119, 118, 117, 116, 115, 114, + 112, 111, 110, 109, 108, 107, 106, 105, 104, 103, + 102, 101, 99, 98, 97, 96, 94, 92, 91, 90, + 89, 87, 84, 83, 82, 81, 80, 79, 78, 77, + 76, 74, 73, 72, 71, 70, 69, 67, 66, 65, + 64, 63, 62, 61, 60, 59, 58, 57, 51, 50, + 49, 48, 47, 45, 44, 43, 42, 41, 39, 38, + 36, 30, 25, 23, 20, 19, 18, 17, 16, 7, + 6, 5, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, - 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, - 147, 147, 147, 147, 147, 147, 147, 147 - } ; + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147 +}; /* Table of booleans, true if rule could match eol. */ -static yyconst flex_int32_t yy_rule_can_match_eol[31] = - { 0, -0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; +static yyconst flex_int32_t yy_rule_can_match_eol[31] = { 0, + 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; static yy_state_type yy_last_accepting_state; static char *yy_last_accepting_cpos; @@ -559,24 +552,26 @@ char *yytext; #include "pheading.h" #include "tac.h" #include "switches.h" +#include "error.h" /* tokens for language */ #include "parser.h" -void mkname(char *name); -void mkval(void); -void mktext(void); +void mkname (char *name); +void mkval (void); +void mktext (void); -int yyerror(char *s); +int yyerror (char *s); -Symbol mkstring(char *name); +Symbol mkstring (char *name); -struct stringlist { - char* string; - struct stringlist* next; +struct stringlist +{ + char *string; + struct stringlist *next; }; -typedef struct stringlist* Stringlist; +typedef struct stringlist *Stringlist; static Stringlist allocatedStrings = NULL; @@ -586,11 +581,11 @@ int mylineno = 0; /* the "incl" state is used for picking up the name of an include file */ -#line 55 "scanner.l" +#line 56 "scanner.l" #define MAX_INCLUDE_DEPTH 10 YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH]; int include_stack_ptr = 0; -#line 594 "" +#line 595 "" #define INITIAL 0 #define incl 1 @@ -614,28 +609,28 @@ int include_stack_ptr = 0; #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 ); - +static void yyunput (int c, char *buf_ptr); + #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy (char *, yyconst char *, int); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen (yyconst 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 @@ -739,458 +734,445 @@ extern int yylex (void); */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; - -#line 60 "scanner.l" + register yy_state_type yy_current_state; + register char *yy_cp, *yy_bp; + register int yy_act; -#line 749 "" +#line 61 "scanner.l" - if ( (yy_init) ) - { - (yy_init) = 0; +#line 750 "" + + if ((yy_init)) + { + (yy_init) = 0; #ifdef YY_USER_INIT - YY_USER_INIT; + YY_USER_INIT; #endif - if ( ! (yy_start) ) - (yy_start) = 1; /* first start state */ + if (!(yy_start)) + (yy_start) = 1; /* first start state */ - if ( ! yyin ) - yyin = stdin; + if (!yyin) + yyin = stdin; - if ( ! yyout ) - yyout = stdout; + if (!yyout) + yyout = stdout; - if ( ! YY_CURRENT_BUFFER ) { - yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); - } + if (!YY_CURRENT_BUFFER) + { + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = yy_create_buffer (yyin, YY_BUF_SIZE); + } - yy_load_buffer_state( ); - } + yy_load_buffer_state (); + } - while ( 1 ) /* loops until end-of-file is reached */ - { - yy_cp = (yy_c_buf_p); + while (1) /* loops until end-of-file is reached */ + { + yy_cp = (yy_c_buf_p); - /* Support of yytext. */ - *yy_cp = (yy_hold_char); + /* Support of yytext. */ + *yy_cp = (yy_hold_char); - /* yy_bp points to the position in yy_ch_buf of the start of - * the current run. - */ - yy_bp = yy_cp; + /* yy_bp points to the position in yy_ch_buf of the start of + * the current run. + */ + yy_bp = yy_cp; - yy_current_state = (yy_start); -yy_match: - do - { - register 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; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 148 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - ++yy_cp; - } - while ( yy_base[yy_current_state] != 183 ); + yy_current_state = (yy_start); + yy_match: + do + { + register 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; + (yy_last_accepting_cpos) = yy_cp; + } + while (yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state) + { + yy_current_state = (int) yy_def[yy_current_state]; + if (yy_current_state >= 148) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = + yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + ++yy_cp; + } + while (yy_base[yy_current_state] != 183); -yy_find_action: - yy_act = yy_accept[yy_current_state]; - if ( yy_act == 0 ) - { /* have to back up */ - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - yy_act = yy_accept[yy_current_state]; - } + yy_find_action: + yy_act = yy_accept[yy_current_state]; + if (yy_act == 0) + { /* have to back up */ + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); + yy_act = yy_accept[yy_current_state]; + } - YY_DO_BEFORE_ACTION; + YY_DO_BEFORE_ACTION; - if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) - { - int yyl; - for ( yyl = 0; yyl < yyleng; ++yyl ) - if ( yytext[yyl] == '\n' ) - - yylineno++; -; - } + if (yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act]) + { + int yyl; + for (yyl = 0; yyl < yyleng; ++yyl) + if (yytext[yyl] == '\n') -do_action: /* This label is used only to access EOF actions. */ + yylineno++; + ; + } - switch ( yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = (yy_hold_char); - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - goto yy_find_action; + do_action: /* This label is used only to access EOF actions. */ -case 1: -YY_RULE_SETUP -#line 61 "scanner.l" -BEGIN(incl); - YY_BREAK -case 2: -YY_RULE_SETUP + switch (yy_act) + { /* beginning of action switch */ + case 0: /* must back up */ + /* undo the effects of YY_DO_BEFORE_ACTION */ + *yy_cp = (yy_hold_char); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); + goto yy_find_action; + + case 1: + YY_RULE_SETUP #line 62 "scanner.l" -/* eat the whitespace */ - YY_BREAK -case 3: -/* rule 3 can match eol */ -YY_RULE_SETUP + BEGIN (incl); + YY_BREAK case 2:YY_RULE_SETUP #line 63 "scanner.l" -{ /* got the include file name */ - if ( include_stack_ptr >= MAX_INCLUDE_DEPTH ) - { - fprintf( stderr, "Includes nested too deeply" ); - exit( 1 ); - } - - include_stack[include_stack_ptr++] = - YY_CURRENT_BUFFER; - - /* try to open, using scytherdirs environment variable as well. */ - yyin = openFileSearch (yytext, NULL); - - if (! yyin) - { - error ("could not open include file %s.", yytext); - } - - yy_switch_to_buffer(yy_create_buffer(yyin,YY_BUF_SIZE ) ); - - BEGIN(INITIAL); - } - YY_BREAK -case 4: -YY_RULE_SETUP -#line 87 "scanner.l" -{ /* eat the closing things */ - BEGIN(INITIAL); - } - YY_BREAK -case YY_STATE_EOF(INITIAL): -#line 91 "scanner.l" -{ - if ( --include_stack_ptr < 0 ) - { - yyterminate(); - } +/* eat the whitespace */ + YY_BREAK case 3: +/* rule 3 can match eol */ + YY_RULE_SETUP +#line 64 "scanner.l" + { /* got the include file name */ + if (include_stack_ptr >= MAX_INCLUDE_DEPTH) + { + printfstderr ("Includes nested too deeply"); + exit (1); + } - else - { - yy_delete_buffer(YY_CURRENT_BUFFER ); - yy_switch_to_buffer(include_stack[include_stack_ptr] ); - BEGIN(inclend); - } - } - YY_BREAK -case 5: -YY_RULE_SETUP -#line 106 "scanner.l" -{ - register int c; + include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER; - for ( ; ; ) - { - while ( (c = input()) != '*' && c != '\n' && c != EOF ) - ; /* eat up text of comment */ + /* try to open, using scytherdirs environment variable as well. */ + yyin = openFileSearch (yytext, NULL); - if ( c == '*' ) - { - while ( (c = input()) == '*' ) - ; - if ( c == '/' ) - break; /* found the end */ - } + if (!yyin) + { + error ("could not open include file %s.", yytext); + } - if (c == '\n') - mylineno++; + yy_switch_to_buffer (yy_create_buffer (yyin, YY_BUF_SIZE)); - if ( c == EOF ) - { - yyerror( "EOF in comment" ); - break; - } - } - } - YY_BREAK -case 6: + BEGIN (INITIAL); + } + YY_BREAK case 4:YY_RULE_SETUP +#line 88 "scanner.l" + { /* eat the closing things */ + BEGIN (INITIAL); + } + YY_BREAK case YY_STATE_EOF (INITIAL): +#line 92 "scanner.l" + { + if (--include_stack_ptr < 0) + { + yyterminate (); + } + + else + { + yy_delete_buffer (YY_CURRENT_BUFFER); + yy_switch_to_buffer (include_stack[include_stack_ptr]); + BEGIN (inclend); + } + } + YY_BREAK case 5:YY_RULE_SETUP +#line 107 "scanner.l" + { + register int c; + + for (;;) + { + while ((c = input ()) != '*' && c != '\n' && c != EOF) + ; /* eat up text of comment */ + + if (c == '*') + { + while ((c = input ()) == '*') + ; + if (c == '/') + break; /* found the end */ + } + + if (c == '\n') + mylineno++; + + if (c == EOF) + { + yyerror ("EOF in comment"); + break; + } + } + } + YY_BREAK case 6: /* rule 6 can match eol */ -YY_RULE_SETUP -#line 133 "scanner.l" -{ mylineno++; } - YY_BREAK -case 7: -/* rule 7 can match eol */ -YY_RULE_SETUP + YY_RULE_SETUP #line 134 "scanner.l" -{ } - YY_BREAK -case 8: -YY_RULE_SETUP + { + mylineno++; + } + YY_BREAK case 7: +/* rule 7 can match eol */ + YY_RULE_SETUP #line 135 "scanner.l" -{ } - YY_BREAK -case 9: -YY_RULE_SETUP + { + } + YY_BREAK case 8:YY_RULE_SETUP #line 136 "scanner.l" -{ } - YY_BREAK -case 10: -YY_RULE_SETUP -#line 138 "scanner.l" -{ return PROTOCOL; } - YY_BREAK -case 11: -YY_RULE_SETUP + { + } + YY_BREAK case 9:YY_RULE_SETUP +#line 137 "scanner.l" + { + } + YY_BREAK case 10:YY_RULE_SETUP #line 139 "scanner.l" -{ return ROLE; } - YY_BREAK -case 12: -YY_RULE_SETUP + { + return PROTOCOL; + } + YY_BREAK case 11:YY_RULE_SETUP #line 140 "scanner.l" -{ return READT; } - YY_BREAK -case 13: -YY_RULE_SETUP + { + return ROLE; + } + YY_BREAK case 12:YY_RULE_SETUP #line 141 "scanner.l" -{ return SENDT; } - YY_BREAK -case 14: -YY_RULE_SETUP + { + return READT; + } + YY_BREAK case 13:YY_RULE_SETUP #line 142 "scanner.l" -{ return VAR; } - YY_BREAK -case 15: -YY_RULE_SETUP + { + return SENDT; + } + YY_BREAK case 14:YY_RULE_SETUP #line 143 "scanner.l" -{ return CONST; } - YY_BREAK -case 16: -YY_RULE_SETUP + { + return VAR; + } + YY_BREAK case 15:YY_RULE_SETUP #line 144 "scanner.l" -{ return CLAIMT; } - YY_BREAK -case 17: -YY_RULE_SETUP + { + return CONST; + } + YY_BREAK case 16:YY_RULE_SETUP #line 145 "scanner.l" -{ return RUN; } - YY_BREAK -case 18: -YY_RULE_SETUP + { + return CLAIMT; + } + YY_BREAK case 17:YY_RULE_SETUP #line 146 "scanner.l" -{ return SECRET; } - YY_BREAK -case 19: -YY_RULE_SETUP + { + return RUN; + } + YY_BREAK case 18:YY_RULE_SETUP #line 147 "scanner.l" -{ return INVERSEKEYS; } - YY_BREAK -case 20: -YY_RULE_SETUP + { + return SECRET; + } + YY_BREAK case 19:YY_RULE_SETUP #line 148 "scanner.l" -{ return UNTRUSTED; } - YY_BREAK -case 21: -YY_RULE_SETUP + { + return INVERSEKEYS; + } + YY_BREAK case 20:YY_RULE_SETUP #line 149 "scanner.l" -{ return COMPROMISED; } - YY_BREAK -case 22: -YY_RULE_SETUP + { + return UNTRUSTED; + } + YY_BREAK case 21:YY_RULE_SETUP #line 150 "scanner.l" -{ return USERTYPE; } - YY_BREAK -case 23: -YY_RULE_SETUP + { + return COMPROMISED; + } + YY_BREAK case 22:YY_RULE_SETUP #line 151 "scanner.l" -{ return SINGULAR; } - YY_BREAK -case 24: -YY_RULE_SETUP + { + return USERTYPE; + } + YY_BREAK case 23:YY_RULE_SETUP #line 152 "scanner.l" -{ return FUNCTION; } - YY_BREAK -case 25: -YY_RULE_SETUP + { + return SINGULAR; + } + YY_BREAK case 24:YY_RULE_SETUP #line 153 "scanner.l" -{ return HASHFUNCTION; } - YY_BREAK -case 26: -YY_RULE_SETUP + { + return FUNCTION; + } + YY_BREAK case 25:YY_RULE_SETUP #line 154 "scanner.l" -{ return KNOWS; } - YY_BREAK -case 27: -YY_RULE_SETUP + { + return HASHFUNCTION; + } + YY_BREAK case 26:YY_RULE_SETUP #line 155 "scanner.l" -{ return TRUSTED; } - YY_BREAK -case 28: -YY_RULE_SETUP + { + return KNOWS; + } + YY_BREAK case 27:YY_RULE_SETUP #line 156 "scanner.l" -{ - yylval.symb = mkstring(yytext); - return ID; - } - YY_BREAK -case 29: -YY_RULE_SETUP -#line 160 "scanner.l" -{ return yytext[0]; } - YY_BREAK -case 30: -YY_RULE_SETUP -#line 164 "scanner.l" -ECHO; - YY_BREAK -#line 1062 "" -case YY_STATE_EOF(incl): -case YY_STATE_EOF(inclend): - yyterminate(); + { + return TRUSTED; + } + YY_BREAK case 28:YY_RULE_SETUP +#line 157 "scanner.l" + { + yylval.symb = mkstring (yytext); + return ID; + } + YY_BREAK case 29:YY_RULE_SETUP +#line 161 "scanner.l" + { + return yytext[0]; + } + YY_BREAK case 30:YY_RULE_SETUP +#line 165 "scanner.l" + ECHO; + YY_BREAK +#line 1063 "" + case YY_STATE_EOF (incl): + case YY_STATE_EOF (inclend): + yyterminate (); case YY_END_OF_BUFFER: - { - /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; + { + /* Amount of text matched not including the EOB char. */ + int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; - /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = (yy_hold_char); - YY_RESTORE_YY_MORE_OFFSET - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) - { - /* We're scanning a new file or input source. It's - * possible that this happened because the user - * just pointed yyin at a new source and called - * yylex(). If so, then we have to assure - * consistency between YY_CURRENT_BUFFER and our - * globals. Here is the right place to do so, because - * this is the first action (other than possibly a - * back-up) that will match for the new input source. - */ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; - } - - /* Note that here we test for yy_c_buf_p "<=" to the position - * of the first EOB in the buffer, since yy_c_buf_p will - * already have been incremented past the NUL character - * (since all states make transitions on EOB to the - * end-of-buffer state). Contrast this with the test - * in input(). + /* Undo the effects of YY_DO_BEFORE_ACTION. */ + *yy_cp = (yy_hold_char); + YY_RESTORE_YY_MORE_OFFSET + if (YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW) + { + /* We're scanning a new file or input source. It's + * possible that this happened because the user + * just pointed yyin at a new source and called + * yylex(). If so, then we have to assure + * consistency between YY_CURRENT_BUFFER and our + * globals. Here is the right place to do so, because + * this is the first action (other than possibly a + * back-up) that will match for the new input source. */ - if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) - { /* This was really a NUL. */ - yy_state_type yy_next_state; + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; + } - (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; + /* Note that here we test for yy_c_buf_p "<=" to the position + * of the first EOB in the buffer, since yy_c_buf_p will + * already have been incremented past the NUL character + * (since all states make transitions on EOB to the + * end-of-buffer state). Contrast this with the test + * in input(). + */ + if ((yy_c_buf_p) <= + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]) + { /* This was really a NUL. */ + yy_state_type yy_next_state; - yy_current_state = yy_get_previous_state( ); + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - /* Okay, we're now positioned to make the NUL - * transition. We couldn't have - * yy_get_previous_state() go ahead and do it - * for us because it doesn't know how to deal - * with the possibility of jamming (and we don't - * want to build jamming into it because then it - * will run more slowly). + yy_current_state = yy_get_previous_state (); + + /* Okay, we're now positioned to make the NUL + * transition. We couldn't have + * yy_get_previous_state() go ahead and do it + * for us because it doesn't know how to deal + * with the possibility of jamming (and we don't + * want to build jamming into it because then it + * will run more slowly). + */ + + yy_next_state = yy_try_NUL_trans (yy_current_state); + + yy_bp = (yytext_ptr) + YY_MORE_ADJ; + + if (yy_next_state) + { + /* Consume the NUL. */ + yy_cp = ++(yy_c_buf_p); + yy_current_state = yy_next_state; + goto yy_match; + } + + else + { + yy_cp = (yy_c_buf_p); + goto yy_find_action; + } + } + + else + switch (yy_get_next_buffer ()) + { + case EOB_ACT_END_OF_FILE: + { + (yy_did_buffer_switch_on_eof) = 0; + + if (yywrap ()) + { + /* Note: because we've taken care in + * yy_get_next_buffer() to have set up + * yytext, we can now set up + * yy_c_buf_p so that if some total + * hoser (like flex itself) wants to + * call the scanner after we return the + * YY_NULL, it'll still work - another + * YY_NULL will get returned. */ + (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; - yy_next_state = yy_try_NUL_trans( yy_current_state ); + yy_act = YY_STATE_EOF (YY_START); + goto do_action; + } - yy_bp = (yytext_ptr) + YY_MORE_ADJ; + else + { + if (!(yy_did_buffer_switch_on_eof)) + YY_NEW_FILE; + } + break; + } - if ( yy_next_state ) - { - /* Consume the NUL. */ - yy_cp = ++(yy_c_buf_p); - yy_current_state = yy_next_state; - goto yy_match; - } + case EOB_ACT_CONTINUE_SCAN: + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - else - { - yy_cp = (yy_c_buf_p); - goto yy_find_action; - } - } + yy_current_state = yy_get_previous_state (); - else switch ( yy_get_next_buffer( ) ) - { - case EOB_ACT_END_OF_FILE: - { - (yy_did_buffer_switch_on_eof) = 0; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; + goto yy_match; - if ( yywrap( ) ) - { - /* Note: because we've taken care in - * yy_get_next_buffer() to have set up - * yytext, we can now set up - * yy_c_buf_p so that if some total - * hoser (like flex itself) wants to - * call the scanner after we return the - * YY_NULL, it'll still work - another - * YY_NULL will get returned. - */ - (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; + case EOB_ACT_LAST_MATCH: + (yy_c_buf_p) = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - yy_act = YY_STATE_EOF(YY_START); - goto do_action; - } + yy_current_state = yy_get_previous_state (); - else - { - if ( ! (yy_did_buffer_switch_on_eof) ) - YY_NEW_FILE; - } - break; - } - - case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = - (yytext_ptr) + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( ); - - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - goto yy_match; - - case EOB_ACT_LAST_MATCH: - (yy_c_buf_p) = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - - yy_current_state = yy_get_previous_state( ); - - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - goto yy_find_action; - } - break; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; + goto yy_find_action; } + break; + } default: - YY_FATAL_ERROR( - "fatal flex scanner internal error--no action found" ); - } /* end of action switch */ - } /* end of scanning one token */ -} /* end of yylex */ + YY_FATAL_ERROR + ("fatal flex scanner internal error--no action found"); + } /* end of action switch */ + } /* end of scanning one token */ +} /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer * @@ -1199,157 +1181,158 @@ case YY_STATE_EOF(inclend): * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ -static int yy_get_next_buffer (void) +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; - int ret_val; + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = (yytext_ptr); + register int number_to_move, i; + int ret_val; - if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) - YY_FATAL_ERROR( - "fatal flex scanner internal error--end of buffer missed" ); + if ((yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1]) + YY_FATAL_ERROR + ("fatal flex scanner internal error--end of buffer missed"); - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) - { /* Don't try to fill the buffer, so this is an EOF. */ - if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) - { - /* We matched a single character, the EOB, so - * treat this as a final EOF. - */ - return EOB_ACT_END_OF_FILE; - } + if (YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0) + { /* Don't try to fill the buffer, so this is an EOF. */ + if ((yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1) + { + /* We matched a single character, the EOB, so + * treat this as a final EOF. + */ + return EOB_ACT_END_OF_FILE; + } - else - { - /* We matched some text prior to the EOB, first - * process it. - */ - return EOB_ACT_LAST_MATCH; - } - } + else + { + /* We matched some text prior to the EOB, first + * process it. + */ + return EOB_ACT_LAST_MATCH; + } + } - /* Try to read more data. */ + /* Try to read more data. */ - /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + /* First move last chars to start of buffer. */ + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); + for (i = 0; i < number_to_move; ++i) + *(dest++) = *(source++); - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) - /* don't do the read, it's not guaranteed to return an EOF, - * just force an EOF - */ - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; + if (YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING) + /* don't do the read, it's not guaranteed to return an EOF, + * just force an EOF + */ + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; - else - { - int num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; + else + { + 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. */ + 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; + /* just a shorter name for the current buffer */ + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; - int yy_c_buf_p_offset = - (int) ((yy_c_buf_p) - b->yy_ch_buf); + int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); - if ( b->yy_is_our_buffer ) - { - int new_size = b->yy_buf_size * 2; + if (b->yy_is_our_buffer) + { + int new_size = b->yy_buf_size * 2; - if ( new_size <= 0 ) - b->yy_buf_size += b->yy_buf_size / 8; - else - b->yy_buf_size *= 2; + if (new_size <= 0) + b->yy_buf_size += b->yy_buf_size / 8; + else + b->yy_buf_size *= 2; - b->yy_ch_buf = (char *) - /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); - } - else - /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + b->yy_ch_buf = (char *) + /* Include room in for 2 EOB chars. */ + yyrealloc ((void *) b->yy_ch_buf, b->yy_buf_size + 2); + } + else + /* Can't grow it, we don't own it. */ + b->yy_ch_buf = 0; - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( - "fatal error - scanner input buffer overflow" ); + if (!b->yy_ch_buf) + YY_FATAL_ERROR ("fatal error - scanner input buffer overflow"); - (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - - number_to_move - 1; + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - + number_to_move - 1; - } + } - if ( num_to_read > YY_READ_BUF_SIZE ) - num_to_read = YY_READ_BUF_SIZE; + if (num_to_read > YY_READ_BUF_SIZE) + num_to_read = YY_READ_BUF_SIZE; - /* Read in more data. */ - YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), num_to_read ); + /* Read in more data. */ + YY_INPUT ((&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + (yy_n_chars), num_to_read); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } - if ( (yy_n_chars) == 0 ) - { - if ( number_to_move == YY_MORE_ADJ ) - { - ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); - } + if ((yy_n_chars) == 0) + { + if (number_to_move == YY_MORE_ADJ) + { + ret_val = EOB_ACT_END_OF_FILE; + yyrestart (yyin); + } - else - { - ret_val = EOB_ACT_LAST_MATCH; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = - YY_BUFFER_EOF_PENDING; - } - } + else + { + ret_val = EOB_ACT_LAST_MATCH; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_EOF_PENDING; + } + } - else - ret_val = EOB_ACT_CONTINUE_SCAN; + else + ret_val = EOB_ACT_CONTINUE_SCAN; - (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; + (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; - (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; + (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; - return ret_val; + return ret_val; } /* yy_get_previous_state - get the state just before the EOB char was reached */ - static yy_state_type yy_get_previous_state (void) +static yy_state_type +yy_get_previous_state (void) { - register yy_state_type yy_current_state; - register char *yy_cp; - - yy_current_state = (yy_start); + register yy_state_type yy_current_state; + register char *yy_cp; - 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); - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 148 ) - 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_start); - return yy_current_state; + 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); + if (yy_accept[yy_current_state]) + { + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; + } + while (yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state) + { + yy_current_state = (int) yy_def[yy_current_state]; + if (yy_current_state >= 148) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = + yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + } + + return yy_current_state; } /* yy_try_NUL_trans - try to make a transition on the NUL character @@ -1357,208 +1340,214 @@ static int yy_get_next_buffer (void) * synopsis * next_state = yy_try_NUL_trans( current_state ); */ - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) +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); + register int yy_is_jam; + register char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 148 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 147); + register YY_CHAR yy_c = 1; + if (yy_accept[yy_current_state]) + { + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; + } + while (yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state) + { + yy_current_state = (int) yy_def[yy_current_state]; + if (yy_current_state >= 148) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_is_jam = (yy_current_state == 147); - 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 ) +static void +yyunput (int c, register char *yy_bp) { - register char *yy_cp; - - yy_cp = (yy_c_buf_p); + register char *yy_cp; - /* undo effects of setting up yytext */ - *yy_cp = (yy_hold_char); + yy_cp = (yy_c_buf_p); - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) - { /* need to shift things up to make room */ - /* +2 for EOB chars. */ - register int number_to_move = (yy_n_chars) + 2; - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ - YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; - register char *source = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; + /* undo effects of setting up yytext */ + *yy_cp = (yy_hold_char); - while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - *--dest = *--source; + if (yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2) + { /* need to shift things up to make room */ + /* +2 for EOB chars. */ + register int number_to_move = (yy_n_chars) + 2; + register char *dest = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[YY_CURRENT_BUFFER_LVALUE-> + yy_buf_size + 2]; + register char *source = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; - 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; + while (source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + *--dest = *--source; - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) - YY_FATAL_ERROR( "flex scanner push-back overflow" ); - } + 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_cp = (char) c; - - if ( c == '\n' ){ - --yylineno; + if (yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2) + YY_FATAL_ERROR ("flex scanner push-back overflow"); } - (yytext_ptr) = yy_bp; - (yy_hold_char) = *yy_cp; - (yy_c_buf_p) = yy_cp; + *--yy_cp = (char) c; + + if (c == '\n') + { + --yylineno; + } + + (yytext_ptr) = yy_bp; + (yy_hold_char) = *yy_cp; + (yy_c_buf_p) = yy_cp; } #ifndef YY_NO_INPUT #ifdef __cplusplus - static int yyinput (void) +static int +yyinput (void) #else - static int input (void) +static int +input (void) #endif - { - int c; - - *(yy_c_buf_p) = (yy_hold_char); + int c; - if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) - { - /* yy_c_buf_p now points to the character we want to return. - * If this occurs *before* the EOB characters, then it's a - * valid NUL; if not, then we've hit the end of the buffer. - */ - if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) - /* This was really a NUL. */ - *(yy_c_buf_p) = '\0'; + *(yy_c_buf_p) = (yy_hold_char); - else - { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); - ++(yy_c_buf_p); + if (*(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR) + { + /* yy_c_buf_p now points to the character we want to return. + * If this occurs *before* the EOB characters, then it's a + * valid NUL; if not, then we've hit the end of the buffer. + */ + if ((yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]) + /* This was really a NUL. */ + *(yy_c_buf_p) = '\0'; - switch ( yy_get_next_buffer( ) ) - { - case EOB_ACT_LAST_MATCH: - /* This happens because yy_g_n_b() - * sees that we've accumulated a - * token and flags that we need to - * try matching the token before - * proceeding. But for input(), - * there's no matching to consider. - * So convert the EOB_ACT_LAST_MATCH - * to EOB_ACT_END_OF_FILE. - */ + else + { /* need more input */ + int offset = (yy_c_buf_p) - (yytext_ptr); + ++(yy_c_buf_p); - /* Reset buffer status. */ - yyrestart(yyin ); + switch (yy_get_next_buffer ()) + { + case EOB_ACT_LAST_MATCH: + /* This happens because yy_g_n_b() + * sees that we've accumulated a + * token and flags that we need to + * try matching the token before + * proceeding. But for input(), + * there's no matching to consider. + * So convert the EOB_ACT_LAST_MATCH + * to EOB_ACT_END_OF_FILE. + */ - /*FALLTHROUGH*/ + /* Reset buffer status. */ + yyrestart (yyin); - case EOB_ACT_END_OF_FILE: - { - if ( yywrap( ) ) - return EOF; + /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: + { + if (yywrap ()) + return EOF; - if ( ! (yy_did_buffer_switch_on_eof) ) - YY_NEW_FILE; + if (!(yy_did_buffer_switch_on_eof)) + YY_NEW_FILE; #ifdef __cplusplus - return yyinput(); + return yyinput (); #else - return input(); + return input (); #endif - } + } - case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = (yytext_ptr) + offset; - break; - } - } - } + case EOB_ACT_CONTINUE_SCAN: + (yy_c_buf_p) = (yytext_ptr) + offset; + break; + } + } + } - c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ - *(yy_c_buf_p) = '\0'; /* preserve yytext */ - (yy_hold_char) = *++(yy_c_buf_p); + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ + *(yy_c_buf_p) = '\0'; /* preserve yytext */ + (yy_hold_char) = *++(yy_c_buf_p); + + if (c == '\n') - if ( c == '\n' ) - yylineno++; -; + ; - return c; + return c; } -#endif /* ifndef YY_NO_INPUT */ +#endif /* ifndef YY_NO_INPUT */ /** Immediately switch to a different input stream. * @param input_file A readable stream. * * @note This function does not reset the start condition to @c INITIAL . */ - void yyrestart (FILE * input_file ) +void +yyrestart (FILE * input_file) { - - if ( ! YY_CURRENT_BUFFER ){ - yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); - } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); + if (!YY_CURRENT_BUFFER) + { + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = yy_create_buffer (yyin, YY_BUF_SIZE); + } + + yy_init_buffer (YY_CURRENT_BUFFER, input_file); + yy_load_buffer_state (); } /** Switch to a different input buffer. * @param new_buffer The new input buffer. * */ - void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) +void +yy_switch_to_buffer (YY_BUFFER_STATE new_buffer) { - - /* TODO. We should be able to replace this entire function body - * with - * yypop_buffer_state(); - * yypush_buffer_state(new_buffer); - */ - yyensure_buffer_stack (); - if ( YY_CURRENT_BUFFER == new_buffer ) - return; - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } + /* TODO. We should be able to replace this entire function body + * with + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); + */ + yyensure_buffer_stack (); + if (YY_CURRENT_BUFFER == new_buffer) + return; - YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + if (YY_CURRENT_BUFFER) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } - /* We don't actually know whether we did this switch during - * EOF (yywrap()) processing, but the only time this flag - * is looked at is after yywrap() is called, so it's safe - * to go ahead and always set it. - */ - (yy_did_buffer_switch_on_eof) = 1; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + yy_load_buffer_state (); + + /* We don't actually know whether we did this switch during + * EOF (yywrap()) processing, but the only time this flag + * is looked at is after yywrap() is called, so it's safe + * to go ahead and always set it. + */ + (yy_did_buffer_switch_on_eof) = 1; } -static void yy_load_buffer_state (void) +static void +yy_load_buffer_state (void) { - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; - yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; - (yy_hold_char) = *(yy_c_buf_p); + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + (yy_hold_char) = *(yy_c_buf_p); } /** Allocate and initialize an input buffer state. @@ -1567,106 +1556,110 @@ static void yy_load_buffer_state (void) * * @return the allocated buffer state. */ - YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) +YY_BUFFER_STATE +yy_create_buffer (FILE * file, int size) { - YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + YY_BUFFER_STATE b; - b->yy_buf_size = size; + b = (YY_BUFFER_STATE) yyalloc (sizeof (struct yy_buffer_state)); + if (!b) + YY_FATAL_ERROR ("out of dynamic memory in yy_create_buffer()"); - /* 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 ); - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + b->yy_buf_size = size; - b->yy_is_our_buffer = 1; + /* 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); + if (!b->yy_ch_buf) + YY_FATAL_ERROR ("out of dynamic memory in yy_create_buffer()"); - yy_init_buffer(b,file ); + b->yy_is_our_buffer = 1; - return b; + yy_init_buffer (b, file); + + return b; } /** Destroy the buffer. * @param b a buffer created with yy_create_buffer() * */ - void yy_delete_buffer (YY_BUFFER_STATE b ) +void +yy_delete_buffer (YY_BUFFER_STATE b) { - - if ( ! b ) - return; - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; + if (!b) + return; - if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + if (b == YY_CURRENT_BUFFER) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; - yyfree((void *) b ); + if (b->yy_is_our_buffer) + yyfree ((void *) b->yy_ch_buf); + + yyfree ((void *) b); } #ifndef __cplusplus -extern int isatty (int ); +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. */ - static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) - +static void +yy_init_buffer (YY_BUFFER_STATE b, FILE * file) { - int oerrno = errno; - - yy_flush_buffer(b ); + int oerrno = errno; - b->yy_input_file = file; - b->yy_fill_buffer = 1; + yy_flush_buffer (b); - /* If b is the current buffer, then yy_init_buffer was _probably_ - * called from yyrestart() or through yy_get_next_buffer. - * In that case, we don't want to reset the lineno or column. - */ - if (b != YY_CURRENT_BUFFER){ - b->yy_bs_lineno = 1; - b->yy_bs_column = 0; + b->yy_input_file = file; + b->yy_fill_buffer = 1; + + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER) + { + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; } - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - - errno = oerrno; + b->yy_is_interactive = file ? (isatty (fileno (file)) > 0) : 0; + + errno = oerrno; } /** Discard all buffered characters. On the next scan, YY_INPUT will be called. * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. * */ - void yy_flush_buffer (YY_BUFFER_STATE b ) +void +yy_flush_buffer (YY_BUFFER_STATE b) { - if ( ! b ) - return; + if (!b) + return; - b->yy_n_chars = 0; + b->yy_n_chars = 0; - /* We always need two end-of-buffer characters. The first causes - * a transition to the end-of-buffer state. The second causes - * a jam in that state. - */ - b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; + /* We always need two end-of-buffer characters. The first causes + * a transition to the end-of-buffer state. The second causes + * a jam in that state. + */ + b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; + b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - b->yy_buf_pos = &b->yy_ch_buf[0]; + b->yy_buf_pos = &b->yy_ch_buf[0]; - b->yy_at_bol = 1; - b->yy_buffer_status = YY_BUFFER_NEW; + b->yy_at_bol = 1; + b->yy_buffer_status = YY_BUFFER_NEW; - if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + if (b == YY_CURRENT_BUFFER) + yy_load_buffer_state (); } /** Pushes the new state onto the stack. The new state becomes @@ -1675,92 +1668,97 @@ extern int isatty (int ); * @param new_buffer The new state. * */ -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) +void +yypush_buffer_state (YY_BUFFER_STATE new_buffer) { - if (new_buffer == NULL) - return; + if (new_buffer == NULL) + return; - yyensure_buffer_stack(); + yyensure_buffer_stack (); - /* This block is copied from yy_switch_to_buffer. */ - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } + /* This block is copied from yy_switch_to_buffer. */ + if (YY_CURRENT_BUFFER) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } - /* Only push if top exists. Otherwise, replace top. */ - if (YY_CURRENT_BUFFER) - (yy_buffer_stack_top)++; - YY_CURRENT_BUFFER_LVALUE = new_buffer; + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + (yy_buffer_stack_top)++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; - /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state (); + (yy_did_buffer_switch_on_eof) = 1; } /** Removes and deletes the top of the stack, if present. * The next element becomes the new top. * */ -void yypop_buffer_state (void) +void +yypop_buffer_state (void) { - if (!YY_CURRENT_BUFFER) - return; + if (!YY_CURRENT_BUFFER) + return; - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - if ((yy_buffer_stack_top) > 0) - --(yy_buffer_stack_top); + yy_delete_buffer (YY_CURRENT_BUFFER); + YY_CURRENT_BUFFER_LVALUE = NULL; + if ((yy_buffer_stack_top) > 0) + --(yy_buffer_stack_top); - if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; - } + if (YY_CURRENT_BUFFER) + { + yy_load_buffer_state (); + (yy_did_buffer_switch_on_eof) = 1; + } } /* Allocates the stack if it does not exist. * Guarantees space for at least one push. */ -static void yyensure_buffer_stack (void) +static void +yyensure_buffer_stack (void) { - int num_to_alloc; - - if (!(yy_buffer_stack)) { + int num_to_alloc; - /* First allocation is just for 2 elements, since we don't know if this - * 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; - (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - ); - - 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; - } + if (!(yy_buffer_stack)) + { - if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ + /* First allocation is just for 2 elements, since we don't know if this + * 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; + (yy_buffer_stack) = (struct yy_buffer_state **) yyalloc + (num_to_alloc * sizeof (struct yy_buffer_state *)); - /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + memset ((yy_buffer_stack), 0, + num_to_alloc * sizeof (struct yy_buffer_state *)); - num_to_alloc = (yy_buffer_stack_max) + grow_size; - (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc - ((yy_buffer_stack), - num_to_alloc * sizeof(struct yy_buffer_state*) - ); + (yy_buffer_stack_max) = num_to_alloc; + (yy_buffer_stack_top) = 0; + return; + } - /* zero only the new slots.*/ - memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); - (yy_buffer_stack_max) = num_to_alloc; - } + 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 */ ; + + num_to_alloc = (yy_buffer_stack_max) + grow_size; + (yy_buffer_stack) = (struct yy_buffer_state **) yyrealloc + ((yy_buffer_stack), num_to_alloc * sizeof (struct yy_buffer_state *)); + + /* zero only the new slots. */ + memset ((yy_buffer_stack) + (yy_buffer_stack_max), 0, + grow_size * sizeof (struct yy_buffer_state *)); + (yy_buffer_stack_max) = num_to_alloc; + } } /** Setup the input buffer state to scan directly from a user-specified character buffer. @@ -1769,33 +1767,34 @@ static void yyensure_buffer_stack (void) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) +YY_BUFFER_STATE +yy_scan_buffer (char *base, yy_size_t size) { - YY_BUFFER_STATE b; - - if ( size < 2 || - 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; + YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); + if (size < 2 || + 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; - 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_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; + b = (YY_BUFFER_STATE) yyalloc (sizeof (struct yy_buffer_state)); + if (!b) + YY_FATAL_ERROR ("out of dynamic memory in yy_scan_buffer()"); - yy_switch_to_buffer(b ); + 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_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; - return b; + yy_switch_to_buffer (b); + + return b; } /** Setup the input buffer state to scan a string. The next call to yylex() will @@ -1806,10 +1805,11 @@ 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 * yy_str ) +YY_BUFFER_STATE +yy_scan_string (yyconst char *yy_str) { - - return yy_scan_bytes(yy_str,strlen(yy_str) ); + + return yy_scan_bytes (yy_str, strlen (yy_str)); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will @@ -1819,44 +1819,46 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * bytes, int len ) +YY_BUFFER_STATE +yy_scan_bytes (yyconst char *bytes, int len) { - YY_BUFFER_STATE b; - char *buf; - yy_size_t n; - int i; - - /* Get memory for full buffer, including space for trailing EOB's. */ - n = len + 2; - buf = (char *) yyalloc(n ); - if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); + YY_BUFFER_STATE b; + char *buf; + yy_size_t n; + int i; - for ( i = 0; i < len; ++i ) - buf[i] = bytes[i]; + /* Get memory for full buffer, including space for trailing EOB's. */ + n = len + 2; + buf = (char *) yyalloc (n); + if (!buf) + YY_FATAL_ERROR ("out of dynamic memory in yy_scan_bytes()"); - buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; + for (i = 0; i < len; ++i) + buf[i] = bytes[i]; - b = yy_scan_buffer(buf,n ); - if ( ! b ) - YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); + buf[len] = buf[len + 1] = YY_END_OF_BUFFER_CHAR; - /* It's okay to grow etc. this buffer, and we should throw it - * away when we're done. - */ - b->yy_is_our_buffer = 1; + b = yy_scan_buffer (buf, n); + if (!b) + YY_FATAL_ERROR ("bad buffer in yy_scan_bytes()"); - return b; + /* It's okay to grow etc. this buffer, and we should throw it + * away when we're done. + */ + b->yy_is_our_buffer = 1; + + return b; } #ifndef YY_EXIT_FAILURE #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void +yy_fatal_error (yyconst char *msg) { - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); + (void) fprintf (stderr, "%s\n", msg); + exit (YY_EXIT_FAILURE); } /* Redefine yyless() so it works in section 3 code. */ @@ -1881,53 +1883,59 @@ static void yy_fatal_error (yyconst char* msg ) /** Get the current line number. * */ -int yyget_lineno (void) +int +yyget_lineno (void) { - - return yylineno; + + return yylineno; } /** Get the input stream. * */ -FILE *yyget_in (void) +FILE * +yyget_in (void) { - return yyin; + return yyin; } /** Get the output stream. * */ -FILE *yyget_out (void) +FILE * +yyget_out (void) { - return yyout; + return yyout; } /** Get the length of the current token. * */ -int yyget_leng (void) +int +yyget_leng (void) { - return yyleng; + return yyleng; } /** Get the current token. * */ -char *yyget_text (void) +char * +yyget_text (void) { - return yytext; + return yytext; } /** Set the current line number. * @param 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 @@ -1936,42 +1944,48 @@ void yyset_lineno (int line_number ) * * @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) +int +yyget_debug (void) { - return yy_flex_debug; + return yy_flex_debug; } -void yyset_debug (int bdebug ) +void +yyset_debug (int bdebug) { - yy_flex_debug = bdebug ; + yy_flex_debug = bdebug; } /* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (void) +int +yylex_destroy (void) { - - /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - yypop_buffer_state(); - } - /* Destroy the stack itself. */ - yyfree((yy_buffer_stack) ); - (yy_buffer_stack) = NULL; + /* Pop the buffer stack, destroying each element. */ + while (YY_CURRENT_BUFFER) + { + yy_delete_buffer (YY_CURRENT_BUFFER); + YY_CURRENT_BUFFER_LVALUE = NULL; + yypop_buffer_state (); + } - return 0; + /* Destroy the stack itself. */ + yyfree ((yy_buffer_stack)); + (yy_buffer_stack) = NULL; + + return 0; } /* @@ -1979,45 +1993,50 @@ 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, yyconst char *s2, int n) { - register int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; + register 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 (yyconst char *s) { - register int n; - for ( n = 0; s[n]; ++n ) - ; + register int n; + for (n = 0; s[n]; ++n) + ; - return n; + return n; } #endif -void *yyalloc (yy_size_t size ) +void * +yyalloc (yy_size_t size) { - return (void *) malloc( size ); + return (void *) malloc (size); } -void *yyrealloc (void * ptr, yy_size_t 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 - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return (void *) realloc( (char *) ptr, 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 + * because both ANSI C and C++ allow castless assignment from + * any pointer type to void*, and deal with argument conversions + * as though doing an assignment. + */ + return (void *) realloc ((char *) ptr, size); } -void yyfree (void * ptr ) +void +yyfree (void *ptr) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free ((char *) ptr); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" @@ -2034,58 +2053,62 @@ void yyfree (void * ptr ) #undef YY_DECL_IS_OURS #undef YY_DECL #endif -#line 164 "scanner.l" +#line 165 "scanner.l" -Symbol mkstring(char *name) +Symbol +mkstring (char *name) { - Symbol t; - char* s; - Stringlist sl; - int len; + Symbol t; + char *s; + Stringlist sl; + int len; - if (( t = lookup(name)) != NULL) - { - return t; - } - // make new name - len = strlen(name); - s = (char *)malloc(len+1); - sl = (Stringlist) malloc(sizeof(struct stringlist)); - strncpy(s,name,len); - sl->next = allocatedStrings; - allocatedStrings = sl; - sl->string = s; - s[len] = EOS; + if ((t = lookup (name)) != NULL) + { + return t; + } + // make new name + len = strlen (name); + s = (char *) malloc (len + 1); + sl = (Stringlist) malloc (sizeof (struct stringlist)); + strncpy (s, name, len); + sl->next = allocatedStrings; + allocatedStrings = sl; + sl->string = s; + s[len] = EOS; - t = get_symb(); - t->lineno = yylineno; - t->type = T_UNDEF; - t->text = s; + t = get_symb (); + t->lineno = yylineno; + t->type = T_UNDEF; + t->text = s; - insert(t); - return t; + insert (t); + return t; } -void scanner_cleanup(void) +void +scanner_cleanup (void) { - yy_delete_buffer (YY_CURRENT_BUFFER); + yy_delete_buffer (YY_CURRENT_BUFFER); } -void strings_cleanup(void) +void +strings_cleanup (void) { - Stringlist sl; - while (allocatedStrings != NULL) - { - sl = allocatedStrings; - allocatedStrings = sl->next; - free(sl->string); - free(sl); - } + Stringlist sl; + while (allocatedStrings != NULL) + { + sl = allocatedStrings; + allocatedStrings = sl->next; + free (sl->string); + free (sl); + } } -int yywrap (void) +int +yywrap (void) { /* signal true to let lex know that nothing else is coming */ return 1; @@ -2099,4 +2122,3 @@ void mktext(void); // vim:ft=lex: - diff --git a/src/scanner.l b/src/scanner.l index 56c7fc6..2abf520 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -7,6 +7,7 @@ #include "pheading.h" #include "tac.h" #include "switches.h" +#include "error.h" /* tokens for language */ #include "parser.h" @@ -63,7 +64,7 @@ include BEGIN(incl); [^\"]+ { /* got the include file name */ if ( include_stack_ptr >= MAX_INCLUDE_DEPTH ) { - fprintf( stderr, "Includes nested too deeply" ); + printfstderr( "Includes nested too deeply" ); exit( 1 ); } diff --git a/src/switches.c b/src/switches.c index 48dac09..14b86f9 100644 --- a/src/switches.c +++ b/src/switches.c @@ -1231,8 +1231,8 @@ switcher (const int process, int index, int commandline) /* try to open */ if (!freopen (arg_pointer, "w", stdout)) { - fprintf (stderr, "Could not create output file '%s'.\n", - arg_pointer); + printfstderr ("Could not create output file '%s'.\n", + arg_pointer); exit (1); } arg_next (); @@ -1259,12 +1259,12 @@ switcher (const int process, int index, int commandline) // The file was not found. We have two options... if (this_arg[0] == '-') { - fprintf (stderr, "Unknown switch '%s'.\n", this_arg); + printfstderr ("Unknown switch '%s'.\n", this_arg); } else { - fprintf (stderr, "Could not open input file '%s'.\n", - this_arg); + printfstderr ("Could not open input file '%s'.\n", + this_arg); } exit (1); } diff --git a/src/symbol.c b/src/symbol.c index 4c9af85..58da78d 100644 --- a/src/symbol.c +++ b/src/symbol.c @@ -318,7 +318,12 @@ getOutputStream (void) if (globalError == 0) return (FILE *) globalStream; else +#ifdef linux return stderr; +#else + // For non-linux, we simply omit it + return NULL; +#endif } //! Print out according to globalError @@ -336,9 +341,14 @@ void eprintf (char *fmt, ...) { va_list args; + FILE *stream; va_start (args, fmt); - vfprintf (getOutputStream (), fmt, args); + stream = getOutputStream (); + if (stream != NULL) + { + vfprintf (stream, fmt, args); + } va_end (args); } @@ -346,5 +356,11 @@ eprintf (char *fmt, ...) void veprintf (const char *fmt, va_list args) { - vfprintf (getOutputStream (), fmt, args); + FILE *stream; + + stream = getOutputStream (); + if (stream != NULL) + { + vfprintf (stream, fmt, args); + } }