Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-11 05:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/parse-gram.y (YYPRINT, yyprint): Don't mess with the parser

Browse Source 
internals.
* src/reader.h, src/reader.c (grammar_current_rule_prec_set):
Takes a location.
* src/symtab.h, src/symtab.c (symbol_class_set)
(symbol_user_token_number_set): Likewise.
Adjust all callers.
Promote complain_at.
* tests/input.at (Type Clashes): Adjust.
This commit is contained in:
Akim Demaille
2002-06-20 11:10:56 +00:00
parent 5c1180b3c4
commit e776192e4f
12 changed files with 213 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/parse-gram.y
View File

@@ -69,12 +69,9 @@ do { \
#define yyerror(Msg) \
gram_error (yycontrol, &yylloc, Msg)
/* When debugging our pure parser, we want to see values and locations
of the tokens. */
#define YYPRINT(File, Type, Value) \
yyprint (File, &yylloc, Type, &Value)
static void yyprint (FILE *file, const location_t *loc,
int type, const yystype *value);
yyprint (File, Type, &Value)
static void yyprint (FILE *file, int type, const yystype *value);
symbol_class current_class = unknown_sym;
char *current_type = 0;
@@ -289,26 +286,26 @@ symbol_def:
}
| ID
{
symbol_class_set ($1, current_class);
symbol_class_set ($1, current_class, @1);
symbol_type_set ($1, @1, current_type);
}
| ID INT
{
symbol_class_set ($1, current_class);
symbol_class_set ($1, current_class, @1);
symbol_type_set ($1, @1, current_type);
symbol_user_token_number_set ($1, $2);
symbol_user_token_number_set ($1, $2, @2);
}
| ID string_as_id
{
symbol_class_set ($1, current_class);
symbol_class_set ($1, current_class, @1);
symbol_type_set ($1, @1, current_type);
symbol_make_alias ($1, $2);
}
| ID INT string_as_id
{
symbol_class_set ($1, current_class);
symbol_class_set ($1, current_class, @1);
symbol_type_set ($1, @1, current_type);
symbol_user_token_number_set ($1, $2);
symbol_user_token_number_set ($1, $2, @2);
symbol_make_alias ($1, $3);
}
;
@@ -357,7 +354,7 @@ rhs:
| rhs action
{ grammar_current_rule_action_append ($2, @2); }
| rhs "%prec" symbol
{ grammar_current_rule_prec_set ($3); }
{ grammar_current_rule_prec_set ($3, @3); }
;
symbol:
@@ -376,7 +373,7 @@ string_as_id:
STRING
{
$$ = getsym ($1, @1);
symbol_class_set ($$, token_sym);
symbol_class_set ($$, token_sym, @1);
}
;
@@ -411,11 +408,9 @@ semi_colon.opt:
static void
yyprint (FILE *file,
const location_t *loc, int type, const yystype *value)
int type, const yystype *value)
{
fputs (" (", file);
LOCATION_PRINT (file, *loc);
fputs (")", file);
fputc (' ', file);
switch (type)
{
case CHARACTER: