X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1154ccedaf2f504455446e484932c5c9ffd2a18e..c97011bfc1cabd3f7aa8e263f83d9e8a18a262bf:/tests/regression.at?ds=sidebyside

diff --git a/tests/regression.at b/tests/regression.at
index e68d9277..13d3ab9e 100644
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -51,7 +51,7 @@ exp: MY_TOKEN;
 ]])
 
 AT_CHECK([bison input.y -o input.c])
-AT_COMPILE([input], [-c input.c])
+AT_COMPILE([input.o], [-c input.c])
 
 AT_CLEANUP
 
@@ -100,7 +100,7 @@ exp: '(' exp ')' | NUM ;
 ]])
 
 AT_CHECK([bison -v input.y -o input.c], 0, [],
-[[input.y:6: warning: symbol `"<="' used more than once as a literal string
+[[input.y:6.8-14: warning: symbol `"<="' used more than once as a literal string
 ]])
 
 AT_CLEANUP
@@ -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,9 +226,9 @@ state 4
 
 state 5
 
-    0 $axiom: expr $ .
+    0 $accept: expr $end .
 
-    $default	accept
+    $default  accept
 
 
 state 6
@@ -298,8 +298,7 @@ input.y:5.1: invalid character: `%'
 input.y:6.1: invalid character: `%'
 input.y:6.2: invalid character: `-'
 input.y:7.1-8.0: unexpected end of file in a prologue
-input.y:7.1-8.0: parse error, unexpected PROLOGUE, expecting ";" or "|"
-input.y:5.2: symbol a is used, but is not defined as a token and has no rules
+input.y:7.1-8.0: parse error, unexpected "%{...%}", expecting ";" or "|"
 ]])
 
 AT_CLEANUP
@@ -329,7 +328,7 @@ exp: "a";
 ]])
 
 AT_CHECK([bison input.y -o input.c])
-AT_COMPILE([input], [input.c -c])
+AT_COMPILE([input.o], [-c input.c])
 AT_CLEANUP
 
 
@@ -372,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
 
@@ -386,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)
@@ -396,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
@@ -410,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)
 
@@ -422,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
@@ -455,9 +454,9 @@ state 4
 
 state 5
 
-    0 $axiom: CONST_DEC_PART $ .
+    0 $accept: CONST_DEC_PART $end .
 
-    $default	accept
+    $default  accept
 
 
 state 6
@@ -585,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[] =
 {
@@ -600,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,
+       3,     0,     0,     2,     0,     0,     1,     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
 };