Warn about character literals not of length one.

[bison.git] / tests / input.at

diff --git a/tests/input.at b/tests/input.at
index da52f71c7731d8f8c0bea29e4bbc3e97f8f806f0..9c62f9ef6acf1fdf651946e6fd4472de29a653e7 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 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# 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


@@ -32,7 +32,7 @@ exp: { $$ = $1 ; };
 exp: { @$ = @1 ; };
 ]])
 
 exp: { @$ = @1 ; };
 ]])
 

-AT_CHECK([bison 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'
 ]])


@@ -57,7 +57,7 @@ exp: foo { $$; } foo { $2; } foo
    ;
 ]])
 
    ;
 ]])
 

-AT_CHECK([bison 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: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> != <>


@@ -69,10 +69,9 @@ AT_CLEANUP
 
 
 # _AT_UNUSED_VALUES_DECLARATIONS()
 
 
 # _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, [


@@ -97,16 +92,16 @@ m4_ifval($1, [
 ], [_AT_UNUSED_VALUES_DECLARATIONS
 ])[[%%
 start:
 ], [_AT_UNUSED_VALUES_DECLARATIONS
 ])[[%%
 start:

-  'a' a { $]2[ } | 'b' b { $]2[ } | 'c' c { $]2[ } | 'd' d { $]2[ } | 'e' e { $]2[ }
-| 'f' f { $]2[ } | 'g' g { $]2[ } | 'h' h { $]2[ } | 'i' i { $]2[ } | 'j' j { $]2[ }
-| 'k' k { $]2[ } | 'l' l { $]2[ }
+  'a' a { $]2[; } | 'b' b { $]2[; } | 'c' c { $]2[; } | 'd' d { $]2[; }
+| 'e' e { $]2[; } | 'f' f { $]2[; } | 'g' g { $]2[; } | 'h' h { $]2[; }
+| 'i' i { $]2[; } | 'j' j { $]2[; } | 'k' k { $]2[; } | 'l' l { $]2[; }

 ;
 
 a: INT | INT { } INT { } INT { };
 b: INT | /* empty */;
 ;
 
 a: INT | INT { } INT { } INT { };
 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[; };

 f: INT | INT { } INT {  } INT { $]$[ = $]1[ + $]3[ + $]5[; };
 g: INT | INT { $<integer>$; } INT { $<integer>$; } INT { };
 h: INT | INT { $<integer>$; } INT { $<integer>$ = $<integer>2; } INT { };
 f: INT | INT { } INT {  } INT { $]$[ = $]1[ + $]3[ + $]5[; };
 g: INT | INT { $<integer>$; } INT { $<integer>$; } INT { };
 h: INT | INT { $<integer>$; } INT { $<integer>$ = $<integer>2; } INT { };


@@ -117,24 +112,24 @@ l: INT | INT { $<integer>$ = $<integer>1; } INT { $<integer>$ = $<integer>2 + $<
 _AT_UNUSED_VALUES_DECLARATIONS])
 )
 
 _AT_UNUSED_VALUES_DECLARATIONS])
 )
 

-AT_CHECK([bison]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
 [[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-19: warning: unset value: $$
-input.y:13.25-39: warning: unset value: $$
-]]])[[input.y:13.10-59: warning: unset value: $]$[
-input.y:13.10-59: warning: unused value: $]3[
-input.y:13.10-59: warning: unused value: $]5[
+]]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: $$
 ]]m4_ifval($2, [[[input.y:14.14-16: warning: unset value: $$

-]]])[[input.y:14.10-47: warning: unset value: $]$[
-input.y:14.10-47: warning: unused value: $]3[
-input.y:14.10-47: warning: unused value: $]5[
-input.y:15.10-36: warning: unset value: $]$[
-input.y:15.10-36: warning: unused value: $]3[
-input.y:15.10-36: warning: unused value: $]5[
+]]])[[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: unset value: $]$[
 input.y:17.10-58: warning: unused value: $]1[
 ]]m4_ifval($2, [[[input.y:17.10-58: warning: unused value: $]2[


@@ -204,7 +199,7 @@ start: ;
 %printer { destroy ($$); } <>;
 ]])
 
 %printer { destroy ($$); } <>;
 ]])
 

-AT_CHECK([bison input.y], [1], [],
+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: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


@@ -255,7 +250,7 @@ start: ;
 %printer { destroy ($$); } <field2> <field1>;
 ]])
 
 %printer { destroy ($$); } <field2> <field1>;
 ]])
 

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

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


@@ -294,7 +289,7 @@ end: { } ;
 tagged: { } ;
 ]])
 
 tagged: { } ;
 ]])
 

