diff options
| author | Joel E. Denny <jdenny@clemson.edu> | 2009-12-21 14:58:48 -0500 |
|---|---|---|
| committer | Joel E. Denny <jdenny@clemson.edu> | 2009-12-22 13:01:19 -0500 |
| commit | 62efdd2a85847c8b7559d312e7cada6ca03a2779 (patch) | |
| tree | e02ef4db4c21a8821977072702091b56e612477c /data | |
| parent | 41d35e54d59bebb68af3d2dde45a1f7e83b71b83 (diff) | |
| download | bison-62efdd2a85847c8b7559d312e7cada6ca03a2779.tar.gz | |
YYFAIL: warn about uses and remove from lalr1.java.
* NEWS (2.5): Document.
* data/lalr1.java (parser::YYStack::YYFAIL): Rename to YYERRLAB,
and make it private. Update all uses.
* src/scan-code.l (SC_RULE_ACTION): Implement warning.
(cherry picked from commit 4395a9ff4fd518580b9abe9482783e8eba192f34)
Conflicts:
data/lalr1.java
Diffstat (limited to 'data')
| -rw-r--r-- | data/lalr1.java | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/data/lalr1.java b/data/lalr1.java index 0ba03125..25bb1bdb 100644 --- a/data/lalr1.java +++ b/data/lalr1.java @@ -308,12 +308,9 @@ b4_lexer_if([[ * printing an error message. */ public static final int YYERROR = 2; - /** - * Returned by a Bison action in order to print an error message and start - * error recovery. Formally deprecated in Bison 2.4.2's NEWS entry, where - * a plan to phase it out is discussed. */ - public static final int YYFAIL = 3; - + // Internal return codes that are not supported for user semantic + // actions. + private static final int YYERRLAB = 3; private static final int YYNEWSTATE = 4; private static final int YYDEFAULT = 5; private static final int YYREDUCE = 6; @@ -530,7 +527,7 @@ m4_popdef([b4_at_dollar])])dnl else if ((yyn = yytable_[yyn]) <= 0) { if (yy_table_value_is_error_ (yyn)) - label = YYFAIL; + label = YYERRLAB; else { yyn = -yyn; @@ -564,7 +561,7 @@ m4_popdef([b4_at_dollar])])dnl case YYDEFAULT: yyn = yydefact_[yystate]; if (yyn == 0) - label = YYFAIL; + label = YYERRLAB; else label = YYREDUCE; break; @@ -581,7 +578,7 @@ m4_popdef([b4_at_dollar])])dnl /*------------------------------------. | yyerrlab -- here on detecting error | `------------------------------------*/ - case YYFAIL: + case YYERRLAB: /* If not already recovering from an error, report this error. */ if (yyerrstatus_ == 0) { |