#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
%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]+
"%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;
{eols} YY_LINES; YY_STEP;
{blanks} YY_STEP;
{id} {
- yylval->symbol = getsym (yytext, *yylloc);
+ yylval->symbol = symbol_get (yytext, *yylloc);
return ID;
}
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;
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
\\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 `\<<EOF>>'. */
+ \\ YY_OBS_GROW;
}
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 `\<<EOF>>'. */
+ \\ YY_OBS_GROW;
{eols} YY_OBS_GROW; YY_LINES;
}
[^\[\]\"\n\r\\]+ YY_OBS_GROW;
- \\. YY_OBS_GROW;
+ \\(.|\n) YY_OBS_GROW;
+ /* FLex wants this rule, in case of a `\<<EOF>>'. */
+ \\ YY_OBS_GROW;
{eols} YY_OBS_GROW; YY_LINES;
/* Comments. */
"/*" YY_OBS_GROW; yy_push_state (SC_COMMENT);
"//".* YY_OBS_GROW;
+
+ /* Not comments. */
+ "/" YY_OBS_GROW;
}
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;
<<EOF>> {
LOCATION_PRINT (stderr, *yylloc);
yylval->string = last_string;
return PROLOGUE;
}
-
}
%%
/*------------------------------------------------------------------.
-| CP is pointing to a wannabee semantic value (i.e., a `$'). |
+| TEXT is pointing to a wannabee semantic value (i.e., a `$'). |
| |
| Possible inputs: $[<TYPENAME>]($|integer) |
| |
`------------------------------------------------------------------*/
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 == '<')
}
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));
}
break;
case destructor_braced_code:
- handle_destructor_dollar (text, location);
+ case printer_braced_code:
+ handle_symbol_code_dollar (text, location);
break;
}
}
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 (isdigit (*cp) || *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);
}
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));
}
break;
case destructor_braced_code:
- handle_destructor_at (text, location);
+ case printer_braced_code:
+ handle_symbol_code_at (text, location);
break;
}
}
scanner_free (void)
{
obstack_free (&string_obstack, 0);
+ /* Reclaim Flex's buffers. */
+ yy_delete_buffer (YY_CURRENT_BUFFER);
}
projects / bison.git / blobdiff