api.value.type: implement proper support, check, and document

[bison.git] / tests / input.at

diff --git a/tests/input.at b/tests/input.at
index 5e5b1e8f2995079d024b719193477b781a2d4914..322bbe8775b00ceeaf11010c7381597e5e54fb1b 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-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 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


@@ -20,6 +20,29 @@ AT_BANNER([[Input Processing.]])
 # Mostly test that we are robust to mistakes.
 
 
 # Mostly test that we are robust to mistakes.
 
 

+## ----------------- ##
+## Invalid options.  ##
+## ----------------- ##
+
+AT_SETUP([Invalid options])
+
+AT_DATA([input.y],
+[[%%
+exp: '0'
+]])
+
+# We used to accept these, as -f, --report and others were sharing
+# their code with -W.
+AT_BISON_CHECK([-ferror=caret input.y], [1], [], [ignore])
+AT_BISON_CHECK([--report=error=itemsets input.y], [1], [], [ignore])
+
+# We used to accept any character after "-Werror", instead of ensuring
+# this is "=".
+AT_BISON_CHECK([-Werror?all input.y], [1], [], [ignore])
+
+AT_CLEANUP
+
+

 ## ---------------- ##
 ## Invalid inputs.  ##
 ## ---------------- ##
 ## ---------------- ##
 ## Invalid inputs.  ##
 ## ---------------- ##


@@ -85,13 +108,17 @@ AT_SETUP([Invalid $n and @n])
 
 AT_DATA([input.y],
 [[%%
 
 AT_DATA([input.y],
 [[%%

-exp: { $$ = $1 ; };
-exp: { @$ = @1 ; };
+exp: %empty { $$ = $1 ; };
+exp: %empty { @$ = @1 ; };

 ]])
 
 ]])
 

