Use $accept and $end, as BYacc and BTYacc do, instead of $axiom and $.

[bison.git] / tests / regression.at

diff --git a/tests/regression.at b/tests/regression.at
index 352d7042e5282b84942bf69fdde45abe68bd6b76..ca5c2f971cc69451a9d77cf89b02e8c264703fe0 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -150,7 +150,7 @@ AT_CHECK([bison input.y -o input.c -v])
 AT_CHECK([cat input.output], [],
 [[Grammar
 
-    0 $axiom: expr $
+    0 $accept: expr $end
 
     1 @1: /* empty */
 
@@ -163,7 +163,7 @@ AT_CHECK([cat input.output], [],
 
 Terminals, with rules where they appear
 
-$ (0) 0
+$end (0) 0
 'a' (97) 2
 'b' (98) 2
 'c' (99) 4
@@ -172,7 +172,7 @@ error (256)
 
 Nonterminals, with rules where they appear
 
-$axiom (6)
+$accept (6)
     on left: 0
 expr (7)
     on left: 2 4, on right: 0
@@ -184,7 +184,7 @@ expr (7)
 
 state 0
 
-    0 $axiom: . expr $
+    0 $accept: . expr $end
 
     'a'  shift, and go to state 1
 
@@ -205,9 +205,9 @@ state 1
 
 state 2
 
-    0 $axiom: expr . $
+    0 $accept: expr . $end
 
-    $  shift, and go to state 5
+    $end  shift, and go to state 5
 
 
 state 3
@@ -226,7 +226,7 @@ state 4
 
 state 5
 
-    0 $axiom: expr $ .
+    0 $accept: expr $end .
 
     $default   accept
 
@@ -371,7 +371,7 @@ AT_CHECK([bison -v input.y])
 AT_CHECK([cat input.output], 0,
 [[Grammar
 
-    0 $axiom: CONST_DEC_PART $
+    0 $accept: CONST_DEC_PART $end
 
     1 CONST_DEC_PART: CONST_DEC_LIST
 
@@ -385,7 +385,7 @@ AT_CHECK([cat input.output], 0,
 
 Terminals, with rules where they appear
 
-$ (0) 0
+$end (0) 0
 ';' (59) 5
 '=' (61) 5
 error (256)
@@ -395,7 +395,7 @@ const_id_tok (259) 5
 
 Nonterminals, with rules where they appear
 
-$axiom (7)
+$accept (7)
     on left: 0
 CONST_DEC_PART (8)
     on left: 1, on right: 0
@@ -409,7 +409,7 @@ CONST_DEC (10)
 
 state 0
 
-    0 $axiom: . CONST_DEC_PART $
+    0 $accept: . CONST_DEC_PART $end
 
     $default  reduce using rule 4 (@1)
 
@@ -421,9 +421,9 @@ state 0
 
 state 1
 
-    0 $axiom: CONST_DEC_PART . $
+    0 $accept: CONST_DEC_PART . $end
 
-    $  shift, and go to state 5
+    $end  shift, and go to state 5
 
 
 state 2
@@ -454,7 +454,7 @@ state 4
 
 state 5
 
-    0 $axiom: CONST_DEC_PART $ .
+    0 $accept: CONST_DEC_PART $end .
 
     $default   accept
 
@@ -584,12 +584,12 @@ static const unsigned char yyrline[] =
 };
 static const char *const yytname[] =
 {
-  "$", "error", "$undefined.", "\"if\"", "\"const\"", "\"then\"",
-  "\"else\"", "$axiom", "statement", "struct_stat", "if", "else", 0
+  "$end", "error", "$undefined", "\"if\"", "\"const\"", "\"then\"",
+  "\"else\"", "$accept", "statement", "struct_stat", "if", "else", 0
 };
-static const short yytoknum[] =
+static const unsigned short yytoknum[] =
 {
-       0,   256,   257,   258,   259,   260,   261,    -1
+       0,   256,   257,   258,   259,   260,   261
 };
 static const unsigned char yyr1[] =
 {
@@ -599,29 +599,29 @@ static const unsigned char yyr2[] =
 {
        0,     2,     1,     0,     2,     4,     2
 };
-static const short yydefact[] =
+static const unsigned char yydefact[] =
 {
        3,     0,     0,     2,     0,     0,     0,     3,     4,     3,
        6,     5
 };
-static const short yydefgoto[] =
+static const signed char yydefgoto[] =
 {
       -1,     2,     3,     4,     8
 };
-static const short yypact[] =
+static const signed char yypact[] =
 {
-      -2,    -1,     4,-32768,     0,     2,-32768,    -2,-32768,    -2,
-  -32768,-32768
+      -2,    -1,     4,    -8,     0,     2,    -8,    -2,    -8,    -2,
+      -8,    -8
 };
-static const short yypgoto[] =
+static const signed char yypgoto[] =
 {
-  -32768,    -7,-32768,-32768,-32768
+      -8,    -7,    -8,    -8,    -8
 };
-static const short yytable[] =
+static const unsigned char yytable[] =
 {
       10,     1,    11,     5,     6,     0,     7,     9
 };
-static const short yycheck[] =
+static const signed char yycheck[] =
 {
        7,     3,     9,     4,     0,    -1,     6,     5
 };