Merge remote-tracking branch 'origin/maint'

[bison.git] / tests / input.at

diff --git a/tests/input.at b/tests/input.at
index 84ae0ffe136d5c63db0291f51db310d2fcb4fc2f..694adf3b3d1e68d8b88144aacc84ccb9e446a467 100644 (file)
--- a/tests/input.at
+++ b/tests/input.at
@@ -60,9 +60,9 @@ exp: foo { $$; } foo { $2; } foo
 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
 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.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_CLEANUP


@@ -113,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]

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


@@ -177,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


@@ -237,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], [],


@@ -255,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
 
 


@@ -290,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]],


@@ -307,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


@@ -331,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


@@ -386,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


@@ -437,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. */
 


@@ -463,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> '@<:@'


@@ -496,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)
 {


@@ -504,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: "


@@ -531,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,
 [[[@<:@],


@@ -616,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;


@@ -632,25 +724,28 @@ 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 are genuine letters, they can start identifiers.
 
 
 # Periods are genuine letters, they can start identifiers.


@@ -811,7 +906,7 @@ start: %prec PREC ;
 ]])
 
 AT_BISON_CHECK([[input.y]], [[0]], [],
 ]])
 
 AT_BISON_CHECK([[input.y]], [[0]], [],

-[[input.y:2.8-17: warning: token for %prec is not defined: PREC
+[[input.y:2.8-17: warning: token for %prec is not defined: PREC [-Wother]

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1204,10 +1299,10 @@ start: '
 AT_CHECK([[perl -e "print 'start: \'';" >> empty.y || exit 77]])
 
 AT_BISON_CHECK([empty.y], [1], [],
 AT_CHECK([[perl -e "print 'start: \'';" >> empty.y || exit 77]])
 
 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: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:3.8-4.0: missing "'" at end of line

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

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


@@ -1219,10 +1314,10 @@ start: 'ab
 AT_CHECK([[perl -e "print 'start: \'ab';" >> two.y || exit 77]])
 
 AT_BISON_CHECK([two.y], [1], [],
 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
-two.y:3.8-4.0: warning: extra characters in character literal
+[[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: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: warning: extra characters in character literal [-Wother]

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


@@ -1234,10 +1329,10 @@ start: 'abc
 AT_CHECK([[perl -e "print 'start: \'abc';" >> three.y || exit 77]])
 
 AT_BISON_CHECK([three.y], [1], [],
 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
-three.y:3.8-4.0: warning: extra characters in character literal
+[[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: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: warning: extra characters in character literal [-Wother]

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


@@ -1265,25 +1360,25 @@ AT_CHECK([[perl -e 'print "start: \"\\\t\\\f\\\0\\\1\" ;";' >> input.y \
 
 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:3.39-50: warning: empty character literal [-Wother]

 input.y:4.9-10: invalid character after \-escape: ' '
 input.y:4.9-10: invalid character after \-escape: ' '

-input.y:4.8-11: warning: empty character literal
+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


@@ -1328,22 +1423,51 @@ foo-bar: ;
 
 # -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
+[[input.y:2.1-7: warning: POSIX Yacc forbids dashes in symbol names: foo-bar [-Wyacc]

 ]])
 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
+[[input.y:2.1-7: warning: POSIX Yacc forbids dashes in symbol names: foo-bar [-Wyacc]

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