-AT_BISON_CHECK([input.y], [1], [],
-[[input.y:2.13-14: error: integer out of range: '$1'
-input.y:3.13-14: error: integer out of range: '@1'
+AT_BISON_CHECK([-fcaret input.y], [1], [],
+[[input.y:2.20-21: error: integer out of range: '$1'
+ exp: %empty { $$ = $1 ; };
+                    ^^
+input.y:3.20-21: error: integer out of range: '@1'
+ exp: %empty { @$ = @1 ; };
+                    ^^

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -110,16 +137,26 @@ AT_DATA([input.y],
 %%
 exp: foo { $$; } foo { $2; } foo
    | foo
 %%
 exp: foo { $$; } foo { $2; } foo
    | foo

-   | /* Empty. */
+   | %empty

    ;
 ]])
 
    ;
 ]])
 

-AT_BISON_CHECK([input.y], [1], [],
+AT_BISON_CHECK([-fcaret input.y], [1], [],

 [[input.y:5.12-13: error: $$ for the midrule at $2 of 'exp' has no declared type
 [[input.y:5.12-13: error: $$ for the midrule at $2 of 'exp' has no declared type

+ exp: foo { $$; } foo { $2; } foo
+            ^^

 input.y:5.24-25: error: $2 of 'exp' has no declared type
 input.y:5.24-25: error: $2 of 'exp' has no declared type

+ exp: foo { $$; } foo { $2; } foo
+                        ^^

 input.y:5.6-32: warning: type clash on default action: <bar> != <> [-Wother]
 input.y:5.6-32: warning: type clash on default action: <bar> != <> [-Wother]

+ exp: foo { $$; } foo { $2; } foo
+      ^^^^^^^^^^^^^^^^^^^^^^^^^^^

 input.y:6.6-8: 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]
+    | foo
+      ^^^
+input.y:7.6-11: warning: empty rule for typed nonterminal, and no action [-Wother]
+    | %empty
+      ^^^^^^

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -155,7 +192,7 @@ start:
 ;
 
 a: INT | INT { } INT { } INT { };
 ;
 
 a: INT | INT { } INT { } INT { };

-b: INT | /* empty */;
+b: INT | %empty;

 c: INT | INT { $]1[; } INT { $<integer>2; } INT { $<integer>4; };
 d: INT | INT { } INT { $]1[; } INT { $<integer>2; };
 e: INT | INT { } INT {  } INT { $]1[; };
 c: INT | INT { $]1[; } INT { $<integer>2; } INT { $<integer>4; };
 d: INT | INT { } INT { $]1[; } INT { $<integer>2; };
 e: INT | INT { } INT {  } INT { $]1[; };


@@ -183,9 +220,9 @@ input.y:11.18-20: warning: unused value: $][3 [-Wother]
 input.y:11.26-28: warning: unused value: $][5 [-Wother]
  a: INT | INT { } INT { } INT { };
                           ^^^
 input.y:11.26-28: warning: unused value: $][5 [-Wother]
  a: INT | INT { } INT { } INT { };
                           ^^^

-input.y:12.9: warning: empty rule for typed nonterminal, and no action [-Wother]
- b: INT | /* empty */;
-         ^
+input.y:12.10-15: warning: empty rule for typed nonterminal, and no action [-Wother]
+ b: INT | %empty;
+          ^^^^^^

 ]]m4_ifval($2, [[[input.y:13.14-20: warning: unset value: $][$ [-Wmidrule-values]
  c: INT | INT { $][1; } INT { $<integer>2; } INT { $<integer>4; };
               ^^^^^^^
 ]]m4_ifval($2, [[[input.y:13.14-20: warning: unset value: $][$ [-Wmidrule-values]
  c: INT | INT { $][1; } INT { $<integer>2; } INT { $<integer>4; };
               ^^^^^^^


@@ -314,7 +351,7 @@ AT_DATA([[input.y]],
 
 %%
 
 
 %%
 

-start: ;
+start: %empty;

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


@@ -323,31 +360,79 @@ start: ;
 %printer { print ($$); } <>;
 ]])
 
 %printer { print ($$); } <>;
 ]])
 

-AT_BISON_CHECK([input.y], [1], [],
+AT_BISON_CHECK([-fcaret input.y], [1], [],

 [[input.y:1.13-29: error: %destructor redeclaration for <*>
 [[input.y:1.13-29: error: %destructor redeclaration for <*>

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

 input.y:1.13-29:     previous declaration
 input.y:1.13-29:     previous declaration

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

 input.y:2.10-24: error: %printer redeclaration for <*>
 input.y:2.10-24: error: %printer redeclaration for <*>

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

 input.y:2.10-24:     previous declaration
 input.y:2.10-24:     previous declaration

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

 input.y:4.13-29: error: %destructor redeclaration for <*>
 input.y:4.13-29: error: %destructor redeclaration for <*>

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

 input.y:1.13-29:     previous declaration
 input.y:1.13-29:     previous declaration

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

 input.y:5.10-24: error: %printer redeclaration for <*>
 input.y:5.10-24: error: %printer redeclaration for <*>

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

 input.y:2.10-24:     previous declaration
 input.y:2.10-24:     previous declaration

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

 input.y:7.13-29: error: %destructor redeclaration for <>
 input.y:7.13-29: error: %destructor redeclaration for <>

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

 input.y:7.13-29:     previous declaration
 input.y:7.13-29:     previous declaration

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

 input.y:8.10-24: error: %printer redeclaration for <>
 input.y:8.10-24: error: %printer redeclaration for <>

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

 input.y:8.10-24:     previous declaration
 input.y:8.10-24:     previous declaration

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

 input.y:10.13-29: error: %destructor redeclaration for <>
 input.y:10.13-29: error: %destructor redeclaration for <>

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

 input.y:7.13-29:      previous declaration
 input.y:7.13-29:      previous declaration

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

 input.y:11.10-24: error: %printer redeclaration for <>
 input.y:11.10-24: error: %printer redeclaration for <>

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

 input.y:8.10-24:      previous declaration
 input.y:8.10-24:      previous declaration

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

 input.y:17.13-29: error: %destructor redeclaration for <*>
 input.y:17.13-29: error: %destructor redeclaration for <*>

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

 input.y:4.13-29:      previous declaration
 input.y:4.13-29:      previous declaration

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

 input.y:18.10-24: error: %printer redeclaration for <*>
 input.y:18.10-24: error: %printer redeclaration for <*>

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

 input.y:5.10-24:      previous declaration
 input.y:5.10-24:      previous declaration

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

 input.y:20.13-29: error: %destructor redeclaration for <>
 input.y:20.13-29: error: %destructor redeclaration for <>

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

 input.y:10.13-29:     previous declaration
 input.y:10.13-29:     previous declaration

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

 input.y:21.10-24: error: %printer redeclaration for <>
 input.y:21.10-24: error: %printer redeclaration for <>

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

 input.y:11.10-24:     previous declaration
 input.y:11.10-24:     previous declaration

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

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -368,7 +453,7 @@ AT_DATA([[input.y]],
 
 %%
 
 
 %%
 

-start: ;
+start: %empty;

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


@@ -383,14 +468,14 @@ input.y:5.10-24: error: %printer redeclaration for <field2>
 input.y:2.10-24:     previous declaration
 input.y:5.10-24: error: %printer redeclaration for <field2>
 input.y:5.10-24:     previous declaration
 input.y:2.10-24:     previous declaration
 input.y:5.10-24: error: %printer redeclaration for <field2>
 input.y:5.10-24:     previous declaration

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

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

-input.y:12.10-24: error: %printer redeclaration for <field1>
-input.y:2.10-24:      previous declaration
+input.y:11.13-29: error: %destructor redeclaration for <field1>
+input.y:4.13-29:      previous declaration

 input.y:12.10-24: error: %printer redeclaration for <field2>
 input.y:5.10-24:      previous declaration
 input.y:12.10-24: error: %printer redeclaration for <field2>
 input.y:5.10-24:      previous declaration

+input.y:12.10-24: error: %printer redeclaration for <field1>
+input.y:2.10-24:      previous declaration

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -409,11 +494,19 @@ AT_DATA([[input.y]],
 exp: bar;
 ]])
 
 exp: bar;
 ]])
 

-AT_BISON_CHECK([input.y], [1], [],
+AT_BISON_CHECK([-fcaret input.y], [1], [],

 [[input.y:2.16-18: error: symbol bar is used, but is not defined as a token and has no rules
 [[input.y:2.16-18: error: symbol bar is used, but is not defined as a token and has no rules

+ %destructor {} bar
+                ^^^

 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.17-19: warning: symbol baz is used, but is not defined as a token and has no rules [-Wother]

+ %printer {} foo baz
+                 ^^^

 input.y:1.13-15: warning: symbol foo 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]

+ %printer {} foo baz
+             ^^^

 input.y:3.13-15: warning: symbol qux is used, but is not defined as a token and has no rules [-Wother]
 input.y:3.13-15: warning: symbol qux is used, but is not defined as a token and has no rules [-Wother]

+ %type <foo> qux
+             ^^^

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -530,10 +623,16 @@ end: { } ;
 tagged: { } ;
 ]])
 
 tagged: { } ;
 ]])
 

-AT_BISON_CHECK([input.y], [0], [],
+AT_BISON_CHECK([-fcaret input.y], [0], [],

 [[input.y:6.8-45: warning: unset value: $$ [-Wother]
 [[input.y:6.8-45: warning: unset value: $$ [-Wother]

+ start: end end tagged tagged { $<tag>1; $3; } ;
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

 input.y:6.12-14: warning: unused value: $2 [-Wother]
 input.y:6.12-14: warning: unused value: $2 [-Wother]

+ start: end end tagged tagged { $<tag>1; $3; } ;
+            ^^^

 input.y:7.6-8: warning: unset value: $$ [-Wother]
 input.y:7.6-8: warning: unset value: $$ [-Wother]

+ end: { } ;
+      ^^^

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


@@ -571,10 +670,16 @@ start: end end { $1; } ;
 end: { }  ;
 ]])
 
 end: { }  ;
 ]])
 

-AT_BISON_CHECK([input.y], [0], [],
+AT_BISON_CHECK([-fcaret input.y], [0], [],

 [[input.y:6.8-22: warning: unset value: $$ [-Wother]
 [[input.y:6.8-22: warning: unset value: $$ [-Wother]

+ start: end end { $1; } ;
+        ^^^^^^^^^^^^^^^

 input.y:6.12-14: warning: unused value: $2 [-Wother]
 input.y:6.12-14: warning: unused value: $2 [-Wother]

+ start: end end { $1; } ;
+            ^^^

 input.y:7.6-8: warning: unset value: $$ [-Wother]
 input.y:7.6-8: warning: unset value: $$ [-Wother]

+ end: { }  ;
+      ^^^

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -603,15 +708,31 @@ AT_DATA([input.y],
 exp: foo;
 ]])
 
 exp: foo;
 ]])
 

-AT_BISON_CHECK([input.y], [1], [],
+AT_BISON_CHECK([-fcaret input.y], [1], [],

 [[input.y:8.7-11: error: %type redeclaration for foo
 [[input.y:8.7-11: error: %type redeclaration for foo

+ %type <baz>       "foo"
+       ^^^^^

 input.y:3.7-11:     previous declaration
 input.y:3.7-11:     previous declaration

+ %type <bar>       foo
+       ^^^^^

 input.y:10.13-17: error: %destructor redeclaration for foo
 input.y:10.13-17: error: %destructor redeclaration for foo

+ %destructor {baz} "foo"
+             ^^^^^

 input.y:5.13-17:      previous declaration
 input.y:5.13-17:      previous declaration

+ %destructor {bar} foo
+             ^^^^^

 input.y:9.10-14: error: %printer redeclaration for foo
 input.y:9.10-14: error: %printer redeclaration for foo

+ %printer {baz}    "foo"
+          ^^^^^

 input.y:4.10-14:     previous declaration
 input.y:4.10-14:     previous declaration

+ %printer {bar}    foo
+          ^^^^^

 input.y:11.1-5: error: %left redeclaration for foo
 input.y:11.1-5: error: %left redeclaration for foo

+ %left             "foo"
+ ^^^^^

 input.y:6.1-5:      previous declaration
 input.y:6.1-5:      previous declaration

+ %left             foo
+ ^^^^^

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -637,8 +758,10 @@ AT_BISON_CHECK([input.y], [1], [],
 AT_DATA([input.y],
 [{}
 ])
 AT_DATA([input.y],
 [{}
 ])

-AT_BISON_CHECK([input.y], [1], [],
+AT_BISON_CHECK([-fcaret  input.y], [1], [],

 [[input.y:1.1-2: error: syntax error, unexpected {...}
 [[input.y:1.1-2: error: syntax error, unexpected {...}

+ {}
+ ^^

 ]])
 
 
 ]])
 
 


@@ -726,7 +849,7 @@ exp: '@<:@' '\1' two '$' '@' '{' oline output.or.oline.opt
 
 two: '\x000000000000000000000000000000000000000000000000000000000000000000002';
 oline: '@' 'o' 'l' 'i' 'n' 'e' '@' '_' '_' 'o' 'l' 'i' 'n' 'e' '_' '_';
 
 two: '\x000000000000000000000000000000000000000000000000000000000000000000002';
 oline: '@' 'o' 'l' 'i' 'n' 'e' '@' '_' '_' 'o' 'l' 'i' 'n' 'e' '_' '_';

-output.or.oline.opt: ;|oline;;|output;;;
+output.or.oline.opt: %empty;|oline;;|output;;;

 output: '#' 'o' 'u' 't' 'p' 'u' 't' ' ';
 %%
 /* Exercise M4 quoting: '@:>@@:>@', @<:@, 2.  */
 output: '#' 'o' 'u' 't' 'p' 'u' 't' ' ';
 %%
 /* Exercise M4 quoting: '@:>@@:>@', @<:@, 2.  */


@@ -759,12 +882,7 @@ AT_DATA([main.c],
 #include "input.h"
 
 int yyparse (void);
 #include "input.h"
 
 int yyparse (void);

-
-int
-main (void)
-{
-  return yyparse ();
-}
+]AT_MAIN_DEFINE[

 ]])
 AT_BISON_OPTION_POPDEFS
 
 ]])
 AT_BISON_OPTION_POPDEFS
 


@@ -813,7 +931,7 @@ m4_define([AT_CHECK_REQUIRE],
 AT_DATA_GRAMMAR([input.y],
 [[%require "$1";
 %%
 AT_DATA_GRAMMAR([input.y],
 [[%require "$1";
 %%

-empty_file:;
+empty_file: %empty;

 ]])
 AT_BISON_CHECK([-o input.c input.y], $2, [], ignore)
 AT_CLEANUP
 ]])
 AT_BISON_CHECK([-o input.c input.y], $2, [], ignore)
 AT_CLEANUP


@@ -877,13 +995,13 @@ AT_BISON_OPTION_POPDEFS
 # POSIX Yacc accept periods, but not dashes.
 AT_BISON_CHECK([--yacc -Wno-error input.y], [], [],
 [[input.y:9.8-16: warning: POSIX Yacc forbids dashes in symbol names: WITH-DASH [-Wyacc]
 # POSIX Yacc accept periods, but not dashes.
 AT_BISON_CHECK([--yacc -Wno-error input.y], [], [],
 [[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]
+input.y:20.8-16: warning: POSIX Yacc forbids dashes in symbol names: with-dash [-Wyacc]

 ]])
 
 # 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 [-Wyacc]
 ]])
 
 # 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 [-Wyacc]

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

 ]])
 
 # Dashes are fine for GNU Bison.
 ]])
 
 # Dashes are fine for GNU Bison.


@@ -971,7 +1089,7 @@ AT_DATA([input.y],
 
 %%
 
 
 %%
 

-start: ;
+start: %empty;

 
 // Used to report a syntax error because it didn't see any kind of symbol
 // identifier.
 
 // Used to report a syntax error because it didn't see any kind of symbol
 // identifier.


@@ -983,15 +1101,6 @@ start: ;
 %destructor { free ($$)
 ]])
 
 %destructor { free ($$)
 ]])
 

