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

* src/getargs.h (trace_e): Add trace_scan, and trace_parse.

Browse Source 
* src/getargs.c (trace_types, trace_args): Adjust.
* src/reader.c (grammar_current_rule_prec_set)
(grammar_current_rule_dprec_set, grammar_current_rule_merge_set):
Standardize error messages.
And s/@prec/%prec/!
(reader): Use trace_flag to enable scanner/parser debugging,
instead of an adhoc scheme.
* src/scan-gram.l: Remove trailing debugging code.
This commit is contained in:
Akim Demaille
2002-10-17 17:47:33 +00:00
parent 93e2236a6d
commit 473d0a7567
6 changed files with 163 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/reader.c
View File

@@ -341,7 +341,7 @@ void
grammar_current_rule_prec_set (symbol_t *precsym, location_t location)
{
if (current_rule->ruleprec)
complain_at (location, _("two @prec's in a row"));
complain_at (location, _("only one %s allowed per rule"), "%prec");
current_rule->ruleprec = precsym;
}
@@ -351,11 +351,12 @@ void
grammar_current_rule_dprec_set (int dprec, location_t location)
{
if (! glr_parser)
warn_at (location, _("%%dprec affects only GLR parsers"));
warn_at (location, _("%s affects only GLR parsers"), "%dprec");
if (dprec <= 0)
complain_at (location, _("%%dprec must be followed by positive number"));
complain_at (location,
_("%s must be followed by positive number"), "%dprec");
else if (current_rule->dprec != 0)
complain_at (location, _("only one %%dprec allowed per rule"));
complain_at (location, _("only one %s allowed per rule"), "%dprec");
current_rule->dprec = dprec;
}
@@ -366,9 +367,9 @@ void
grammar_current_rule_merge_set (const char* name, location_t location)
{
if (! glr_parser)
warn_at (location, _("%%merge affects only GLR parsers"));
warn_at (location, _("%s affects only GLR parsers"), "%merge");
if (current_rule->merger != 0)
complain_at (location, _("only one %%merge allowed per rule"));
complain_at (location, _("only one %s allowed per rule"), "%merge");
current_rule->merger =
get_merge_function (name, current_rule->sym->type_name, location);
}
@@ -499,8 +500,8 @@ reader (void)
finput = xfopen (infile, "r");
gram_in = finput;
gram_debug = !!getenv ("parse");
gram__flex_debug = !!getenv ("scan");
gram__flex_debug = trace_flag & trace_scan;
gram_debug = trace_flag & trace_parse;
scanner_initialize ();
gram_parse (&gram_control);