-AT_CHECK([bison 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: $$
 input.y:6.8-45: warning: unused value: $2
 input.y:7.6-8: warning: unset value: $$


@@ -311,7 +306,7 @@ end: { } ;
 tagged: { } ;
 ]])
 
 tagged: { } ;
 ]])
 

-AT_CHECK([bison 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
 input.y:8.9-11: warning: unset value: $$
 ]])


@@ -335,7 +330,7 @@ start: end end { $1; } ;
 end: { }  ;
 ]])
 
 end: { }  ;
 ]])
 

-AT_CHECK([bison 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: $$
 input.y:6.8-22: warning: unused value: $2
 input.y:7.6-8: warning: unset value: $$


@@ -367,7 +362,7 @@ AT_DATA([input.y],
 exp: foo;
 ]])
 
 exp: foo;
 ]])
 

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

 [[input.y:8.7-11: %type redeclaration for foo
 input.y:3.7-11: previous declaration
 input.y:10.13-17: %destructor redeclaration for foo
 [[input.y:8.7-11: %type redeclaration for foo
 input.y:3.7-11: previous declaration
 input.y:10.13-17: %destructor redeclaration for foo


@@ -393,7 +388,7 @@ AT_SETUP([Torturing the Scanner])
 
 
 AT_DATA([input.y], [])
 
 
 AT_DATA([input.y], [])

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

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


@@ -401,7 +396,7 @@ AT_CHECK([bison input.y], [1], [],
 AT_DATA([input.y],
 [{}
 ])
 AT_DATA([input.y],
 [{}
 ])

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

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


@@ -537,7 +532,7 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([bison -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], [input.o main.o])
 AT_COMPILE([input.o], [-c input.c])
 AT_COMPILE([main.o], [-c main.c])
 AT_COMPILE([input], [input.o main.o])


@@ -568,7 +563,7 @@ exp: "MY TOKEN";
 %%
 ]])
 
 %%
 ]])
 

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

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -584,7 +579,7 @@ AT_DATA_GRAMMAR([input.y],
 %%
 empty_file:;
 ]])
 %%
 empty_file:;
 ]])

-AT_CHECK([bison -o input.c input.y], $2, [], ignore)
+AT_BISON_CHECK([-o input.c input.y], $2, [], ignore)

 AT_CLEANUP
 ])
 
 AT_CLEANUP
 ])
 


@@ -600,8 +595,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"


@@ -610,7 +605,114 @@ start: 'a';
 %%
 ]])
 
 %%
 ]])
 