-AT_BISON_CHECK([-o input.c input.y], 1, [],
-[[input.y:1.10-2.0: error: missing '"' at end of line
-input.y:4.10-5.0: error: missing "'" at end of line
-input.y:14.11-15.0: error: missing "'" at end of line
-input.y:16.11-17.0: error: missing '"' at end of line
-input.y:19.13-20.0: error: missing '}' at end of file
-input.y:20.1: error: syntax error, unexpected end of file
-]])
-

 AT_BISON_CHECK([-fcaret -o input.c input.y], 1, [],
 [[input.y:1.10-2.0: error: missing '"' at end of line
  %token A "a
 AT_BISON_CHECK([-fcaret -o input.c input.y], 1, [],
 [[input.y:1.10-2.0: error: missing '"' at end of line
  %token A "a


@@ -1025,7 +1134,7 @@ AT_SETUP([%start after first rule])
 
 AT_DATA([input.y],
 [[%%
 
 AT_DATA([input.y],
 [[%%

-false_start: ;
+false_start: %empty;

 start: false_start ;
 %start start;
 ]])
 start: false_start ;
 %start start;
 ]])


@@ -1046,7 +1155,7 @@ AT_SETUP([%prec takes a token])
 AT_DATA([input.y],
 [[%%
 start: PREC %prec PREC ;
 AT_DATA([input.y],
 [[%%
 start: PREC %prec PREC ;

-PREC: ;
+PREC: %empty;

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


@@ -1088,7 +1197,7 @@ AT_DATA([input-c.y],
 %code bad {}
 %code format {}
 %%
 %code bad {}
 %code format {}
 %%

-start: ;
+start: %empty;

 ]])
 AT_BISON_CHECK([[input-c.y]], [[1]], [],
 [[input-c.y:1.7: error: %code qualifier 'q' is not used
 ]])
 AT_BISON_CHECK([[input-c.y]], [[1]], [],
 [[input-c.y:1.7: error: %code qualifier 'q' is not used


@@ -1102,7 +1211,7 @@ AT_DATA([input-c-glr.y],
 %code bad {}
  %code bad {}
 %%
 %code bad {}
  %code bad {}
 %%

-start: ;
+start: %empty;

 ]])
 AT_BISON_CHECK([[input-c-glr.y]], [[1]], [],
 [[input-c-glr.y:1.7: error: %code qualifier 'q' is not used
 ]])
 AT_BISON_CHECK([[input-c-glr.y]], [[1]], [],
 [[input-c-glr.y:1.7: error: %code qualifier 'q' is not used


@@ -1115,7 +1224,7 @@ AT_DATA([input-c++.y],
 %code bad {}
  %code q {}
 %%
 %code bad {}
  %code q {}
 %%

-start: ;
+start: %empty;

 ]])
 AT_BISON_CHECK([[input-c++.y]], [[1]], [],
 [[input-c++.y:1.7: error: %code qualifier 'q' is not used
 ]])
 AT_BISON_CHECK([[input-c++.y]], [[1]], [],
 [[input-c++.y:1.7: error: %code qualifier 'q' is not used


@@ -1128,7 +1237,7 @@ AT_DATA([input-c++-glr.y],
 %code q {}
 %code q {}
 %%
 %code q {}
 %code q {}
 %%

-start: ;
+start: %empty;

 ]])
 AT_BISON_CHECK([[input-c++-glr.y]], [[1]], [],
 [[input-c++-glr.y:1.7-9: error: %code qualifier 'bad' is not used
 ]])
 AT_BISON_CHECK([[input-c++-glr.y]], [[1]], [],
 [[input-c++-glr.y:1.7-9: error: %code qualifier 'bad' is not used


@@ -1141,7 +1250,7 @@ AT_DATA([special-char-@@.y],
 %code q {}
 %code q {}
 %%
 %code q {}
 %code q {}
 %%

-start: ;
+start: %empty;

 ]])
 AT_BISON_CHECK([[special-char-@@.y]], [[1]], [],
 [[special-char-@@.y:1.7-9: error: %code qualifier 'bad' is not used
 ]])
 AT_BISON_CHECK([[special-char-@@.y]], [[1]], [],
 [[special-char-@@.y:1.7-9: error: %code qualifier 'bad' is not used


@@ -1154,7 +1263,7 @@ AT_DATA([special-char-@:>@.y],
 %code q {}
 %code q {}
 %%
 %code q {}
 %code q {}
 %%

-start: ;
+start: %empty;

 ]])
 AT_BISON_CHECK([[special-char-@:>@.y]], [[1]], [],
 [[special-char-@:>@.y:1.7-9: error: %code qualifier 'bad' is not used
 ]])
 AT_BISON_CHECK([[special-char-@:>@.y]], [[1]], [],
 [[special-char-@:>@.y:1.7-9: error: %code qualifier 'bad' is not used


@@ -1178,7 +1287,7 @@ AT_DATA([input-redefined.y],
 %define special1 "@:>@"
 %define special2 "@<:@"
 %%
 %define special1 "@:>@"
 %define special2 "@<:@"
 %%

-start: ;
+start: %empty;

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


@@ -1191,7 +1300,7 @@ input-redefined.y:2.9-11:      previous definition
 AT_DATA([input-unused.y],
 [[%define var "value"
 %%
 AT_DATA([input-unused.y],
 [[%define var "value"
 %%

-start: ;
+start: %empty;

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


@@ -1219,7 +1328,7 @@ m4@&t@_divert_pop(0)
 AT_DATA([[input.y]],
 [[%define var-dfg "gram"
 %%
 AT_DATA([[input.y]],
 [[%define var-dfg "gram"
 %%

-start: ;
+start: %empty;

 ]])
 AT_BISON_CHECK([[-Dvar-dd=cmd-d1 -Dvar-dd=cmd-d2 \
                  -Fvar-ff=cmd-f1 -Fvar-ff=cmd-f2 \
 ]])
 AT_BISON_CHECK([[-Dvar-dd=cmd-d1 -Dvar-dd=cmd-d2 \
                  -Fvar-ff=cmd-f1 -Fvar-ff=cmd-f2 \


@@ -1236,32 +1345,32 @@ var-fd: cmd-d
 AT_DATA([[input-dg.y]],
 [[%define var "gram"
 %%
 AT_DATA([[input-dg.y]],
 [[%define var "gram"
 %%

-start: ;
+start: %empty;

 ]])
 AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [],
 [[input-dg.y:1.9-11: error: %define variable 'var' redefined
 ]])
 AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [],
 [[input-dg.y:1.9-11: error: %define variable 'var' redefined

-<command line>:1:      previous definition
+<command line>:2:      previous definition

 ]])
 
 AT_DATA([[input-dg.y]],
 [[%define var "gram"
 %%
 ]])
 
 AT_DATA([[input-dg.y]],
 [[%define var "gram"
 %%

-start: ;
+start: %empty;

 ]])
 AT_BISON_CHECK([[-fcaret -Dvar=cmd-d input-dg.y]], [[1]], [],
 [[input-dg.y:1.9-11: error: %define variable 'var' redefined
  %define var "gram"
          ^^^
 ]])
 AT_BISON_CHECK([[-fcaret -Dvar=cmd-d input-dg.y]], [[1]], [],
 [[input-dg.y:1.9-11: error: %define variable 'var' redefined
  %define var "gram"
          ^^^

-<command line>:2:      previous definition
+<command line>:3:      previous definition

 ]])
 
 AT_DATA([[input-unused.y]],
 [[%%
 ]])
 
 AT_DATA([[input-unused.y]],
 [[%%

-start: ;
+start: %empty;

 ]])
 AT_BISON_CHECK([[-Dunused-d -Funused-f input-unused.y]], [[1]], [],
 ]])
 AT_BISON_CHECK([[-Dunused-d -Funused-f input-unused.y]], [[1]], [],

-[[<command line>:1: error: %define variable 'unused-d' is not used
-<command line>:2: error: %define variable 'unused-f' is not used
+[[<command line>:2: error: %define variable 'unused-d' is not used
+<command line>:3: error: %define variable 'unused-f' is not used

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1270,14 +1379,14 @@ AT_CLEANUP
 ## %define Boolean variables.  ##
 ## --------------------------- ##
 
 ## %define Boolean variables.  ##
 ## --------------------------- ##
 

-AT_SETUP([[%define Boolean variables]])
+AT_SETUP([["%define" Boolean variables]])

 
 AT_DATA([Input.y],
 [[%language "Java"
 %define public "maybe"
 %define parser_class_name "Input"
 %%
 
 AT_DATA([Input.y],
 [[%language "Java"
 %define public "maybe"
 %define parser_class_name "Input"
 %%

-start: ;
+start: %empty;

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


@@ -1290,30 +1399,37 @@ AT_CLEANUP
 ## %define enum variables.  ##
 ## ------------------------ ##
 
 ## %define enum variables.  ##
 ## ------------------------ ##
 

-AT_SETUP([[%define enum variables]])
+AT_SETUP([["%define" enum variables]])
+
+# Check errors from the front-end, and the back-end.  Since the
+# front-end quits before calling the back-end, these tests cannot be
+# fused.

 
 # Front-end.
 AT_DATA([[input.y]],
 [[%define lr.default-reduction bogus
 %%
 
 # Front-end.
 AT_DATA([[input.y]],
 [[%define lr.default-reduction bogus
 %%

-start: ;
+start: %empty;

 ]])
 ]])

-AT_BISON_CHECK([[input.y]], [[1]], [[]],
+AT_BISON_CHECK([[-fcaret input.y]], [[1]], [[]],

 [[input.y:1.9-28: error: invalid value for %define variable 'lr.default-reduction': 'bogus'
 [[input.y:1.9-28: error: invalid value for %define variable 'lr.default-reduction': 'bogus'

+ %define lr.default-reduction bogus
+         ^^^^^^^^^^^^^^^^^^^^

 input.y:1.9-28:     accepted value: 'most'
 input.y:1.9-28:     accepted value: 'consistent'
 input.y:1.9-28:     accepted value: 'accepting'
 ]])
 
 # Back-end.
 input.y:1.9-28:     accepted value: 'most'
 input.y:1.9-28:     accepted value: 'consistent'
 input.y:1.9-28:     accepted value: 'accepting'
 ]])
 
 # Back-end.

-# FIXME: these should be indented, but we shouldn't mess with the m4 yet

 AT_DATA([[input.y]],
 [[%define api.push-pull neither
 %%
 AT_DATA([[input.y]],
 [[%define api.push-pull neither
 %%

-start: ;
+start: %empty;

 ]])
 ]])

-AT_BISON_CHECK([[input.y]], [1], [],
+AT_BISON_CHECK([[-fcaret input.y]], [[1]], [[]],

 [[input.y:1.9-21: error: invalid value for %define variable 'api.push-pull': 'neither'
 [[input.y:1.9-21: error: invalid value for %define variable 'api.push-pull': 'neither'

+ %define 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:     accepted value: 'pull'
 input.y:1.9-21:     accepted value: 'push'
 input.y:1.9-21:     accepted value: 'both'


@@ -1325,53 +1441,37 @@ AT_CLEANUP
 ## %define backward compatibility.  ##
 ## -------------------------------- ##
 
 ## %define backward compatibility.  ##
 ## -------------------------------- ##
 

-AT_SETUP([[%define backward compatibility]])
-
-# The error messages tell us whether underscores in these variables are
-# being converted to dashes.
+AT_SETUP([["%define" backward compatibility]])

 
 

+# The error messages tell us whether the variables are properly updated.

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

-[[%define api.push_pull "neither"
+[[%define api.push_pull both
+%define lr.keep_unreachable_states maybe
+%define namespace "foo"
+%define api.namespace {foo}
+%define variant

 %%
 %%

-start: ;
-]])
-AT_BISON_CHECK([[input.y]], [1], [],
-[[input.y:1.9-21: warning: deprecated %define variable name: 'api.push_pull', use 'api.push-pull' [-Wdeprecated]
-input.y:1.9-21: error: 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]],
-[[%define lr.keep_unreachable_states maybe
-%%
-start: ;
-]])
-AT_BISON_CHECK([[input.y]], [1], [],
-[[input.y:1.9-34: warning: deprecated %define variable name: 'lr.keep_unreachable_states', use 'lr.keep-unreachable-state' [-Wdeprecated]
-input.y:1.9-34: error: invalid value for %define Boolean variable 'lr.keep-unreachable-state'
-]])
-
-AT_DATA([[input.y]],
-[[%define namespace "foo"
-%define api.namespace "foo"
-%%
-start: ;
-]])
-AT_BISON_CHECK([[input.y]], [1], [],
-[[input.y:1.9-17: warning: deprecated %define variable name: 'namespace', use 'api.namespace' [-Wdeprecated]
-input.y:2.9-21: error: %define variable 'api.namespace' redefined
-input.y:1.9-17:     previous definition
-]])
-
-AT_DATA([[input.y]],
-[[%define foo_bar "baz"
-%%
-start: ;
-]])
-AT_BISON_CHECK([[input.y]], [[1]], [],
-[[input.y:1.9-15: error: %define variable 'foo_bar' is not used
+start: %empty;
+]])
+AT_BISON_CHECK([[-fcaret input.y]], [1], [],
+[[input.y:1.9-21: warning: deprecated directive, use '%define api.push-pull both' [-Wdeprecated]
+ %define api.push_pull both
+         ^^^^^^^^^^^^^
+input.y:2.9-34: warning: deprecated directive, use '%define lr.keep-unreachable-state maybe' [-Wdeprecated]
+ %define lr.keep_unreachable_states maybe
+         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+input.y:3.9-17: warning: deprecated directive, use '%define api.namespace foo' [-Wdeprecated]
+ %define namespace "foo"
+         ^^^^^^^^^
+input.y:4.9-21: error: %define variable 'api.namespace' redefined
+ %define api.namespace {foo}
+         ^^^^^^^^^^^^^
+input.y:3.9-17:     previous definition
+ %define namespace "foo"
+         ^^^^^^^^^
+input.y:5.9-15: warning: deprecated directive, use '%define api.value.type variant' [-Wdeprecated]
+ %define variant
+         ^^^^^^^

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1384,7 +1484,7 @@ AT_SETUP([[Unused %define api.pure]])
 
 # AT_CHECK_API_PURE(DECLS, VALUE)
 # -------------------------------
 
 # AT_CHECK_API_PURE(DECLS, VALUE)
 # -------------------------------

-# Make sure Bison reports that `%define api.pure VALUE' is unused when DECLS
+# Make sure Bison reports that '%define api.pure VALUE' is unused when DECLS

 # are specified.
 m4_define([AT_CHECK_API_PURE],
 [
 # are specified.
 m4_define([AT_CHECK_API_PURE],
 [


@@ -1392,7 +1492,7 @@ AT_DATA([[input.y]],
 [[%define api.pure ]$2[
 ]$1[
 %%
 [[%define api.pure ]$2[
 ]$1[
 %%

-start: ;
+start: %empty;

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


@@ -1400,10 +1500,10 @@ AT_BISON_CHECK([[input.y]], [[1]], [],
 ]])
 ])
 
 ]])
 ])
 

-AT_CHECK_API_PURE([[%language "c++" %defines]], [[]])
-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]], [[false]])
+AT_CHECK_API_PURE([[%language "c++"]], [[]])
+AT_CHECK_API_PURE([[%language "c++"]], [[false]])
+AT_CHECK_API_PURE([[%language "c++" %glr-parser]], [[""]])
+AT_CHECK_API_PURE([[%language "c++" %glr-parser]], [[false]])

 AT_CHECK_API_PURE([[%language "java"]], [[true]])
 AT_CHECK_API_PURE([[%language "java"]], [[false]])
 
 AT_CHECK_API_PURE([[%language "java"]], [[true]])
 AT_CHECK_API_PURE([[%language "java"]], [[false]])
 


@@ -1423,9 +1523,9 @@ m4_define([AT_CHECK_NAMESPACE_ERROR],
 AT_DATA([[input.y]],
 [[%language "C++"
 %defines
 AT_DATA([[input.y]],
 [[%language "C++"
 %defines

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

 %%
 %%

-start: ;
+start: %empty;

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


@@ -1436,22 +1536,22 @@ AT_BISON_CHECK([[input.y]], [1], [],
 
 AT_CHECK_NAMESPACE_ERROR([[]],
                          [[namespace reference is empty]])
 
 AT_CHECK_NAMESPACE_ERROR([[]],
                          [[namespace reference is empty]])

-AT_CHECK_NAMESPACE_ERROR([[                            ]],
+AT_CHECK_NAMESPACE_ERROR([[ @tb@@tb@  @tb@ @tb@]],

                          [[namespace reference is empty]])
 AT_CHECK_NAMESPACE_ERROR([[foo::::bar]],
                          [[namespace reference has consecutive "::"]])
                          [[namespace reference is empty]])
 AT_CHECK_NAMESPACE_ERROR([[foo::::bar]],
                          [[namespace reference has consecutive "::"]])

-AT_CHECK_NAMESPACE_ERROR([[foo::       ::bar]],
+AT_CHECK_NAMESPACE_ERROR([[foo:: @tb@::bar]],

                          [[namespace reference has consecutive "::"]])
 AT_CHECK_NAMESPACE_ERROR([[::::bar]],
                          [[namespace reference has consecutive "::"]])
 AT_CHECK_NAMESPACE_ERROR([[:: ::bar]],
                          [[namespace reference has consecutive "::"]])
                          [[namespace reference has consecutive "::"]])
 AT_CHECK_NAMESPACE_ERROR([[::::bar]],
                          [[namespace reference has consecutive "::"]])
 AT_CHECK_NAMESPACE_ERROR([[:: ::bar]],
                          [[namespace reference has consecutive "::"]])

-AT_CHECK_NAMESPACE_ERROR([[foo::bar::  ::]],
+AT_CHECK_NAMESPACE_ERROR([[foo::bar::@tb@::]],

                          [[namespace reference has consecutive "::"]],
                          [[namespace reference has a trailing "::"]])
 AT_CHECK_NAMESPACE_ERROR([[foo::bar::]],
                          [[namespace reference has a trailing "::"]])
                          [[namespace reference has consecutive "::"]],
                          [[namespace reference has a trailing "::"]])
 AT_CHECK_NAMESPACE_ERROR([[foo::bar::]],
                          [[namespace reference has a trailing "::"]])

-AT_CHECK_NAMESPACE_ERROR([[foo::bar::  ]],
+AT_CHECK_NAMESPACE_ERROR([[foo::bar:: @tb@]],

                          [[namespace reference has a trailing "::"]])
 AT_CHECK_NAMESPACE_ERROR([[::]],
                          [[namespace reference has a trailing "::"]])
                          [[namespace reference has a trailing "::"]])
 AT_CHECK_NAMESPACE_ERROR([[::]],
                          [[namespace reference has a trailing "::"]])


@@ -1478,12 +1578,22 @@ start: '
 ]])
 AT_CHECK([[$PERL -e "print 'start: \'';" >> empty.y || exit 77]])
 
 ]])
 AT_CHECK([[$PERL -e "print 'start: \'';" >> empty.y || exit 77]])
 

-AT_BISON_CHECK([empty.y], [1], [],
+AT_BISON_CHECK([-fcaret empty.y], [1], [],

 [[empty.y:2.8-9: warning: empty character literal [-Wother]
 [[empty.y:2.8-9: warning: empty character literal [-Wother]

-empty.y:3.8-4.0: warning: empty character literal [-Wother]
+ start: '';
+        ^^

 empty.y:3.8-4.0: error: missing "'" at end of line
 empty.y:3.8-4.0: error: missing "'" at end of line

-empty.y:4.8: warning: empty character literal [-Wother]
+ start: '
+        ^
+empty.y:3.8-4.0: warning: empty character literal [-Wother]
+ start: '
+        ^

 empty.y:4.8: error: missing "'" at end of file
 empty.y:4.8: error: missing "'" at end of file

+ start: '
+        ^
+empty.y:4.8: warning: empty character literal [-Wother]
+ start: '
+        ^

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


@@ -1495,10 +1605,10 @@ AT_CHECK([[$PERL -e "print 'start: \'ab';" >> two.y || exit 77]])
 
 AT_BISON_CHECK([two.y], [1], [],
 [[two.y:2.8-11: warning: extra characters in character literal [-Wother]
 
 AT_BISON_CHECK([two.y], [1], [],
 [[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: error: missing "'" at end of line
 two.y:3.8-4.0: error: missing "'" at end of line

-two.y:4.8-10: warning: extra characters in character literal [-Wother]
+two.y:3.8-4.0: warning: extra characters in character literal [-Wother]

 two.y:4.8-10: error: missing "'" at end of file
 two.y:4.8-10: error: missing "'" at end of file

+two.y:4.8-10: warning: extra characters in character literal [-Wother]

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


@@ -1510,10 +1620,10 @@ AT_CHECK([[$PERL -e "print 'start: \'abc';" >> three.y || exit 77]])
 
 AT_BISON_CHECK([three.y], [1], [],
 [[three.y:2.8-12: warning: extra characters in character literal [-Wother]
 
 AT_BISON_CHECK([three.y], [1], [],
 [[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: error: missing "'" at end of line
 three.y:3.8-4.0: error: missing "'" at end of line

-three.y:4.8-11: warning: extra characters in character literal [-Wother]
+three.y:3.8-4.0: warning: extra characters in character literal [-Wother]

 three.y:4.8-11: error: missing "'" at end of file
 three.y:4.8-11: error: missing "'" at end of file

+three.y:4.8-11: warning: extra characters in character literal [-Wother]

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1575,17 +1685,17 @@ AT_SETUP([[LAC: Errors for %define]])
 
 AT_DATA([[input.y]],
 [[%%
 
 AT_DATA([[input.y]],
 [[%%

-start: ;
+start: %empty;

 ]])
 
 # parse.lac.* options are useless if LAC isn't actually activated.
 AT_BISON_CHECK([[-Dparse.lac.es-capacity-initial=1 input.y]],
                [[1]], [],
 ]])
 
 # 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>:1: error: %define variable 'parse.lac.es-capacity-initial' is not used
+[[<command line>:2: error: %define variable 'parse.lac.es-capacity-initial' is not used

 ]])
 AT_BISON_CHECK([[-Dparse.lac.memory-trace=full input.y]],
                [[1]], [],
 ]])
 AT_BISON_CHECK([[-Dparse.lac.memory-trace=full input.y]],
                [[1]], [],

-[[<command line>:1: error: %define variable 'parse.lac.memory-trace' is not used
+[[<command line>:2: error: %define variable 'parse.lac.memory-trace' is not used

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1598,27 +1708,27 @@ AT_SETUP([[-Werror is not affected by -Wnone and -Wall]])
 
 AT_DATA([[input.y]],
 [[%%
 
 AT_DATA([[input.y]],
 [[%%

-foo-bar: ;
+a: '0' { $$ = $; };

 ]])
 
 # -Werror is not enabled by -Wall or equivalent.
 AT_BISON_CHECK([[-Wall input.y]], [[0]], [[]],
 ]])
 
 # -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]
+[[input.y:2.15: warning: stray '$' [-Wother]

 ]])
 AT_BISON_CHECK([[-W input.y]], [[0]], [[]],
 ]])
 AT_BISON_CHECK([[-W input.y]], [[0]], [[]],

-[[input.y:2.1-7: warning: POSIX Yacc forbids dashes in symbol names: foo-bar [-Wyacc]
+[[input.y:2.15: warning: stray '$' [-Wother]

 ]])
 AT_BISON_CHECK([[-Wno-none input.y]], [[0]], [[]],
 ]])
 AT_BISON_CHECK([[-Wno-none input.y]], [[0]], [[]],

-[[input.y:2.1-7: warning: POSIX Yacc forbids dashes in symbol names: foo-bar [-Wyacc]
+[[input.y:2.15: warning: stray '$' [-Wother]

 ]])
 
 # -Werror is not disabled by -Wnone or equivalent.
 ]])
 
 # -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]],
-[[input.y:2.1-7: error: POSIX Yacc forbids dashes in symbol names: foo-bar [-Werror=yacc]
+AT_BISON_CHECK([[-Werror,none,other input.y]], [[1]], [[]],
+[[input.y:2.15: error: stray '$' [-Werror=other]
+]])
+AT_BISON_CHECK([[-Werror,no-all,other input.y]], [[1]], [[]],
+[[input.y:2.15: error: stray '$' [-Werror=other]

 ]])
 ]])

-[mv stderr experr]
-AT_BISON_CHECK([[-Werror,no-all,yacc input.y]], [[1]], [[]], [[experr]])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -1627,7 +1737,7 @@ AT_CLEANUP
 ## %name-prefix and %define api.prefix are incompatible.  ##
 ## ------------------------------------------------------ ##
 
 ## %name-prefix and %define api.prefix are incompatible.  ##
 ## ------------------------------------------------------ ##
 

-AT_SETUP([[%name-prefix and %define api.prefix are incompatible]])
+AT_SETUP([[%name-prefix and api.prefix are incompatible]])

 
 # AT_TEST(DIRECTIVES, OPTIONS, ERROR-LOCATION)
 # --------------------------------------------
 
 # AT_TEST(DIRECTIVES, OPTIONS, ERROR-LOCATION)
 # --------------------------------------------


@@ -1635,7 +1745,7 @@ m4_pushdef([AT_TEST],
 [AT_DATA([[input.y]],
 [[$1
 %%
 [AT_DATA([[input.y]],
 [[$1
 %%

-exp:;
+exp: %empty;

 ]])
 AT_BISON_CHECK([[$2 input.y]], [[1]], [[]],
 [[$3: error: '%name-prefix' and '%define api.prefix' cannot be used together
 ]])
 AT_BISON_CHECK([[$2 input.y]], [[1]], [[]],
 [[$3: error: '%name-prefix' and '%define api.prefix' cannot be used together


@@ -1643,8 +1753,8 @@ AT_BISON_CHECK([[$2 input.y]], [[1]], [[]],
 ])
 
 AT_TEST([%define api.prefix foo %name-prefix "bar"], [], [input.y:1.9-18])
 ])
 
 AT_TEST([%define api.prefix foo %name-prefix "bar"], [], [input.y:1.9-18])

-AT_TEST([], [-Dapi.prefix=foo -p bar], [<command line>:1])
-AT_TEST([%name-prefix "bar"], [-Dapi.prefix=foo], [<command line>:1])
+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_TEST([%define api.prefix foo], [-p bar], [input.y:1.9-18])
 
 m4_popdef([AT_TEST])


@@ -1667,19 +1777,22 @@ AT_DATA_GRAMMAR([[input.y]],
 %destructor     { $%; @%; } <*> exp TOK;
 %initial-action { $%; @%; };
 %printer        { $%; @%; } <*> exp TOK;
 %destructor     { $%; @%; } <*> exp TOK;
 %initial-action { $%; @%; };
 %printer        { $%; @%; } <*> exp TOK;

+%{ $ @ %} // Should not warn.

 %%
 exp: TOK        { $%; @%; $$ = $1; };
 %%
 exp: TOK        { $%; @%; $$ = $1; };

+%%
+$ @ // Should not warn.

 ]])
 
 ]])
 

-AT_BISON_CHECK([[input.y]], 0, [],
+AT_BISON_CHECK([[-Wall input.y]], 0, [],

 [[input.y:11.19: warning: stray '$' [-Wother]
 input.y:11.23: warning: stray '@' [-Wother]
 input.y:12.19: warning: stray '$' [-Wother]
 input.y:12.23: warning: stray '@' [-Wother]
 input.y:13.19: warning: stray '$' [-Wother]
 input.y:13.23: warning: stray '@' [-Wother]
 [[input.y:11.19: warning: stray '$' [-Wother]
 input.y:11.23: warning: stray '@' [-Wother]
 input.y:12.19: warning: stray '$' [-Wother]
 input.y:12.23: warning: stray '@' [-Wother]
 input.y:13.19: warning: stray '$' [-Wother]
 input.y:13.23: warning: stray '@' [-Wother]

-input.y:15.19: warning: stray '$' [-Wother]
-input.y:15.23: warning: stray '@' [-Wother]
+input.y:16.19: warning: stray '$' [-Wother]
+input.y:16.23: warning: stray '@' [-Wother]

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP