doc: merge HACKING and README-hacking.

[bison.git] / tests / regression.at

diff --git a/tests/regression.at b/tests/regression.at
index 1c5ccbbf370766306713828ff23c5d6d2f1ee7dd..a4b20de5a343ea79e9cc00fe0f007574fb3af19a 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -1,22 +1,20 @@
 # Bison Regressions.                               -*- Autotest -*-
 
 # Bison Regressions.                               -*- Autotest -*-
 

-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software

 # Foundation, Inc.
 
 # Foundation, Inc.
 

-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify

 # it under the terms of the GNU General Public License as published by
 # it under the terms of the GNU General Public License as published by

-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#

 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-
+#

 # You should have received a copy of the GNU General Public License
 # You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 AT_BANNER([[Regression tests.]])
 
 
 AT_BANNER([[Regression tests.]])
 


@@ -41,7 +39,7 @@ int yylex (void);
 program: 'x';
 ]])
 
 program: 'x';
 ]])
 

-AT_CHECK([bison -o input.c input.y])
+AT_BISON_CHECK([-o input.c input.y])

 AT_COMPILE([input.o], [-c input.c])
 AT_COMPILE([input.o], [-DYYDEBUG -c input.c])
 
 AT_COMPILE([input.o], [-c input.c])
 AT_COMPILE([input.o], [-DYYDEBUG -c input.c])
 


@@ -69,7 +67,7 @@ typedef union { char const *val; } YYSTYPE;
 program: { $$ = ""; };
 ]])
 
 program: { $$ = ""; };
 ]])
 

-AT_CHECK([bison -o input.c input.y])
+AT_BISON_CHECK([-o input.c input.y])

 AT_COMPILE([input.o], [-c input.c])
 
 AT_CLEANUP
 AT_COMPILE([input.o], [-c input.c])
 
 AT_CLEANUP


@@ -107,7 +105,7 @@ exp: MY_TOKEN;
 %%
 ]])
 
 %%
 ]])
 

-AT_CHECK([bison -y -o input.c input.y])
+AT_BISON_CHECK([-y -o input.c input.y])

 AT_COMPILE([input.o], [-c input.c])
 
 AT_CLEANUP
 AT_COMPILE([input.o], [-c input.c])
 
 AT_CLEANUP


@@ -150,7 +148,7 @@ exp: MY_TOKEN;
 %%
 ]])
 
 %%
 ]])
 

-AT_CHECK([bison -o input.c input.y])
+AT_BISON_CHECK([-o input.c input.y])

 AT_COMPILE([input.o], [-c input.c])
 
 AT_CLEANUP
 AT_COMPILE([input.o], [-c input.c])
 
 AT_CLEANUP


@@ -172,7 +170,7 @@ exp: { tests = {{{{{{{{{{}}}}}}}}}}; };
 %%
 ]])
 
 %%
 ]])
 

-AT_CHECK([bison -v -o input.c input.y])
+AT_BISON_CHECK([-v -o input.c input.y])

 
 AT_CHECK([grep 'tests = {{{{{{{{{{}}}}}}}}}};' input.c], 0, [ignore])
 
 
 AT_CHECK([grep 'tests = {{{{{{{{{{}}}}}}}}}};' input.c], 0, [ignore])
 


@@ -199,7 +197,7 @@ exp: '(' exp ')' | NUM ;
 %%
 ]])
 
 %%
 ]])
 

-AT_CHECK([bison -v -o input.c input.y], 0, [],
+AT_BISON_CHECK([-v -o input.c input.y], 0, [],

 [[input.y:6.8-14: 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
 ]])
 


@@ -244,7 +242,7 @@ expr:
 };
 ]])
 
 };
 ]])
 

