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

* data/yacc.c (YY_LOCATION_PRINT): New.

Browse Source 
Define when we know YYLTYPE's structure, i.e., when the default
YYLLOC_DEFAULT is used.
* data/c.m4 (b4_yysymprint_generate): Use it.
* data/lalr1.cc (YYLLOC_DEFAULT): Stop relying on the initial
value of the result.
(error_start_): Replace with...
(error_range_): this location array.
This allows to replace code relying on the implementation of
locations by portable code.
* data/yacc.c (yylerrsp): Replace with...
(yyerror_range): this.
Every time a token is popped, update yyerror_range[0], to have an
accurate location for the error token.
* data/glr.c (YY_LOCATION_PRINT): New.
(yyprocessOneStack): Fix an invocation of YY_SYMBOL_PRINT:
deference a pointer.
* tests/actions.at (_AT_CHECK_PRINTER_AND_DESTRUCTOR): No longer
report the location in %printers.
* src/scan-skel.l: Instead of abort, report error messages to ease
understanding skeleton scanning failures.
This commit is contained in:
Akim Demaille
2004-09-20 09:32:55 +00:00
parent ecfe33e799
commit 3fc16193d9
7 changed files with 107 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
data/lalr1.cc
View File

@@ -172,9 +172,14 @@ b4_syncline([@oline@], [@ofile@])],
]/* Line __line__ of lalr1.cc. */
b4_syncline([@oline@], [@ofile@])[
/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. */
#ifndef YYLLOC_DEFAULT
# define YYLLOC_DEFAULT(Current, Rhs, N) \
((Current).end = Rhs[N].end)
# define YYLLOC_DEFAULT(Current, Rhs, N) \
do { \
((Current).begin = (Rhs)[1].begin); \
((Current).end = (Rhs)[N].end); \
} while (0)
#endif
namespace yy
@@ -323,8 +328,8 @@ namespace yy
/* Semantic value and location of look-ahead token. */
SemanticType value;
LocationType location;
/* Beginning of the last erroneous token popped off. */
Position error_start_;
/// The locations where the error started and ended.
Location error_range_[2];
/* @@$ and $$. */
SemanticType yyval;
@@ -604,7 +609,7 @@ yyerrlab:
/* If not already recovering from an error, report this error. */
report_syntax_error_ ();
error_start_ = location.begin;
error_range_[0] = location;
if (errstatus_ == 3)
{
/* If just tried and failed to reuse look-ahead token after an
@@ -618,7 +623,7 @@ yyerrlab:
if (looka_ == eof_)
for (;;)
{
error_start_ = location_stack_[0].begin;
error_range_[0] = location_stack_[0];
pop ();
if (state_stack_.height () == 1)
YYABORT;
@@ -652,7 +657,7 @@ yyerrorlab:
goto yyerrorlab;
#endif
error_start_ = location_stack_[len_ - 1].begin;
error_range_[0] = location_stack_[len_ - 1];
pop (len_);
state_ = state_stack_[0];
goto yyerrlab1;
@@ -681,10 +686,9 @@ yyerrlab1:
if (state_stack_.height () == 1)
YYABORT;
error_range_[0] = location_stack_[0];
destruct_ ("Error: popping",
stos_[state_], &semantic_stack_[0], &location_stack_[0]);
error_start_ = location_stack_[0].begin;
pop ();
state_ = state_stack_[0];
YY_STACK_PRINT ();
@@ -693,13 +697,12 @@ yyerrlab1:
if (n_ == final_)
goto yyacceptlab;
{
Location errloc;
errloc.begin = error_start_;
errloc.end = location.end;
semantic_stack_.push (value);
location_stack_.push (errloc);
}
error_range_[1] = location;
// Using LOCATION is tempting, but would change the location of
// the look-ahead. YYLOC is available though.
YYLLOC_DEFAULT (yyloc, error_range_ - 1, 2);
semantic_stack_.push (value);
location_stack_.push (yyloc);
/* Shift the error token. */
YY_SYMBOL_PRINT ("Shifting", stos_[n_],