Merge remote-tracking branch 'origin/maint'

[bison.git] / tests / input.at

diff --git a/tests/input.at b/tests/input.at
index 0f3f8a383040ca636a1f67736c5b0a5ee242cc89..694adf3b3d1e68d8b88144aacc84ccb9e446a467 100644 (file)
--- a/tests/input.at
+++ b/tests/input.at
@@ -1,6 +1,6 @@
 # Checking the Bison scanner.                    -*- Autotest -*-
 # Checking the Bison scanner.                    -*- Autotest -*-

-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.

 
 # 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
 
 # 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


@@ -33,8 +33,8 @@ exp: { @$ = @1 ; };
 ]])
 
 AT_BISON_CHECK([input.y], [1], [],
 ]])
 
 AT_BISON_CHECK([input.y], [1], [],

-[[input.y:2.13-14: integer out of range: `$1'
-input.y:3.13-14: integer out of range: `@1'
+[[input.y:2.13-14: integer out of range: '$1'
+input.y:3.13-14: integer out of range: '@1'

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -58,21 +58,20 @@ exp: foo { $$; } foo { $2; } foo
 ]])
 
 AT_BISON_CHECK([input.y], [1], [],
 ]])
 
 AT_BISON_CHECK([input.y], [1], [],

-[[input.y:5.12-13: $$ for the midrule at $2 of `exp' has no declared type
-input.y:5.24-25: $2 of `exp' has no declared type
-input.y:5.6-32: warning: type clash on default action: <bar> != <>
-input.y:6.6-8: warning: type clash on default action: <bar> != <>
-input.y:7.5: warning: empty rule for typed nonterminal, and no action
+[[input.y:5.12-13: $$ for the midrule at $2 of 'exp' has no declared type
+input.y:5.24-25: $2 of 'exp' has no declared type
+input.y:5.6-32: warning: type clash on default action: <bar> != <> [-Wother]
+input.y:6.6-8: warning: type clash on default action: <bar> != <> [-Wother]
+input.y:7.5: warning: empty rule for typed nonterminal, and no action [-Wother]

 ]])
 
 AT_CLEANUP
 
 
 # _AT_UNUSED_VALUES_DECLARATIONS()
 ]])
 
 AT_CLEANUP
 
 
 # _AT_UNUSED_VALUES_DECLARATIONS()

-# --------------------------------------------
+# --------------------------------

 # Generate the token, type, and destructor
 # declarations for the unused values tests.
 # Generate the token, type, and destructor
 # declarations for the unused values tests.

