X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/676385e29c4aedfc05d20daf1ef20cd4ccc84856..c0cac722f7e5d7498528a67a37477cdf9ed1745c:/src/scan-gram.l?ds=sidebyside diff --git a/src/scan-gram.l b/src/scan-gram.l index e5147b7f..ef3976af 100644 --- a/src/scan-gram.l +++ b/src/scan-gram.l @@ -34,14 +34,14 @@ #define YY_USER_INIT \ do { \ LOCATION_RESET (*yylloc); \ + yylloc->file = infile; \ /* This is only to avoid GCC warnings. */ \ if (yycontrol) {;}; \ } while (0) -#define YY_USER_ACTION LOCATION_COLUMNS (*yylloc, yyleng) -#define YY_LINES LOCATION_LINES (*yylloc, yyleng); lineno += yyleng; -#define YY_STEP LOCATION_STEP (*yylloc) - +#define YY_USER_ACTION LOCATION_COLUMNS (*yylloc, yyleng); +#define YY_LINES LOCATION_LINES (*yylloc, yyleng); +#define YY_STEP LOCATION_STEP (*yylloc); /* STRING_OBSTACK -- Used to store all the characters that we need to keep (to construct ID, STRINGS etc.). Use the following macros to @@ -90,7 +90,7 @@ static void handle_at PARAMS ((braced_code_t code_kind, %x SC_ESCAPED_STRING SC_ESCAPED_CHARACTER %x SC_BRACED_CODE SC_PROLOGUE SC_EPILOGUE -id [.a-zA-Z][.a-zA-Z_0-9]* +id [.a-zA-Z_][.a-zA-Z_0-9]* int [0-9]+ eols (\n|\r|\n\r|\r\n)+ blanks [ \t\f]+ @@ -160,17 +160,17 @@ blanks [ \t\f]+ {eols} YY_LINES; YY_STEP; {blanks} YY_STEP; {id} { - yylval->symbol = getsym (yytext, *yylloc); + yylval->symbol = symbol_get (yytext, *yylloc); return ID; } {int} yylval->integer = strtol (yytext, 0, 10); return INT; /* Characters. We don't check there is only one. */ - \' YY_OBS_GROW; yy_push_state (SC_ESCAPED_CHARACTER); + "'" YY_OBS_GROW; yy_push_state (SC_ESCAPED_CHARACTER); /* Strings. */ - \" YY_OBS_GROW; yy_push_state (SC_ESCAPED_STRING); + "\"" YY_OBS_GROW; yy_push_state (SC_ESCAPED_STRING); /* Comments. */ "/*" yy_push_state (SC_COMMENT); @@ -199,7 +199,7 @@ blanks [ \t\f]+ . { LOCATION_PRINT (stderr, *yylloc); - fprintf (stderr, ": invalid character: `%c'\n", *yytext); + fprintf (stderr, _(": invalid character: `%c'\n"), *yytext); YY_STEP; } } @@ -243,7 +243,7 @@ blanks [ \t\f]+ <> { LOCATION_PRINT (stderr, *yylloc); - fprintf (stderr, ": unexpected end of file in a comment\n"); + fprintf (stderr, _(": unexpected end of file in a comment\n")); yy_pop_state (); } } @@ -256,7 +256,7 @@ blanks [ \t\f]+ { - \" { + "\"" { assert (yy_top_state () == INITIAL); YY_OBS_GROW; YY_OBS_FINISH; @@ -271,7 +271,7 @@ blanks [ \t\f]+ <> { LOCATION_PRINT (stderr, *yylloc); - fprintf (stderr, ": unexpected end of file in a string\n"); + fprintf (stderr, _(": unexpected end of file in a string\n")); assert (yy_top_state () == INITIAL); YY_OBS_FINISH; yylval->string = last_string; @@ -287,27 +287,28 @@ blanks [ \t\f]+ { - \' { + "'" { YY_OBS_GROW; assert (yy_top_state () == INITIAL); { YY_OBS_FINISH; - yylval->symbol = getsym (last_string, *yylloc); + yylval->symbol = symbol_get (last_string, *yylloc); symbol_class_set (yylval->symbol, token_sym, *yylloc); - symbol_user_token_number_set (yylval->symbol, last_string[1], *yylloc); + symbol_user_token_number_set (yylval->symbol, + (unsigned char) last_string[1], *yylloc); YY_OBS_FREE; yy_pop_state (); return ID; } } - [^\'\n\r\\] YY_OBS_GROW; + [^\n\r\\] YY_OBS_GROW; {eols} obstack_1grow (&string_obstack, '\n'); YY_LINES; <> { LOCATION_PRINT (stderr, *yylloc); - fprintf (stderr, ": unexpected end of file in a character\n"); + fprintf (stderr, _(": unexpected end of file in a character\n")); assert (yy_top_state () == INITIAL); YY_OBS_FINISH; yylval->string = last_string; @@ -328,7 +329,7 @@ blanks [ \t\f]+ if (c > 255) { LOCATION_PRINT (stderr, *yylloc); - fprintf (stderr, ": invalid escape: %s\n", quote (yytext)); + fprintf (stderr, _(": invalid escape: %s\n"), quote (yytext)); YY_STEP; } else @@ -349,7 +350,7 @@ blanks [ \t\f]+ \\[\\""] obstack_1grow (&string_obstack, yytext[1]); \\(.|\n) { LOCATION_PRINT (stderr, *yylloc); - fprintf (stderr, ": unrecognized escape: %s\n", quote (yytext)); + fprintf (stderr, _(": unrecognized escape: %s\n"), quote (yytext)); YY_OBS_GROW; } /* FLex wants this rule, in case of a `\<>'. */ @@ -364,7 +365,7 @@ blanks [ \t\f]+ { - \' { + "'" { YY_OBS_GROW; assert (yy_top_state () != INITIAL); yy_pop_state (); @@ -379,7 +380,7 @@ blanks [ \t\f]+ <> { LOCATION_PRINT (stderr, *yylloc); - fprintf (stderr, ": unexpected end of file in a character\n"); + fprintf (stderr, _(": unexpected end of file in a character\n")); assert (yy_top_state () != INITIAL); yy_pop_state (); } @@ -393,7 +394,7 @@ blanks [ \t\f]+ { - \" { + "\"" { assert (yy_top_state () != INITIAL); YY_OBS_GROW; yy_pop_state (); @@ -408,7 +409,7 @@ blanks [ \t\f]+ <> { LOCATION_PRINT (stderr, *yylloc); - fprintf (stderr, ": unexpected end of file in a string\n"); + fprintf (stderr, _(": unexpected end of file in a string\n")); assert (yy_top_state () != INITIAL); yy_pop_state (); } @@ -422,10 +423,10 @@ blanks [ \t\f]+ { /* Characters. We don't check there is only one. */ - \' YY_OBS_GROW; yy_push_state (SC_CHARACTER); + "'" YY_OBS_GROW; yy_push_state (SC_CHARACTER); /* Strings. */ - \" YY_OBS_GROW; yy_push_state (SC_STRING); + "\"" YY_OBS_GROW; yy_push_state (SC_STRING); /* Comments. */ "/*" YY_OBS_GROW; yy_push_state (SC_COMMENT); @@ -469,7 +470,7 @@ blanks [ \t\f]+ <> { LOCATION_PRINT (stderr, *yylloc); - fprintf (stderr, ": unexpected end of file in a braced code\n"); + fprintf (stderr, _(": unexpected end of file in a braced code\n")); yy_pop_state (); YY_OBS_FINISH; yylval->string = last_string; @@ -498,7 +499,7 @@ blanks [ \t\f]+ <> { LOCATION_PRINT (stderr, *yylloc); - fprintf (stderr, ": unexpected end of file in a prologue\n"); + fprintf (stderr, _(": unexpected end of file in a prologue\n")); yy_pop_state (); YY_OBS_FINISH; yylval->string = last_string; @@ -557,13 +558,13 @@ handle_action_dollar (char *text, location_t location) type_name = symbol_list_n_type_name_get (current_rule, location, 0); if (!type_name && typed) complain_at (location, _("$$ of `%s' has no declared type"), - symbol_tag_get (current_rule->sym)); + current_rule->sym->tag); if (!type_name) type_name = ""; obstack_fgrow1 (&string_obstack, "]b4_lhs_value([%s])[", type_name); } - else if (isdigit (*cp) || *cp == '-') + else if (('0' <= *cp && *cp <= '9') || *cp == '-') { /* RULE_LENGTH is the number of values in the current rule so far, which says where to find `$0' with respect to the top of @@ -581,7 +582,7 @@ handle_action_dollar (char *text, location_t location) n); if (!type_name && typed) complain_at (location, _("$%d of `%s' has no declared type"), - n, symbol_tag_get (current_rule->sym)); + n, current_rule->sym->tag); if (!type_name) type_name = ""; obstack_fgrow3 (&string_obstack, @@ -650,7 +651,7 @@ handle_action_at (char *text, location_t location) { obstack_sgrow (&string_obstack, "]b4_lhs_location["); } - else if (isdigit (*cp) || *cp == '-') + else if (('0' <= *cp && *cp <= '9') || *cp == '-') { /* RULE_LENGTH is the number of values in the current rule so far, which says where to find `$0' with respect to the top of @@ -730,4 +731,6 @@ void scanner_free (void) { obstack_free (&string_obstack, 0); + /* Reclaim Flex's buffers. */ + yy_delete_buffer (YY_CURRENT_BUFFER); }