X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f25bfb75aa45ded96d5e8060a637d366c3a47924..c0cac722f7e5d7498528a67a37477cdf9ed1745c:/src/scan-gram.l diff --git a/src/scan-gram.l b/src/scan-gram.l index 5a1ce57b..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]+ @@ -124,18 +124,22 @@ blanks [ \t\f]+ "%define" return PERCENT_DEFINE; "%defines" return PERCENT_DEFINES; "%destructor" return PERCENT_DESTRUCTOR; + "%dprec" return PERCENT_DPREC; "%error"[-_]"verbose" return PERCENT_ERROR_VERBOSE; "%expect" return PERCENT_EXPECT; "%file-prefix" return PERCENT_FILE_PREFIX; "%fixed"[-_]"output"[-_]"files" return PERCENT_YACC; + "%glr"[-_]"parser" return PERCENT_GLR_PARSER; "%left" return PERCENT_LEFT; "%locations" return PERCENT_LOCATIONS; + "%merge" return PERCENT_MERGE; "%name"[-_]"prefix" return PERCENT_NAME_PREFIX; "%no"[-_]"lines" return PERCENT_NO_LINES; "%nonassoc" return PERCENT_NONASSOC; "%nterm" return PERCENT_NTERM; "%output" return PERCENT_OUTPUT; "%prec" return PERCENT_PREC; + "%printer" return PERCENT_PRINTER; "%pure"[-_]"parser" return PERCENT_PURE_PARSER; "%right" return PERCENT_RIGHT; "%skeleton" return PERCENT_SKELETON; @@ -156,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); @@ -195,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; } } @@ -239,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 (); } } @@ -252,7 +256,7 @@ blanks [ \t\f]+ { - \" { + "\"" { assert (yy_top_state () == INITIAL); YY_OBS_GROW; YY_OBS_FINISH; @@ -267,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; @@ -283,27 +287,28 @@ blanks [ \t\f]+ { - \' { + "'" { YY_OBS_GROW; assert (yy_top_state () == INITIAL); { YY_OBS_FINISH; - yylval->symbol = getsym (last_string, *yylloc); - symbol_class_set (yylval->symbol, token_sym); - symbol_user_token_number_set (yylval->symbol, last_string[1]); + yylval->symbol = symbol_get (last_string, *yylloc); + symbol_class_set (yylval->symbol, token_sym, *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; @@ -324,7 +329,7 @@ blanks [ \t\f]+ if (c > 255) { LOCATION_PRINT (stderr, *yylloc); - fprintf (stderr, ": invalid escape: %s\n", yytext); + fprintf (stderr, _(": invalid escape: %s\n"), quote (yytext)); YY_STEP; } else @@ -343,11 +348,13 @@ blanks [ \t\f]+ \\t obstack_1grow (&string_obstack, '\t'); \\v obstack_1grow (&string_obstack, '\v'); \\[\\""] obstack_1grow (&string_obstack, yytext[1]); - \\. { + \\(.|\n) { LOCATION_PRINT (stderr, *yylloc); - fprintf (stderr, ": unrecognized escape: %s\n", yytext); + fprintf (stderr, _(": unrecognized escape: %s\n"), quote (yytext)); YY_OBS_GROW; } + /* FLex wants this rule, in case of a `\<>'. */ + \\ YY_OBS_GROW; } @@ -358,20 +365,22 @@ blanks [ \t\f]+ { - \' { + "'" { YY_OBS_GROW; assert (yy_top_state () != INITIAL); yy_pop_state (); } - [^\[\]\'\n\r\\] YY_OBS_GROW; - \\. YY_OBS_GROW; + [^\[\]\'\n\r\\]+ YY_OBS_GROW; + \\(.|\n) YY_OBS_GROW; + /* FLex wants this rule, in case of a `\<>'. */ + \\ YY_OBS_GROW; {eols} YY_OBS_GROW; 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_pop_state (); } @@ -385,20 +394,22 @@ blanks [ \t\f]+ { - \" { + "\"" { assert (yy_top_state () != INITIAL); YY_OBS_GROW; yy_pop_state (); } [^\[\]\"\n\r\\]+ YY_OBS_GROW; - \\. YY_OBS_GROW; + \\(.|\n) YY_OBS_GROW; + /* FLex wants this rule, in case of a `\<>'. */ + \\ YY_OBS_GROW; {eols} YY_OBS_GROW; YY_LINES; <> { 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 (); } @@ -412,14 +423,17 @@ 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); "//".* YY_OBS_GROW; + + /* Not comments. */ + "/" YY_OBS_GROW; } @@ -456,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; @@ -479,19 +493,18 @@ blanks [ \t\f]+ return PROLOGUE; } - [^%\[\]/\'\"\n\r]+ YY_OBS_GROW; - "%"+[^%\}\n\r]+ YY_OBS_GROW; - {eols} YY_OBS_GROW; YY_LINES; + [^%\[\]/\'\"\n\r]+ YY_OBS_GROW; + "%" YY_OBS_GROW; + {eols} YY_OBS_GROW; YY_LINES; <> { 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; return PROLOGUE; } - } @@ -516,7 +529,7 @@ blanks [ \t\f]+ %% /*------------------------------------------------------------------. -| CP is pointing to a wannabee semantic value (i.e., a `$'). | +| TEXT is pointing to a wannabee semantic value (i.e., a `$'). | | | | Possible inputs: $[]($|integer) | | | @@ -524,11 +537,10 @@ blanks [ \t\f]+ `------------------------------------------------------------------*/ static inline void -handle_action_dollar (char *cp, location_t location) +handle_action_dollar (char *text, location_t location) { const char *type_name = NULL; - - ++cp; + char *cp = text + 1; /* Get the type name if explicit. */ if (*cp == '<') @@ -552,7 +564,7 @@ handle_action_dollar (char *cp, location_t location) 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 @@ -580,31 +592,24 @@ handle_action_dollar (char *cp, location_t location) } else { - char buf[] = "$c"; - buf[1] = *cp; - complain_at (location, _("%s is invalid"), quote (buf)); + complain_at (location, _("%s is invalid"), quote (text)); } } -/*---------------------------------------. -| CP is pointing to $$ in a destructor. | -`---------------------------------------*/ +/*---------------------------------------------------------------. +| TEXT is expexted tp be $$ in some code associated to a symbol: | +| destructor or printer. | +`---------------------------------------------------------------*/ static inline void -handle_destructor_dollar (char *cp, location_t location) +handle_symbol_code_dollar (char *text, location_t location) { - ++cp; + char *cp = text + 1; if (*cp == '$') - { - obstack_sgrow (&string_obstack, "]b4_dollar_dollar["); - } + obstack_sgrow (&string_obstack, "]b4_dollar_dollar["); else - { - char buf[] = "$c"; - buf[1] = *cp; - complain_at (location, _("%s is invalid"), quote (buf)); - } + complain_at (location, _("%s is invalid"), quote (text)); } @@ -624,7 +629,8 @@ handle_dollar (braced_code_t braced_code_kind, break; case destructor_braced_code: - handle_destructor_dollar (text, location); + case printer_braced_code: + handle_symbol_code_dollar (text, location); break; } } @@ -638,21 +644,21 @@ handle_dollar (braced_code_t braced_code_kind, static inline void handle_action_at (char *text, location_t location) { + char *cp = text + 1; locations_flag = 1; - ++text; - if (*text == '$') + if (*cp == '$') { obstack_sgrow (&string_obstack, "]b4_lhs_location["); } - else if (isdigit (*text) || *text == '-') + 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 the stack. It is not the same as the rule->length in the case of mid rule actions. */ int rule_length = symbol_list_length (current_rule->next); - int n = strtol (text, &text, 10); + int n = strtol (cp, &cp, 10); if (n > rule_length) complain_at (location, _("invalid value: %s%d"), "@", n); @@ -662,31 +668,24 @@ handle_action_at (char *text, location_t location) } else { - char buf[] = "@c"; - buf[1] = *text; - complain_at (location, _("%s is invalid"), quote (buf)); + complain_at (location, _("%s is invalid"), quote (text)); } } -/*--------------------------------------------. -| TEXT is expexted tp be @$ in a destructor. | -`--------------------------------------------*/ +/*---------------------------------------------------------------. +| TEXT is expexted tp be @$ in some code associated to a symbol: | +| destructor or printer. | +`---------------------------------------------------------------*/ static inline void -handle_destructor_at (char *text, location_t location) +handle_symbol_code_at (char *text, location_t location) { - ++text; - if (*text == '$') - { - obstack_sgrow (&string_obstack, "]b4_at_dollar["); - } + char *cp = text + 1; + if (*cp == '$') + obstack_sgrow (&string_obstack, "]b4_at_dollar["); else - { - char buf[] = "$c"; - buf[1] = *text; - complain_at (location, _("%s is invalid"), quote (buf)); - } + complain_at (location, _("%s is invalid"), quote (text)); } @@ -706,7 +705,8 @@ handle_at (braced_code_t braced_code_kind, break; case destructor_braced_code: - handle_destructor_at (text, location); + case printer_braced_code: + handle_symbol_code_at (text, location); break; } } @@ -731,4 +731,6 @@ void scanner_free (void) { obstack_free (&string_obstack, 0); + /* Reclaim Flex's buffers. */ + yy_delete_buffer (YY_CURRENT_BUFFER); }