X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/74ffbcb6bf2b471ef16c485830a3084978fa29f7..29e8831621af57c5056380b68a96337e7647b850:/tests/regression.at

diff --git a/tests/regression.at b/tests/regression.at
index 70e3420b..9d55cf64 100644
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -25,7 +25,7 @@ AT_BANNER([[Regression tests.]])
 
 AT_SETUP([Duplicate string])
 
-AT_DATA([duplicate.y],
+AT_DATA([input.y],
 [[/* `Bison -v' used to dump core when two tokens are defined with the same
    string, as LE and GE below. */
 
@@ -38,7 +38,7 @@ exp: '(' exp ')' | NUM ;
 %%
 ]])
 
-AT_CHECK([bison -v duplicate.y -o duplicate.c], 0, ignore, ignore)
+AT_CHECK([bison -v input.y -o input.c], 0, ignore, ignore)
 
 AT_CLEANUP
 
@@ -61,19 +61,20 @@ AT_CHECK([bison input.y -o input.c -v], 0, [],
 
 # Check the contents of the report.
 AT_CHECK([cat input.output], [],
-[[State 4 contains 1 shift/reduce conflict.
+[[State 5 contains 1 shift/reduce conflict.
 
 
 Grammar
 
   Number, Line, Rule
+    0   3 $axiom -> exp $
     1   3 exp -> exp OP exp
     2   3 exp -> NUM
 
 
 Terminals, with rules where they appear
 
-$ (-1)
+$ (0) 0
 error (256)
 NUM (257) 2
 OP (258) 1
@@ -81,8 +82,10 @@ OP (258) 1
 
 Nonterminals, with rules where they appear
 
-exp (5)
-    on left: 1 2, on right: 1
+$axiom (5)
+    on left: 0
+exp (6)
+    on left: 1 2, on right: 0 1
 
 
 state 0
@@ -103,44 +106,41 @@ state 1
 
 state 2
 
+    $axiom  ->  exp . $   (rule 0)
     exp  ->  exp . OP exp   (rule 1)
 
-    $   	go to state 5
-    OP  	shift, and go to state 3
+    $   	shift, and go to state 3
+    OP  	shift, and go to state 4
 
 
 
 state 3
 
-    exp  ->  exp OP . exp   (rule 1)
-
-    NUM 	shift, and go to state 1
-
-    exp 	go to state 4
+    $axiom  ->  exp $ .   (rule 0)
 
+    $default	accept
 
 
 state 4
 
-    exp  ->  exp . OP exp   (rule 1)
-    exp  ->  exp OP exp .   (rule 1)
+    exp  ->  exp OP . exp   (rule 1)
 
-    OP  	shift, and go to state 3
+    NUM 	shift, and go to state 1
 
-    OP  	[reduce using rule 1 (exp)]
-    $default	reduce using rule 1 (exp)
+    exp 	go to state 5
 
 
 
 state 5
 
-    $   	go to state 6
-
+    exp  ->  exp . OP exp   (rule 1)
+    exp  ->  exp OP exp .   (rule 1)
 
+    OP  	shift, and go to state 4
 
-state 6
+    OP  	[reduce using rule 1 (exp)]
+    $default	reduce using rule 1 (exp)
 
-    $default	accept
 
 
 ]])
@@ -165,19 +165,20 @@ AT_CHECK([bison input.y -o input.c -v], 0, [], [])
 
 # Check the contents of the report.
 AT_CHECK([cat input.output], [],
-[[Conflict in state 4 between rule 1 and token OP resolved as shift.
+[[Conflict in state 5 between rule 2 and token OP resolved as shift.
 
 
 Grammar
 
   Number, Line, Rule
+    0   4 $axiom -> exp $
     1   4 exp -> exp OP exp
     2   4 exp -> NUM
 
 
 Terminals, with rules where they appear
 
-$ (-1)
+$ (0) 0
 error (256)
 NUM (257) 2
 OP (258) 1
@@ -185,8 +186,10 @@ OP (258) 1
 
 Nonterminals, with rules where they appear
 
-exp (5)
-    on left: 1 2, on right: 1
+$axiom (5)
+    on left: 0
+exp (6)
+    on left: 1 2, on right: 0 1
 
 
 state 0
@@ -207,43 +210,40 @@ state 1
 
 state 2
 
+    $axiom  ->  exp . $   (rule 0)
     exp  ->  exp . OP exp   (rule 1)
 
-    $   	go to state 5
-    OP  	shift, and go to state 3
+    $   	shift, and go to state 3
+    OP  	shift, and go to state 4
 
 
 
 state 3
 
-    exp  ->  exp OP . exp   (rule 1)
-
-    NUM 	shift, and go to state 1
-
-    exp 	go to state 4
+    $axiom  ->  exp $ .   (rule 0)
 
+    $default	accept
 
 
 state 4
 
-    exp  ->  exp . OP exp   (rule 1)
-    exp  ->  exp OP exp .   (rule 1)
+    exp  ->  exp OP . exp   (rule 1)
 
-    OP  	shift, and go to state 3
+    NUM 	shift, and go to state 1
 
-    $default	reduce using rule 1 (exp)
+    exp 	go to state 5
 
 
 
 state 5
 
-    $   	go to state 6
-
+    exp  ->  exp . OP exp   (rule 1)
+    exp  ->  exp OP exp .   (rule 1)
 
+    OP  	shift, and go to state 4
 
-state 6
+    $default	reduce using rule 1 (exp)
 
-    $default	accept
 
 
 ]])
@@ -296,6 +296,7 @@ AT_CHECK([cat input.output], [],
 [[Grammar
 
   Number, Line, Rule
+    0   2 $axiom -> expr $
     1   2 @1 -> /* empty */
     2   2 expr -> 'a' @1 'b'
     3  15 @2 -> /* empty */
@@ -304,7 +305,7 @@ AT_CHECK([cat input.output], [],
 
 Terminals, with rules where they appear
 
-$ (-1)
+$ (0) 0
 'a' (97) 2
 'b' (98) 2
 'c' (99) 4
@@ -313,11 +314,13 @@ error (256)
 
 Nonterminals, with rules where they appear
 
-expr (6)
-    on left: 2 4
-@1 (7)
+$axiom (6)
+    on left: 0
+expr (7)
+    on left: 2 4, on right: 0
+@1 (8)
     on left: 1, on right: 2
-@2 (8)
+@2 (9)
     on left: 3, on right: 4
 
 
@@ -327,8 +330,8 @@ state 0
 
     $default	reduce using rule 3 (@2)
 
-    expr	go to state 6
-    @2  	go to state 2
+    expr	go to state 2
+    @2  	go to state 3
 
 
 
@@ -338,57 +341,55 @@ state 1
 
     $default	reduce using rule 1 (@1)
 
-    @1  	go to state 3
+    @1  	go to state 4
 
 
 
 state 2
 
-    expr  ->  @2 . 'c'   (rule 4)
+    $axiom  ->  expr . $   (rule 0)
 
-    'c' 	shift, and go to state 4
+    $   	shift, and go to state 5
 
 
 
 state 3
 
-    expr  ->  'a' @1 . 'b'   (rule 2)
+    expr  ->  @2 . 'c'   (rule 4)
 
-    'b' 	shift, and go to state 5
+    'c' 	shift, and go to state 6
 
 
 
 state 4
 
-    expr  ->  @2 'c' .   (rule 4)
+    expr  ->  'a' @1 . 'b'   (rule 2)
 
-    $default	reduce using rule 4 (expr)
+    'b' 	shift, and go to state 7
 
 
 
 state 5
 
-    expr  ->  'a' @1 'b' .   (rule 2)
-
-    $default	reduce using rule 2 (expr)
+    $axiom  ->  expr $ .   (rule 0)
 
+    $default	accept
 
 
 state 6
 
-    $   	go to state 7
-
+    expr  ->  @2 'c' .   (rule 4)
 
+    $default	reduce using rule 4 (expr)
 
-state 7
 
-    $   	go to state 8
 
+state 7
 
+    expr  ->  'a' @1 'b' .   (rule 2)
 
-state 8
+    $default	reduce using rule 2 (expr)
 
-    $default	accept
 
 
 ]])
@@ -484,7 +485,7 @@ AT_CLEANUP
 
 AT_SETUP([%union and --defines])
 
-AT_DATA([union.y],
+AT_DATA([input.y],
 [%union
 {
   int   integer;
@@ -494,30 +495,7 @@ AT_DATA([union.y],
 exp: {};
 ])
 
-AT_CHECK([bison --defines union.y])
-
-AT_CLEANUP
-
-
-## --------------------------------------- ##
-## Duplicate '/' in C comments in %union   ##
-## --------------------------------------- ##
-
-
-AT_SETUP([%union and C comments])
-
-AT_DATA([union-comment.y],
-[%union
-{
-  /* The int.  */	int   integer;
-  /* The string.  */	char *string ;
-}
-%%
-exp: {};
-])
-
-AT_CHECK([bison union-comment.y])
-AT_CHECK([fgrep '//*' union-comment.tab.c], [1], [])
+AT_CHECK([bison --defines input.y])
 
 AT_CLEANUP
 
@@ -613,76 +591,238 @@ AT_TEST_CPP_GUARD_H([input/input])
 AT_TEST_CPP_GUARD_H([9foo])
 
 
-## ---------------- ##
-## Broken Closure.  ##
-## ---------------- ##
 
-# TC was once broken during a massive `simplification' of the code.
-# It resulted in bison dumping core on the following grammar (the
-# computation of FIRSTS uses TC).  It managed to produce a pretty
-# exotic closure:
-#
-# TC: Input
-#
-#    01234567
-#   +--------+
-#  0| 1      |
-#  1|  1     |
-#  2|   1    |
-#  3|    1   |
-#  4|     1  |
-#  5|      1 |
-#  6|       1|
-#  7|        |
-#   +--------+
+## -------------- ##
+## Web2c Report.  ##
+## -------------- ##
+
+# The generation of the reduction was once wrong in Bison, and made it
+# miss some reductions.  In the following test case, the reduction on
+# `undef_id_tok' in state 1 was missing.  This is stripped down from
+# the actual web2c.y.
+
+AT_SETUP([Web2c Report])
+
+AT_DATA([input.y],
+[[%token	undef_id_tok const_id_tok
+
+%start CONST_DEC_PART
+
+%%
+CONST_DEC_PART:
+         CONST_DEC_LIST
+        ;
+
+CONST_DEC_LIST:
+	  CONST_DEC
+        | CONST_DEC_LIST CONST_DEC
+        ;
+
+CONST_DEC:
+	  { } undef_id_tok '=' const_id_tok ';'
+        ;
+%%
+
+]])
+
+AT_CHECK([bison -v input.y])
+
+AT_CHECK([sed -n 's/  *$//;/^$/!p' input.output], 0,
+[[Grammar
+  Number, Line, Rule
+    0   6 $axiom -> CONST_DEC_PART $
+    1   6 CONST_DEC_PART -> CONST_DEC_LIST
+    2  10 CONST_DEC_LIST -> CONST_DEC
+    3  12 CONST_DEC_LIST -> CONST_DEC_LIST CONST_DEC
+    4  15 @1 -> /* empty */
+    5  15 CONST_DEC -> @1 undef_id_tok '=' const_id_tok ';'
+Terminals, with rules where they appear
+$ (0) 0
+';' (59) 5
+'=' (61) 5
+error (256)
+undef_id_tok (257) 5
+const_id_tok (258) 5
+Nonterminals, with rules where they appear
+$axiom (7)
+    on left: 0
+CONST_DEC_PART (8)
+    on left: 1, on right: 0
+CONST_DEC_LIST (9)
+    on left: 2 3, on right: 1 3
+CONST_DEC (10)
+    on left: 5, on right: 2 3
+@1 (11)
+    on left: 4, on right: 5
+state 0
+    $default	reduce using rule 4 (@1)
+    CONST_DEC_PART	go to state 1
+    CONST_DEC_LIST	go to state 2
+    CONST_DEC	go to state 3
+    @1  	go to state 4
+state 1
+    $axiom  ->  CONST_DEC_PART . $   (rule 0)
+    $   	shift, and go to state 5
+state 2
+    CONST_DEC_PART  ->  CONST_DEC_LIST .   (rule 1)
+    CONST_DEC_LIST  ->  CONST_DEC_LIST . CONST_DEC   (rule 3)
+    undef_id_tok	reduce using rule 4 (@1)
+    $default	reduce using rule 1 (CONST_DEC_PART)
+    CONST_DEC	go to state 6
+    @1  	go to state 4
+state 3
+    CONST_DEC_LIST  ->  CONST_DEC .   (rule 2)
+    $default	reduce using rule 2 (CONST_DEC_LIST)
+state 4
+    CONST_DEC  ->  @1 . undef_id_tok '=' const_id_tok ';'   (rule 5)
+    undef_id_tok	shift, and go to state 7
+state 5
+    $axiom  ->  CONST_DEC_PART $ .   (rule 0)
+    $default	accept
+state 6
+    CONST_DEC_LIST  ->  CONST_DEC_LIST CONST_DEC .   (rule 3)
+    $default	reduce using rule 3 (CONST_DEC_LIST)
+state 7
+    CONST_DEC  ->  @1 undef_id_tok . '=' const_id_tok ';'   (rule 5)
+    '=' 	shift, and go to state 8
+state 8
+    CONST_DEC  ->  @1 undef_id_tok '=' . const_id_tok ';'   (rule 5)
+    const_id_tok	shift, and go to state 9
+state 9
+    CONST_DEC  ->  @1 undef_id_tok '=' const_id_tok . ';'   (rule 5)
+    ';' 	shift, and go to state 10
+state 10
+    CONST_DEC  ->  @1 undef_id_tok '=' const_id_tok ';' .   (rule 5)
+    $default	reduce using rule 5 (CONST_DEC)
+]])
+
+AT_CLEANUP
+
+
+## --------------- ##
+## Web2c Actions.  ##
+## --------------- ##
+
+# The generation of the mapping `state -> action' was once wrong in
+# extremely specific situations.  web2c.y exhibits this situation.
+# Below is a stripped version of the grammar.  It looks like one can
+# simplify it further, but just don't: it is tuned to exhibit a bug,
+# which disapears when applying sane grammar transformations.
 #
-# TC: Output
+# It used to be wrong on yydefact only:
 #
-#    01234567
-#   +--------+
-#  0| 1      |
-#  1| 111    |
-#  2| 111    |
-#  3| 1111   |
-#  4| 111 1  |
-#  5| 111  1 |
-#  6| 111   1|
-#  7| 111    |
-#   +--------+
+# static const short yydefact[] =
+#  {
+# -       2,     0,     1,     0,     0,     2,     3,     2,     5,     4,
+# +       2,     0,     1,     0,     0,     0,     3,     2,     5,     4,
+#         0,     0
+#  };
 #
-# instead of that below.
+# but let's check all the tables.
+
 
-AT_SETUP([Broken Closure])
+AT_SETUP([Web2c Actions])
 
 AT_DATA([input.y],
 [[%%
-a: b
-b: c
-c: d
-d: e
-e: f
-f: g
-g: h
-h: 'h'
+statement:  struct_stat;
+struct_stat:  /* empty. */ | if else;
+if: "if" "const" "then" statement;
+else: "else" statement;
+%%
 ]])
 
-AT_CHECK([bison --trace input.y 2>&1 |
-          sed -n '/^TC: Output BEGIN/,/^TC: Output END/p'],
-         [0],
-[[TC: Output BEGIN
-           @&t@
-   01234567
-  +--------+
- 0| 1111111|
- 1|  111111|
- 2|   11111|
- 3|    1111|
- 4|     111|
- 5|      11|
- 6|       1|
- 7|        |
-  +--------+
-TC: Output END
+AT_CHECK([bison -v input.y -o input.c])
+
+# Check only the tables.  We don't use --no-parser, because it is
+# still to be implemented in the experimental branch of Bison.
+AT_CHECK([[sed -n 's/  *$//;/^static const.*\[\] =/,/^}/p' input.c]], 0,
+[[static const char yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     3,     4,     5,
+       6
+};
+static const short yyprhs[] =
+{
+       0,     0,     3,     5,     6,     9,    14
+};
+static const short yyrhs[] =
+{
+       8,     0,    -1,     9,    -1,    -1,    10,    11,    -1,     3,
+       4,     5,     8,    -1,     6,     8,    -1
+};
+static const short yyrline[] =
+{
+       0,     2,     2,     3,     3,     4,     5
+};
+static const char *const yytname[] =
+{
+  "$", "error", "$undefined.", "\"if\"", "\"const\"", "\"then\"",
+  "\"else\"", "$axiom", "statement", "struct_stat", "if", "else", NULL
+};
+static const short yytoknum[] =
+{
+       0,   256,     2,   257,   258,   259,   260,    -1
+};
+static const short yyr1[] =
+{
+       0,     7,     8,     9,     9,    10,    11
+};
+static const short yyr2[] =
+{
+       0,     2,     1,     0,     2,     4,     2
+};
+static const short yydefact[] =
+{
+       3,     0,     0,     2,     0,     0,     0,     3,     4,     3,
+       6,     5
+};
+static const short yydefgoto[] =
+{
+      -1,     2,     3,     4,     8
+};
+static const short yypact[] =
+{
+      -2,    -1,     4,-32768,     0,     2,-32768,    -2,-32768,    -2,
+  -32768,-32768
+};
+static const short yypgoto[] =
+{
+  -32768,    -7,-32768,-32768,-32768
+};
+static const short yytable[] =
+{
+      10,     1,    11,     5,     6,     0,     7,     9
+};
+static const short yycheck[] =
+{
+       7,     3,     9,     4,     0,    -1,     6,     5
+};
 ]])
 
 AT_CLEANUP