X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2b45240d6c1b9177533aa5d83ac1c879198111c5..dc8e535c37dffc57e5bc9f97108db6f5eb7a77ce:/tests/input.at?ds=sidebyside diff --git a/tests/input.at b/tests/input.at index 30107218..8184b03e 100644 --- a/tests/input.at +++ b/tests/input.at @@ -1,6 +1,6 @@ # Checking the Bison scanner. -*- Autotest -*- -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,6 +20,63 @@ AT_BANNER([[Input Processing.]]) # Mostly test that we are robust to mistakes. +## ---------------- ## +## Invalid inputs. ## +## ---------------- ## + +AT_SETUP([Invalid inputs]) + +AT_DATA([input.y], +[[\000\001\002\377? +%% +? +default: 'a' } +%& +%a-does-not-exist +%- +%{ +]]) +AT_CHECK([[$PERL -pi -e 's/\\(\d{3})/chr(oct($1))/ge' input.y || exit 77]]) + +AT_BISON_CHECK([input.y], [1], [], +[[input.y:1.1-2: error: invalid characters: '\0\001\002\377?' +input.y:3.1: error: invalid character: '?' +input.y:4.14: error: invalid character: '}' +input.y:5.1: error: invalid character: '%' +input.y:5.2: error: invalid character: '&' +input.y:6.1-17: error: invalid directive: '%a-does-not-exist' +input.y:7.1: error: invalid character: '%' +input.y:7.2: error: invalid character: '-' +input.y:8.1-9.0: error: missing '%}' at end of file +input.y:8.1-9.0: error: syntax error, unexpected %{...%} +]]) + +AT_CLEANUP + + +AT_SETUP([Invalid inputs with {}]) + +# We used to SEGV here. See +# http://lists.gnu.org/archive/html/bug-bison/2005-07/msg00053.html + +AT_DATA([input.y], +[[ +%destructor +%initial-action +%lex-param +%parse-param +%printer +%union +]]) + +AT_BISON_CHECK([input.y], [1], [], +[[input.y:3.1-15: error: syntax error, unexpected %initial-action, expecting {...} +]]) + +AT_CLEANUP + + + ## ------------ ## ## Invalid $n. ## ## ------------ ## @@ -32,9 +89,13 @@ exp: { $$ = $1 ; }; exp: { @$ = @1 ; }; ]]) -AT_BISON_CHECK([input.y], [1], [], +AT_BISON_CHECK([-fcaret input.y], [1], [], [[input.y:2.13-14: error: integer out of range: '$1' + exp: { $$ = $1 ; }; + ^^ input.y:3.13-14: error: integer out of range: '@1' + exp: { @$ = @1 ; }; + ^^ ]]) AT_CLEANUP @@ -53,16 +114,26 @@ AT_DATA([input.y], %% exp: foo { $$; } foo { $2; } foo | foo - | /* Empty. */ + | /* empty. */ ; ]]) -AT_BISON_CHECK([input.y], [1], [], +AT_BISON_CHECK([-fcaret input.y], [1], [], [[input.y:5.12-13: error: $$ for the midrule at $2 of 'exp' has no declared type + exp: foo { $$; } foo { $2; } foo + ^^ input.y:5.24-25: error: $2 of 'exp' has no declared type + exp: foo { $$; } foo { $2; } foo + ^^ input.y:5.6-32: warning: type clash on default action: != <> [-Wother] + exp: foo { $$; } foo { $2; } foo + ^^^^^^^^^^^^^^^^^^^^^^^^^^^ input.y:6.6-8: warning: type clash on default action: != <> [-Wother] + | foo + ^^^ input.y:7.5: warning: empty rule for typed nonterminal, and no action [-Wother] + | /* empty. */ + ^ ]]) AT_CLEANUP @@ -112,42 +183,109 @@ l: INT | INT { $$ = $1; } INT { $$ = $2 + $< _AT_UNUSED_VALUES_DECLARATIONS]) ) -AT_BISON_CHECK(m4_ifval($2, [ --warnings=midrule-values ])[ input.y], [0], [], -[[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] +AT_BISON_CHECK(m4_ifval($2, [--warnings=midrule-values ])[-fcaret input.y], + [0], [], +[[input.y:11.10-32: warning: unset value: $][$ [-Wother] + a: INT | INT { } INT { } INT { }; + ^^^^^^^^^^^^^^^^^^^^^^^ +input.y:11.10-12: warning: unused value: $][1 [-Wother] + a: INT | INT { } INT { } INT { }; + ^^^ +input.y:11.18-20: warning: unused value: $][3 [-Wother] + a: INT | INT { } INT { } INT { }; + ^^^ +input.y:11.26-28: warning: unused value: $][5 [-Wother] + a: INT | INT { } INT { } INT { }; + ^^^ input.y:12.9: warning: empty rule for typed nonterminal, and no action [-Wother] -]]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] -]]]))]) - + b: INT | /* empty */; + ^ +]]m4_ifval($2, [[[input.y:13.14-20: warning: unset value: $][$ [-Wmidrule-values] + c: INT | INT { $][1; } INT { $2; } INT { $4; }; + ^^^^^^^ +input.y:13.26-41: warning: unset value: $][$ [-Wmidrule-values] + c: INT | INT { $][1; } INT { $2; } INT { $4; }; + ^^^^^^^^^^^^^^^^ +]]])[[input.y:13.10-62: warning: unset value: $][$ [-Wother] + c: INT | INT { $][1; } INT { $2; } INT { $4; }; + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +input.y:13.22-24: warning: unused value: $][3 [-Wother] + c: INT | INT { $][1; } INT { $2; } INT { $4; }; + ^^^ +input.y:13.43-45: warning: unused value: $][5 [-Wother] + c: INT | INT { $][1; } INT { $2; } INT { $4; }; + ^^^ +]]m4_ifval($2, [[[input.y:14.14-16: warning: unset value: $][$ [-Wmidrule-values] + d: INT | INT { } INT { $][1; } INT { $2; }; + ^^^ +]]])[[input.y:14.10-49: warning: unset value: $][$ [-Wother] + d: INT | INT { } INT { $][1; } INT { $2; }; + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +input.y:14.18-20: warning: unused value: $][3 [-Wother] + d: INT | INT { } INT { $][1; } INT { $2; }; + ^^^ +input.y:14.30-32: warning: unused value: $][5 [-Wother] + d: INT | INT { } INT { $][1; } INT { $2; }; + ^^^ +input.y:15.10-37: warning: unset value: $][$ [-Wother] + e: INT | INT { } INT { } INT { $][1; }; + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +input.y:15.18-20: warning: unused value: $][3 [-Wother] + e: INT | INT { } INT { } INT { $][1; }; + ^^^ +input.y:15.27-29: warning: unused value: $][5 [-Wother] + e: INT | INT { } INT { } INT { $][1; }; + ^^^ +input.y:17.10-58: warning: unset value: $][$ [-Wother] + g: INT | INT { $$; } INT { $$; } INT { }; + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +input.y:17.10-12: warning: unused value: $][1 [-Wother] + g: INT | INT { $$; } INT { $$; } INT { }; + ^^^ +]]m4_ifval($2, [[[input.y:17.14-29: warning: unused value: $][2 [-Wmidrule-values] + g: INT | INT { $$; } INT { $$; } INT { }; + ^^^^^^^^^^^^^^^^ +]]])[[input.y:17.31-33: warning: unused value: $][3 [-Wother] + g: INT | INT { $$; } INT { $$; } INT { }; + ^^^ +]]m4_ifval($2, [[[input.y:17.35-50: warning: unused value: $][4 [-Wmidrule-values] + g: INT | INT { $$; } INT { $$; } INT { }; + ^^^^^^^^^^^^^^^^ +]]])[[input.y:17.52-54: warning: unused value: $][5 [-Wother] + g: INT | INT { $$; } INT { $$; } INT { }; + ^^^ +input.y:18.10-72: warning: unset value: $][$ [-Wother] + h: INT | INT { $$; } INT { $$ = $2; } INT { }; + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +input.y:18.10-12: warning: unused value: $][1 [-Wother] + h: INT | INT { $$; } INT { $$ = $2; } INT { }; + ^^^ +input.y:18.31-33: warning: unused value: $][3 [-Wother] + h: INT | INT { $$; } INT { $$ = $2; } INT { }; + ^^^ +]]m4_ifval($2, [[[input.y:18.35-64: warning: unused value: $][4 [-Wmidrule-values] + h: INT | INT { $$; } INT { $$ = $2; } INT { }; + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +]]])[[input.y:18.66-68: warning: unused value: $][5 [-Wother] + h: INT | INT { $$; } INT { $$ = $2; } INT { }; + ^^^ +]]m4_ifval($2, [[[input.y:20.18-37: warning: unused value: $][3 [-Wmidrule-values] + j: INT | INT INT { $$ = 1; } { $][$ = $][1 + $][2; }; + ^^^^^^^^^^^^^^^^^^^^ +]]])[[input.y:21.10-68: warning: unset value: $][$ [-Wother] + k: INT | INT INT { $$; } { $$ = $3; } { }; + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +input.y:21.10-12: warning: unused value: $][1 [-Wother] + k: INT | INT INT { $$; } { $$ = $3; } { }; + ^^^ +input.y:21.14-16: warning: unused value: $][2 [-Wother] + k: INT | INT INT { $$; } { $$ = $3; } { }; + ^^^ +]]m4_ifval($2, [[[input.y:21.35-64: warning: unused value: $][4 [-Wmidrule-values] + k: INT | INT INT { $$; } { $$ = $3; } { }; + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +]]])) +]) ## --------------- ## ## Unused values. ## @@ -199,31 +337,79 @@ start: ; %printer { print ($$); } <>; ]]) -AT_BISON_CHECK([input.y], [1], [], +AT_BISON_CHECK([-fcaret input.y], [1], [], [[input.y:1.13-29: error: %destructor redeclaration for <*> + %destructor { destroy ($$); } <*> <*> + ^^^^^^^^^^^^^^^^^ input.y:1.13-29: previous declaration + %destructor { destroy ($$); } <*> <*> + ^^^^^^^^^^^^^^^^^ input.y:2.10-24: error: %printer redeclaration for <*> + %printer { print ($$); } <*> <*> + ^^^^^^^^^^^^^^^ input.y:2.10-24: previous declaration + %printer { print ($$); } <*> <*> + ^^^^^^^^^^^^^^^ input.y:4.13-29: error: %destructor redeclaration for <*> + %destructor { destroy ($$); } <*> + ^^^^^^^^^^^^^^^^^ input.y:1.13-29: previous declaration + %destructor { destroy ($$); } <*> <*> + ^^^^^^^^^^^^^^^^^ input.y:5.10-24: error: %printer redeclaration for <*> + %printer { print ($$); } <*> + ^^^^^^^^^^^^^^^ input.y:2.10-24: previous declaration + %printer { print ($$); } <*> <*> + ^^^^^^^^^^^^^^^ input.y:7.13-29: error: %destructor redeclaration for <> + %destructor { destroy ($$); } <> <> + ^^^^^^^^^^^^^^^^^ input.y:7.13-29: previous declaration + %destructor { destroy ($$); } <> <> + ^^^^^^^^^^^^^^^^^ input.y:8.10-24: error: %printer redeclaration for <> + %printer { print ($$); } <> <> + ^^^^^^^^^^^^^^^ input.y:8.10-24: previous declaration + %printer { print ($$); } <> <> + ^^^^^^^^^^^^^^^ input.y:10.13-29: error: %destructor redeclaration for <> + %destructor { destroy ($$); } <> + ^^^^^^^^^^^^^^^^^ input.y:7.13-29: previous declaration + %destructor { destroy ($$); } <> <> + ^^^^^^^^^^^^^^^^^ input.y:11.10-24: error: %printer redeclaration for <> + %printer { print ($$); } <> + ^^^^^^^^^^^^^^^ input.y:8.10-24: previous declaration + %printer { print ($$); } <> <> + ^^^^^^^^^^^^^^^ input.y:17.13-29: error: %destructor redeclaration for <*> + %destructor { destroy ($$); } <*>; + ^^^^^^^^^^^^^^^^^ input.y:4.13-29: previous declaration + %destructor { destroy ($$); } <*> + ^^^^^^^^^^^^^^^^^ input.y:18.10-24: error: %printer redeclaration for <*> + %printer { print ($$); } <*>; + ^^^^^^^^^^^^^^^ input.y:5.10-24: previous declaration + %printer { print ($$); } <*> + ^^^^^^^^^^^^^^^ input.y:20.13-29: error: %destructor redeclaration for <> + %destructor { destroy ($$); } <>; + ^^^^^^^^^^^^^^^^^ input.y:10.13-29: previous declaration + %destructor { destroy ($$); } <> + ^^^^^^^^^^^^^^^^^ input.y:21.10-24: error: %printer redeclaration for <> + %printer { print ($$); } <>; + ^^^^^^^^^^^^^^^ input.y:11.10-24: previous declaration + %printer { print ($$); } <> + ^^^^^^^^^^^^^^^ ]]) AT_CLEANUP @@ -259,14 +445,14 @@ 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:11.13-29: error: %destructor redeclaration for +input.y:4.13-29: previous declaration input.y:12.10-24: error: %printer redeclaration for input.y:5.10-24: previous declaration +input.y:12.10-24: error: %printer redeclaration for +input.y:2.10-24: previous declaration ]]) AT_CLEANUP @@ -285,11 +471,19 @@ AT_DATA([[input.y]], exp: bar; ]]) -AT_BISON_CHECK([input.y], [1], [], +AT_BISON_CHECK([-fcaret input.y], [1], [], [[input.y:2.16-18: error: symbol bar is used, but is not defined as a token and has no rules + %destructor {} bar + ^^^ input.y:1.17-19: warning: symbol baz is used, but is not defined as a token and has no rules [-Wother] + %printer {} foo baz + ^^^ input.y:1.13-15: warning: symbol foo is used, but is not defined as a token and has no rules [-Wother] + %printer {} foo baz + ^^^ input.y:3.13-15: warning: symbol qux is used, but is not defined as a token and has no rules [-Wother] + %type qux + ^^^ ]]) AT_CLEANUP @@ -406,10 +600,16 @@ end: { } ; tagged: { } ; ]]) -AT_BISON_CHECK([input.y], [0], [], +AT_BISON_CHECK([-fcaret input.y], [0], [], [[input.y:6.8-45: warning: unset value: $$ [-Wother] -input.y:6.8-45: warning: unused value: $2 [-Wother] + start: end end tagged tagged { $1; $3; } ; + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +input.y:6.12-14: warning: unused value: $2 [-Wother] + start: end end tagged tagged { $1; $3; } ; + ^^^ input.y:7.6-8: warning: unset value: $$ [-Wother] + end: { } ; + ^^^ ]]) AT_DATA([[input.y]], @@ -424,7 +624,7 @@ tagged: { } ; ]]) AT_BISON_CHECK([input.y], [0], [], -[[input.y:6.8-45: warning: unused value: $4 [-Wother] +[[input.y:6.23-28: warning: unused value: $4 [-Wother] input.y:8.9-11: warning: unset value: $$ [-Wother] ]]) @@ -447,10 +647,16 @@ start: end end { $1; } ; end: { } ; ]]) -AT_BISON_CHECK([input.y], [0], [], +AT_BISON_CHECK([-fcaret input.y], [0], [], [[input.y:6.8-22: warning: unset value: $$ [-Wother] -input.y:6.8-22: warning: unused value: $2 [-Wother] + start: end end { $1; } ; + ^^^^^^^^^^^^^^^ +input.y:6.12-14: warning: unused value: $2 [-Wother] + start: end end { $1; } ; + ^^^ input.y:7.6-8: warning: unset value: $$ [-Wother] + end: { } ; + ^^^ ]]) AT_CLEANUP @@ -479,15 +685,31 @@ AT_DATA([input.y], exp: foo; ]]) -AT_BISON_CHECK([input.y], [1], [], +AT_BISON_CHECK([-fcaret input.y], [1], [], [[input.y:8.7-11: error: %type redeclaration for foo + %type "foo" + ^^^^^ input.y:3.7-11: previous declaration + %type foo + ^^^^^ input.y:10.13-17: error: %destructor redeclaration for foo + %destructor {baz} "foo" + ^^^^^ input.y:5.13-17: previous declaration + %destructor {bar} foo + ^^^^^ input.y:9.10-14: error: %printer redeclaration for foo + %printer {baz} "foo" + ^^^^^ input.y:4.10-14: previous declaration + %printer {bar} foo + ^^^^^ input.y:11.1-5: error: %left redeclaration for foo + %left "foo" + ^^^^^ input.y:6.1-5: previous declaration + %left foo + ^^^^^ ]]) AT_CLEANUP @@ -513,8 +735,10 @@ AT_BISON_CHECK([input.y], [1], [], AT_DATA([input.y], [{} ]) -AT_BISON_CHECK([input.y], [1], [], +AT_BISON_CHECK([-fcaret input.y], [1], [], [[input.y:1.1-2: error: syntax error, unexpected {...} + {} + ^^ ]]) @@ -635,12 +859,7 @@ AT_DATA([main.c], #include "input.h" int yyparse (void); - -int -main (void) -{ - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) AT_BISON_OPTION_POPDEFS @@ -689,7 +908,7 @@ m4_define([AT_CHECK_REQUIRE], AT_DATA_GRAMMAR([input.y], [[%require "$1"; %% -empty_file:; +empty_file: /* empty */; ]]) AT_BISON_CHECK([-o input.c input.y], $2, [], ignore) AT_CLEANUP @@ -753,13 +972,13 @@ AT_BISON_OPTION_POPDEFS # POSIX Yacc accept periods, but not dashes. AT_BISON_CHECK([--yacc -Wno-error input.y], [], [], [[input.y:9.8-16: warning: POSIX Yacc forbids dashes in symbol names: WITH-DASH [-Wyacc] -input.y:18.8-16: warning: POSIX Yacc forbids dashes in symbol names: with-dash [-Wyacc] +input.y:20.8-16: warning: POSIX Yacc forbids dashes in symbol names: with-dash [-Wyacc] ]]) # So warn about them. AT_BISON_CHECK([-Wyacc input.y], [], [], [[input.y:9.8-16: warning: POSIX Yacc forbids dashes in symbol names: WITH-DASH [-Wyacc] -input.y:18.8-16: warning: POSIX Yacc forbids dashes in symbol names: with-dash [-Wyacc] +input.y:20.8-16: warning: POSIX Yacc forbids dashes in symbol names: with-dash [-Wyacc] ]]) # Dashes are fine for GNU Bison. @@ -859,12 +1078,22 @@ start: ; %destructor { free ($$) ]]) -AT_BISON_CHECK([-o input.c input.y], 1, [], +AT_BISON_CHECK([-fcaret -o input.c input.y], 1, [], [[input.y:1.10-2.0: error: missing '"' at end of line + %token A "a + ^^ input.y:4.10-5.0: error: missing "'" at end of line + %token C '1 + ^^ input.y:14.11-15.0: error: missing "'" at end of line + %type 'a + ^^ input.y:16.11-17.0: error: missing '"' at end of line + %type "a + ^^ input.y:19.13-20.0: error: missing '}' at end of file + %destructor { free ($$) + ^^^^^^^^^^^ input.y:20.1: error: syntax error, unexpected end of file ]]) @@ -1100,6 +1329,18 @@ AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [], :2: previous definition ]]) +AT_DATA([[input-dg.y]], +[[%define var "gram" +%% +start: ; +]]) +AT_BISON_CHECK([[-fcaret -Dvar=cmd-d input-dg.y]], [[1]], [], +[[input-dg.y:1.9-11: error: %define variable 'var' redefined + %define var "gram" + ^^^ +:3: previous definition +]]) + AT_DATA([[input-unused.y]], [[%% start: ; @@ -1115,7 +1356,7 @@ AT_CLEANUP ## %define Boolean variables. ## ## --------------------------- ## -AT_SETUP([[%define Boolean variables]]) +AT_SETUP([["%define" Boolean variables]]) AT_DATA([Input.y], [[%language "Java" @@ -1135,30 +1376,37 @@ AT_CLEANUP ## %define enum variables. ## ## ------------------------ ## -AT_SETUP([[%define enum variables]]) +AT_SETUP([["%define" enum variables]]) + +# Check errors from the front-end, and the back-end. Since the +# front-end quits before calling the back-end, these tests cannot be +# fused. # Front-end. AT_DATA([[input.y]], -[[%define lr.default-reductions bogus +[[%define lr.default-reduction bogus %% start: ; ]]) -AT_BISON_CHECK([[input.y]], [[1]], [[]], -[[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' +AT_BISON_CHECK([[-fcaret input.y]], [[1]], [[]], +[[input.y:1.9-28: error: invalid value for %define variable 'lr.default-reduction': 'bogus' + %define lr.default-reduction bogus + ^^^^^^^^^^^^^^^^^^^^ +input.y:1.9-28: accepted value: 'most' +input.y:1.9-28: accepted value: 'consistent' +input.y:1.9-28: accepted value: 'accepting' ]]) # Back-end. -# 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], [], +AT_BISON_CHECK([[-fcaret input.y]], [[1]], [[]], [[input.y:1.9-21: error: invalid value for %define variable 'api.push-pull': 'neither' + %define api.push-pull neither + ^^^^^^^^^^^^^ input.y:1.9-21: accepted value: 'pull' input.y:1.9-21: accepted value: 'push' input.y:1.9-21: accepted value: 'both' @@ -1170,53 +1418,37 @@ 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_SETUP([["%define" backward compatibility]]) +# The error messages tell us whether the variables are properly updated. AT_DATA([[input.y]], -[[%define api.push_pull "neither" -%% -start: ; -]]) -AT_BISON_CHECK([[input.y]], [1], [], -[[input.y:1.9-21: warning: deprecated %define variable name: 'api.push_pull', use 'api.push-pull' [-Wdeprecated] -input.y:1.9-21: error: invalid value for %define variable 'api.push-pull': 'neither' -input.y:1.9-21: accepted value: 'pull' -input.y:1.9-21: accepted value: 'push' -input.y:1.9-21: accepted value: 'both' -]]) - -AT_DATA([[input.y]], -[[%define lr.keep_unreachable_states maybe -%% -start: ; -]]) -AT_BISON_CHECK([[input.y]], [1], [], -[[input.y:1.9-34: warning: deprecated %define variable name: 'lr.keep_unreachable_states', use 'lr.keep-unreachable-states' [-Wdeprecated] -input.y:1.9-34: error: invalid value for %define Boolean variable 'lr.keep-unreachable-states' -]]) - -AT_DATA([[input.y]], -[[%define namespace "foo" +[[%define api.push_pull both +%define lr.keep_unreachable_states maybe +%define namespace "foo" %define api.namespace "foo" +%define variant %% start: ; ]]) -AT_BISON_CHECK([[input.y]], [1], [], -[[input.y:1.9-17: warning: deprecated %define variable name: 'namespace', use 'api.namespace' [-Wdeprecated] -input.y:2.9-21: error: %define variable 'api.namespace' redefined -input.y:1.9-17: previous definition -]]) - -AT_DATA([[input.y]], -[[%define foo_bar "baz" -%% -start: ; -]]) -AT_BISON_CHECK([[input.y]], [[1]], [], -[[input.y:1.9-15: error: %define variable 'foo_bar' is not used +AT_BISON_CHECK([[-fcaret input.y]], [1], [], +[[input.y:1.9-21: warning: deprecated directive, use '%define api.push-pull both' [-Wdeprecated] + %define api.push_pull both + ^^^^^^^^^^^^^ +input.y:2.9-34: warning: deprecated directive, use '%define lr.keep-unreachable-state maybe' [-Wdeprecated] + %define lr.keep_unreachable_states maybe + ^^^^^^^^^^^^^^^^^^^^^^^^^^ +input.y:3.9-17: warning: deprecated directive, use '%define api.namespace foo' [-Wdeprecated] + %define namespace "foo" + ^^^^^^^^^ +input.y:4.9-21: error: %define variable 'api.namespace' redefined + %define api.namespace "foo" + ^^^^^^^^^^^^^ +input.y:3.9-17: previous definition + %define namespace "foo" + ^^^^^^^^^ +input.y:5.9-15: warning: deprecated directive, use '%define api.value.type variant' [-Wdeprecated] + %define variant + ^^^^^^^ ]]) AT_CLEANUP @@ -1245,10 +1477,10 @@ AT_BISON_CHECK([[input.y]], [[1]], [], ]]) ]) -AT_CHECK_API_PURE([[%language "c++" %defines]], [[]]) -AT_CHECK_API_PURE([[%language "c++" %defines]], [[false]]) -AT_CHECK_API_PURE([[%language "c++" %defines %glr-parser]], [[""]]) -AT_CHECK_API_PURE([[%language "c++" %defines %glr-parser]], [[false]]) +AT_CHECK_API_PURE([[%language "c++"]], [[]]) +AT_CHECK_API_PURE([[%language "c++"]], [[false]]) +AT_CHECK_API_PURE([[%language "c++" %glr-parser]], [[""]]) +AT_CHECK_API_PURE([[%language "c++" %glr-parser]], [[false]]) AT_CHECK_API_PURE([[%language "java"]], [[true]]) AT_CHECK_API_PURE([[%language "java"]], [[false]]) @@ -1321,14 +1553,24 @@ AT_DATA([empty.y], start: ''; start: ' ]]) -AT_CHECK([[perl -e "print 'start: \'';" >> empty.y || exit 77]]) +AT_CHECK([[$PERL -e "print 'start: \'';" >> empty.y || exit 77]]) -AT_BISON_CHECK([empty.y], [1], [], +AT_BISON_CHECK([-fcaret empty.y], [1], [], [[empty.y:2.8-9: warning: empty character literal [-Wother] -empty.y:3.8-4.0: warning: empty character literal [-Wother] + start: ''; + ^^ empty.y:3.8-4.0: error: missing "'" at end of line -empty.y:4.8: warning: empty character literal [-Wother] + start: ' + ^ +empty.y:3.8-4.0: warning: empty character literal [-Wother] + start: ' + ^ empty.y:4.8: error: missing "'" at end of file + start: ' + ^ +empty.y:4.8: warning: empty character literal [-Wother] + start: ' + ^ ]]) AT_DATA([two.y], @@ -1336,14 +1578,14 @@ AT_DATA([two.y], start: 'ab'; start: 'ab ]]) -AT_CHECK([[perl -e "print 'start: \'ab';" >> two.y || exit 77]]) +AT_CHECK([[$PERL -e "print 'start: \'ab';" >> two.y || exit 77]]) AT_BISON_CHECK([two.y], [1], [], [[two.y:2.8-11: warning: extra characters in character literal [-Wother] -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:3.8-4.0: warning: extra characters in character literal [-Wother] two.y:4.8-10: error: missing "'" at end of file +two.y:4.8-10: warning: extra characters in character literal [-Wother] ]]) AT_DATA([three.y], @@ -1351,14 +1593,14 @@ AT_DATA([three.y], start: 'abc'; start: 'abc ]]) -AT_CHECK([[perl -e "print 'start: \'abc';" >> three.y || exit 77]]) +AT_CHECK([[$PERL -e "print 'start: \'abc';" >> three.y || exit 77]]) AT_BISON_CHECK([three.y], [1], [], [[three.y:2.8-12: warning: extra characters in character literal [-Wother] -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:3.8-4.0: warning: extra characters in character literal [-Wother] three.y:4.8-11: error: missing "'" at end of file +three.y:4.8-11: warning: extra characters in character literal [-Wother] ]]) AT_CLEANUP @@ -1380,7 +1622,7 @@ start: '\777' '\0' '\xfff' '\x0' # Beside we cannot even expect "echo '\0'" to output two characters # (well three with \n): at least Bash 3.2 converts the two-character # sequence "\0" into a single NUL character. -AT_CHECK([[perl -e 'print "start: \"\\\t\\\f\\\0\\\1\" ;";' >> input.y \ +AT_CHECK([[$PERL -e 'print "start: \"\\\t\\\f\\\0\\\1\" ;";' >> input.y \ || exit 77]]) AT_BISON_CHECK([input.y], [1], [], @@ -1472,7 +1714,7 @@ AT_CLEANUP ## %name-prefix and %define api.prefix are incompatible. ## ## ------------------------------------------------------ ## -AT_SETUP([[%name-prefix and %define api.prefix are incompatible]]) +AT_SETUP([[%name-prefix and api.prefix are incompatible]]) # AT_TEST(DIRECTIVES, OPTIONS, ERROR-LOCATION) # -------------------------------------------- @@ -1480,7 +1722,7 @@ m4_pushdef([AT_TEST], [AT_DATA([[input.y]], [[$1 %% -exp:; +exp: /* empty */; ]]) AT_BISON_CHECK([[$2 input.y]], [[1]], [[]], [[$3: error: '%name-prefix' and '%define api.prefix' cannot be used together @@ -1512,19 +1754,22 @@ AT_DATA_GRAMMAR([[input.y]], %destructor { $%; @%; } <*> exp TOK; %initial-action { $%; @%; }; %printer { $%; @%; } <*> exp TOK; +%{ $ @ %} // Should not warn. %% exp: TOK { $%; @%; $$ = $1; }; +%% +$ @ // Should not warn. ]]) -AT_BISON_CHECK([[input.y]], 0, [], +AT_BISON_CHECK([[-Wall input.y]], 0, [], [[input.y:11.19: warning: stray '$' [-Wother] input.y:11.23: warning: stray '@' [-Wother] input.y:12.19: warning: stray '$' [-Wother] input.y:12.23: warning: stray '@' [-Wother] input.y:13.19: warning: stray '$' [-Wother] input.y:13.23: warning: stray '@' [-Wother] -input.y:15.19: warning: stray '$' [-Wother] -input.y:15.23: warning: stray '@' [-Wother] +input.y:16.19: warning: stray '$' [-Wother] +input.y:16.23: warning: stray '@' [-Wother] ]]) AT_CLEANUP @@ -1594,3 +1839,121 @@ AT_TEST([@:>@m4_errprintn]) m4_popdef([AT_TEST]) AT_CLEANUP + +##----------------------- ## +## Deprecated directives. ## +## ---------------------- ## + +AT_SETUP([[Deprecated directives]]) + +AT_KEYWORDS([[deprec]]) + +AT_DATA_GRAMMAR([[input.y]], +[[ +%default_prec +%error_verbose +%expect_rr 0 +%file-prefix = "foo" +%file-prefix + = +"bar" +%fixed-output_files +%fixed_output-files +%fixed-output-files +%name-prefix= "foo" +%no-default_prec +%no_default-prec +%no_lines +%output = "foo" +%pure_parser +%token_table +%glr-parser +%% exp : '0' +]]) + +AT_BISON_CHECK([[input.y]], [[0]], [[]], +[[input.y:10.1-13: warning: deprecated directive: '%default_prec', use '%default-prec' [-Wdeprecated] +input.y:11.1-14: warning: deprecated directive: '%error_verbose', use '%define parse.error verbose' [-Wdeprecated] +input.y:12.1-10: warning: deprecated directive: '%expect_rr', use '%expect-rr' [-Wdeprecated] +input.y:13.1-14: warning: deprecated directive: '%file-prefix =', use '%file-prefix' [-Wdeprecated] +input.y:14.1-15.2: warning: deprecated directive: '%file-prefix\n =', use '%file-prefix' [-Wdeprecated] +input.y:17.1-19: warning: deprecated directive: '%fixed-output_files', use '%fixed-output-files' [-Wdeprecated] +input.y:18.1-19: warning: deprecated directive: '%fixed_output-files', use '%fixed-output-files' [-Wdeprecated] +input.y:20.1-13: warning: deprecated directive: '%name-prefix=', use '%name-prefix' [-Wdeprecated] +input.y:21.1-16: warning: deprecated directive: '%no-default_prec', use '%no-default-prec' [-Wdeprecated] +input.y:22.1-16: warning: deprecated directive: '%no_default-prec', use '%no-default-prec' [-Wdeprecated] +input.y:23.1-9: warning: deprecated directive: '%no_lines', use '%no-lines' [-Wdeprecated] +input.y:24.1-9: warning: deprecated directive: '%output =', use '%output' [-Wdeprecated] +input.y:25.1-12: warning: deprecated directive: '%pure_parser', use '%pure-parser' [-Wdeprecated] +input.y:26.1-12: warning: deprecated directive: '%token_table', use '%token-table' [-Wdeprecated] +]]) + +AT_CLEANUP + +## ---------------------------- ## +## Unput's effect on locations. ## +## ---------------------------- ## +dnl When the scanner detects a deprecated construct, it unputs the correct +dnl version, but it should *not* have any impact on the scanner cursor. If it +dnl does, the locations of directives on the same line become erroneous. + +AT_SETUP([[Unput's effect on locations]]) + +AT_KEYWORDS([[deprec]]) + +AT_DATA_GRAMMAR([[input.y]], +[[ +%glr-parser +%expect_rr 42 %expect_rr 42 + %expect_rr 42 +%error_verbose %error_verbose + %error_verbose +%% exp: '0' +]]) + +AT_BISON_CHECK([[input.y]], [[1]], [[]], +[[input.y:11.1-10: warning: deprecated directive: '%expect_rr', use '%expect-rr' [-Wdeprecated] +input.y:11.15-24: warning: deprecated directive: '%expect_rr', use '%expect-rr' [-Wdeprecated] +input.y:12.15-24: warning: deprecated directive: '%expect_rr', use '%expect-rr' [-Wdeprecated] +input.y:13.1-14: warning: deprecated directive: '%error_verbose', use '%define parse.error verbose' [-Wdeprecated] +input.y:13.16-29: warning: deprecated directive: '%error_verbose', use '%define parse.error verbose' [-Wdeprecated] +input.y:13.11-21: error: %define variable 'parse.error' redefined +input.y:13-6: previous definition +input.y:14.16-29: warning: deprecated directive: '%error_verbose', use '%define parse.error verbose' [-Wdeprecated] +input.y:14.11-21: error: %define variable 'parse.error' redefined +input.y:13.11-21: previous definition +]]) + +AT_CLEANUP + +##--------------------------- ## +## Non-deprecated directives. ## +## -------------------------- ## + +AT_SETUP([[Non-deprecated directives]]) + +AT_KEYWORDS([[deprec]]) + +AT_DATA_GRAMMAR([[input.y]], +[[ +%default-prec +%error-verbose +%expect-rr 42 +%file-prefix "foo" +%file-prefix +"bar" +%fixed-output-files +%name-prefix "foo" +%no-default-prec +%no-lines +%output "foo" +%pure-parser +%token-table +%% exp : '0' +]]) + +AT_BISON_CHECK([[input.y]], [[0]], [[]], +[[input.y: warning: %expect-rr applies only to GLR parsers [-Wother] +]]) + +AT_CLEANUP