-

 m4_define([_AT_UNUSED_VALUES_DECLARATIONS],
 [[[%token <integer> INT;
 %type <integer> a b c d e f g h i j k l;
 m4_define([_AT_UNUSED_VALUES_DECLARATIONS],
 [[[%token <integer> INT;
 %type <integer> a b c d e f g h i j k l;


@@ -80,15 +79,11 @@ m4_define([_AT_UNUSED_VALUES_DECLARATIONS],
 
 
 # AT_CHECK_UNUSED_VALUES(DECLARATIONS_AFTER, CHECK_MIDRULE_VALUES)
 
 
 # AT_CHECK_UNUSED_VALUES(DECLARATIONS_AFTER, CHECK_MIDRULE_VALUES)

-# ------------------------------------------------------------------
-# Generate a grammar to test unused values,
-# compile it, run it.  If DECLARATIONS_AFTER
-# is set, then the token, type, and destructor
-# declarations are generated after the rules
-# rather than before.  If CHECK_MIDRULE_VALUES
-# is set, then --warnings=midrule-values is
-# set.
-
+# ----------------------------------------------------------------
+# Generate a grammar to test unused values, compile it, run it.  If
+# DECLARATIONS_AFTER is set, then the token, type, and destructor
+# declarations are generated after the rules rather than before.  If
+# CHECK_MIDRULE_VALUES is set, then --warnings=midrule-values is set.

 m4_define([AT_CHECK_UNUSED_VALUES],
 [AT_DATA([input.y],
 m4_ifval($1, [
 m4_define([AT_CHECK_UNUSED_VALUES],
 [AT_DATA([input.y],
 m4_ifval($1, [


@@ -118,39 +113,39 @@ _AT_UNUSED_VALUES_DECLARATIONS])
 )
 
 AT_BISON_CHECK(m4_ifval($2, [ --warnings=midrule-values ])[ input.y], [0], [],
 )
 
 AT_BISON_CHECK(m4_ifval($2, [ --warnings=midrule-values ])[ input.y], [0], [],

-[[input.y:11.10-32: warning: unset value: $]$[
-input.y:11.10-32: warning: unused value: $]1[
-input.y:11.10-32: warning: unused value: $]3[
-input.y:11.10-32: warning: unused value: $]5[
-input.y:12.9: warning: empty rule for typed nonterminal, and no action
-]]m4_ifval($2, [[[input.y:13.14-20: warning: unset value: $$
-input.y:13.26-41: warning: unset value: $$
-]]])[[input.y:13.10-62: warning: unset value: $]$[
-input.y:13.10-62: warning: unused value: $]3[
-input.y:13.10-62: warning: unused value: $]5[
-]]m4_ifval($2, [[[input.y:14.14-16: warning: unset value: $$
-]]])[[input.y:14.10-49: warning: unset value: $]$[
-input.y:14.10-49: warning: unused value: $]3[
-input.y:14.10-49: warning: unused value: $]5[
-input.y:15.10-37: warning: unset value: $]$[
-input.y:15.10-37: warning: unused value: $]3[
-input.y:15.10-37: warning: unused value: $]5[
-input.y:17.10-58: warning: unset value: $]$[
-input.y:17.10-58: warning: unused value: $]1[
-]]m4_ifval($2, [[[input.y:17.10-58: warning: unused value: $]2[
-]]])[[input.y:17.10-58: warning: unused value: $]3[
-]]m4_ifval($2, [[[input.y:17.10-58: warning: unused value: $]4[
-]]])[[input.y:17.10-58: warning: unused value: $]5[
-input.y:18.10-72: warning: unset value: $]$[
-input.y:18.10-72: warning: unused value: $]1[
-input.y:18.10-72: warning: unused value: $]3[
-]]m4_ifval($2, [[[input.y:18.10-72: warning: unused value: $]4[
-]]])[[input.y:18.10-72: warning: unused value: $]5[
-]]m4_ifval($2, [[[input.y:20.10-55: warning: unused value: $]3[
-]]])[[input.y:21.10-68: warning: unset value: $]$[
-input.y:21.10-68: warning: unused value: $]1[
-input.y:21.10-68: warning: unused value: $]2[
-]]m4_ifval($2, [[[input.y:21.10-68: warning: unused value: $]4[
+[[input.y:11.10-32: warning: unset value: $]$[ [-Wother]
+input.y:11.10-32: warning: unused value: $]1[ [-Wother]
+input.y:11.10-32: warning: unused value: $]3[ [-Wother]
+input.y:11.10-32: warning: unused value: $]5[ [-Wother]
+input.y:12.9: warning: empty rule for typed nonterminal, and no action [-Wother]
+]]m4_ifval($2, [[[input.y:13.14-20: warning: unset value: $$ [-Wmidrule-values]
+input.y:13.26-41: warning: unset value: $$ [-Wmidrule-values]
+]]])[[input.y:13.10-62: warning: unset value: $]$[ [-Wother]
+input.y:13.10-62: warning: unused value: $]3[ [-Wother]
+input.y:13.10-62: warning: unused value: $]5[ [-Wother]
+]]m4_ifval($2, [[[input.y:14.14-16: warning: unset value: $$ [-Wmidrule-values]
+]]])[[input.y:14.10-49: warning: unset value: $]$[ [-Wother]
+input.y:14.10-49: warning: unused value: $]3[ [-Wother]
+input.y:14.10-49: warning: unused value: $]5[ [-Wother]
+input.y:15.10-37: warning: unset value: $]$[ [-Wother]
+input.y:15.10-37: warning: unused value: $]3[ [-Wother]
+input.y:15.10-37: warning: unused value: $]5[ [-Wother]
+input.y:17.10-58: warning: unset value: $]$[ [-Wother]
+input.y:17.10-58: warning: unused value: $]1[ [-Wother]
+]]m4_ifval($2, [[[input.y:17.10-58: warning: unused value: $]2[ [-Wmidrule-values]
+]]])[[input.y:17.10-58: warning: unused value: $]3[ [-Wother]
+]]m4_ifval($2, [[[input.y:17.10-58: warning: unused value: $]4[ [-Wmidrule-values]
+]]])[[input.y:17.10-58: warning: unused value: $]5[ [-Wother]
+input.y:18.10-72: warning: unset value: $]$[ [-Wother]
+input.y:18.10-72: warning: unused value: $]1[ [-Wother]
+input.y:18.10-72: warning: unused value: $]3[ [-Wother]
+]]m4_ifval($2, [[[input.y:18.10-72: warning: unused value: $]4[ [-Wmidrule-values]
+]]])[[input.y:18.10-72: warning: unused value: $]5[ [-Wother]
+]]m4_ifval($2, [[[input.y:20.10-55: warning: unused value: $]3[ [-Wmidrule-values]
+]]])[[input.y:21.10-68: warning: unset value: $]$[ [-Wother]
+input.y:21.10-68: warning: unused value: $]1[ [-Wother]
+input.y:21.10-68: warning: unused value: $]2[ [-Wother]
+]]m4_ifval($2, [[[input.y:21.10-68: warning: unused value: $]4[ [-Wmidrule-values]

 ]]]))])
 
 
 ]]]))])
 
 


@@ -182,53 +177,53 @@ AT_SETUP([Default %printer and %destructor redeclared])
 
 AT_DATA([[input.y]],
 [[%destructor { destroy ($$); } <*> <*>
 
 AT_DATA([[input.y]],
 [[%destructor { destroy ($$); } <*> <*>

-%printer { destroy ($$); } <*> <*>
+%printer { print ($$); } <*> <*>

 
 %destructor { destroy ($$); } <*>
 
 %destructor { destroy ($$); } <*>

-%printer { destroy ($$); } <*>
+%printer { print ($$); } <*>

 
 %destructor { destroy ($$); } <> <>
 
 %destructor { destroy ($$); } <> <>

-%printer { destroy ($$); } <> <>
+%printer { print ($$); } <> <>

 
 %destructor { destroy ($$); } <>
 
 %destructor { destroy ($$); } <>

-%printer { destroy ($$); } <>
+%printer { print ($$); } <>

 
 %%
 
 start: ;
 
 %destructor { destroy ($$); } <*>;
 
 %%
 
 start: ;
 
 %destructor { destroy ($$); } <*>;

-%printer { destroy ($$); } <*>;
+%printer { print ($$); } <*>;

 
 %destructor { destroy ($$); } <>;
 
 %destructor { destroy ($$); } <>;

-%printer { destroy ($$); } <>;
+%printer { print ($$); } <>;

 ]])
 
 AT_BISON_CHECK([input.y], [1], [],
 [[input.y:1.13-29: redeclaration for default tagged %destructor
 input.y:1.13-29: previous declaration
 ]])
 
 AT_BISON_CHECK([input.y], [1], [],
 [[input.y:1.13-29: redeclaration for default tagged %destructor
 input.y:1.13-29: previous declaration

-input.y:2.10-26: redeclaration for default tagged %printer
-input.y:2.10-26: previous declaration
+input.y:2.10-24: redeclaration for default tagged %printer
+input.y:2.10-24: previous declaration

 input.y:4.13-29: redeclaration for default tagged %destructor
 input.y:1.13-29: previous declaration
 input.y:4.13-29: redeclaration for default tagged %destructor
 input.y:1.13-29: previous declaration

-input.y:5.10-26: redeclaration for default tagged %printer
-input.y:2.10-26: previous declaration
+input.y:5.10-24: redeclaration for default tagged %printer
+input.y:2.10-24: previous declaration

 input.y:7.13-29: redeclaration for default tagless %destructor
 input.y:7.13-29: previous declaration
 input.y:7.13-29: redeclaration for default tagless %destructor
 input.y:7.13-29: previous declaration

-input.y:8.10-26: redeclaration for default tagless %printer
-input.y:8.10-26: previous declaration
+input.y:8.10-24: redeclaration for default tagless %printer
+input.y:8.10-24: previous declaration

 input.y:10.13-29: redeclaration for default tagless %destructor
 input.y:7.13-29: previous declaration
 input.y:10.13-29: redeclaration for default tagless %destructor
 input.y:7.13-29: previous declaration

-input.y:11.10-26: redeclaration for default tagless %printer
-input.y:8.10-26: previous declaration
+input.y:11.10-24: redeclaration for default tagless %printer
+input.y:8.10-24: previous declaration

 input.y:17.13-29: redeclaration for default tagged %destructor
 input.y:4.13-29: previous declaration
 input.y:17.13-29: redeclaration for default tagged %destructor
 input.y:4.13-29: previous declaration

-input.y:18.10-26: redeclaration for default tagged %printer
-input.y:5.10-26: previous declaration
+input.y:18.10-24: redeclaration for default tagged %printer
+input.y:5.10-24: previous declaration

 input.y:20.13-29: redeclaration for default tagless %destructor
 input.y:10.13-29: previous declaration
 input.y:20.13-29: redeclaration for default tagless %destructor
 input.y:10.13-29: previous declaration

-input.y:21.10-26: redeclaration for default tagless %printer
-input.y:11.10-26: previous declaration
+input.y:21.10-24: redeclaration for default tagless %printer
+input.y:11.10-24: previous declaration

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -242,17 +237,17 @@ AT_SETUP([Per-type %printer and %destructor redeclared])
 
 AT_DATA([[input.y]],
 [[%destructor { destroy ($$); } <field1> <field2>
 
 AT_DATA([[input.y]],
 [[%destructor { destroy ($$); } <field1> <field2>

-%printer { destroy ($$); } <field1> <field2>
+%printer { print ($$); } <field1> <field2>

 
 %destructor { destroy ($$); } <field1> <field1>
 
 %destructor { destroy ($$); } <field1> <field1>

-%printer { destroy ($$); } <field2> <field2>
+%printer { print ($$); } <field2> <field2>

 
 %%
 
 start: ;
 
 %destructor { destroy ($$); } <field2> <field1>;
 
 %%
 
 start: ;
 
 %destructor { destroy ($$); } <field2> <field1>;

-%printer { destroy ($$); } <field2> <field1>;
+%printer { print ($$); } <field2> <field1>;

 ]])
 
 AT_BISON_CHECK([input.y], [1], [],
 ]])
 
 AT_BISON_CHECK([input.y], [1], [],


@@ -260,20 +255,116 @@ AT_BISON_CHECK([input.y], [1], [],
 input.y:1.13-29: previous declaration
 input.y:4.13-29: %destructor redeclaration for <field1>
 input.y:4.13-29: previous declaration
 input.y:1.13-29: previous declaration
 input.y:4.13-29: %destructor redeclaration for <field1>
 input.y:4.13-29: previous declaration

-input.y:5.10-26: %printer redeclaration for <field2>
-input.y:2.10-26: previous declaration
-input.y:5.10-26: %printer redeclaration for <field2>
-input.y:5.10-26: previous declaration
+input.y:5.10-24: %printer redeclaration for <field2>
+input.y:2.10-24: previous declaration
+input.y:5.10-24: %printer redeclaration for <field2>
+input.y:5.10-24: previous declaration

 input.y:11.13-29: %destructor redeclaration for <field1>
 input.y:4.13-29: previous declaration
 input.y:11.13-29: %destructor redeclaration for <field2>
 input.y:1.13-29: previous declaration
 input.y:11.13-29: %destructor redeclaration for <field1>
 input.y:4.13-29: previous declaration
 input.y:11.13-29: %destructor redeclaration for <field2>
 input.y:1.13-29: previous declaration

-input.y:12.10-26: %printer redeclaration for <field1>
-input.y:2.10-26: previous declaration
-input.y:12.10-26: %printer redeclaration for <field2>
-input.y:5.10-26: previous declaration
+input.y:12.10-24: %printer redeclaration for <field1>
+input.y:2.10-24: previous declaration
+input.y:12.10-24: %printer redeclaration for <field2>
+input.y:5.10-24: previous declaration
+]])
+
+AT_CLEANUP
+
+## ----------------------------------------------------- ##
+## Undeclared symbols used for a printer or destructor.  ##
+## ----------------------------------------------------- ##
+
+AT_SETUP([Undeclared symbols used for a printer or destructor])
+
+AT_DATA([[input.y]],
+[[%printer {} foo baz
+%destructor {} bar
+
+%%
+exp: bar;
+]])
+
+AT_BISON_CHECK([input.y], [1], [],
+[[input.y:2.16-18: symbol bar is used, but is not defined as a token and has no rules
+input.y:1.17-19: warning: symbol baz is used, but is not defined as a token and has no rules [-Wother]
+input.y:1.13-15: warning: symbol foo is used, but is not defined as a token and has no rules [-Wother]
+]])
+
+AT_CLEANUP
+
+
+## ----------------------------------------------------- ##
+## Unassociated types used for a printer or destructor.  ##
+## ----------------------------------------------------- ##
+
+AT_SETUP([Unassociated types used for a printer or destructor])
+
+AT_DATA([[input.y]],
+[[%token <type1> tag1
+%type <type2> tag2
+
+%printer { } <type1> <type3>
+%destructor { } <type2> <type4>
+
+%%
+
+exp: tag1 { $1; }
+   | tag2 { $1; }
+
+tag2: "a" { $$; }
+]])
+
+AT_BISON_CHECK([input.y], [0], [],
+[[input.y:4.22-28: warning: type <type3> is used, but is not associated to any symbol [-Wother]
+input.y:5.25-31: warning: type <type4> is used, but is not associated to any symbol [-Wother]
+]])
+
+AT_CLEANUP
+
+
+## --------------------------------- ##
+## Useless printers or destructors.  ##
+## --------------------------------- ##
+
+AT_SETUP([Useless printers or destructors])
+
+AT_DATA([[input.y]],
+[[%token <type1> token1
+%token <type2> token2
+%token <type3> token3
+%token <type4> token4
+%token <type5> token51 token52
+%token <type6> token61 token62
+%token <type7> token7
+
+%printer {} token1
+%destructor {} token2
+%printer {} token51
+%destructor {} token61
+
+%printer {} token7
+
+%printer {} <type1>
+%destructor {} <type2>
+%printer {} <type3>
+%destructor {} <type4>
+
+%printer {} <type5>
+%destructor {} <type6>
+
+%destructor {} <type7>
+
+%%
+exp: "a";
+]])
+
+AT_BISON_CHECK([input.y], [0], [],
+[[input.y:16.13-19: warning: useless %printer for type <type1> [-Wother]
+input.y:17.16-22: warning: useless %destructor for type <type2> [-Wother]

 ]])
 
 ]])
 

+

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -295,9 +386,9 @@ tagged: { } ;
 ]])
 
 AT_BISON_CHECK([input.y], [0], [],
 ]])
 
 AT_BISON_CHECK([input.y], [0], [],

-[[input.y:6.8-45: warning: unset value: $$
-input.y:6.8-45: warning: unused value: $2
-input.y:7.6-8: warning: unset value: $$
+[[input.y:6.8-45: warning: unset value: $$ [-Wother]
+input.y:6.8-45: warning: unused value: $2 [-Wother]
+input.y:7.6-8: warning: unset value: $$ [-Wother]

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


@@ -312,8 +403,8 @@ tagged: { } ;
 ]])
 
 AT_BISON_CHECK([input.y], [0], [],
 ]])
 
 AT_BISON_CHECK([input.y], [0], [],

-[[input.y:6.8-45: warning: unused value: $4
-input.y:8.9-11: warning: unset value: $$
+[[input.y:6.8-45: warning: unused value: $4 [-Wother]
+input.y:8.9-11: warning: unset value: $$ [-Wother]

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -336,9 +427,9 @@ end: { }  ;
 ]])
 
 AT_BISON_CHECK([input.y], [0], [],
 ]])
 
 AT_BISON_CHECK([input.y], [0], [],

-[[input.y:6.8-22: warning: unset value: $$
-input.y:6.8-22: warning: unused value: $2
-input.y:7.6-8: warning: unset value: $$
+[[input.y:6.8-22: warning: unset value: $$ [-Wother]
+input.y:6.8-22: warning: unused value: $2 [-Wother]
+input.y:7.6-8: warning: unset value: $$ [-Wother]

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -391,7 +482,7 @@ AT_CLEANUP
 
 AT_SETUP([Torturing the Scanner])
 
 
 AT_SETUP([Torturing the Scanner])
 

-
+AT_BISON_OPTION_PUSHDEFS

 AT_DATA([input.y], [])
 AT_BISON_CHECK([input.y], [1], [],
 [[input.y:1.1: syntax error, unexpected end of file
 AT_DATA([input.y], [])
 AT_BISON_CHECK([input.y], [1], [],
 [[input.y:1.1: syntax error, unexpected end of file


@@ -442,6 +533,7 @@ char apostrophe = '\'';
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

+#include <assert.h>

 %}
 /* %{ and %} can be here too. */
 
 %}
 /* %{ and %} can be here too. */
 


@@ -468,8 +560,8 @@ char quote[] = "@:>@@:>@,";
 %}
 
 %{
 %}
 
 %{

-static void yyerror (const char *s);
-static int yylex (void);
+]AT_YYERROR_DECLARE[
+]AT_YYLEX_DECLARE[

 %}
 
 %type <ival> '@<:@'
 %}
 
 %type <ival> '@<:@'


@@ -501,7 +593,7 @@ value_as_yystype (value val)
   res.ival = val;
   return res;
 }
   res.ival = val;
   return res;
 }

-
+]AT_YYERROR_DEFINE[

 static int
 yylex (void)
 {
 static int
 yylex (void)
 {


@@ -509,17 +601,10 @@ yylex (void)
 #output "; /* "
   */
   static size_t toknum;
 #output "; /* "
   */
   static size_t toknum;

-  if (! (toknum < sizeof input))
-    abort ();
+  assert (toknum < sizeof input);

   yylval = value_as_yystype (input[toknum]);
   return input[toknum++];
 }
   yylval = value_as_yystype (input[toknum]);
   return input[toknum++];
 }

-
-static void
-yyerror (const char *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}

 ]])
 
 # Pacify Emacs'font-lock-mode: "
 ]])
 
 # Pacify Emacs'font-lock-mode: "


@@ -536,10 +621,11 @@ main (void)
   return yyparse ();
 }
 ]])
   return yyparse ();
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([-d -v -o input.c input.y])
 
 AT_BISON_CHECK([-d -v -o input.c input.y])

-AT_COMPILE([input.o], [-c input.c])
-AT_COMPILE([main.o], [-c main.c])
+AT_COMPILE([input.o])
+AT_COMPILE([main.o])

 AT_COMPILE([input], [input.o main.o])
 AT_PARSER_CHECK([./input], 0,
 [[[@<:@],
 AT_COMPILE([input], [input.o main.o])
 AT_PARSER_CHECK([./input], 0,
 [[[@<:@],


@@ -600,8 +686,8 @@ AT_CHECK_REQUIRE(100.0, 63)
 
 AT_SETUP([String aliases for character tokens])
 
 
 AT_SETUP([String aliases for character tokens])
 

-# Bison once thought a character token and its alias were different symbols
-# with the same user token number.
+# Bison once thought a character token and its alias were different
+# symbols with the same user token number.

 
 AT_DATA_GRAMMAR([input.y],
 [[%token 'a' "a"
 
 AT_DATA_GRAMMAR([input.y],
 [[%token 'a' "a"


@@ -621,14 +707,15 @@ AT_CLEANUP
 
 AT_SETUP([Symbols])
 
 
 AT_SETUP([Symbols])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([input.y],
 [[%token WITH-DASH
 %token WITHOUT_DASH "WITHOUT-DASH"
 %token WITH.PERIOD
 %token WITHOUT_PERIOD "WITHOUT.PERIOD"
 %code {
 AT_DATA_GRAMMAR([input.y],
 [[%token WITH-DASH
 %token WITHOUT_DASH "WITHOUT-DASH"
 %token WITH.PERIOD
 %token WITHOUT_PERIOD "WITHOUT.PERIOD"
 %code {

-  void yyerror (char const *);
-  int yylex (void);
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[

 }
 %%
 start: with-dash without_dash with.period without_period;
 }
 %%
 start: with-dash without_dash with.period without_period;


@@ -637,38 +724,44 @@ without_dash: "WITHOUT-DASH";
 with.period: WITH.PERIOD;
 without_period: "WITHOUT.PERIOD";
 %%
 with.period: WITH.PERIOD;
 without_period: "WITHOUT.PERIOD";
 %%

+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE[

 ]])
 ]])

+AT_BISON_OPTION_POPDEFS

 
 # POSIX Yacc accept periods, but not dashes.
 AT_BISON_CHECK([--yacc input.y], [1], [],
 
 # POSIX Yacc accept periods, but not dashes.
 AT_BISON_CHECK([--yacc input.y], [1], [],

-[[input.y:9.8-16: POSIX Yacc forbids dashes in symbol names: WITH-DASH
-input.y:18.8-16: POSIX Yacc forbids dashes in symbol names: with-dash
+[[input.y:9.8-16: POSIX Yacc forbids dashes in symbol names: WITH-DASH [-Wyacc]
+input.y:18.8-16: POSIX Yacc forbids dashes in symbol names: with-dash [-Wyacc]

 ]])
 
 # So warn about them.
 AT_BISON_CHECK([-Wyacc input.y], [], [],
 ]])
 
 # So warn about them.
 AT_BISON_CHECK([-Wyacc input.y], [], [],

-[[input.y:9.8-16: warning: POSIX Yacc forbids dashes in symbol names: WITH-DASH
-input.y:18.8-16: warning: POSIX Yacc forbids dashes in symbol names: with-dash
+[[input.y:9.8-16: warning: POSIX Yacc forbids dashes in symbol names: WITH-DASH [-Wyacc]
+input.y:18.8-16: warning: POSIX Yacc forbids dashes in symbol names: with-dash [-Wyacc]

 ]])
 
 # Dashes are fine for GNU Bison.
 AT_BISON_CHECK([-o input.c input.y])
 
 # Make sure we don't export silly token identifiers with periods or dashes.
 ]])
 
 # Dashes are fine for GNU Bison.
 AT_BISON_CHECK([-o input.c input.y])
 
 # Make sure we don't export silly token identifiers with periods or dashes.

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

 
 
 
 

-# Periods and dashes are genuine letters, they can start identifiers.
-# Digits cannot.
+# Periods are genuine letters, they can start identifiers.
+# Digits and dashes cannot.

 AT_DATA_GRAMMAR([input.y],
 [[%token .GOOD
          -GOOD
          1NV4L1D
 AT_DATA_GRAMMAR([input.y],
 [[%token .GOOD
          -GOOD
          1NV4L1D

+         -123

 %%
 %%

-start: .GOOD -GOOD
+start: .GOOD GOOD

 ]])
 AT_BISON_CHECK([-o input.c input.y], [1], [],
 ]])
 AT_BISON_CHECK([-o input.c input.y], [1], [],

-[[input.y:11.10-16: invalid identifier: `1NV4L1D'
+[[input.y:10.10: invalid character: '-'
+input.y:11.10-16: invalid identifier: '1NV4L1D'
+input.y:12.10: invalid character: '-'

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -705,8 +798,8 @@ start: TOO_LARGE_DEC TOO_LARGE_HEX
 ]])
 
 AT_BISON_CHECK([too-large.y], [1], [],
 ]])
 
 AT_BISON_CHECK([too-large.y], [1], [],

-[[too-large.y:9.22-42: integer out of range: `999999999999999999999'
-too-large.y:10.24-44: integer out of range: `0xFFFFFFFFFFFFFFFFFFF'
+[[too-large.y:9.22-42: integer out of range: '999999999999999999999'
+too-large.y:10.24-44: integer out of range: '0xFFFFFFFFFFFFFFFFFFF'

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -718,10 +811,10 @@ AT_CLEANUP
 
 AT_SETUP([Unclosed constructs])
 
 
 AT_SETUP([Unclosed constructs])
 

-# Bison's scan-gram.l once forgot to STRING_FINISH some unclosed constructs, so
-# they were prepended to whatever it STRING_GROW'ed next.  It also threw them
-# away rather than returning them to the parser.  The effect was confusing
-# subsequent error messages.
+# Bison's scan-gram.l once forgot to STRING_FINISH some unclosed
+# constructs, so they were prepended to whatever it STRING_GROW'ed
+# next.  It also threw them away rather than returning them to the
+# parser.  The effect was confusing subsequent error messages.

 
 AT_DATA([input.y],
 [[%token A "a
 
 AT_DATA([input.y],
 [[%token A "a


@@ -746,11 +839,11 @@ start: ;
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 1, [],
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 1, [],

-[[input.y:1.10-2.0: missing `"' at end of line
-input.y:4.10-5.0: missing `'' at end of line
-input.y:14.11-15.0: missing `'' at end of line
-input.y:16.11-17.0: missing `"' at end of line
-input.y:19.13-20.0: missing `}' at end of file
+[[input.y:1.10-2.0: missing '"' at end of line
+input.y:4.10-5.0: missing "'" at end of line
+input.y:14.11-15.0: missing "'" at end of line
+input.y:16.11-17.0: missing '"' at end of line
+input.y:19.13-20.0: missing '}' at end of file

 input.y:20.1: syntax error, unexpected end of file
 ]])
 
 input.y:20.1: syntax error, unexpected end of file
 ]])
 


@@ -763,8 +856,8 @@ AT_CLEANUP
 
 AT_SETUP([%start after first rule])
 
 
 AT_SETUP([%start after first rule])
 

-# Bison once complained that a %start after the first rule was a redeclaration
-# of the start symbol.
+# Bison once complained that a %start after the first rule was a
+# redeclaration of the start symbol.

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


@@ -799,6 +892,26 @@ AT_BISON_CHECK([input.y], [1], [],
 AT_CLEANUP
 
 
 AT_CLEANUP
 
 

+## ------------------------------- ##
+## %prec's token must be defined.  ##
+## ------------------------------- ##
+
+AT_SETUP([[%prec's token must be defined]])
+
+# According to POSIX, a %prec token must be defined separately.
+
+AT_DATA([[input.y]],
+[[%%
+start: %prec PREC ;
+]])
+
+AT_BISON_CHECK([[input.y]], [[0]], [],
+[[input.y:2.8-17: warning: token for %prec is not defined: PREC [-Wother]
+]])
+
+AT_CLEANUP
+
+

 ## -------------------------------- ##
 ## Reject unused %code qualifiers.  ##
 ## -------------------------------- ##
 ## -------------------------------- ##
 ## Reject unused %code qualifiers.  ##
 ## -------------------------------- ##


@@ -813,11 +926,11 @@ AT_DATA([input-c.y],
 %%
 start: ;
 ]])
 %%
 start: ;
 ]])

-AT_BISON_CHECK([[input-c.y]], [0], [],
-[[input-c.y:1.7: warning: %code qualifier `q' is not used
-input-c.y:2.7-9: warning: %code qualifier `bad' is not used
-input-c.y:3.7-9: warning: %code qualifier `bad' is not used
-input-c.y:4.7-12: warning: %code qualifier `format' is not used
+AT_BISON_CHECK([[input-c.y]], [[1]], [],
+[[input-c.y:1.7: %code qualifier 'q' is not used
+input-c.y:2.7-9: %code qualifier 'bad' is not used
+input-c.y:3.7-9: %code qualifier 'bad' is not used
+input-c.y:4.7-12: %code qualifier 'format' is not used

 ]])
 
 AT_DATA([input-c-glr.y],
 ]])
 
 AT_DATA([input-c-glr.y],


@@ -827,10 +940,10 @@ AT_DATA([input-c-glr.y],
 %%
 start: ;
 ]])
 %%
 start: ;
 ]])

-AT_BISON_CHECK([[input-c-glr.y]], [0], [],
-[[input-c-glr.y:1.7: warning: %code qualifier `q' is not used
-input-c-glr.y:2.7-9: warning: %code qualifier `bad' is not used
-input-c-glr.y:3.8-10: warning: %code qualifier `bad' is not used
+AT_BISON_CHECK([[input-c-glr.y]], [[1]], [],
+[[input-c-glr.y:1.7: %code qualifier 'q' is not used
+input-c-glr.y:2.7-9: %code qualifier 'bad' is not used
+input-c-glr.y:3.8-10: %code qualifier 'bad' is not used

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


@@ -840,10 +953,10 @@ AT_DATA([input-c++.y],
 %%
 start: ;
 ]])
 %%
 start: ;
 ]])

-AT_BISON_CHECK([[input-c++.y]], [0], [],
-[[input-c++.y:1.7: warning: %code qualifier `q' is not used
-input-c++.y:2.7-9: warning: %code qualifier `bad' is not used
-input-c++.y:3.8: warning: %code qualifier `q' is not used
+AT_BISON_CHECK([[input-c++.y]], [[1]], [],
+[[input-c++.y:1.7: %code qualifier 'q' is not used
+input-c++.y:2.7-9: %code qualifier 'bad' is not used
+input-c++.y:3.8: %code qualifier 'q' is not used

 ]])
 
 AT_DATA([input-c++-glr.y],
 ]])
 
 AT_DATA([input-c++-glr.y],


@@ -853,10 +966,10 @@ AT_DATA([input-c++-glr.y],
 %%
 start: ;
 ]])
 %%
 start: ;
 ]])

-AT_BISON_CHECK([[input-c++-glr.y]], [0], [],
-[[input-c++-glr.y:1.7-9: warning: %code qualifier `bad' is not used
-input-c++-glr.y:2.7: warning: %code qualifier `q' is not used
-input-c++-glr.y:3.7: warning: %code qualifier `q' is not used
+AT_BISON_CHECK([[input-c++-glr.y]], [[1]], [],
+[[input-c++-glr.y:1.7-9: %code qualifier 'bad' is not used
+input-c++-glr.y:2.7: %code qualifier 'q' is not used
+input-c++-glr.y:3.7: %code qualifier 'q' is not used

 ]])
 
 AT_DATA([special-char-@@.y],
 ]])
 
 AT_DATA([special-char-@@.y],


@@ -866,10 +979,10 @@ AT_DATA([special-char-@@.y],
 %%
 start: ;
 ]])
 %%
 start: ;
 ]])

-AT_BISON_CHECK([[special-char-@@.y]], [0], [],
-[[special-char-@@.y:1.7-9: warning: %code qualifier `bad' is not used
-special-char-@@.y:2.7: warning: %code qualifier `q' is not used
-special-char-@@.y:3.7: warning: %code qualifier `q' is not used
+AT_BISON_CHECK([[special-char-@@.y]], [[1]], [],
+[[special-char-@@.y:1.7-9: %code qualifier 'bad' is not used
+special-char-@@.y:2.7: %code qualifier 'q' is not used
+special-char-@@.y:3.7: %code qualifier 'q' is not used

 ]])
 
 AT_DATA([special-char-@:>@.y],
 ]])
 
 AT_DATA([special-char-@:>@.y],


@@ -879,10 +992,10 @@ AT_DATA([special-char-@:>@.y],
 %%
 start: ;
 ]])
 %%
 start: ;
 ]])

-AT_BISON_CHECK([[special-char-@:>@.y]], [0], [],
-[[special-char-@:>@.y:1.7-9: warning: %code qualifier `bad' is not used
-special-char-@:>@.y:2.7: warning: %code qualifier `q' is not used
-special-char-@:>@.y:3.7: warning: %code qualifier `q' is not used
+AT_BISON_CHECK([[special-char-@:>@.y]], [[1]], [],
+[[special-char-@:>@.y:1.7-9: %code qualifier 'bad' is not used
+special-char-@:>@.y:2.7: %code qualifier 'q' is not used
+special-char-@:>@.y:3.7: %code qualifier 'q' is not used

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -905,9 +1018,9 @@ start: ;
 ]])
 
 AT_BISON_CHECK([[input-redefined.y]], [[1]], [],
 ]])
 
 AT_BISON_CHECK([[input-redefined.y]], [[1]], [],

-[[input-redefined.y:2.9-11: %define variable `var' redefined
+[[input-redefined.y:2.9-11: %define variable 'var' redefined

 input-redefined.y:1.9-11: previous definition
 input-redefined.y:1.9-11: previous definition

-input-redefined.y:3.10-12: %define variable `var' redefined
+input-redefined.y:3.10-12: %define variable 'var' redefined

 input-redefined.y:2.9-11: previous definition
 ]])
 
 input-redefined.y:2.9-11: previous definition
 ]])
 


@@ -917,8 +1030,8 @@ AT_DATA([input-unused.y],
 start: ;
 ]])
 
 start: ;
 ]])
 

-AT_BISON_CHECK([[input-unused.y]], [[0]], [],
-[[input-unused.y:1.9-11: warning: %define variable `var' is not used
+AT_BISON_CHECK([[input-unused.y]], [[1]], [],
+[[input-unused.y:1.9-11: %define variable 'var' is not used

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -928,9 +1041,9 @@ AT_CLEANUP
 ## %define, --define, --force-define.  ##
 ## ----------------------------------- ##
 
 ## %define, --define, --force-define.  ##
 ## ----------------------------------- ##
 

-AT_SETUP([%define, --define, --force-define])
+AT_SETUP([[%define, --define, --force-define]])

 
 

-AT_DATA([skel.c],
+AT_DATA([[skel.c]],

 [[m4@&t@_divert_push(0)@
 @output(b4_parser_file_name@)@
 [var-dd: ]b4_percent_define_get([[var-dd]])[
 [[m4@&t@_divert_push(0)@
 @output(b4_parser_file_name@)@
 [var-dd: ]b4_percent_define_get([[var-dd]])[


@@ -939,23 +1052,16 @@ var-dfg: ]b4_percent_define_get([[var-dfg]])[
 var-fd: ]b4_percent_define_get([[var-fd]])
 m4@&t@_divert_pop(0)
 ]])
 var-fd: ]b4_percent_define_get([[var-fd]])
 m4@&t@_divert_pop(0)
 ]])

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

 [[%define var-dfg "gram"
 %%
 start: ;
 ]])
 [[%define var-dfg "gram"
 %%
 start: ;
 ]])

-

 AT_BISON_CHECK([[-Dvar-dd=cmd-d1 -Dvar-dd=cmd-d2 \
                  -Fvar-ff=cmd-f1 -Fvar-ff=cmd-f2 \
                  -Dvar-dfg=cmd-d -Fvar-dfg=cmd-f \
                  -Fvar-fd=cmd-f -Dvar-fd=cmd-d   \
 AT_BISON_CHECK([[-Dvar-dd=cmd-d1 -Dvar-dd=cmd-d2 \
                  -Fvar-ff=cmd-f1 -Fvar-ff=cmd-f2 \
                  -Dvar-dfg=cmd-d -Fvar-dfg=cmd-f \
                  -Fvar-fd=cmd-f -Dvar-fd=cmd-d   \

-                 -Dunused-d -Funused-f           \
-                 --skeleton ./skel.c input.y]], [[0]], [],
-[[<command line>:10: warning: %define variable `unused-d' is not used
-<command line>:11: warning: %define variable `unused-f' is not used
-]])
-
+                 --skeleton ./skel.c input.y]])

 AT_CHECK([[cat input.tab.c]], [[0]],
 [[var-dd: cmd-d2
 var-ff: cmd-f2
 AT_CHECK([[cat input.tab.c]], [[0]],
 [[var-dd: cmd-d2
 var-ff: cmd-f2


@@ -963,17 +1069,25 @@ var-dfg: cmd-f
 var-fd: cmd-d
 ]])
 
 var-fd: cmd-d
 ]])
 

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

 [[%define var "gram"
 %%
 start: ;
 ]])
 [[%define var "gram"
 %%
 start: ;
 ]])

-

 AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [],
 AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [],

-[[input-dg.y:1.9-11: %define variable `var' redefined
+[[input-dg.y:1.9-11: %define variable 'var' redefined

 <command line>:2: previous definition
 ]])
 
 <command line>:2: previous definition
 ]])
 

+AT_DATA([[input-unused.y]],
+[[%%
+start: ;
+]])
+AT_BISON_CHECK([[-Dunused-d -Funused-f input-unused.y]], [[1]], [],
+[[<command line>:2: %define variable 'unused-d' is not used
+<command line>:3: %define variable 'unused-f' is not used
+]])
+

 AT_CLEANUP
 
 ## --------------------------- ##
 AT_CLEANUP
 
 ## --------------------------- ##


@@ -991,7 +1105,7 @@ start: ;
 ]])
 
 AT_BISON_CHECK([[Input.y]], [1], [],
 ]])
 
 AT_BISON_CHECK([[Input.y]], [1], [],

-[[Input.y:2.9-14: invalid value for %define Boolean variable `public'
+[[Input.y:2.9-14: invalid value for %define Boolean variable 'public'

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1004,28 +1118,28 @@ AT_SETUP([[%define enum variables]])
 
 # Front-end.
 AT_DATA([[input.y]],
 
 # Front-end.
 AT_DATA([[input.y]],

-[[%define lr.default-reductions "bogus"
+[[%define lr.default-reductions bogus

 %%
 start: ;
 ]])
 AT_BISON_CHECK([[input.y]], [[1]], [[]],
 %%
 start: ;
 ]])
 AT_BISON_CHECK([[input.y]], [[1]], [[]],

-[[input.y:1.9-29: invalid value for %define variable `lr.default-reductions': `bogus'
-input.y:1.9-29: accepted value: `all'
-input.y:1.9-29: accepted value: `consistent'
-input.y:1.9-29: accepted value: `accepting'
+[[input.y:1.9-29: invalid value for %define variable 'lr.default-reductions': 'bogus'
+input.y:1.9-29: accepted value: 'most'
+input.y:1.9-29: accepted value: 'consistent'
+input.y:1.9-29: accepted value: 'accepting'

 ]])
 
 # Back-end.
 AT_DATA([[input.y]],
 ]])
 
 # Back-end.
 AT_DATA([[input.y]],

-[[%define api.push-pull "neither"
+[[%define api.push-pull neither

 %%
 start: ;
 ]])
 AT_BISON_CHECK([[input.y]], [1], [],
 %%
 start: ;
 ]])
 AT_BISON_CHECK([[input.y]], [1], [],

-[[input.y:1.9-21: invalid value for %define variable `api.push-pull': `neither'
-input.y:1.9-21: accepted value: `pull'
-input.y:1.9-21: accepted value: `push'
-input.y:1.9-21: accepted value: `both'
+[[input.y:1.9-21: invalid value for %define variable 'api.push-pull': 'neither'
+input.y:1.9-21: accepted value: 'pull'
+input.y:1.9-21: accepted value: 'push'
+input.y:1.9-21: accepted value: 'both'

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1045,19 +1159,30 @@ AT_DATA([[input.y]],
 start: ;
 ]])
 AT_BISON_CHECK([[input.y]], [1], [],
 start: ;
 ]])
 AT_BISON_CHECK([[input.y]], [1], [],

-[[input.y:1.9-21: invalid value for %define variable `api.push-pull': `neither'
-input.y:1.9-21: accepted value: `pull'
-input.y:1.9-21: accepted value: `push'
-input.y:1.9-21: accepted value: `both'
+[[input.y:1.9-21: invalid value for %define variable 'api.push-pull': 'neither'
+input.y:1.9-21: accepted value: 'pull'
+input.y:1.9-21: accepted value: 'push'
+input.y:1.9-21: accepted value: 'both'

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

-[[%define lr.keep_unreachable_states "maybe"
+[[%define lr.keep_unreachable_states maybe

 %%
 start: ;
 ]])
 AT_BISON_CHECK([[input.y]], [1], [],
 %%
 start: ;
 ]])
 AT_BISON_CHECK([[input.y]], [1], [],

-[[input.y:1.9-34: invalid value for %define Boolean variable `lr.keep-unreachable-states'
+[[input.y:1.9-34: invalid value for %define Boolean variable 'lr.keep-unreachable-states'
+]])
+
+AT_DATA([[input.y]],
+[[%define namespace "foo"
+%define api.namespace "foo"
+%%
+start: ;
+]])
+AT_BISON_CHECK([[input.y]], [1], [],
+[[input.y:2.9-21: %define variable 'api.namespace' redefined
+input.y:1.9-17: previous definition

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


@@ -1065,8 +1190,8 @@ AT_DATA([[input.y]],
 %%
 start: ;
 ]])
 %%
 start: ;
 ]])

-AT_BISON_CHECK([[input.y]], [0], [],
-[[input.y:1.9-15: warning: %define variable `foo_bar' is not used
+AT_BISON_CHECK([[input.y]], [[1]], [],
+[[input.y:1.9-15: %define variable 'foo_bar' is not used

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1090,17 +1215,17 @@ AT_DATA([[input.y]],
 start: ;
 ]])
 
 start: ;
 ]])
 

-AT_BISON_CHECK([[input.y]], [0], [],
-[[input.y:1.9-16: warning: %define variable `api.pure' is not used
+AT_BISON_CHECK([[input.y]], [[1]], [],
+[[input.y:1.9-16: %define variable 'api.pure' is not used

 ]])
 ])
 
 AT_CHECK_API_PURE([[%language "c++" %defines]], [[]])
 ]])
 ])
 
 AT_CHECK_API_PURE([[%language "c++" %defines]], [[]])

-AT_CHECK_API_PURE([[%language "c++" %defines]], [["false"]])
+AT_CHECK_API_PURE([[%language "c++" %defines]], [[false]])

 AT_CHECK_API_PURE([[%language "c++" %defines %glr-parser]], [[""]])
 AT_CHECK_API_PURE([[%language "c++" %defines %glr-parser]], [[""]])

-AT_CHECK_API_PURE([[%language "c++" %defines %glr-parser]], [["false"]])
-AT_CHECK_API_PURE([[%language "java"]], [["true"]])
-AT_CHECK_API_PURE([[%language "java"]], [["false"]])
+AT_CHECK_API_PURE([[%language "c++" %defines %glr-parser]], [[false]])
+AT_CHECK_API_PURE([[%language "java"]], [[true]])
+AT_CHECK_API_PURE([[%language "java"]], [[false]])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -1118,14 +1243,14 @@ m4_define([AT_CHECK_NAMESPACE_ERROR],
 AT_DATA([[input.y]],
 [[%language "C++"
 %defines
 AT_DATA([[input.y]],
 [[%language "C++"
 %defines

-%define namespace "]$1["
+%define api.namespace "]$1["

 %%
 start: ;
 ]])
 
 AT_BISON_CHECK([[input.y]], [1], [],
 [m4_foreach([b4_arg], m4_dquote(m4_shift($@)),
 %%
 start: ;
 ]])
 
 AT_BISON_CHECK([[input.y]], [1], [],
 [m4_foreach([b4_arg], m4_dquote(m4_shift($@)),

-[[input.y:3.9-17: ]b4_arg[
+[[input.y:3.9-21: ]b4_arg[

 ]])])
 ])
 
 ]])])
 ])
 


@@ -1160,10 +1285,8 @@ AT_CLEANUP
 # Bison used to accept character literals that were empty or contained
 # too many characters.
 
 # Bison used to accept character literals that were empty or contained
 # too many characters.
 

-# FIXME: $ECHO_N and $ECHO_C are not very portable according to the
-# Autoconf manual.  Switch to AS_ECHO_N when Autoconf 2.64 is released?
-# Even better, AT_DATA or some variant of AT_DATA may eventually permit
-# a trailing newline.  See the threads starting at
+# FIXME: AT_DATA or some variant of AT_DATA may eventually permit
+# the final newline to be omitted.  See the threads starting at

 # <http://lists.gnu.org/archive/html/bison-patches/2009-07/msg00019.html>.
 
 AT_SETUP([[Bad character literals]])
 # <http://lists.gnu.org/archive/html/bison-patches/2009-07/msg00019.html>.
 
 AT_SETUP([[Bad character literals]])


@@ -1173,14 +1296,14 @@ AT_DATA([empty.y],
 start: '';
 start: '
 ]])
 start: '';
 start: '
 ]])

-echo $ECHO_N "start: '$ECHO_C" >> empty.y
+AT_CHECK([[perl -e "print 'start: \'';" >> empty.y || exit 77]])

 
 AT_BISON_CHECK([empty.y], [1], [],
 
 AT_BISON_CHECK([empty.y], [1], [],

-[[empty.y:2.8-9: warning: empty character literal
-empty.y:3.8-4.0: warning: empty character literal
-empty.y:3.8-4.0: missing `'' at end of line
-empty.y:4.8: warning: empty character literal
-empty.y:4.8: missing `'' at end of file
+[[empty.y:2.8-9: warning: empty character literal [-Wother]
+empty.y:3.8-4.0: warning: empty character literal [-Wother]
+empty.y:3.8-4.0: missing "'" at end of line
+empty.y:4.8: warning: empty character literal [-Wother]
+empty.y:4.8: missing "'" at end of file

 ]])
 
 AT_DATA([two.y],
 ]])
 
 AT_DATA([two.y],


@@ -1188,14 +1311,14 @@ AT_DATA([two.y],
 start: 'ab';
 start: 'ab
 ]])
 start: 'ab';
 start: 'ab
 ]])

-echo $ECHO_N "start: 'ab$ECHO_C" >> two.y
+AT_CHECK([[perl -e "print 'start: \'ab';" >> two.y || exit 77]])

 
 AT_BISON_CHECK([two.y], [1], [],
 
 AT_BISON_CHECK([two.y], [1], [],

-[[two.y:2.8-11: warning: extra characters in character literal
-two.y:3.8-4.0: warning: extra characters in character literal
-two.y:3.8-4.0: missing `'' at end of line
-two.y:4.8-10: warning: extra characters in character literal
-two.y:4.8-10: missing `'' at end of file
+[[two.y:2.8-11: warning: extra characters in character literal [-Wother]
+two.y:3.8-4.0: warning: extra characters in character literal [-Wother]
+two.y:3.8-4.0: missing "'" at end of line
+two.y:4.8-10: warning: extra characters in character literal [-Wother]
+two.y:4.8-10: missing "'" at end of file

 ]])
 
 AT_DATA([three.y],
 ]])
 
 AT_DATA([three.y],


@@ -1203,14 +1326,14 @@ AT_DATA([three.y],
 start: 'abc';
 start: 'abc
 ]])
 start: 'abc';
 start: 'abc
 ]])

