diff options
Diffstat (limited to 'usr.bin/lex/yylex.c')
| -rw-r--r-- | usr.bin/lex/yylex.c | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/usr.bin/lex/yylex.c b/usr.bin/lex/yylex.c index 563297a..17ec1b8 100644 --- a/usr.bin/lex/yylex.c +++ b/usr.bin/lex/yylex.c @@ -26,7 +26,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /home/daffy/u0/vern/flex/RCS/yylex.c,v 2.10 93/09/16 20:31:48 vern Exp $ */ +/* $Header: /home/daffy/u0/vern/flex/RCS/yylex.c,v 2.13 95/03/04 16:10:41 vern Exp $ */ #include <ctype.h> #include "flexdef.h" @@ -39,6 +39,7 @@ int yylex() { int toktype; static int beglin = false; + extern char *yytext; if ( eofseen ) toktype = EOF; @@ -51,7 +52,7 @@ int yylex() if ( sectnum == 1 ) { - synerr( "premature EOF" ); + synerr( _( "premature EOF" ) ); sectnum = 2; toktype = SECTEND; } @@ -109,10 +110,6 @@ int yylex() fputs( "%x", stderr ); break; - case WHITESPACE: - (void) putc( ' ', stderr ); - break; - case SECTEND: fputs( "%%\n", stderr ); @@ -120,9 +117,8 @@ int yylex() * writing out numbers as we echo rules. * flexscan() has already assigned sectnum. */ - if ( sectnum == 2 ) - beglin = 1; + beglin = 1; break; @@ -183,13 +179,34 @@ int yylex() fprintf( stderr, "<<EOF>>" ); break; + case OPTION_OP: + fprintf( stderr, "%s ", yytext ); + break; + + case OPT_OUTFILE: + case OPT_PREFIX: + case CCE_ALNUM: + case CCE_ALPHA: + case CCE_BLANK: + case CCE_CNTRL: + case CCE_DIGIT: + case CCE_GRAPH: + case CCE_LOWER: + case CCE_PRINT: + case CCE_PUNCT: + case CCE_SPACE: + case CCE_UPPER: + case CCE_XDIGIT: + fprintf( stderr, "%s", yytext ); + break; + case 0: - fprintf( stderr, "End Marker" ); + fprintf( stderr, _( "End Marker\n" ) ); break; default: fprintf( stderr, - "*Something Weird* - tok: %d val: %d\n", + _( "*Something Weird* - tok: %d val: %d\n" ), toktype, yylval ); break; } |
