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

* src/parse-gram.y (YYLLOC_DEFAULT, current_lhs_location): New.

Browse Source 
(input): Don't try to initialize yylloc here, do it in the
scanner.
* src/scan-gram.l (YY_USER_INIT): Initialize yylloc.
* src/gram.h (rule_t): Change line and action_line into location
and action_location, of location_t type.
Adjust all dependencies.
* src/location.h, src/location.c (empty_location): New.
* src/reader.h, src/reader.c (grammar_start_symbol_set)
(grammar_symbol_append, grammar_rule_begin, grammar_rule_end)
(grammar_current_rule_symbol_append)
(grammar_current_rule_action_append): Expect a location as argument.
* src/reader.c (grammar_midrule_action): Adjust to attach an
action's location as dummy symbol location.
* src/symtab.h, src/symtab.c (startsymbol_location): New.
* tests/regression.at (Web2c Report, Rule Line Numbers): Adjust
the line numbers.
This commit is contained in:
Akim Demaille
2002-06-15 18:21:11 +00:00
parent 4f6bb8b24b
commit 8efe435c05
28 changed files with 699 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/parse-gram.y
View File

@@ -40,6 +40,20 @@
/* Produce verbose parse errors. */
#define YYERROR_VERBOSE 1
#define YYLLOC_DEFAULT(Current, Rhs, N) \
do { \
if (N) \
{ \
Current.first_column = Rhs[1].first_column; \
Current.first_line = Rhs[1].first_line; \
Current.last_column = Rhs[N].last_column; \
Current.last_line = Rhs[N].last_line; \
} \
else \
{ \
Current = Rhs[0]; \
} \
} while (0)
/* Pass the control structure to YYPARSE and YYLEX. */
#define YYPARSE_PARAM gram_control
@@ -64,6 +78,7 @@ static void yyprint (FILE *file, const location_t *loc,
symbol_class current_class = unknown_sym;
char *current_type = 0;
symbol_t *current_lhs;
location_t current_lhs_location;
associativity current_assoc;
int current_prec = 0;
%}
@@ -128,11 +143,11 @@ int current_prec = 0;
%%
input: { LOCATION_RESET (yylloc); }
input:
declarations "%%" grammar epilogue.opt
{
yycontrol->errcode = 0;
epilogue_set ($5, @5);
epilogue_set ($4, @4);
}
;
@@ -171,7 +186,7 @@ grammar_declaration:
| symbol_declaration
| "%start" symbol
{
grammar_start_symbol_set ($2);
grammar_start_symbol_set ($2, @2);
}
| "%union" BRACED_CODE
{
@@ -298,22 +313,22 @@ rules_or_grammar_declaration:
;
rules:
ID ":" { current_lhs = $1; } rhses.1 ";"
ID ":" { current_lhs = $1; current_lhs_location = @1; } rhses.1 ";"
{;}
;
rhses.1:
rhs { grammar_rule_end (); }
| rhses.1 "|" rhs { grammar_rule_end (); }
rhs { grammar_rule_end (@1); }
| rhses.1 "|" rhs { grammar_rule_end (@3); }
;
rhs:
/* Nothing. */
{ grammar_rule_begin (current_lhs); }
{ grammar_rule_begin (current_lhs, current_lhs_location); }
| rhs symbol
{ grammar_current_rule_symbol_append ($2); }
{ grammar_current_rule_symbol_append ($2, @2); }
| rhs action
{ grammar_current_rule_action_append ($2, @2.first_line); }
{ grammar_current_rule_action_append ($2, @2); }
| rhs "%prec" symbol
{ grammar_current_rule_prec_set ($3); }
;