diff options
author | uqs <uqs@FreeBSD.org> | 2010-11-09 18:28:11 +0000 |
---|---|---|
committer | uqs <uqs@FreeBSD.org> | 2010-11-09 18:28:11 +0000 |
commit | e89c44deb646ed516b5dc67d99a4dd013cb405a5 (patch) | |
tree | bd5e7d24301e536f1bbb2242bde1526496307d57 | |
parent | daddd7a01b6a943ac2f68062bba955ba36e41d3b (diff) | |
download | FreeBSD-src-e89c44deb646ed516b5dc67d99a4dd013cb405a5.zip FreeBSD-src-e89c44deb646ed516b5dc67d99a4dd013cb405a5.tar.gz |
Unbreak the test target by re-generating the initial scanner
using an updated flex(1) binary.
Also ignore the changing $FreeBSD$ ID lines when doing the diff.
This needs additional obfuscation, to not upset the svn precommit
hooks :/
-rw-r--r-- | usr.bin/lex/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/lex/initscan.c | 388 |
2 files changed, 207 insertions, 183 deletions
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile index e16568f..947eba1 100644 --- a/usr.bin/lex/Makefile +++ b/usr.bin/lex/Makefile @@ -44,7 +44,7 @@ test: check check: $(PROG) ./$(PROG) $(LFLAGS) -t $(COMPRESSION) $(.CURDIR)/scan.l \ | sed s,\"$(.CURDIR)/scan.l",\"scan.l", \ - | diff $(.CURDIR)/initscan.c - + | diff -I '\$$FreeBS[D]:.*\$$' $(.CURDIR)/initscan.c - @echo "Check successful" .include <bsd.prog.mk> diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c index 59c81f7..7620c52 100644 --- a/usr.bin/lex/initscan.c +++ b/usr.bin/lex/initscan.c @@ -3,9 +3,15 @@ /* Scanner skeleton version: * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ + * $FreeBSD$ */ + +#if defined(__FreeBSD__) #include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); +#else +#define __unused +#define __dead2 +#endif #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 @@ -243,7 +249,7 @@ YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); static void *yy_flex_alloc YY_PROTO(( yy_size_t )); -static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); +static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) __unused; static void yy_flex_free YY_PROTO(( void * )); #define yy_new_buffer yy_create_buffer @@ -273,7 +279,7 @@ extern char *yytext; static yy_state_type yy_get_previous_state YY_PROTO(( void )); static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); static int yy_get_next_buffer YY_PROTO(( void )); -static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); +static void yy_fatal_error YY_PROTO(( yyconst char msg[] )) __dead2; /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. @@ -1273,11 +1279,7 @@ char *yytext; */ /* $Header: /home/daffy/u0/vern/flex/RCS/scan.l,v 2.56 95/04/24 12:17:19 vern Exp $ */ - -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +/* $FreeBSD$ */ #include "flexdef.h" #include "parse.h" @@ -1336,7 +1338,7 @@ static const char rcsid[] = #define OPTION 17 #define LINEDIR 18 -#line 1333 "scan.c" +#line 1342 "scan.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1490,7 +1492,7 @@ YY_DECL char *yy_cp, *yy_bp; int yy_act; -#line 94 "scan.l" +#line 95 "scan.l" static int bracelevel, didadef, indented_code; static int doing_rule_action = false; @@ -1501,7 +1503,7 @@ YY_DECL Char nmdef[MAXLINE], myesc(); -#line 1498 "scan.c" +#line 1507 "scan.c" if ( yy_init ) { @@ -1588,32 +1590,32 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 105 "scan.l" +#line 106 "scan.l" indented_code = true; BEGIN(CODEBLOCK); YY_BREAK case 2: YY_RULE_SETUP -#line 106 "scan.l" +#line 107 "scan.l" ACTION_ECHO; yy_push_state( COMMENT ); YY_BREAK case 3: YY_RULE_SETUP -#line 107 "scan.l" +#line 108 "scan.l" yy_push_state( LINEDIR ); YY_BREAK case 4: YY_RULE_SETUP -#line 108 "scan.l" +#line 109 "scan.l" return SCDECL; YY_BREAK case 5: YY_RULE_SETUP -#line 109 "scan.l" +#line 110 "scan.l" return XSCDECL; YY_BREAK case 6: YY_RULE_SETUP -#line 110 "scan.l" +#line 111 "scan.l" { ++linenum; line_directive_out( (FILE *) 0, 1 ); @@ -1623,12 +1625,12 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 117 "scan.l" +#line 118 "scan.l" /* discard */ YY_BREAK case 8: YY_RULE_SETUP -#line 119 "scan.l" +#line 120 "scan.l" { sectnum = 2; bracelevel = 0; @@ -1640,37 +1642,37 @@ YY_RULE_SETUP YY_BREAK case 9: YY_RULE_SETUP -#line 128 "scan.l" +#line 129 "scan.l" yytext_is_array = false; ++linenum; YY_BREAK case 10: YY_RULE_SETUP -#line 129 "scan.l" +#line 130 "scan.l" yytext_is_array = true; ++linenum; YY_BREAK case 11: YY_RULE_SETUP -#line 131 "scan.l" +#line 132 "scan.l" BEGIN(OPTION); return OPTION_OP; YY_BREAK case 12: YY_RULE_SETUP -#line 133 "scan.l" +#line 134 "scan.l" ++linenum; /* ignore */ YY_BREAK case 13: YY_RULE_SETUP -#line 134 "scan.l" +#line 135 "scan.l" ++linenum; /* ignore */ YY_BREAK case 14: YY_RULE_SETUP -#line 136 "scan.l" +#line 137 "scan.l" synerr( _( "unrecognized '%' directive" ) ); YY_BREAK case 15: YY_RULE_SETUP -#line 138 "scan.l" +#line 139 "scan.l" { strcpy( nmstr, yytext ); didadef = false; @@ -1679,56 +1681,56 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 144 "scan.l" +#line 145 "scan.l" RETURNNAME; YY_BREAK case 17: YY_RULE_SETUP -#line 145 "scan.l" +#line 146 "scan.l" ++linenum; /* allows blank lines in section 1 */ YY_BREAK case 18: YY_RULE_SETUP -#line 146 "scan.l" +#line 147 "scan.l" ACTION_ECHO; ++linenum; /* maybe end of comment line */ YY_BREAK case 19: YY_RULE_SETUP -#line 151 "scan.l" +#line 152 "scan.l" ACTION_ECHO; yy_pop_state(); YY_BREAK case 20: YY_RULE_SETUP -#line 152 "scan.l" +#line 153 "scan.l" ACTION_ECHO; YY_BREAK case 21: YY_RULE_SETUP -#line 153 "scan.l" +#line 154 "scan.l" ACTION_ECHO; YY_BREAK case 22: YY_RULE_SETUP -#line 154 "scan.l" +#line 155 "scan.l" ++linenum; ACTION_ECHO; YY_BREAK case 23: YY_RULE_SETUP -#line 158 "scan.l" +#line 159 "scan.l" yy_pop_state(); YY_BREAK case 24: YY_RULE_SETUP -#line 159 "scan.l" +#line 160 "scan.l" linenum = myctoi( yytext ); YY_BREAK case 25: YY_RULE_SETUP -#line 161 "scan.l" +#line 162 "scan.l" { flex_free( (void *) infilename ); infilename = copy_string( yytext + 1 ); @@ -1737,24 +1739,24 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 166 "scan.l" +#line 167 "scan.l" /* ignore spurious characters */ YY_BREAK case 27: YY_RULE_SETUP -#line 170 "scan.l" +#line 171 "scan.l" ++linenum; BEGIN(INITIAL); YY_BREAK case 28: YY_RULE_SETUP -#line 172 "scan.l" +#line 173 "scan.l" ACTION_ECHO; YY_BREAK case 29: YY_RULE_SETUP -#line 174 "scan.l" +#line 175 "scan.l" { ++linenum; ACTION_ECHO; @@ -1766,12 +1768,12 @@ YY_RULE_SETUP case 30: YY_RULE_SETUP -#line 184 "scan.l" +#line 185 "scan.l" /* separates name and definition */ YY_BREAK case 31: YY_RULE_SETUP -#line 186 "scan.l" +#line 187 "scan.l" { strcpy( (char *) nmdef, yytext ); @@ -1789,7 +1791,7 @@ YY_RULE_SETUP YY_BREAK case 32: YY_RULE_SETUP -#line 201 "scan.l" +#line 202 "scan.l" { if ( ! didadef ) synerr( _( "incomplete name definition" ) ); @@ -1801,94 +1803,94 @@ YY_RULE_SETUP case 33: YY_RULE_SETUP -#line 211 "scan.l" +#line 212 "scan.l" ++linenum; BEGIN(INITIAL); YY_BREAK case 34: YY_RULE_SETUP -#line 212 "scan.l" +#line 213 "scan.l" option_sense = true; YY_BREAK case 35: YY_RULE_SETUP -#line 214 "scan.l" +#line 215 "scan.l" return '='; YY_BREAK case 36: YY_RULE_SETUP -#line 216 "scan.l" +#line 217 "scan.l" option_sense = ! option_sense; YY_BREAK case 37: YY_RULE_SETUP -#line 218 "scan.l" +#line 219 "scan.l" csize = option_sense ? 128 : 256; YY_BREAK case 38: YY_RULE_SETUP -#line 219 "scan.l" +#line 220 "scan.l" csize = option_sense ? 256 : 128; YY_BREAK case 39: YY_RULE_SETUP -#line 221 "scan.l" +#line 222 "scan.l" long_align = option_sense; YY_BREAK case 40: YY_RULE_SETUP -#line 222 "scan.l" +#line 223 "scan.l" { action_define( "YY_ALWAYS_INTERACTIVE", option_sense ); } YY_BREAK case 41: YY_RULE_SETUP -#line 225 "scan.l" +#line 226 "scan.l" yytext_is_array = option_sense; YY_BREAK case 42: YY_RULE_SETUP -#line 226 "scan.l" +#line 227 "scan.l" backing_up_report = option_sense; YY_BREAK case 43: YY_RULE_SETUP -#line 227 "scan.l" +#line 228 "scan.l" interactive = ! option_sense; YY_BREAK case 44: YY_RULE_SETUP -#line 228 "scan.l" +#line 229 "scan.l" C_plus_plus = option_sense; YY_BREAK case 45: YY_RULE_SETUP -#line 229 "scan.l" +#line 230 "scan.l" caseins = ! option_sense; YY_BREAK case 46: YY_RULE_SETUP -#line 230 "scan.l" +#line 231 "scan.l" caseins = option_sense; YY_BREAK case 47: YY_RULE_SETUP -#line 231 "scan.l" +#line 232 "scan.l" ddebug = option_sense; YY_BREAK case 48: YY_RULE_SETUP -#line 232 "scan.l" +#line 233 "scan.l" spprdflt = ! option_sense; YY_BREAK case 49: YY_RULE_SETUP -#line 233 "scan.l" +#line 234 "scan.l" useecs = option_sense; YY_BREAK case 50: YY_RULE_SETUP -#line 234 "scan.l" +#line 235 "scan.l" { useecs = usemecs = false; use_read = fullspd = true; @@ -1896,7 +1898,7 @@ YY_RULE_SETUP YY_BREAK case 51: YY_RULE_SETUP -#line 238 "scan.l" +#line 239 "scan.l" { useecs = usemecs = false; use_read = fulltbl = true; @@ -1904,22 +1906,22 @@ YY_RULE_SETUP YY_BREAK case 52: YY_RULE_SETUP -#line 242 "scan.l" +#line 243 "scan.l" ACTION_IFDEF("YY_NO_INPUT", ! option_sense); YY_BREAK case 53: YY_RULE_SETUP -#line 243 "scan.l" +#line 244 "scan.l" interactive = option_sense; YY_BREAK case 54: YY_RULE_SETUP -#line 244 "scan.l" +#line 245 "scan.l" lex_compat = option_sense; YY_BREAK case 55: YY_RULE_SETUP -#line 245 "scan.l" +#line 246 "scan.l" { action_define( "YY_MAIN", option_sense ); do_yywrap = ! option_sense; @@ -1927,129 +1929,129 @@ YY_RULE_SETUP YY_BREAK case 56: YY_RULE_SETUP -#line 249 "scan.l" +#line 250 "scan.l" usemecs = option_sense; YY_BREAK case 57: YY_RULE_SETUP -#line 250 "scan.l" +#line 251 "scan.l" { action_define( "YY_NEVER_INTERACTIVE", option_sense ); } YY_BREAK case 58: YY_RULE_SETUP -#line 253 "scan.l" +#line 254 "scan.l" performance_report += option_sense ? 1 : -1; YY_BREAK case 59: YY_RULE_SETUP -#line 254 "scan.l" +#line 255 "scan.l" yytext_is_array = ! option_sense; YY_BREAK case 60: YY_RULE_SETUP -#line 255 "scan.l" +#line 256 "scan.l" use_read = option_sense; YY_BREAK case 61: YY_RULE_SETUP -#line 256 "scan.l" +#line 257 "scan.l" reject_really_used = option_sense; YY_BREAK case 62: YY_RULE_SETUP -#line 257 "scan.l" +#line 258 "scan.l" action_define( "YY_STACK_USED", option_sense ); YY_BREAK case 63: YY_RULE_SETUP -#line 258 "scan.l" +#line 259 "scan.l" do_stdinit = option_sense; YY_BREAK case 64: YY_RULE_SETUP -#line 259 "scan.l" +#line 260 "scan.l" use_stdout = option_sense; YY_BREAK case 65: YY_RULE_SETUP -#line 260 "scan.l" +#line 261 "scan.l" ACTION_IFDEF("YY_NO_UNPUT", ! option_sense); YY_BREAK case 66: YY_RULE_SETUP -#line 261 "scan.l" +#line 262 "scan.l" printstats = option_sense; YY_BREAK case 67: YY_RULE_SETUP -#line 262 "scan.l" +#line 263 "scan.l" nowarn = ! option_sense; YY_BREAK case 68: YY_RULE_SETUP -#line 263 "scan.l" +#line 264 "scan.l" do_yylineno = option_sense; YY_BREAK case 69: YY_RULE_SETUP -#line 264 "scan.l" +#line 265 "scan.l" yymore_really_used = option_sense; YY_BREAK case 70: YY_RULE_SETUP -#line 265 "scan.l" +#line 266 "scan.l" do_yywrap = option_sense; YY_BREAK case 71: YY_RULE_SETUP -#line 267 "scan.l" +#line 268 "scan.l" ACTION_IFDEF("YY_NO_PUSH_STATE", ! option_sense); YY_BREAK case 72: YY_RULE_SETUP -#line 268 "scan.l" +#line 269 "scan.l" ACTION_IFDEF("YY_NO_POP_STATE", ! option_sense); YY_BREAK case 73: YY_RULE_SETUP -#line 269 "scan.l" +#line 270 "scan.l" ACTION_IFDEF("YY_NO_TOP_STATE", ! option_sense); YY_BREAK case 74: YY_RULE_SETUP -#line 271 "scan.l" +#line 272 "scan.l" ACTION_IFDEF("YY_NO_SCAN_BUFFER", ! option_sense); YY_BREAK case 75: YY_RULE_SETUP -#line 272 "scan.l" +#line 273 "scan.l" ACTION_IFDEF("YY_NO_SCAN_BYTES", ! option_sense); YY_BREAK case 76: YY_RULE_SETUP -#line 273 "scan.l" +#line 274 "scan.l" ACTION_IFDEF("YY_NO_SCAN_STRING", ! option_sense); YY_BREAK case 77: YY_RULE_SETUP -#line 275 "scan.l" +#line 276 "scan.l" return OPT_OUTFILE; YY_BREAK case 78: YY_RULE_SETUP -#line 276 "scan.l" +#line 277 "scan.l" return OPT_PREFIX; YY_BREAK case 79: YY_RULE_SETUP -#line 277 "scan.l" +#line 278 "scan.l" return OPT_YYCLASS; YY_BREAK case 80: YY_RULE_SETUP -#line 279 "scan.l" +#line 280 "scan.l" { strcpy( nmstr, yytext + 1 ); nmstr[strlen( nmstr ) - 1] = '\0'; @@ -2058,7 +2060,7 @@ YY_RULE_SETUP YY_BREAK case 81: YY_RULE_SETUP -#line 285 "scan.l" +#line 286 "scan.l" { format_synerr( _( "unrecognized %%option: %s" ), yytext ); @@ -2068,28 +2070,28 @@ YY_RULE_SETUP case 82: YY_RULE_SETUP -#line 292 "scan.l" +#line 293 "scan.l" ++linenum; BEGIN(INITIAL); YY_BREAK case 83: YY_RULE_SETUP -#line 296 "scan.l" +#line 297 "scan.l" ++bracelevel; yyless( 2 ); /* eat only %{ */ YY_BREAK case 84: YY_RULE_SETUP -#line 297 "scan.l" +#line 298 "scan.l" --bracelevel; yyless( 2 ); /* eat only %} */ YY_BREAK case 85: YY_RULE_SETUP -#line 299 "scan.l" +#line 300 "scan.l" ACTION_ECHO; /* indented code in prolog */ YY_BREAK case 86: YY_RULE_SETUP -#line 301 "scan.l" +#line 302 "scan.l" { /* non-indented code */ if ( bracelevel <= 0 ) { /* not in %{ ... %} */ @@ -2104,16 +2106,16 @@ YY_RULE_SETUP YY_BREAK case 87: YY_RULE_SETUP -#line 313 "scan.l" +#line 314 "scan.l" ACTION_ECHO; YY_BREAK case 88: YY_RULE_SETUP -#line 314 "scan.l" +#line 315 "scan.l" ++linenum; ACTION_ECHO; YY_BREAK case YY_STATE_EOF(SECT2PROLOG): -#line 316 "scan.l" +#line 317 "scan.l" { mark_prolog(); sectnum = 0; @@ -2124,12 +2126,12 @@ case YY_STATE_EOF(SECT2PROLOG): case 89: YY_RULE_SETUP -#line 324 "scan.l" +#line 325 "scan.l" ++linenum; /* allow blank lines in section 2 */ YY_BREAK case 90: YY_RULE_SETUP -#line 326 "scan.l" +#line 327 "scan.l" { indented_code = false; doing_codeblock = true; @@ -2139,17 +2141,17 @@ YY_RULE_SETUP YY_BREAK case 91: YY_RULE_SETUP -#line 333 "scan.l" +#line 334 "scan.l" BEGIN(SC); return '<'; YY_BREAK case 92: YY_RULE_SETUP -#line 334 "scan.l" +#line 335 "scan.l" return '^'; YY_BREAK case 93: YY_RULE_SETUP -#line 335 "scan.l" +#line 336 "scan.l" BEGIN(QUOTE); return '"'; YY_BREAK case 94: @@ -2157,7 +2159,7 @@ case 94: yy_c_buf_p = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 336 "scan.l" +#line 337 "scan.l" BEGIN(NUM); return '{'; YY_BREAK case 95: @@ -2165,12 +2167,12 @@ case 95: yy_c_buf_p = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 337 "scan.l" +#line 338 "scan.l" return '$'; YY_BREAK case 96: YY_RULE_SETUP -#line 339 "scan.l" +#line 340 "scan.l" { bracelevel = 1; BEGIN(PERCENT_BRACE_ACTION); @@ -2185,12 +2187,12 @@ YY_RULE_SETUP YY_BREAK case 97: YY_RULE_SETUP -#line 350 "scan.l" +#line 351 "scan.l" continued_action = true; ++linenum; return '\n'; YY_BREAK case 98: YY_RULE_SETUP -#line 352 "scan.l" +#line 353 "scan.l" { yyless( yyleng - 2 ); /* put back '/', '*' */ bracelevel = 0; @@ -2200,12 +2202,12 @@ YY_RULE_SETUP YY_BREAK case 99: YY_RULE_SETUP -#line 359 "scan.l" +#line 360 "scan.l" /* allow indented rules */ YY_BREAK case 100: YY_RULE_SETUP -#line 361 "scan.l" +#line 362 "scan.l" { /* This rule is separate from the one below because * otherwise we get variable trailing context, so @@ -2225,7 +2227,7 @@ YY_RULE_SETUP YY_BREAK case 101: YY_RULE_SETUP -#line 378 "scan.l" +#line 379 "scan.l" { bracelevel = 0; continued_action = false; @@ -2241,15 +2243,15 @@ YY_RULE_SETUP } YY_BREAK case 102: -#line 393 "scan.l" +#line 394 "scan.l" case 103: YY_RULE_SETUP -#line 393 "scan.l" +#line 394 "scan.l" return EOF_OP; YY_BREAK case 104: YY_RULE_SETUP -#line 395 "scan.l" +#line 396 "scan.l" { sectnum = 3; BEGIN(SECT3); @@ -2258,7 +2260,7 @@ YY_RULE_SETUP YY_BREAK case 105: YY_RULE_SETUP -#line 401 "scan.l" +#line 402 "scan.l" { int cclval; @@ -2295,7 +2297,7 @@ YY_RULE_SETUP YY_BREAK case 106: YY_RULE_SETUP -#line 435 "scan.l" +#line 436 "scan.l" { Char *nmdefptr; Char *ndlookup(); @@ -2332,24 +2334,24 @@ YY_RULE_SETUP YY_BREAK case 107: YY_RULE_SETUP -#line 469 "scan.l" +#line 470 "scan.l" return (unsigned char) yytext[0]; YY_BREAK case 108: YY_RULE_SETUP -#line 470 "scan.l" +#line 471 "scan.l" RETURNCHAR; YY_BREAK case 109: YY_RULE_SETUP -#line 475 "scan.l" +#line 476 "scan.l" return (unsigned char) yytext[0]; YY_BREAK case 110: YY_RULE_SETUP -#line 476 "scan.l" +#line 477 "scan.l" BEGIN(SECT2); return '>'; YY_BREAK case 111: @@ -2357,17 +2359,17 @@ case 111: yy_c_buf_p = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 477 "scan.l" +#line 478 "scan.l" BEGIN(CARETISBOL); return '>'; YY_BREAK case 112: YY_RULE_SETUP -#line 478 "scan.l" +#line 479 "scan.l" RETURNNAME; YY_BREAK case 113: YY_RULE_SETUP -#line 479 "scan.l" +#line 480 "scan.l" { format_synerr( _( "bad <start condition>: %s" ), yytext ); @@ -2376,23 +2378,23 @@ YY_RULE_SETUP case 114: YY_RULE_SETUP -#line 485 "scan.l" +#line 486 "scan.l" BEGIN(SECT2); return '^'; YY_BREAK case 115: YY_RULE_SETUP -#line 489 "scan.l" +#line 490 "scan.l" RETURNCHAR; YY_BREAK case 116: YY_RULE_SETUP -#line 490 "scan.l" +#line 491 "scan.l" BEGIN(SECT2); return '"'; YY_BREAK case 117: YY_RULE_SETUP -#line 492 "scan.l" +#line 493 "scan.l" { synerr( _( "missing quote" ) ); BEGIN(SECT2); @@ -2407,7 +2409,7 @@ case 118: yy_c_buf_p = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 502 "scan.l" +#line 503 "scan.l" BEGIN(CCL); return '^'; YY_BREAK case 119: @@ -2415,12 +2417,12 @@ case 119: yy_c_buf_p = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 503 "scan.l" +#line 504 "scan.l" return '^'; YY_BREAK case 120: YY_RULE_SETUP -#line 504 "scan.l" +#line 505 "scan.l" BEGIN(CCL); RETURNCHAR; YY_BREAK @@ -2430,22 +2432,22 @@ case 121: yy_c_buf_p = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 508 "scan.l" +#line 509 "scan.l" return '-'; YY_BREAK case 122: YY_RULE_SETUP -#line 509 "scan.l" +#line 510 "scan.l" RETURNCHAR; YY_BREAK case 123: YY_RULE_SETUP -#line 510 "scan.l" +#line 511 "scan.l" BEGIN(SECT2); return ']'; YY_BREAK case 124: YY_RULE_SETUP -#line 511 "scan.l" +#line 512 "scan.l" { synerr( _( "bad character class" ) ); BEGIN(SECT2); @@ -2456,67 +2458,67 @@ YY_RULE_SETUP case 125: YY_RULE_SETUP -#line 519 "scan.l" +#line 520 "scan.l" BEGIN(CCL); return CCE_ALNUM; YY_BREAK case 126: YY_RULE_SETUP -#line 520 "scan.l" +#line 521 "scan.l" BEGIN(CCL); return CCE_ALPHA; YY_BREAK case 127: YY_RULE_SETUP -#line 521 "scan.l" +#line 522 "scan.l" BEGIN(CCL); return CCE_BLANK; YY_BREAK case 128: YY_RULE_SETUP -#line 522 "scan.l" +#line 523 "scan.l" BEGIN(CCL); return CCE_CNTRL; YY_BREAK case 129: YY_RULE_SETUP -#line 523 "scan.l" +#line 524 "scan.l" BEGIN(CCL); return CCE_DIGIT; YY_BREAK case 130: YY_RULE_SETUP -#line 524 "scan.l" +#line 525 "scan.l" BEGIN(CCL); return CCE_GRAPH; YY_BREAK case 131: YY_RULE_SETUP -#line 525 "scan.l" +#line 526 "scan.l" BEGIN(CCL); return CCE_LOWER; YY_BREAK case 132: YY_RULE_SETUP -#line 526 "scan.l" +#line 527 "scan.l" BEGIN(CCL); return CCE_PRINT; YY_BREAK case 133: YY_RULE_SETUP -#line 527 "scan.l" +#line 528 "scan.l" BEGIN(CCL); return CCE_PUNCT; YY_BREAK case 134: YY_RULE_SETUP -#line 528 "scan.l" +#line 529 "scan.l" BEGIN(CCL); return CCE_SPACE; YY_BREAK case 135: YY_RULE_SETUP -#line 529 "scan.l" +#line 530 "scan.l" BEGIN(CCL); return CCE_UPPER; YY_BREAK case 136: YY_RULE_SETUP -#line 530 "scan.l" +#line 531 "scan.l" BEGIN(CCL); return CCE_XDIGIT; YY_BREAK case 137: YY_RULE_SETUP -#line 531 "scan.l" +#line 532 "scan.l" { format_synerr( _( "bad character class expression: %s" ), @@ -2528,7 +2530,7 @@ YY_RULE_SETUP case 138: YY_RULE_SETUP -#line 540 "scan.l" +#line 541 "scan.l" { yylval = myctoi( yytext ); return NUMBER; @@ -2536,17 +2538,17 @@ YY_RULE_SETUP YY_BREAK case 139: YY_RULE_SETUP -#line 545 "scan.l" +#line 546 "scan.l" return ','; YY_BREAK case 140: YY_RULE_SETUP -#line 546 "scan.l" +#line 547 "scan.l" BEGIN(SECT2); return '}'; YY_BREAK case 141: YY_RULE_SETUP -#line 548 "scan.l" +#line 549 "scan.l" { synerr( _( "bad character inside {}'s" ) ); BEGIN(SECT2); @@ -2555,7 +2557,7 @@ YY_RULE_SETUP YY_BREAK case 142: YY_RULE_SETUP -#line 554 "scan.l" +#line 555 "scan.l" { synerr( _( "missing }" ) ); BEGIN(SECT2); @@ -2567,18 +2569,18 @@ YY_RULE_SETUP case 143: YY_RULE_SETUP -#line 564 "scan.l" +#line 565 "scan.l" bracelevel = 0; YY_BREAK case 144: YY_RULE_SETUP -#line 566 "scan.l" +#line 567 "scan.l" ACTION_ECHO; yy_push_state( COMMENT ); YY_BREAK case 145: YY_RULE_SETUP -#line 569 "scan.l" +#line 570 "scan.l" { ACTION_ECHO; CHECK_REJECT(yytext); @@ -2586,7 +2588,7 @@ YY_RULE_SETUP YY_BREAK case 146: YY_RULE_SETUP -#line 573 "scan.l" +#line 574 "scan.l" { ACTION_ECHO; CHECK_YYMORE(yytext); @@ -2595,12 +2597,12 @@ YY_RULE_SETUP case 147: YY_RULE_SETUP -#line 579 "scan.l" +#line 580 "scan.l" ACTION_ECHO; YY_BREAK case 148: YY_RULE_SETUP -#line 580 "scan.l" +#line 581 "scan.l" { ++linenum; ACTION_ECHO; @@ -2620,37 +2622,37 @@ YY_RULE_SETUP case 149: YY_RULE_SETUP -#line 598 "scan.l" +#line 599 "scan.l" ACTION_ECHO; ++bracelevel; YY_BREAK case 150: YY_RULE_SETUP -#line 599 "scan.l" +#line 600 "scan.l" ACTION_ECHO; --bracelevel; YY_BREAK case 151: YY_RULE_SETUP -#line 600 "scan.l" +#line 601 "scan.l" ACTION_ECHO; YY_BREAK case 152: YY_RULE_SETUP -#line 601 "scan.l" +#line 602 "scan.l" ACTION_ECHO; YY_BREAK case 153: YY_RULE_SETUP -#line 602 "scan.l" +#line 603 "scan.l" ACTION_ECHO; /* character constant */ YY_BREAK case 154: YY_RULE_SETUP -#line 603 "scan.l" +#line 604 "scan.l" ACTION_ECHO; BEGIN(ACTION_STRING); YY_BREAK case 155: YY_RULE_SETUP -#line 604 "scan.l" +#line 605 "scan.l" { ++linenum; ACTION_ECHO; @@ -2666,41 +2668,41 @@ YY_RULE_SETUP YY_BREAK case 156: YY_RULE_SETUP -#line 616 "scan.l" +#line 617 "scan.l" ACTION_ECHO; YY_BREAK case 157: YY_RULE_SETUP -#line 620 "scan.l" +#line 621 "scan.l" ACTION_ECHO; YY_BREAK case 158: YY_RULE_SETUP -#line 621 "scan.l" +#line 622 "scan.l" ACTION_ECHO; YY_BREAK case 159: YY_RULE_SETUP -#line 622 "scan.l" +#line 623 "scan.l" ++linenum; ACTION_ECHO; YY_BREAK case 160: YY_RULE_SETUP -#line 623 "scan.l" +#line 624 "scan.l" ACTION_ECHO; BEGIN(ACTION); YY_BREAK case 161: YY_RULE_SETUP -#line 624 "scan.l" +#line 625 "scan.l" ACTION_ECHO; YY_BREAK case YY_STATE_EOF(COMMENT): case YY_STATE_EOF(ACTION): case YY_STATE_EOF(ACTION_STRING): -#line 627 "scan.l" +#line 628 "scan.l" { synerr( _( "EOF encountered inside an action" ) ); yyterminate(); @@ -2708,7 +2710,7 @@ case YY_STATE_EOF(ACTION_STRING): YY_BREAK case 162: YY_RULE_SETUP -#line 633 "scan.l" +#line 634 "scan.l" { yylval = myesc( (Char *) yytext ); @@ -2721,25 +2723,25 @@ YY_RULE_SETUP case 163: YY_RULE_SETUP -#line 644 "scan.l" +#line 645 "scan.l" ECHO; YY_BREAK case YY_STATE_EOF(SECT3): -#line 645 "scan.l" +#line 646 "scan.l" sectnum = 0; yyterminate(); YY_BREAK case 164: YY_RULE_SETUP -#line 648 "scan.l" +#line 649 "scan.l" format_synerr( _( "bad character: %s" ), yytext ); YY_BREAK case 165: YY_RULE_SETUP -#line 650 "scan.l" +#line 651 "scan.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 2736 "scan.c" +#line 2745 "scan.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(SECT2): case YY_STATE_EOF(CODEBLOCK): @@ -2894,7 +2896,11 @@ case YY_STATE_EOF(LINEDIR): * EOB_ACT_END_OF_FILE - end of file */ +#ifdef YY_USE_PROTOS static int yy_get_next_buffer(void) +#else +static int yy_get_next_buffer() +#endif { char *dest = yy_current_buffer->yy_ch_buf; char *source = yytext_ptr; @@ -3026,7 +3032,11 @@ static int yy_get_next_buffer(void) /* yy_get_previous_state - get the state just before the EOB char was reached */ +#ifdef YY_USE_PROTOS static yy_state_type yy_get_previous_state(void) +#else +static yy_state_type yy_get_previous_state() +#endif { yy_state_type yy_current_state; char *yy_cp; @@ -3135,10 +3145,15 @@ char *yy_bp; #endif /* ifndef YY_NO_UNPUT */ +#ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput() #else +#ifdef YY_USE_PROTOS static int input(void) +#else +static int input() +#endif #endif { int c; @@ -3176,7 +3191,7 @@ static int input(void) /* Reset buffer status. */ yyrestart( yyin ); - /* FALLTHROUGH */ + /* fall through */ case EOB_ACT_END_OF_FILE: { @@ -3207,6 +3222,7 @@ static int input(void) return c; } +#endif /* ifndef YY_NO_INPUT */ #ifdef YY_USE_PROTOS @@ -3510,7 +3526,11 @@ int new_state; #ifndef YY_NO_POP_STATE +#ifdef YY_USE_PROTOS +static void yy_pop_state(void) +#else static void yy_pop_state() +#endif { if ( --yy_start_stack_ptr < 0 ) YY_FATAL_ERROR( "start-condition stack underflow" ); @@ -3521,7 +3541,11 @@ static void yy_pop_state() #ifndef YY_NO_TOP_STATE +#ifdef YY_USE_PROTOS +static int yy_top_state(void) +#else static int yy_top_state() +#endif { return yy_start_stack[yy_start_stack_ptr - 1]; } @@ -3640,7 +3664,7 @@ int main() return 0; } #endif -#line 650 "scan.l" +#line 651 "scan.l" |