X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e141f4d4bb6584bfbf13003047a2e48e9a6eab6a..c6c8de1609da38a4ffb6dbed8047491d85d57e3d:/tests/input.at diff --git a/tests/input.at b/tests/input.at index 71fc3562..30107218 100644 --- a/tests/input.at +++ b/tests/input.at @@ -1,5 +1,6 @@ # Checking the Bison scanner. -*- Autotest -*- -# Copyright (C) 2002-2010 Free Software Foundation, Inc. + +# Copyright (C) 2002-2012 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -32,8 +33,8 @@ exp: { @$ = @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: error: integer out of range: '$1' +input.y:3.13-14: error: integer out of range: '@1' ]]) AT_CLEANUP @@ -57,11 +58,11 @@ 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 -input.y:5.6-32: warning: type clash on default action: != <> -input.y:6.6-8: warning: type clash on default action: != <> -input.y:7.5: warning: empty rule for typed nonterminal, and no action +[[input.y:5.12-13: error: $$ for the midrule at $2 of 'exp' has no declared type +input.y:5.24-25: error: $2 of 'exp' has no declared type +input.y:5.6-32: warning: type clash on default action: != <> [-Wother] +input.y:6.6-8: warning: type clash on default action: != <> [-Wother] +input.y:7.5: warning: empty rule for typed nonterminal, and no action [-Wother] ]]) AT_CLEANUP @@ -112,39 +113,39 @@ _AT_UNUSED_VALUES_DECLARATIONS]) ) 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] ]]]))]) @@ -176,53 +177,53 @@ AT_SETUP([Default %printer and %destructor redeclared]) AT_DATA([[input.y]], [[%destructor { destroy ($$); } <*> <*> -%printer { destroy ($$); } <*> <*> +%printer { print ($$); } <*> <*> %destructor { destroy ($$); } <*> -%printer { destroy ($$); } <*> +%printer { print ($$); } <*> %destructor { destroy ($$); } <> <> -%printer { destroy ($$); } <> <> +%printer { print ($$); } <> <> %destructor { destroy ($$); } <> -%printer { destroy ($$); } <> +%printer { print ($$); } <> %% start: ; %destructor { destroy ($$); } <*>; -%printer { destroy ($$); } <*>; +%printer { print ($$); } <*>; %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 -input.y:2.10-26: redeclaration for default tagged %printer -input.y:2.10-26: 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: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: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: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: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:1.13-29: error: %destructor redeclaration for <*> +input.y:1.13-29: previous declaration +input.y:2.10-24: error: %printer redeclaration for <*> +input.y:2.10-24: previous declaration +input.y:4.13-29: error: %destructor redeclaration for <*> +input.y:1.13-29: previous declaration +input.y:5.10-24: error: %printer redeclaration for <*> +input.y:2.10-24: previous declaration +input.y:7.13-29: error: %destructor redeclaration for <> +input.y:7.13-29: previous declaration +input.y:8.10-24: error: %printer redeclaration for <> +input.y:8.10-24: previous declaration +input.y:10.13-29: error: %destructor redeclaration for <> +input.y:7.13-29: previous declaration +input.y:11.10-24: error: %printer redeclaration for <> +input.y:8.10-24: previous declaration +input.y:17.13-29: error: %destructor redeclaration for <*> +input.y:4.13-29: previous declaration +input.y:18.10-24: error: %printer redeclaration for <*> +input.y:5.10-24: previous declaration +input.y:20.13-29: error: %destructor redeclaration for <> +input.y:10.13-29: previous declaration +input.y:21.10-24: error: %printer redeclaration for <> +input.y:11.10-24: previous declaration ]]) AT_CLEANUP @@ -236,38 +237,155 @@ AT_SETUP([Per-type %printer and %destructor redeclared]) AT_DATA([[input.y]], [[%destructor { destroy ($$); } -%printer { destroy ($$); } +%printer { print ($$); } %destructor { destroy ($$); } -%printer { destroy ($$); } +%printer { print ($$); } %% start: ; %destructor { destroy ($$); } ; -%printer { destroy ($$); } ; +%printer { print ($$); } ; ]]) AT_BISON_CHECK([input.y], [1], [], -[[input.y:4.13-29: %destructor redeclaration for -input.y:1.13-29: previous declaration -input.y:4.13-29: %destructor redeclaration for -input.y:4.13-29: previous declaration -input.y:5.10-26: %printer redeclaration for -input.y:2.10-26: previous declaration -input.y:5.10-26: %printer redeclaration for -input.y:5.10-26: previous declaration -input.y:11.13-29: %destructor redeclaration for -input.y:4.13-29: previous declaration -input.y:11.13-29: %destructor redeclaration for -input.y:1.13-29: previous declaration -input.y:12.10-26: %printer redeclaration for -input.y:2.10-26: previous declaration -input.y:12.10-26: %printer redeclaration for -input.y:5.10-26: previous declaration +[[input.y:4.13-29: error: %destructor redeclaration for +input.y:1.13-29: previous declaration +input.y:4.13-29: error: %destructor redeclaration for +input.y:4.13-29: previous declaration +input.y:5.10-24: error: %printer redeclaration for +input.y:2.10-24: previous declaration +input.y:5.10-24: error: %printer redeclaration for +input.y:5.10-24: previous declaration +input.y:11.13-29: error: %destructor redeclaration for +input.y:4.13-29: previous declaration +input.y:11.13-29: error: %destructor redeclaration for +input.y:1.13-29: previous declaration +input.y:12.10-24: error: %printer redeclaration for +input.y:2.10-24: previous declaration +input.y:12.10-24: error: %printer redeclaration for +input.y:5.10-24: previous declaration +]]) + +AT_CLEANUP + +## ------------------- ## +## Undefined symbols. ## +## ------------------- ## + +AT_SETUP([Undefined symbols]) + +AT_DATA([[input.y]], +[[%printer {} foo baz +%destructor {} bar +%type qux +%% +exp: bar; ]]) +AT_BISON_CHECK([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: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] +input.y:3.13-15: warning: symbol qux 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 tag1 +%type tag2 + +%printer { } +%destructor { } + +%% + +exp: tag1 { $1; } + | tag2 { $1; } + +tag2: "a" { $$; } +]]) + +AT_BISON_CHECK([input.y], [0], [], +[[input.y:4.22-28: warning: type is used, but is not associated to any symbol [-Wother] +input.y:5.25-31: warning: type is used, but is not associated to any symbol [-Wother] +]]) + +AT_CLEANUP + + +## --------------------------------- ## +## Useless printers or destructors. ## +## --------------------------------- ## + +AT_SETUP([Useless printers or destructors]) + +# AT_TEST([INPUT], [STDERR]) +# -------------------------- +m4_pushdef([AT_TEST], +[AT_DATA([[input.y]], +[$1 +]) +AT_BISON_CHECK([input.y], [0], [], [$2 +])]) + +AT_TEST([[%token token1 +%token token2 +%token token3 +%token token4 +%token token51 token52 +%token token61 token62 +%token token7 + +%printer {} token1 +%destructor {} token2 +%printer {} token51 +%destructor {} token61 + +%printer {} token7 + +%printer {} +%destructor {} +%printer {} +%destructor {} + +%printer {} +%destructor {} + +%destructor {} + +%% +exp: "a";]], +[[input.y:16.13-19: warning: useless %printer for type [-Wother] +input.y:17.16-22: warning: useless %destructor for type [-Wother]]]) + +# If everybody is typed, <> is useless. +AT_TEST([[%type exp +%token a +%printer {} <> <*> +%% +exp: a;]], +[[input.y:3.13-14: warning: useless %printer for type <> [-Wother]]]) + +# If nobody is typed, <*> is useless. +AT_TEST([[%token a +%printer {} <> <*> +%% +exp: a;]], +[[input.y:2.16-18: warning: useless %printer for type <*> [-Wother]]]) + +m4_popdef([AT_TEST]) + AT_CLEANUP @@ -289,9 +407,9 @@ tagged: { } ; ]]) 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]], @@ -306,8 +424,8 @@ tagged: { } ; ]]) 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 @@ -330,9 +448,9 @@ end: { } ; ]]) 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 @@ -362,14 +480,14 @@ exp: foo; ]]) 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:5.13-17: previous declaration -input.y:9.10-14: %printer redeclaration for foo -input.y:4.10-14: previous declaration -input.y:11.1-5: %left redeclaration for foo -input.y:6.1-5: previous declaration +[[input.y:8.7-11: error: %type redeclaration for foo +input.y:3.7-11: previous declaration +input.y:10.13-17: error: %destructor redeclaration for foo +input.y:5.13-17: previous declaration +input.y:9.10-14: error: %printer redeclaration for foo +input.y:4.10-14: previous declaration +input.y:11.1-5: error: %left redeclaration for foo +input.y:6.1-5: previous declaration ]]) AT_CLEANUP @@ -385,10 +503,10 @@ AT_CLEANUP 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 +[[input.y:1.1: error: syntax error, unexpected end of file ]]) @@ -396,7 +514,7 @@ AT_DATA([input.y], [{} ]) AT_BISON_CHECK([input.y], [1], [], -[[input.y:1.1-2: syntax error, unexpected {...} +[[input.y:1.1-2: error: syntax error, unexpected {...} ]]) @@ -436,6 +554,7 @@ char apostrophe = '\''; #include #include +#include %} /* %{ and %} can be here too. */ @@ -462,8 +581,8 @@ char quote[] = "@:>@@:>@,"; %} %{ -static void yyerror (const char *s); -static int yylex (void); +]AT_YYERROR_DECLARE[ +]AT_YYLEX_DECLARE[ %} %type '@<:@' @@ -495,7 +614,7 @@ value_as_yystype (value val) res.ival = val; return res; } - +]AT_YYERROR_DEFINE[ static int yylex (void) { @@ -503,17 +622,10 @@ yylex (void) #output "; /* " */ static size_t toknum; - if (! (toknum < sizeof input)) - abort (); + assert (toknum < sizeof input); 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: " @@ -530,10 +642,11 @@ main (void) return yyparse (); } ]]) +AT_BISON_OPTION_POPDEFS 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, [[[@<:@], @@ -615,14 +728,15 @@ AT_CLEANUP 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 { - void yyerror (char const *); - int yylex (void); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ } %% start: with-dash without_dash with.period without_period; @@ -631,38 +745,44 @@ without_dash: "WITHOUT-DASH"; 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], [], -[[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 +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] ]]) # 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. -AT_COMPILE([input.o], [-c input.c]) +AT_COMPILE([input.o]) -# Periods and dashes are genuine letters, they can start identifiers. -# Digits cannot. +# Periods are genuine letters, they can start identifiers. +# Digits and dashes cannot. AT_DATA_GRAMMAR([input.y], [[%token .GOOD -GOOD 1NV4L1D + -123 %% -start: .GOOD -GOOD +start: .GOOD GOOD ]]) AT_BISON_CHECK([-o input.c input.y], [1], [], -[[input.y:11.10-16: invalid identifier: `1NV4L1D' +[[input.y:10.10: error: invalid character: '-' +input.y:11.10-16: error: invalid identifier: '1NV4L1D' +input.y:12.10: error: invalid character: '-' ]]) AT_CLEANUP @@ -684,10 +804,10 @@ start: DECIMAL_1 HEXADECIMAL_2; ]]) AT_BISON_CHECK([redecl.y], [1], [], -[[redecl.y:10.10-22: user token number 11259375 redeclaration for HEXADECIMAL_1 -redecl.y:9.8-16: previous declaration for DECIMAL_1 -redecl.y:12.10-18: user token number 16702650 redeclaration for DECIMAL_2 -redecl.y:11.10-22: previous declaration for HEXADECIMAL_2 +[[redecl.y:10.10-22: error: user token number 11259375 redeclaration for HEXADECIMAL_1 +redecl.y:9.8-16: previous declaration for DECIMAL_1 +redecl.y:12.10-18: error: user token number 16702650 redeclaration for DECIMAL_2 +redecl.y:11.10-22: previous declaration for HEXADECIMAL_2 ]]) AT_DATA_GRAMMAR([too-large.y], @@ -699,8 +819,8 @@ start: TOO_LARGE_DEC TOO_LARGE_HEX ]]) AT_BISON_CHECK([too-large.y], [1], [], -[[too-large.y:9.22-42: integer out of range: `999999999999999999999' -too-large.y:10.24-44: integer out of range: `0xFFFFFFFFFFFFFFFFFFF' +[[too-large.y:9.22-42: error: integer out of range: '999999999999999999999' +too-large.y:10.24-44: error: integer out of range: '0xFFFFFFFFFFFFFFFFFFF' ]]) AT_CLEANUP @@ -740,12 +860,12 @@ start: ; ]]) AT_BISON_CHECK([-o input.c input.y], 1, [], -[[input.y:1.10-2.0: missing `"' at end of line -input.y:4.10-5.0: missing `'' at end of line -input.y:14.11-15.0: missing `'' at end of line -input.y:16.11-17.0: missing `"' at end of line -input.y:19.13-20.0: missing `}' at end of file -input.y:20.1: syntax error, unexpected end of file +[[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_CLEANUP @@ -787,7 +907,7 @@ PREC: ; ]]) AT_BISON_CHECK([input.y], [1], [], -[[input.y:3.1-4: rule given for PREC, which is a token +[[input.y:3.1-4: error: rule given for PREC, which is a token ]]) AT_CLEANUP @@ -806,8 +926,8 @@ AT_DATA([[input.y]], start: %prec PREC ; ]]) -AT_BISON_CHECK([[input.y]], [[1]], [], -[[input.y:2.8-17: token for %prec is not defined: PREC +AT_BISON_CHECK([[input.y]], [[0]], [], +[[input.y:2.8-17: warning: token for %prec is not defined: PREC [-Wother] ]]) AT_CLEANUP @@ -828,10 +948,10 @@ AT_DATA([input-c.y], start: ; ]]) AT_BISON_CHECK([[input-c.y]], [[1]], [], -[[input-c.y:1.7: %code qualifier `q' is not used -input-c.y:2.7-9: %code qualifier `bad' is not used -input-c.y:3.7-9: %code qualifier `bad' is not used -input-c.y:4.7-12: %code qualifier `format' is not used +[[input-c.y:1.7: error: %code qualifier 'q' is not used +input-c.y:2.7-9: error: %code qualifier 'bad' is not used +input-c.y:3.7-9: error: %code qualifier 'bad' is not used +input-c.y:4.7-12: error: %code qualifier 'format' is not used ]]) AT_DATA([input-c-glr.y], @@ -842,9 +962,9 @@ AT_DATA([input-c-glr.y], start: ; ]]) AT_BISON_CHECK([[input-c-glr.y]], [[1]], [], -[[input-c-glr.y:1.7: %code qualifier `q' is not used -input-c-glr.y:2.7-9: %code qualifier `bad' is not used -input-c-glr.y:3.8-10: %code qualifier `bad' is not used +[[input-c-glr.y:1.7: error: %code qualifier 'q' is not used +input-c-glr.y:2.7-9: error: %code qualifier 'bad' is not used +input-c-glr.y:3.8-10: error: %code qualifier 'bad' is not used ]]) AT_DATA([input-c++.y], @@ -855,9 +975,9 @@ AT_DATA([input-c++.y], start: ; ]]) AT_BISON_CHECK([[input-c++.y]], [[1]], [], -[[input-c++.y:1.7: %code qualifier `q' is not used -input-c++.y:2.7-9: %code qualifier `bad' is not used -input-c++.y:3.8: %code qualifier `q' is not used +[[input-c++.y:1.7: error: %code qualifier 'q' is not used +input-c++.y:2.7-9: error: %code qualifier 'bad' is not used +input-c++.y:3.8: error: %code qualifier 'q' is not used ]]) AT_DATA([input-c++-glr.y], @@ -868,9 +988,9 @@ AT_DATA([input-c++-glr.y], start: ; ]]) AT_BISON_CHECK([[input-c++-glr.y]], [[1]], [], -[[input-c++-glr.y:1.7-9: %code qualifier `bad' is not used -input-c++-glr.y:2.7: %code qualifier `q' is not used -input-c++-glr.y:3.7: %code qualifier `q' is not used +[[input-c++-glr.y:1.7-9: error: %code qualifier 'bad' is not used +input-c++-glr.y:2.7: error: %code qualifier 'q' is not used +input-c++-glr.y:3.7: error: %code qualifier 'q' is not used ]]) AT_DATA([special-char-@@.y], @@ -881,9 +1001,9 @@ AT_DATA([special-char-@@.y], start: ; ]]) AT_BISON_CHECK([[special-char-@@.y]], [[1]], [], -[[special-char-@@.y:1.7-9: %code qualifier `bad' is not used -special-char-@@.y:2.7: %code qualifier `q' is not used -special-char-@@.y:3.7: %code qualifier `q' is not used +[[special-char-@@.y:1.7-9: error: %code qualifier 'bad' is not used +special-char-@@.y:2.7: error: %code qualifier 'q' is not used +special-char-@@.y:3.7: error: %code qualifier 'q' is not used ]]) AT_DATA([special-char-@:>@.y], @@ -894,9 +1014,9 @@ AT_DATA([special-char-@:>@.y], start: ; ]]) AT_BISON_CHECK([[special-char-@:>@.y]], [[1]], [], -[[special-char-@:>@.y:1.7-9: %code qualifier `bad' is not used -special-char-@:>@.y:2.7: %code qualifier `q' is not used -special-char-@:>@.y:3.7: %code qualifier `q' is not used +[[special-char-@:>@.y:1.7-9: error: %code qualifier 'bad' is not used +special-char-@:>@.y:2.7: error: %code qualifier 'q' is not used +special-char-@:>@.y:3.7: error: %code qualifier 'q' is not used ]]) AT_CLEANUP @@ -919,10 +1039,10 @@ start: ; ]]) 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 +[[input-redefined.y:2.9-11: error: %define variable 'var' redefined +input-redefined.y:1.9-11: previous definition +input-redefined.y:3.10-12: error: %define variable 'var' redefined +input-redefined.y:2.9-11: previous definition ]]) AT_DATA([input-unused.y], @@ -932,7 +1052,7 @@ start: ; ]]) AT_BISON_CHECK([[input-unused.y]], [[1]], [], -[[input-unused.y:1.9-11: %define variable `var' is not used +[[input-unused.y:1.9-11: error: %define variable 'var' is not used ]]) AT_CLEANUP @@ -976,8 +1096,8 @@ AT_DATA([[input-dg.y]], start: ; ]]) AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [], -[[input-dg.y:1.9-11: %define variable `var' redefined -:2: previous definition +[[input-dg.y:1.9-11: error: %define variable 'var' redefined +:2: previous definition ]]) AT_DATA([[input-unused.y]], @@ -985,8 +1105,8 @@ AT_DATA([[input-unused.y]], start: ; ]]) AT_BISON_CHECK([[-Dunused-d -Funused-f input-unused.y]], [[1]], [], -[[:2: %define variable `unused-d' is not used -:3: %define variable `unused-f' is not used +[[:2: error: %define variable 'unused-d' is not used +:3: error: %define variable 'unused-f' is not used ]]) AT_CLEANUP @@ -1006,7 +1126,7 @@ start: ; ]]) AT_BISON_CHECK([[Input.y]], [1], [], -[[Input.y:2.9-14: invalid value for %define Boolean variable `public' +[[Input.y:2.9-14: error: invalid value for %define Boolean variable 'public' ]]) AT_CLEANUP @@ -1024,23 +1144,24 @@ AT_DATA([[input.y]], start: ; ]]) AT_BISON_CHECK([[input.y]], [[1]], [[]], -[[input.y:1.9-29: invalid value for %define variable `lr.default-reductions': `bogus' -input.y:1.9-29: accepted value: `all' -input.y:1.9-29: accepted value: `consistent' -input.y:1.9-29: accepted value: `accepting' +[[input.y:1.9-29: error: invalid value for %define variable 'lr.default-reductions': 'bogus' +input.y:1.9-29: accepted value: 'most' +input.y:1.9-29: accepted value: 'consistent' +input.y:1.9-29: accepted value: 'accepting' ]]) # Back-end. +# FIXME: these should be indented, but we shouldn't mess with the m4 yet 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' +[[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_CLEANUP @@ -1060,10 +1181,11 @@ AT_DATA([[input.y]], start: ; ]]) AT_BISON_CHECK([[input.y]], [1], [], -[[input.y:1.9-21: invalid value for %define variable `api.push-pull': `neither' -input.y:1.9-21: accepted value: `pull' -input.y:1.9-21: accepted value: `push' -input.y:1.9-21: accepted value: `both' +[[input.y:1.9-21: 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]], @@ -1072,7 +1194,8 @@ AT_DATA([[input.y]], start: ; ]]) AT_BISON_CHECK([[input.y]], [1], [], -[[input.y:1.9-34: invalid value for %define Boolean variable `lr.keep-unreachable-states' +[[input.y:1.9-34: warning: deprecated %define variable name: 'lr.keep_unreachable_states', use 'lr.keep-unreachable-states' [-Wdeprecated] +input.y:1.9-34: error: invalid value for %define Boolean variable 'lr.keep-unreachable-states' ]]) AT_DATA([[input.y]], @@ -1082,8 +1205,9 @@ AT_DATA([[input.y]], start: ; ]]) AT_BISON_CHECK([[input.y]], [1], [], -[[input.y:2.9-21: %define variable `api.namespace' redefined -input.y:1.9-17: previous definition +[[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]], @@ -1092,7 +1216,7 @@ AT_DATA([[input.y]], start: ; ]]) AT_BISON_CHECK([[input.y]], [[1]], [], -[[input.y:1.9-15: %define variable `foo_bar' is not used +[[input.y:1.9-15: error: %define variable 'foo_bar' is not used ]]) AT_CLEANUP @@ -1117,7 +1241,7 @@ start: ; ]]) AT_BISON_CHECK([[input.y]], [[1]], [], -[[input.y:1.9-16: %define variable `api.pure' is not used +[[input.y:1.9-16: error: %define variable 'api.pure' is not used ]]) ]) @@ -1151,7 +1275,7 @@ start: ; AT_BISON_CHECK([[input.y]], [1], [], [m4_foreach([b4_arg], m4_dquote(m4_shift($@)), -[[input.y:3.9-21: ]b4_arg[ +[[input.y:3.9-21: error: ]b4_arg[ ]])]) ]) @@ -1200,11 +1324,11 @@ start: ' 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:3.8-4.0: missing `'' at end of line -empty.y:4.8: warning: empty character literal -empty.y:4.8: missing `'' at end of file +[[empty.y:2.8-9: warning: empty character literal [-Wother] +empty.y:3.8-4.0: warning: empty character literal [-Wother] +empty.y:3.8-4.0: error: missing "'" at end of line +empty.y:4.8: warning: empty character literal [-Wother] +empty.y:4.8: error: missing "'" at end of file ]]) AT_DATA([two.y], @@ -1215,11 +1339,11 @@ start: 'ab 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:3.8-4.0: missing `'' at end of line -two.y:4.8-10: warning: extra characters in character literal -two.y:4.8-10: missing `'' at end of file +[[two.y:2.8-11: warning: extra characters in character literal [-Wother] +two.y:3.8-4.0: warning: extra characters in character literal [-Wother] +two.y:3.8-4.0: error: missing "'" at end of line +two.y:4.8-10: warning: extra characters in character literal [-Wother] +two.y:4.8-10: error: missing "'" at end of file ]]) AT_DATA([three.y], @@ -1230,11 +1354,11 @@ start: 'abc 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:3.8-4.0: missing `'' at end of line -three.y:4.8-11: warning: extra characters in character literal -three.y:4.8-11: missing `'' at end of file +[[three.y:2.8-12: warning: extra characters in character literal [-Wother] +three.y:3.8-4.0: warning: extra characters in character literal [-Wother] +three.y:3.8-4.0: error: missing "'" at end of line +three.y:4.8-11: warning: extra characters in character literal [-Wother] +three.y:4.8-11: error: missing "'" at end of file ]]) AT_CLEANUP @@ -1260,30 +1384,213 @@ AT_CHECK([[perl -e 'print "start: \"\\\t\\\f\\\0\\\1\" ;";' >> input.y \ || exit 77]]) AT_BISON_CHECK([input.y], [1], [], -[[input.y:2.9-12: invalid number after \-escape: 777 -input.y:2.8-13: warning: empty character literal -input.y:2.16-17: invalid number after \-escape: 0 -input.y:2.15-18: warning: empty character literal -input.y:2.21-25: invalid number after \-escape: xfff -input.y:2.20-26: warning: empty character literal -input.y:2.29-31: invalid number after \-escape: x0 -input.y:2.28-32: warning: empty character literal -input.y:3.9-14: invalid number after \-escape: uffff -input.y:3.8-15: warning: empty character literal -input.y:3.18-23: invalid number after \-escape: u0000 -input.y:3.17-24: warning: empty character literal -input.y:3.27-36: invalid number after \-escape: Uffffffff -input.y:3.26-37: warning: empty character literal -input.y:3.40-49: invalid number after \-escape: U00000000 -input.y:3.39-50: warning: empty character literal -input.y:4.9-10: invalid character after \-escape: ` ' -input.y:4.8-11: warning: empty character literal -input.y:4.14-15: invalid character after \-escape: A -input.y:4.13-16: warning: empty character literal -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.19: invalid character after \-escape: \001 +[[input.y:2.9-12: error: invalid number after \-escape: 777 +input.y:2.8-13: warning: empty character literal [-Wother] +input.y:2.16-17: error: invalid number after \-escape: 0 +input.y:2.15-18: warning: empty character literal [-Wother] +input.y:2.21-25: error: invalid number after \-escape: xfff +input.y:2.20-26: warning: empty character literal [-Wother] +input.y:2.29-31: error: invalid number after \-escape: x0 +input.y:2.28-32: warning: empty character literal [-Wother] +input.y:3.9-14: error: invalid number after \-escape: uffff +input.y:3.8-15: warning: empty character literal [-Wother] +input.y:3.18-23: error: invalid number after \-escape: u0000 +input.y:3.17-24: warning: empty character literal [-Wother] +input.y:3.27-36: error: invalid number after \-escape: Uffffffff +input.y:3.26-37: warning: empty character literal [-Wother] +input.y:3.40-49: error: invalid number after \-escape: U00000000 +input.y:3.39-50: warning: empty character literal [-Wother] +input.y:4.9-10: error: invalid character after \-escape: ' ' +input.y:4.8-11: warning: empty character literal [-Wother] +input.y:4.14-15: error: invalid character after \-escape: A +input.y:4.13-16: warning: empty character literal [-Wother] +input.y:5.9-16: error: invalid character after \-escape: \t +input.y:5.17: error: invalid character after \-escape: \f +input.y:5.18: error: invalid character after \-escape: \0 +input.y:5.19: error: invalid character after \-escape: \001 +]]) + +AT_CLEANUP + +## ------------------------- ## +## LAC: Errors for %define. ## +## ------------------------- ## + +AT_SETUP([[LAC: Errors for %define]]) + +AT_DATA([[input.y]], +[[%% +start: ; +]]) + +# parse.lac.* options are useless if LAC isn't actually activated. +AT_BISON_CHECK([[-Dparse.lac.es-capacity-initial=1 input.y]], + [[1]], [], +[[:2: error: %define variable 'parse.lac.es-capacity-initial' is not used ]]) +AT_BISON_CHECK([[-Dparse.lac.memory-trace=full input.y]], + [[1]], [], +[[:2: error: %define variable 'parse.lac.memory-trace' is not used +]]) + +AT_CLEANUP + +## --------------------------------------------- ## +## -Werror is not affected by -Wnone and -Wall. ## +## --------------------------------------------- ## + +AT_SETUP([[-Werror is not affected by -Wnone and -Wall]]) + +AT_DATA([[input.y]], +[[%% +foo-bar: ; +]]) + +# -Werror is not enabled by -Wall or equivalent. +AT_BISON_CHECK([[-Wall input.y]], [[0]], [[]], +[[input.y:2.1-7: warning: POSIX Yacc forbids dashes in symbol names: foo-bar [-Wyacc] +]]) +AT_BISON_CHECK([[-W input.y]], [[0]], [[]], +[[input.y:2.1-7: warning: POSIX Yacc forbids dashes in symbol names: foo-bar [-Wyacc] +]]) +AT_BISON_CHECK([[-Wno-none input.y]], [[0]], [[]], +[[input.y:2.1-7: warning: POSIX Yacc forbids dashes in symbol names: foo-bar [-Wyacc] +]]) + +# -Werror is not disabled by -Wnone or equivalent. +AT_BISON_CHECK([[-Werror,none,yacc input.y]], [[1]], [[]], [[stderr]]) +AT_CHECK([[sed 's/^.*bison:/bison:/' stderr]], [[0]], +[[input.y:2.1-7: error: POSIX Yacc forbids dashes in symbol names: foo-bar [-Werror=yacc] +]]) +[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: error: '%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], [:2]) +AT_TEST([%name-prefix "bar"], [-Dapi.prefix=foo], [:2]) +AT_TEST([%define api.prefix foo], [-p bar], [input.y:1.9-18]) + +m4_popdef([AT_TEST]) + +AT_CLEANUP + + +## -------------- ## +## Stray $ or @. ## +## -------------- ## + +AT_SETUP([[Stray $ or @]]) + +# Give %printer and %destructor "<*> exp TOK" instead of "<*>" to +# check that the warnings are reported once, not three times. + +AT_DATA_GRAMMAR([[input.y]], +[[%type exp +%token TOK TOK2 +%destructor { $%; @%; } <*> exp TOK; +%initial-action { $%; @%; }; +%printer { $%; @%; } <*> exp TOK; +%% +exp: TOK { $%; @%; $$ = $1; }; +]]) + +AT_BISON_CHECK([[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:15.19: warning: stray '$' [-Wother] +input.y:15.23: warning: stray '@' [-Wother] +]]) + +AT_CLEANUP + + + +## ---------------- ## +## Code injection. ## +## ---------------- ## + + +AT_SETUP([[Code injection]]) + +m4_pattern_allow([^m4_errprintn$]) + +# AT_TEST([MACRO]) +# ---------------- +# Try to have MACRO be run by bison. +m4_pushdef([AT_TEST], +[AT_DATA([[input.y]], +[[%type <$1(DEAD %type)> exp +%token <$1(DEAD %token)> a +%token b +%initial-action +{ + $$; + $<$1(DEAD %initial-action)>$ +}; +%printer +{ + $$ + $<$1(DEAD %printer)>$ +} <> <*>; +%lex-param +{ + $1(DEAD %lex-param) +}; +%parse-param +{ + $1(DEAD %parse-param) +}; +%% +exp: + a a[name] b + { + $$; + $][1; + $<$1(DEAD action 1)>$ + $<$1(DEAD action 2)>1 + $<$1(DEAD action 3)>name + $<$1(DEAD action 4)>0 + ; + }; +]]) + +# FIXME: Provide a means to iterate over all the skeletons. +AT_BISON_CHECK([[-d input.y]]) +AT_BISON_CHECK([[-d -S glr.c input.y]]) +AT_BISON_CHECK([[-d -S lalr1.cc input.y]]) +AT_BISON_CHECK([[-d -S glr.cc input.y]]) +AT_BISON_CHECK([[ -S lalr1.java input.y]]) +]) + +AT_TEST([m4_errprintn]) +AT_TEST([@:>@m4_errprintn]) + +m4_popdef([AT_TEST]) AT_CLEANUP