-AT_CHECK([bison -o input.c input.y])
+AT_BISON_CHECK([-o input.c input.y])
+
+AT_CLEANUP
+
+
+## -------------- ##
+## Symbol names.  ##
+## -------------- ##
+
+AT_SETUP([Symbols])
+
+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);
+}
+%%
+start: with-dash without_dash with.period without_period;
+with-dash: WITH-DASH;
+without_dash: "WITHOUT-DASH";
+with.period: WITH.PERIOD;
+without_period: "WITHOUT.PERIOD";
+%%
+]])
+
+# 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
+]])
+
+# 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
+]])
+
+# 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])
+
+
+# Periods and dashes are genuine letters, they can start identifiers.
+# Digits cannot.
+AT_DATA_GRAMMAR([input.y],
+[[%token .GOOD
+         -GOOD
+         1NV4L1D
+%%
+start: .GOOD -GOOD
+]])
+AT_BISON_CHECK([-o input.c input.y], [1], [],
+[[input.y:11.10-16: invalid identifier: `1NV4L1D'
+]])
+
+AT_CLEANUP
+
+
+## ----------------- ##
+## Numbered tokens.  ##
+## ----------------- ##
+
+AT_SETUP([Numbered tokens])
+
+AT_DATA_GRAMMAR([1.y],
+[[%token DECIMAL     11259375
+         HEXADECIMAL 0xabcdef
+%%
+start: DECIMAL;
+]])
+
+AT_BISON_CHECK([1.y], [1], [],
+[[1.y:10.10-20: user token number 11259375 redeclaration for HEXADECIMAL
+1.y:9.8-14: previous declaration for DECIMAL
+]])
+
+
+AT_DATA_GRAMMAR([2.y],
+[[%token HEXADECIMAL 0xabcdef
+         DECIMAL     11259375
+%%
+start: HEXADECIMAL;
+]])
+
+AT_BISON_CHECK([2.y], [1], [],
+[[2.y:10.10-16: user token number 11259375 redeclaration for DECIMAL
+2.y:9.8-18: previous declaration for HEXADECIMAL
+]])
+
+
+AT_DATA_GRAMMAR([3.y],
+[[%token TOO_LARGE_DEC 999999999999999999999
+         TOO_LARGE_HEX 0xFFFFFFFFFFFFFFFFFFF
+%%
+start: TOO_LARGE_DEC TOO_LARGE_HEX
+%%
+]])
+
+AT_BISON_CHECK([3.y], [1], [],
+[[3.y:9.22-42: integer out of range: `999999999999999999999'
+3.y:10.24-44: integer out of range: `0xFFFFFFFFFFFFFFFFFFF'
+]])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -621,10 +723,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


@@ -648,7 +750,7 @@ start: ;
 %destructor { free ($$)
 ]])
 
 %destructor { free ($$)
 ]])
 

-AT_CHECK([bison -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: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


@@ -666,8 +768,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],
 [[%%


@@ -676,7 +778,7 @@ start: false_start ;
 %start start;
 ]])
 
 %start start;
 ]])
 

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

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -695,7 +797,7 @@ start: PREC %prec PREC ;
 PREC: ;
 ]])
 
 PREC: ;
 ]])
 

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

 [[input.y:3.1-4: rule given for PREC, which is a token
 ]])
 
 [[input.y:3.1-4: rule given for PREC, which is a token
 ]])
 


@@ -716,7 +818,7 @@ AT_DATA([input-c.y],
 %%
 start: ;
 ]])
 %%
 start: ;
 ]])

-AT_CHECK([[bison input-c.y]], [0], [],
+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: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


@@ -730,7 +832,7 @@ AT_DATA([input-c-glr.y],
 %%
 start: ;
 ]])
 %%
 start: ;
 ]])

-AT_CHECK([[bison input-c-glr.y]], [0], [],
+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
 [[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


@@ -743,7 +845,7 @@ AT_DATA([input-c++.y],
 %%
 start: ;
 ]])
 %%
 start: ;
 ]])

-AT_CHECK([[bison input-c++.y]], [0], [],
+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
 [[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


@@ -756,7 +858,7 @@ AT_DATA([input-c++-glr.y],
 %%
 start: ;
 ]])
 %%
 start: ;
 ]])

-AT_CHECK([[bison input-c++-glr.y]], [0], [],
+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
 [[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


@@ -769,7 +871,7 @@ AT_DATA([special-char-@@.y],
 %%
 start: ;
 ]])
 %%
 start: ;
 ]])

-AT_CHECK([[bison special-char-@@.y]], [0], [],
+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
 [[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


@@ -782,7 +884,7 @@ AT_DATA([special-char-@:>@.y],
 %%
 start: ;
 ]])
 %%
 start: ;
 ]])

-AT_CHECK([[bison special-char-@:>@.y]], [0], [],
+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
 [[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


@@ -797,7 +899,7 @@ AT_CLEANUP
 
 AT_SETUP([%define errors])
 
 
 AT_SETUP([%define errors])
 

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

 [[%define var "value1"
 %define var "value1"
  %define var "value2"
 [[%define var "value1"
 %define var "value1"
  %define var "value2"


@@ -807,16 +909,74 @@ AT_DATA([input.y],
 start: ;
 ]])
 
 start: ;
 ]])
 

-AT_CHECK([[bison input.y]], [0], [],
-[[input.y:2.9-11: warning: %define variable `var' redefined
-input.y:1.9-11: warning: previous definition
-input.y:3.10-12: warning: %define variable `var' redefined
-input.y:2.9-11: warning: previous definition
-input.y:1.9-11: warning: %define variable `var' is not used
-input.y:2.9-11: warning: %define variable `var' is not used
-input.y:3.10-12: warning: %define variable `var' is not used
-input.y:4.9-16: warning: %define variable `special1' is not used
-input.y:5.9-16: warning: %define variable `special2' is not used
+AT_BISON_CHECK([[input-redefined.y]], [[1]], [],
+[[input-redefined.y:2.9-11: %define variable `var' redefined
+input-redefined.y:1.9-11: previous definition
+input-redefined.y:3.10-12: %define variable `var' redefined
+input-redefined.y:2.9-11: previous definition
+]])
+
+AT_DATA([input-unused.y],
+[[%define var "value"
+%%
+start: ;
+]])
+
+AT_BISON_CHECK([[input-unused.y]], [[0]], [],
+[[input-unused.y:1.9-11: warning: %define variable `var' is not used
+]])
+
+AT_CLEANUP
+
+
+## ----------------------------------- ##
+## %define, --define, --force-define.  ##
+## ----------------------------------- ##
+
+AT_SETUP([%define, --define, --force-define])
+
+AT_DATA([skel.c],
+[[m4@&t@_divert_push(0)@
+@output(b4_parser_file_name@)@
+[var-dd: ]b4_percent_define_get([[var-dd]])[
+var-ff: ]b4_percent_define_get([[var-ff]])[
+var-dfg: ]b4_percent_define_get([[var-dfg]])[
+var-fd: ]b4_percent_define_get([[var-fd]])
+m4@&t@_divert_pop(0)
+]])
+
+AT_DATA([input.y],
+[[%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   \
+                 -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
+]])
+
+AT_CHECK([[cat input.tab.c]], [[0]],
+[[var-dd: cmd-d2
+var-ff: cmd-f2
+var-dfg: cmd-f
+var-fd: cmd-d
+]])
+
+AT_DATA([input-dg.y],
+[[%define var "gram"
+%%
+start: ;
+]])
+
+AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [],
+[[input-dg.y:1.9-11: %define variable `var' redefined
+<command line>:2: previous definition

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -835,7 +995,7 @@ AT_DATA([Input.y],
 start: ;
 ]])
 
 start: ;
 ]])
 

-AT_CHECK([[bison 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'
 ]])
 


@@ -847,14 +1007,71 @@ AT_CLEANUP
 
 AT_SETUP([[%define enum variables]])
 
 
 AT_SETUP([[%define enum variables]])
 

+# Front-end.
+AT_DATA([[input.y]],
+[[%define lr.default-reductions "bogus"
+%%
+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'
+]])
+
+# Back-end.
+AT_DATA([[input.y]],
+[[%define api.push-pull "neither"
+%%
+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'
+]])
+
+AT_CLEANUP
+
+## -------------------------------- ##
+## %define backward compatibility.  ##
+## -------------------------------- ##
+
+AT_SETUP([[%define backward compatibility]])
+
+# The error messages tell us whether underscores in these variables are
+# being converted to dashes.
+

 AT_DATA([[input.y]],
 [[%define api.push_pull "neither"
 %%
 start: ;
 ]])
 AT_DATA([[input.y]],
 [[%define api.push_pull "neither"
 %%
 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'
+]])
+
+AT_DATA([[input.y]],
+[[%define lr.keep_unreachable_states "maybe"
+%%
+start: ;
+]])
+AT_BISON_CHECK([[input.y]], [1], [],
+[[input.y:1.9-34: invalid value for %define Boolean variable `lr.keep-unreachable-states'
+]])

 
 

-AT_CHECK([[bison input.y]], [1], [],
-[[input.y:1.9-21: invalid value for %define variable `api.push_pull': `neither'
+AT_DATA([[input.y]],
+[[%define foo_bar "baz"
+%%
+start: ;
+]])
+AT_BISON_CHECK([[input.y]], [0], [],
+[[input.y:1.9-15: warning: %define variable `foo_bar' is not used

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -878,7 +1095,7 @@ AT_DATA([[input.y]],
 start: ;
 ]])
 
 start: ;
 ]])
 

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

 [[input.y:1.9-16: warning: %define variable `api.pure' is not used
 ]])
 ])
 [[input.y:1.9-16: warning: %define variable `api.pure' is not used
 ]])
 ])


@@ -906,14 +1123,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: ;
 ]])
 
 %%
 start: ;
 ]])
 

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

 [m4_foreach([b4_arg], m4_dquote(m4_shift($@)),
 [m4_foreach([b4_arg], m4_dquote(m4_shift($@)),

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

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


@@ -940,3 +1157,65 @@ AT_CHECK_NAMESPACE_ERROR([[::]],
                          [[namespace reference has a trailing "::"]])
 
 AT_CLEANUP
                          [[namespace reference has a trailing "::"]])
 
 AT_CLEANUP

+
+## ------------------------ ##
+## Bad character literals.  ##
+## ------------------------ ##
+
+# 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
+# <http://lists.gnu.org/archive/html/bison-patches/2009-07/msg00019.html>.
+
+AT_SETUP([[Bad character literals]])
+
+AT_DATA([empty.y],
+[[%%
+start: '';
+start: '
+]])
+echo $ECHO_N "start: '$ECHO_C" >> empty.y
+
+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
+]])
+
+AT_DATA([two.y],
+[[%%
+start: 'ab';
+start: 'ab
+]])
+echo $ECHO_N "start: 'ab$ECHO_C" >> two.y
+
+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
+]])
+
+AT_DATA([three.y],
+[[%%
+start: 'abc';
+start: 'abc
+]])
+echo $ECHO_N "start: 'abc$ECHO_C" >> three.y
+
+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
+]])
+
+AT_CLEANUP