-echo $ECHO_N "start: 'abc$ECHO_C" >> three.y
+AT_CHECK([[perl -e "print 'start: \'abc';" >> three.y || exit 77]])

 
 AT_BISON_CHECK([three.y], [1], [],
 
 AT_BISON_CHECK([three.y], [1], [],

-[[three.y:2.8-12: warning: extra characters in character literal
-three.y:3.8-4.0: warning: extra characters in character literal
-three.y:3.8-4.0: missing `'' at end of line
-three.y:4.8-11: warning: extra characters in character literal
-three.y:4.8-11: missing `'' at end of file
+[[three.y:2.8-12: warning: extra characters in character literal [-Wother]
+three.y:3.8-4.0: warning: extra characters in character literal [-Wother]
+three.y:3.8-4.0: missing "'" at end of line
+three.y:4.8-11: warning: extra characters in character literal [-Wother]
+three.y:4.8-11: missing "'" at end of file

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1227,29 +1350,35 @@ start: '\777' '\0' '\xfff' '\x0'
        '\uffff' '\u0000' '\Uffffffff' '\U00000000'
        '\ ' '\A';
 ]])
        '\uffff' '\u0000' '\Uffffffff' '\U00000000'
        '\ ' '\A';
 ]])

-echo 'start: "\T\F\0\1" ;' | tr 'TF01' '\011\014\0\1' >> input.y
+
+# It is not easy to create special characters, we cannot even trust tr.
+# Beside we cannot even expect "echo '\0'" to output two characters
+# (well three with \n): at least Bash 3.2 converts the two-character
+# sequence "\0" into a single NUL character.
+AT_CHECK([[perl -e 'print "start: \"\\\t\\\f\\\0\\\1\" ;";' >> input.y \
+           || exit 77]])

 
 AT_BISON_CHECK([input.y], [1], [],
 [[input.y:2.9-12: invalid number after \-escape: 777
 
 AT_BISON_CHECK([input.y], [1], [],
 [[input.y:2.9-12: invalid number after \-escape: 777

-input.y:2.8-13: warning: empty character literal
+input.y:2.8-13: warning: empty character literal [-Wother]

 input.y:2.16-17: invalid number after \-escape: 0
 input.y:2.16-17: invalid number after \-escape: 0

-input.y:2.15-18: warning: empty character literal
+input.y:2.15-18: warning: empty character literal [-Wother]

 input.y:2.21-25: invalid number after \-escape: xfff
 input.y:2.21-25: invalid number after \-escape: xfff

-input.y:2.20-26: warning: empty character literal
+input.y:2.20-26: warning: empty character literal [-Wother]

 input.y:2.29-31: invalid number after \-escape: x0
 input.y:2.29-31: invalid number after \-escape: x0

-input.y:2.28-32: warning: empty character literal
+input.y:2.28-32: warning: empty character literal [-Wother]

 input.y:3.9-14: invalid number after \-escape: uffff
 input.y:3.9-14: invalid number after \-escape: uffff

-input.y:3.8-15: warning: empty character literal
+input.y:3.8-15: warning: empty character literal [-Wother]

 input.y:3.18-23: invalid number after \-escape: u0000
 input.y:3.18-23: invalid number after \-escape: u0000

-input.y:3.17-24: warning: empty character literal
+input.y:3.17-24: warning: empty character literal [-Wother]

 input.y:3.27-36: invalid number after \-escape: Uffffffff
 input.y:3.27-36: invalid number after \-escape: Uffffffff

-input.y:3.26-37: warning: empty character literal
+input.y:3.26-37: warning: empty character literal [-Wother]

 input.y:3.40-49: invalid number after \-escape: U00000000
 input.y:3.40-49: invalid number after \-escape: U00000000

-input.y:3.39-50: warning: empty character literal
-input.y:4.9-10: invalid character after \-escape: ` '
-input.y:4.8-11: warning: empty character literal
+input.y:3.39-50: warning: empty character literal [-Wother]
+input.y:4.9-10: invalid character after \-escape: ' '
+input.y:4.8-11: warning: empty character literal [-Wother]

 input.y:4.14-15: invalid character after \-escape: A
 input.y:4.14-15: invalid character after \-escape: A

-input.y:4.13-16: warning: empty character literal
+input.y:4.13-16: warning: empty character literal [-Wother]

 input.y:5.9-16: invalid character after \-escape: \t
 input.y:5.17: invalid character after \-escape: \f
 input.y:5.18: invalid character after \-escape: \0
 input.y:5.9-16: invalid character after \-escape: \t
 input.y:5.17: invalid character after \-escape: \f
 input.y:5.18: invalid character after \-escape: \0


@@ -1257,3 +1386,88 @@ input.y:5.19: invalid character after \-escape: \001
 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP

+
+## ------------------------- ##
+## LAC: Errors for %define.  ##
+## ------------------------- ##
+
+AT_SETUP([[LAC: Errors for %define]])
+
+AT_DATA([[input.y]],
+[[%%
+start: ;
+]])
+
+# parse.lac.* options are useless if LAC isn't actually activated.
+AT_BISON_CHECK([[-Dparse.lac.es-capacity-initial=1 input.y]],
+               [[1]], [],
+[[<command line>:2: %define variable 'parse.lac.es-capacity-initial' is not used
+]])
+AT_BISON_CHECK([[-Dparse.lac.memory-trace=full input.y]],
+               [[1]], [],
+[[<command line>:2: %define variable 'parse.lac.memory-trace' is not used
+]])
+
+AT_CLEANUP
+
+## --------------------------------------------- ##
+## -Werror is not affected by -Wnone and -Wall.  ##
+## --------------------------------------------- ##
+
+AT_SETUP([[-Werror is not affected by -Wnone and -Wall]])
+
+AT_DATA([[input.y]],
+[[%%
+foo-bar: ;
+]])
+
+# -Werror is not enabled by -Wall or equivalent.
+AT_BISON_CHECK([[-Wall input.y]], [[0]], [[]],
+[[input.y:2.1-7: warning: POSIX Yacc forbids dashes in symbol names: foo-bar [-Wyacc]
+]])
+AT_BISON_CHECK([[-W input.y]], [[0]], [[]],
+[[input.y:2.1-7: warning: POSIX Yacc forbids dashes in symbol names: foo-bar [-Wyacc]
+]])
+AT_BISON_CHECK([[-Wno-none input.y]], [[0]], [[]],
+[[input.y:2.1-7: warning: POSIX Yacc forbids dashes in symbol names: foo-bar [-Wyacc]
+]])
+
+# -Werror is not disabled by -Wnone or equivalent.
+AT_BISON_CHECK([[-Werror,none,yacc input.y]], [[1]], [[]], [[stderr]])
+AT_CHECK([[sed 's/^.*bison:/bison:/' stderr]], [[0]],
+[[bison: warnings being treated as errors
+input.y:2.1-7: warning: POSIX Yacc forbids dashes in symbol names: foo-bar [-Wyacc]
+]])
+[mv stderr experr]
+AT_BISON_CHECK([[-Werror,no-all,yacc input.y]], [[1]], [[]], [[experr]])
+
+AT_CLEANUP
+
+
+## ------------------------------------------------------ ##
+## %name-prefix and %define api.prefix are incompatible.  ##
+## ------------------------------------------------------ ##
+
+AT_SETUP([[%name-prefix and %define api.prefix are incompatible]])
+
+# AT_TEST(DIRECTIVES, OPTIONS, ERROR-LOCATION)
+# --------------------------------------------
+m4_pushdef([AT_TEST],
+[AT_DATA([[input.y]],
+[[$1
+%%
+exp:;
+]])
+AT_BISON_CHECK([[$2 input.y]], [[1]], [[]],
+[[$3: '%name-prefix' and '%define api.prefix' cannot be used together
+]])
+])
+
+AT_TEST([%define api.prefix foo %name-prefix "bar"], [], [input.y:1.9-18])
+AT_TEST([], [-Dapi.prefix=foo -p bar], [<command line>:2])
+AT_TEST([%name-prefix "bar"], [-Dapi.prefix=foo], [<command line>:2])
+AT_TEST([%define api.prefix foo], [-p bar], [input.y:1.9-18])
+
+m4_popdef([AT_TEST])
+
+AT_CLEANUP