-AT_CHECK([bison -o input.c -v input.y])
+AT_BISON_CHECK([-o input.c -v input.y])

 
 # Check the contents of the report.
 AT_CHECK([cat input.output], [],
 
 # Check the contents of the report.
 AT_CHECK([cat input.output], [],


@@ -252,13 +250,13 @@ AT_CHECK([cat input.output], [],
 
     0 $accept: expr $end
 
 
     0 $accept: expr $end
 

-    1 @1: /* empty */
+    1 $@1: /* empty */

 
 

-    2 expr: 'a' @1 'b'
+    2 expr: 'a' $@1 'b'

 
 

-    3 @2: /* empty */
+    3 $@2: /* empty */

 
 

-    4 expr: @2 'c'
+    4 expr: $@2 'c'

 
 
 Terminals, with rules where they appear
 
 
 Terminals, with rules where they appear


@@ -276,9 +274,9 @@ $accept (6)
     on left: 0
 expr (7)
     on left: 2 4, on right: 0
     on left: 0
 expr (7)
     on left: 2 4, on right: 0

-@1 (8)
+$@1 (8)

     on left: 1, on right: 2
     on left: 1, on right: 2

-@2 (9)
+$@2 (9)

     on left: 3, on right: 4
 
 
     on left: 3, on right: 4
 
 


@@ -288,19 +286,19 @@ state 0
 
     'a'  shift, and go to state 1
 
 
     'a'  shift, and go to state 1
 

-    $default  reduce using rule 3 (@2)
+    $default  reduce using rule 3 ($@2)

 
     expr  go to state 2
 
     expr  go to state 2

-    @2    go to state 3
+    $@2   go to state 3

 
 
 state 1
 
 
 
 state 1
 

-    2 expr: 'a' . @1 'b'
+    2 expr: 'a' . $@1 'b'

 
 

-    $default  reduce using rule 1 (@1)
+    $default  reduce using rule 1 ($@1)

 
 

-    @1  go to state 4
+    $@1  go to state 4

 
 
 state 2
 
 
 state 2


@@ -312,14 +310,14 @@ state 2
 
 state 3
 
 
 state 3
 

-    4 expr: @2 . 'c'
+    4 expr: $@2 . 'c'

 
     'c'  shift, and go to state 6
 
 
 state 4
 
 
     'c'  shift, and go to state 6
 
 
 state 4
 

-    2 expr: 'a' @1 . 'b'
+    2 expr: 'a' $@1 . 'b'

 
     'b'  shift, and go to state 7
 
 
     'b'  shift, and go to state 7
 


@@ -333,14 +331,14 @@ state 5
 
 state 6
 
 
 state 6
 

-    4 expr: @2 'c' .
+    4 expr: $@2 'c' .

 
     $default  reduce using rule 4 (expr)
 
 
 state 7
 
 
     $default  reduce using rule 4 (expr)
 
 
 state 7
 

-    2 expr: 'a' @1 'b' .
+    2 expr: 'a' $@1 'b' .

 
     $default  reduce using rule 2 (expr)
 ]])
 
     $default  reduce using rule 2 (expr)
 ]])


@@ -366,7 +364,7 @@ exp: ;
 %%
 ]])
 
 %%
 ]])
 

-AT_CHECK([bison -v -o input.c input.y])
+AT_BISON_CHECK([-v -o input.c input.y])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -389,7 +387,7 @@ default: 'a' }
 %{
 ]])
 
 %{
 ]])
 

-AT_CHECK([bison input.y], [1], [],
+AT_BISON_CHECK([input.y], [1], [],

 [[input.y:2.1: invalid character: `?'
 input.y:3.14: invalid character: `}'
 input.y:4.1: invalid character: `%'
 [[input.y:2.1: invalid character: `?'
 input.y:3.14: invalid character: `}'
 input.y:4.1: invalid character: `%'


@@ -416,7 +414,7 @@ AT_DATA([input.y],
 %union
 ]])
 
 %union
 ]])
 

-AT_CHECK([bison input.y], [1], [],
+AT_BISON_CHECK([input.y], [1], [],

 [[input.y:3.1-15: syntax error, unexpected %initial-action, expecting {...}
 ]])
 
 [[input.y:3.1-15: syntax error, unexpected %initial-action, expecting {...}
 ]])
 


@@ -434,6 +432,7 @@ AT_SETUP([Token definitions])
 # Bison managed, when fed with `%token 'f' "f"' to #define 'f'!
 AT_DATA_GRAMMAR([input.y],
 [%{
 # Bison managed, when fed with `%token 'f' "f"' to #define 'f'!
 AT_DATA_GRAMMAR([input.y],
 [%{

+#include <stdlib.h>

 #include <stdio.h>
 void yyerror (const char *s);
 int yylex (void);
 #include <stdio.h>
 void yyerror (const char *s);
 int yylex (void);


@@ -445,6 +444,7 @@ int yylex (void);
 %token C_TOKEN 'c'
 %token 'd' D_TOKEN
 %token SPECIAL "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!"
 %token C_TOKEN 'c'
 %token 'd' D_TOKEN
 %token SPECIAL "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!"

+%token SPECIAL "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!"

 %%
 exp: "a" "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!";
 %%
 %%
 exp: "a" "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!";
 %%


@@ -457,6 +457,9 @@ yyerror (char const *s)
 int
 yylex (void)
 {
 int
 yylex (void)
 {

+  static int called;
+  if (called++)
+    abort ();

   return SPECIAL;
 }
 
   return SPECIAL;
 }
 


@@ -467,10 +470,22 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([bison -o input.c input.y])
+# Checking the warning message guarantees that the trigraph "??!" isn't
+# unnecessarily escaped here even though it would need to be if encoded in a
+# C-string literal.  Also notice that unnecessary escaping, such as "\?", from
+# the user specification is eliminated.
+AT_BISON_CHECK([-o input.c input.y], [[0]], [[]],
+[[input.y:22.8-14: warning: symbol SPECIAL redeclared
+input.y:22.8-63: warning: symbol `"\\'?\"\a\b\f\n\r\t\v\001\201\001\201??!"' used more than once as a literal string
+]])

 AT_COMPILE([input])
 AT_COMPILE([input])

+
+# Checking the error message here guarantees that yytname, which does contain
+# C-string literals, does have the trigraph escaped correctly.  Thus, the
+# symbol name reported by the parser is exactly the same as that reported by
+# Bison itself.

 AT_DATA([experr],
 AT_DATA([experr],

-[[syntax error, unexpected "\\'?\"\a\b\f\n\r\t\v\001\201\001\201?\?!", expecting a
+[[syntax error, unexpected "\\'?\"\a\b\f\n\r\t\v\001\201\001\201??!", expecting a

 ]])
 AT_PARSER_CHECK([./input], 1, [], [experr])
 AT_CLEANUP
 ]])
 AT_PARSER_CHECK([./input], 1, [], [experr])
 AT_CLEANUP


@@ -489,9 +504,7 @@ AT_DATA_GRAMMAR([input.y],
 void yyerror (const char *s);
 int yylex (void);
 %}
 void yyerror (const char *s);
 int yylex (void);
 %}

-[%token QUOTES "\""
-%token TICK "'"
-%%
+[%%

 exp:
   '\'' "\'"
 | '\"' "\""
 exp:
   '\'' "\'"
 | '\"' "\""


@@ -500,7 +513,7 @@ exp:
 ]])
 # Pacify font-lock-mode: "
 
 ]])
 # Pacify font-lock-mode: "
 

-AT_CHECK([bison -o input.c input.y])
+AT_BISON_CHECK([-o input.c input.y])

 AT_COMPILE([input.o], [-c input.c])
 AT_CLEANUP
 
 AT_COMPILE([input.o], [-c input.c])
 AT_CLEANUP
 


@@ -540,7 +553,7 @@ CONST_DEC:
 %%
 ]])
 
 %%
 ]])
 

-AT_CHECK([bison -v input.y])
+AT_BISON_CHECK([-v input.y])

 AT_CHECK([cat input.output], 0,
 [[Grammar
 
 AT_CHECK([cat input.output], 0,
 [[Grammar
 


@@ -551,9 +564,9 @@ AT_CHECK([cat input.output], 0,
     2 CONST_DEC_LIST: CONST_DEC
     3               | CONST_DEC_LIST CONST_DEC
 
     2 CONST_DEC_LIST: CONST_DEC
     3               | CONST_DEC_LIST CONST_DEC
 

-    4 @1: /* empty */
+    4 $@1: /* empty */

 
 

-    5 CONST_DEC: @1 undef_id_tok '=' const_id_tok ';'
+    5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok ';'

 
 
 Terminals, with rules where they appear
 
 
 Terminals, with rules where they appear


@@ -576,7 +589,7 @@ CONST_DEC_LIST (9)
     on left: 2 3, on right: 1 3
 CONST_DEC (10)
     on left: 5, on right: 2 3
     on left: 2 3, on right: 1 3
 CONST_DEC (10)
     on left: 5, on right: 2 3

-@1 (11)
+$@1 (11)

     on left: 4, on right: 5
 
 
     on left: 4, on right: 5
 
 


@@ -584,12 +597,12 @@ state 0
 
     0 $accept: . CONST_DEC_PART $end
 
 
     0 $accept: . CONST_DEC_PART $end
 

-    $default  reduce using rule 4 (@1)
+    $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
 
     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
+    $@1             go to state 4

 
 
 state 1
 
 
 state 1


@@ -604,11 +617,11 @@ state 2
     1 CONST_DEC_PART: CONST_DEC_LIST .
     3 CONST_DEC_LIST: CONST_DEC_LIST . CONST_DEC
 
     1 CONST_DEC_PART: CONST_DEC_LIST .
     3 CONST_DEC_LIST: CONST_DEC_LIST . CONST_DEC
 

-    undef_id_tok  reduce using rule 4 (@1)
+    undef_id_tok  reduce using rule 4 ($@1)

     $default      reduce using rule 1 (CONST_DEC_PART)
 
     CONST_DEC  go to state 6
     $default      reduce using rule 1 (CONST_DEC_PART)
 
     CONST_DEC  go to state 6

-    @1         go to state 4
+    $@1        go to state 4

 
 
 state 3
 
 
 state 3


@@ -620,7 +633,7 @@ state 3
 
 state 4
 
 
 state 4
 

-    5 CONST_DEC: @1 . undef_id_tok '=' const_id_tok ';'
+    5 CONST_DEC: $@1 . undef_id_tok '=' const_id_tok ';'

 
     undef_id_tok  shift, and go to state 7
 
 
     undef_id_tok  shift, and go to state 7
 


@@ -641,28 +654,28 @@ state 6
 
 state 7
 
 
 state 7
 

-    5 CONST_DEC: @1 undef_id_tok . '=' const_id_tok ';'
+    5 CONST_DEC: $@1 undef_id_tok . '=' const_id_tok ';'

 
     '='  shift, and go to state 8
 
 
 state 8
 
 
     '='  shift, and go to state 8
 
 
 state 8
 

-    5 CONST_DEC: @1 undef_id_tok '=' . const_id_tok ';'
+    5 CONST_DEC: $@1 undef_id_tok '=' . const_id_tok ';'

 
     const_id_tok  shift, and go to state 9
 
 
 state 9
 
 
     const_id_tok  shift, and go to state 9
 
 
 state 9
 

-    5 CONST_DEC: @1 undef_id_tok '=' const_id_tok . ';'
+    5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok . ';'

 
     ';'  shift, and go to state 10
 
 
 state 10
 
 
     ';'  shift, and go to state 10
 
 
 state 10
 

-    5 CONST_DEC: @1 undef_id_tok '=' const_id_tok ';' .
+    5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok ';' .

 
     $default  reduce using rule 5 (CONST_DEC)
 ]])
 
     $default  reduce using rule 5 (CONST_DEC)
 ]])


@@ -702,17 +715,12 @@ statement:  struct_stat;
 struct_stat:  /* empty. */ | if else;
 if: "if" "const" "then" statement;
 else: "else" statement;
 struct_stat:  /* empty. */ | if else;
 if: "if" "const" "then" statement;
 else: "else" statement;

-%token IF "if";
-%token CONST "const";
-%token THEN "then";
-%token ELSE "else";

 %%
 ]])
 
 %%
 ]])
 

-AT_CHECK([bison -v -o input.c input.y])
+AT_BISON_CHECK([-v -o input.c input.y])

 
 

-# Check only the tables.  We don't use --no-parser, because it is
-# still to be implemented in the experimental branch of Bison.
+# Check only the tables.

 [sed -n 's/  *$//;/^static const.*\[\] =/,/^}/p' input.c >tables.c]
 
 AT_CHECK([[cat tables.c]], 0,
 [sed -n 's/  *$//;/^static const.*\[\] =/,/^}/p' input.c >tables.c]
 
 AT_CHECK([[cat tables.c]], 0,


@@ -746,15 +754,6 @@ AT_CHECK([[cat tables.c]], 0,
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
        5,     6
 };
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
        5,     6
 };

-static const yytype_uint8 yyprhs[] =
-{
-       0,     0,     3,     5,     6,     9,    14
-};
-static const yytype_int8 yyrhs[] =
-{
-       8,     0,    -1,     9,    -1,    -1,    10,    11,    -1,     3,
-       4,     5,     8,    -1,     6,     8,    -1
-};

 static const yytype_uint8 yyrline[] =
 {
        0,     2,     2,     3,     3,     4,     5
 static const yytype_uint8 yyrline[] =
 {
        0,     2,     2,     3,     3,     4,     5


@@ -768,32 +767,24 @@ static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261
 };
 {
        0,   256,   257,   258,   259,   260,   261
 };

-static const yytype_uint8 yyr1[] =
-{
-       0,     7,     8,     9,     9,    10,    11
-};
-static const yytype_uint8 yyr2[] =
+static const yytype_int8 yypact[] =

 {
 {

-       0,     2,     1,     0,     2,     4,     2
+      -2,    -1,     4,    -8,     0,     2,    -8,    -2,    -8,    -2,
+      -8,    -8

 };
 static const yytype_uint8 yydefact[] =
 {
        3,     0,     0,     2,     0,     0,     1,     3,     4,     3,
        6,     5
 };
 };
 static const yytype_uint8 yydefact[] =
 {
        3,     0,     0,     2,     0,     0,     1,     3,     4,     3,
        6,     5
 };

-static const yytype_int8 yydefgoto[] =
-{
-      -1,     2,     3,     4,     8
-};
-static const yytype_int8 yypact[] =
-{
-      -2,    -1,     4,    -8,     0,     2,    -8,    -2,    -8,    -2,
-      -8,    -8
-};

 static const yytype_int8 yypgoto[] =
 {
       -8,    -7,    -8,    -8,    -8
 };
 static const yytype_int8 yypgoto[] =
 {
       -8,    -7,    -8,    -8,    -8
 };

+static const yytype_int8 yydefgoto[] =
+{
+      -1,     2,     3,     4,     8
+};

 static const yytype_uint8 yytable[] =
 {
       10,     1,    11,     5,     6,     0,     7,     9
 static const yytype_uint8 yytable[] =
 {
       10,     1,    11,     5,     6,     0,     7,     9


@@ -807,6 +798,14 @@ static const yytype_uint8 yystos[] =
        0,     3,     8,     9,    10,     4,     0,     6,    11,     5,
        8,     8
 };
        0,     3,     8,     9,    10,     4,     0,     6,    11,     5,
        8,     8
 };

+static const yytype_uint8 yyr1[] =
+{
+       0,     7,     8,     9,     9,    10,    11
+};
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     0,     2,     4,     2
+};

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -828,7 +827,8 @@ m4_define([_AT_DATA_DANCER_Y],
 [%{
 static int yylex (AT_LALR1_CC_IF([int *], [void]));
 AT_LALR1_CC_IF([],
 [%{
 static int yylex (AT_LALR1_CC_IF([int *], [void]));
 AT_LALR1_CC_IF([],

-[#include <stdio.h>
+[#include <stdlib.h>
+#include <stdio.h>

 static void yyerror (const char *);])
 %}
 $1
 static void yyerror (const char *);])
 %}
 $1


@@ -878,7 +878,7 @@ member: STRING
 AT_LALR1_CC_IF(
 [/* A C++ error reporting function. */
 void
 AT_LALR1_CC_IF(
 [/* A C++ error reporting function. */
 void

-yy::parser::error (const location&, const std::string& m)
+yy::parser::error (const std::string& m)

 {
   std::cerr << m << std::endl;
 }
 {
   std::cerr << m << std::endl;
 }


@@ -887,7 +887,9 @@ int
 yyparse ()
 {
   yy::parser parser;
 yyparse ()
 {
   yy::parser parser;

-  parser.set_debug_level (!!YYDEBUG);
+#if YYDEBUG
+  parser.set_debug_level (YYDEBUG);
+#endif

   return parser.parse ();
 }
 ],
   return parser.parse ();
 }
 ],


@@ -900,12 +902,14 @@ yyerror (const char *s)
 static int
 yylex (AT_LALR1_CC_IF([int *lval], [void]))
 [{
 static int
 yylex (AT_LALR1_CC_IF([int *lval], [void]))
 [{

-  static int toknum = 0;
-  static int tokens[] =
+  static int const tokens[] =

     {
       ':', -1
     };
     {
       ':', -1
     };

+  static size_t toknum;

   ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC.  */])[
   ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC.  */])[

+  if (! (toknum < sizeof tokens / sizeof *tokens))
+    abort ();

   return tokens[toknum++];
 }]
 
   return tokens[toknum++];
 }]
 


@@ -925,12 +929,8 @@ m4_define([AT_CHECK_DANCER],
 [AT_SETUP([Dancer $1])
 AT_BISON_OPTION_PUSHDEFS([$1])
 _AT_DATA_DANCER_Y([$1])
 [AT_SETUP([Dancer $1])
 AT_BISON_OPTION_PUSHDEFS([$1])
 _AT_DATA_DANCER_Y([$1])

-AT_CHECK([bison -o dancer.c dancer.y])
-AT_LALR1_CC_IF(
-  [AT_CHECK([bison -o dancer.cc dancer.y])
-   AT_COMPILE_CXX([dancer])],
-  [AT_CHECK([bison -o dancer.c dancer.y])
-   AT_COMPILE([dancer])])
+AT_BISON_CHECK([-o dancer.c dancer.y])
+AT_FULL_COMPILE([dancer])

 AT_PARSER_CHECK([./dancer], 1, [],
 [syntax error, unexpected ':'
 ])
 AT_PARSER_CHECK([./dancer], 1, [],
 [syntax error, unexpected ':'
 ])


@@ -956,6 +956,7 @@ m4_define([_AT_DATA_EXPECT2_Y],
 static int yylex (AT_LALR1_CC_IF([int *], [void]));
 AT_LALR1_CC_IF([],
 [#include <stdio.h>
 static int yylex (AT_LALR1_CC_IF([int *], [void]));
 AT_LALR1_CC_IF([],
 [#include <stdio.h>

+#include <stdlib.h>

 static void yyerror (const char *);])
 %}
 $1
 static void yyerror (const char *);])
 %}
 $1


@@ -976,7 +977,7 @@ t: A | B;
 AT_LALR1_CC_IF(
 [/* A C++ error reporting function. */
 void
 AT_LALR1_CC_IF(
 [/* A C++ error reporting function. */
 void

-yy::parser::error (const location&, const std::string& m)
+yy::parser::error (const std::string& m)

 {
   std::cerr << m << std::endl;
 }
 {
   std::cerr << m << std::endl;
 }


@@ -997,12 +998,14 @@ yyerror (const char *s)
 static int
 yylex (AT_LALR1_CC_IF([int *lval], [void]))
 [{
 static int
 yylex (AT_LALR1_CC_IF([int *lval], [void]))
 [{

-  static int toknum = 0;
-  static int tokens[] =
+  static int const tokens[] =

     {
       1000, '+', '+', -1
     };
     {
       1000, '+', '+', -1
     };

+  static size_t toknum;

   ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC.  */])[
   ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC.  */])[

+  if (! (toknum < sizeof tokens / sizeof *tokens))
+    abort ();

   return tokens[toknum++];
 }]
 
   return tokens[toknum++];
 }]
 


@@ -1022,12 +1025,8 @@ m4_define([AT_CHECK_EXPECT2],
 [AT_SETUP([Expecting two tokens $1])
 AT_BISON_OPTION_PUSHDEFS([$1])
 _AT_DATA_EXPECT2_Y([$1])
 [AT_SETUP([Expecting two tokens $1])
 AT_BISON_OPTION_PUSHDEFS([$1])
 _AT_DATA_EXPECT2_Y([$1])

-AT_CHECK([bison -o expect2.c expect2.y])
-AT_LALR1_CC_IF(
-  [AT_CHECK([bison -o expect2.cc expect2.y])
-   AT_COMPILE_CXX([expect2])],
-  [AT_CHECK([bison -o expect2.c expect2.y])
-   AT_COMPILE([expect2])])
+AT_BISON_CHECK([-o expect2.c expect2.y])
+AT_FULL_COMPILE([expect2])

 AT_PARSER_CHECK([./expect2], 1, [],
 [syntax error, unexpected '+', expecting A or B
 ])
 AT_PARSER_CHECK([./expect2], 1, [],
 [syntax error, unexpected '+', expecting A or B
 ])


@@ -1093,14 +1092,14 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([bison -t -o input.c input.y])
+AT_BISON_CHECK([-t -o input.c input.y])

 AT_COMPILE([input])
 AT_PARSER_CHECK([./input], 0,
 [[Bison would once convert this action to a midrule because of the subsequent braced code.
 ]],
 [[Starting parse
 Entering state 0
 AT_COMPILE([input])
 AT_PARSER_CHECK([./input], 0,
 [[Bison would once convert this action to a midrule because of the subsequent braced code.
 ]],
 [[Starting parse
 Entering state 0

-Reducing stack by rule 1 (line 22):
+Reducing stack by rule 1 (line 20):

 -> $$ = nterm start ()
 Stack now 0
 Entering state 1
 -> $$ = nterm start ()
 Stack now 0
 Entering state 1


@@ -1126,7 +1125,7 @@ AT_SETUP([String alias declared after use])
 # Bison once incorrectly asserted that the symbol number for either a token or
 # its alias was the highest symbol number so far at the point of the alias
 # declaration.  That was true unless the declaration appeared after their first
 # Bison once incorrectly asserted that the symbol number for either a token or
 # its alias was the highest symbol number so far at the point of the alias
 # declaration.  That was true unless the declaration appeared after their first

-# uses.
+# uses and other tokens appeared in between.

 
 AT_DATA([input.y],
 [[%%
 
 AT_DATA([input.y],
 [[%%


@@ -1134,28 +1133,108 @@ start: 'a' "A" 'b';
 %token 'a' "A";
 ]])
 
 %token 'a' "A";
 ]])
 

-AT_CHECK([bison -t -o input.c input.y])
+AT_BISON_CHECK([-t -o input.c input.y])

 
 AT_CLEANUP
 
 
 
 
 AT_CLEANUP
 
 
 

-## --------------------------- ##
-## Undeclared string literal.  ##
-## --------------------------- ##
+## -------------------------------- ##
+## Extra lookahead sets in report.  ##
+## -------------------------------- ##

 
 

-AT_SETUP([Undeclared string literal])
+AT_SETUP([[Extra lookahead sets in report]])

 
 

-# Bison once allowed a string literal to be used in the grammar without any
-# declaration assigning it as an alias of another token.
+# Bison prints each reduction's lookahead set only next to the associated
+# state's one item that (1) is associated with the same rule as the reduction
+# and (2) has its dot at the end of its RHS.  Previously, Bison also
+# erroneously printed the lookahead set next to all of the state's other items
+# associated with the same rule.  This bug affected only the `.output' file and
+# not the generated parser source code.

 
 

-AT_DATA([input.y],
+AT_DATA([[input.y]],

 [[%%
 [[%%

-start: "abc";
+start: a | 'a' a 'a' ;
+a: 'a' ;
+]])
+
+AT_BISON_CHECK([[--report=all input.y]])
+AT_CHECK([[sed -n '/^state 1$/,/^state 2$/p' input.output]], [[0]],
+[[state 1
+
+    2 start: 'a' . a 'a'
+    3 a: . 'a'
+    3  | 'a' .  [$end]
+
+    'a'  shift, and go to state 4
+
+    $default  reduce using rule 3 (a)
+
+    a  go to state 5
+
+
+state 2
+]])
+
+AT_CLEANUP
+
+
+
+## ---------------------------------------- ##
+## Token number in precedence declaration.  ##
+## ---------------------------------------- ##
+
+AT_SETUP([[Token number in precedence declaration]])
+
+# POSIX says token numbers can be declared in %left, %right, and %nonassoc, but
+# we lost this in Bison 1.50.
+
+AT_DATA_GRAMMAR([input.y],
+[[%{
+  #include <stdio.h>
+  void yyerror (char const *);
+  int yylex (void);
+%}
+
+%error-verbose
+%left TK1 1 TK2 2 "tok alias" 3
+
+%%
+
+start: TK1 sr_conflict "tok alias" ;
+
+sr_conflict:
+  TK2
+  | TK2 "tok alias"
+  ;
+
+%%
+
+void
+yyerror (char const *msg)
+{
+  fprintf (stderr, "%s\n", msg);
+}
+
+int
+yylex (void)
+{
+  static int const input[] = { 1, 2, 3, 0 };
+  static int const *inputp = input;
+  return *inputp++;
+}
+
+int
+main (void)
+{
+  return yyparse ();
+}

 ]])
 
 ]])
 

-AT_CHECK([bison -t -o input.c input.y], [1], [],
-[[input.y:2.8-12: "abc" undeclared
+AT_BISON_CHECK([[-o input.c input.y]], [[0]],,
+[[input.y:24.5-19: warning: rule useless in parser due to conflicts: sr_conflict: TK2 "tok alias"

 ]])
 ]])

+AT_COMPILE([[input]])
+AT_PARSER_CHECK([[./input]])

 
 AT_CLEANUP
 
 AT_CLEANUP