X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0242bf04acf60bef5ecde9f8f8babccf2e277c06..f68a49ed4942714616e692f0fa2a8315368bae3b:/tests/input.at?ds=sidebyside diff --git a/tests/input.at b/tests/input.at index 21179637..85267a20 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,29 @@ AT_BANNER([[Input Processing.]]) # Mostly test that we are robust to mistakes. +## ----------------- ## +## Invalid options. ## +## ----------------- ## + +AT_SETUP([Invalid options]) + +AT_DATA([input.y], +[[%% +exp: '0' +]]) + +# We used to accept these, as -f, --report and others were sharing +# their code with -W. +AT_BISON_CHECK([-ferror=caret input.y], [1], [], [ignore]) +AT_BISON_CHECK([--report=error=itemsets input.y], [1], [], [ignore]) + +# We used to accept any character after "-Werror", instead of ensuring +# this is "=". +AT_BISON_CHECK([-Werror?all input.y], [1], [], [ignore]) + +AT_CLEANUP + + ## ---------------- ## ## Invalid inputs. ## ## ---------------- ## @@ -85,17 +108,17 @@ AT_SETUP([Invalid $n and @n]) AT_DATA([input.y], [[%% -exp: { $$ = $1 ; }; -exp: { @$ = @1 ; }; +exp: %empty { $$ = $1 ; }; +exp: %empty { @$ = @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 ; }; - ^^ +[[input.y:2.20-21: error: integer out of range: '$1' + exp: %empty { $$ = $1 ; }; + ^^ +input.y:3.20-21: error: integer out of range: '@1' + exp: %empty { @$ = @1 ; }; + ^^ ]]) AT_CLEANUP @@ -114,7 +137,7 @@ AT_DATA([input.y], %% exp: foo { $$; } foo { $2; } foo | foo - | /* Empty. */ + | %empty ; ]]) @@ -131,9 +154,9 @@ input.y:5.6-32: warning: type clash on default action: != <> [-Wother] 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. */ - ^ +input.y:7.6-11: warning: empty rule for typed nonterminal, and no action [-Wother] + | %empty + ^^^^^^ ]]) AT_CLEANUP @@ -169,7 +192,7 @@ start: ; a: INT | INT { } INT { } INT { }; -b: INT | /* empty */; +b: INT | %empty; c: INT | INT { $]1[; } INT { $2; } INT { $4; }; d: INT | INT { } INT { $]1[; } INT { $2; }; e: INT | INT { } INT { } INT { $]1[; }; @@ -197,9 +220,9 @@ input.y:11.18-20: warning: unused value: $][3 [-Wother] input.y:11.26-28: warning: unused value: $][5 [-Wother] a: INT | INT { } INT { } INT { }; ^^^ -input.y:12.9: warning: empty rule for typed nonterminal, and no action [-Wother] - b: INT | /* empty */; - ^ +input.y:12.10-15: warning: empty rule for typed nonterminal, and no action [-Wother] + b: INT | %empty; + ^^^^^^ ]]m4_ifval($2, [[[input.y:13.14-20: warning: unset value: $][$ [-Wmidrule-values] c: INT | INT { $][1; } INT { $2; } INT { $4; }; ^^^^^^^ @@ -328,7 +351,7 @@ AT_DATA([[input.y]], %% -start: ; +start: %empty; %destructor { destroy ($$); } <*>; %printer { print ($$); } <*>; @@ -430,7 +453,7 @@ AT_DATA([[input.y]], %% -start: ; +start: %empty; %destructor { destroy ($$); } ; %printer { print ($$); } ; @@ -445,14 +468,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 @@ -826,7 +849,7 @@ exp: '@<:@' '\1' two '$' '@' '{' oline output.or.oline.opt two: '\x000000000000000000000000000000000000000000000000000000000000000000002'; oline: '@' 'o' 'l' 'i' 'n' 'e' '@' '_' '_' 'o' 'l' 'i' 'n' 'e' '_' '_'; -output.or.oline.opt: ;|oline;;|output;;; +output.or.oline.opt: %empty;|oline;;|output;;; output: '#' 'o' 'u' 't' 'p' 'u' 't' ' '; %% /* Exercise M4 quoting: '@:>@@:>@', @<:@, 2. */ @@ -859,12 +882,7 @@ AT_DATA([main.c], #include "input.h" int yyparse (void); - -int -main (void) -{ - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) AT_BISON_OPTION_POPDEFS @@ -913,7 +931,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 @@ -977,13 +995,13 @@ AT_BISON_OPTION_POPDEFS # POSIX Yacc accept periods, but not dashes. AT_BISON_CHECK([--yacc -Wno-error input.y], [], [], [[input.y:9.8-16: warning: POSIX Yacc forbids dashes in symbol names: WITH-DASH [-Wyacc] -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. @@ -1071,7 +1089,7 @@ AT_DATA([input.y], %% -start: ; +start: %empty; // Used to report a syntax error because it didn't see any kind of symbol // identifier. @@ -1116,7 +1134,7 @@ AT_SETUP([%start after first rule]) AT_DATA([input.y], [[%% -false_start: ; +false_start: %empty; start: false_start ; %start start; ]]) @@ -1137,7 +1155,7 @@ AT_SETUP([%prec takes a token]) AT_DATA([input.y], [[%% start: PREC %prec PREC ; -PREC: ; +PREC: %empty; ]]) AT_BISON_CHECK([input.y], [1], [], @@ -1179,7 +1197,7 @@ AT_DATA([input-c.y], %code bad {} %code format {} %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[input-c.y]], [[1]], [], [[input-c.y:1.7: error: %code qualifier 'q' is not used @@ -1193,7 +1211,7 @@ AT_DATA([input-c-glr.y], %code bad {} %code bad {} %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[input-c-glr.y]], [[1]], [], [[input-c-glr.y:1.7: error: %code qualifier 'q' is not used @@ -1206,7 +1224,7 @@ AT_DATA([input-c++.y], %code bad {} %code q {} %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[input-c++.y]], [[1]], [], [[input-c++.y:1.7: error: %code qualifier 'q' is not used @@ -1219,7 +1237,7 @@ AT_DATA([input-c++-glr.y], %code q {} %code q {} %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[input-c++-glr.y]], [[1]], [], [[input-c++-glr.y:1.7-9: error: %code qualifier 'bad' is not used @@ -1232,7 +1250,7 @@ AT_DATA([special-char-@@.y], %code q {} %code q {} %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[special-char-@@.y]], [[1]], [], [[special-char-@@.y:1.7-9: error: %code qualifier 'bad' is not used @@ -1245,7 +1263,7 @@ AT_DATA([special-char-@:>@.y], %code q {} %code q {} %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[special-char-@:>@.y]], [[1]], [], [[special-char-@:>@.y:1.7-9: error: %code qualifier 'bad' is not used @@ -1269,7 +1287,7 @@ AT_DATA([input-redefined.y], %define special1 "@:>@" %define special2 "@<:@" %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[input-redefined.y]], [[1]], [], @@ -1282,7 +1300,7 @@ input-redefined.y:2.9-11: previous definition AT_DATA([input-unused.y], [[%define var "value" %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[input-unused.y]], [[1]], [], @@ -1310,7 +1328,7 @@ m4@&t@_divert_pop(0) AT_DATA([[input.y]], [[%define var-dfg "gram" %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[-Dvar-dd=cmd-d1 -Dvar-dd=cmd-d2 \ -Fvar-ff=cmd-f1 -Fvar-ff=cmd-f2 \ @@ -1327,7 +1345,7 @@ var-fd: cmd-d AT_DATA([[input-dg.y]], [[%define var "gram" %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [], [[input-dg.y:1.9-11: error: %define variable 'var' redefined @@ -1337,7 +1355,7 @@ AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [], AT_DATA([[input-dg.y]], [[%define var "gram" %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[-fcaret -Dvar=cmd-d input-dg.y]], [[1]], [], [[input-dg.y:1.9-11: error: %define variable 'var' redefined @@ -1348,7 +1366,7 @@ AT_BISON_CHECK([[-fcaret -Dvar=cmd-d input-dg.y]], [[1]], [], AT_DATA([[input-unused.y]], [[%% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[-Dunused-d -Funused-f input-unused.y]], [[1]], [], [[:2: error: %define variable 'unused-d' is not used @@ -1368,7 +1386,7 @@ AT_DATA([Input.y], %define public "maybe" %define parser_class_name "Input" %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[Input.y]], [1], [], @@ -1391,7 +1409,7 @@ AT_SETUP([["%define" enum variables]]) AT_DATA([[input.y]], [[%define lr.default-reduction bogus %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[-fcaret input.y]], [[1]], [[]], [[input.y:1.9-28: error: invalid value for %define variable 'lr.default-reduction': 'bogus' @@ -1406,7 +1424,7 @@ input.y:1.9-28: accepted value: 'accepting' AT_DATA([[input.y]], [[%define api.push-pull neither %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[-fcaret input.y]], [[1]], [[]], [[input.y:1.9-21: error: invalid value for %define variable 'api.push-pull': 'neither' @@ -1433,7 +1451,7 @@ AT_DATA([[input.y]], %define api.namespace "foo" %define variant %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[-fcaret input.y]], [1], [], [[input.y:1.9-21: warning: deprecated directive, use '%define api.push-pull both' [-Wdeprecated] @@ -1474,7 +1492,7 @@ AT_DATA([[input.y]], [[%define api.pure ]$2[ ]$1[ %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[input.y]], [[1]], [], @@ -1482,10 +1500,10 @@ AT_BISON_CHECK([[input.y]], [[1]], [], ]]) ]) -AT_CHECK_API_PURE([[%language "c++" %defines]], [[]]) -AT_CHECK_API_PURE([[%language "c++" %defines]], [[false]]) -AT_CHECK_API_PURE([[%language "c++" %defines %glr-parser]], [[""]]) -AT_CHECK_API_PURE([[%language "c++" %defines %glr-parser]], [[false]]) +AT_CHECK_API_PURE([[%language "c++"]], [[]]) +AT_CHECK_API_PURE([[%language "c++"]], [[false]]) +AT_CHECK_API_PURE([[%language "c++" %glr-parser]], [[""]]) +AT_CHECK_API_PURE([[%language "c++" %glr-parser]], [[false]]) AT_CHECK_API_PURE([[%language "java"]], [[true]]) AT_CHECK_API_PURE([[%language "java"]], [[false]]) @@ -1507,7 +1525,7 @@ AT_DATA([[input.y]], %defines %define api.namespace "]$1[" %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[input.y]], [1], [], @@ -1518,22 +1536,22 @@ AT_BISON_CHECK([[input.y]], [1], [], AT_CHECK_NAMESPACE_ERROR([[]], [[namespace reference is empty]]) -AT_CHECK_NAMESPACE_ERROR([[ ]], +AT_CHECK_NAMESPACE_ERROR([[ @tb@@tb@ @tb@ @tb@]], [[namespace reference is empty]]) AT_CHECK_NAMESPACE_ERROR([[foo::::bar]], [[namespace reference has consecutive "::"]]) -AT_CHECK_NAMESPACE_ERROR([[foo:: ::bar]], +AT_CHECK_NAMESPACE_ERROR([[foo:: @tb@::bar]], [[namespace reference has consecutive "::"]]) AT_CHECK_NAMESPACE_ERROR([[::::bar]], [[namespace reference has consecutive "::"]]) AT_CHECK_NAMESPACE_ERROR([[:: ::bar]], [[namespace reference has consecutive "::"]]) -AT_CHECK_NAMESPACE_ERROR([[foo::bar:: ::]], +AT_CHECK_NAMESPACE_ERROR([[foo::bar::@tb@::]], [[namespace reference has consecutive "::"]], [[namespace reference has a trailing "::"]]) AT_CHECK_NAMESPACE_ERROR([[foo::bar::]], [[namespace reference has a trailing "::"]]) -AT_CHECK_NAMESPACE_ERROR([[foo::bar:: ]], +AT_CHECK_NAMESPACE_ERROR([[foo::bar:: @tb@]], [[namespace reference has a trailing "::"]]) AT_CHECK_NAMESPACE_ERROR([[::]], [[namespace reference has a trailing "::"]]) @@ -1667,7 +1685,7 @@ AT_SETUP([[LAC: Errors for %define]]) AT_DATA([[input.y]], [[%% -start: ; +start: %empty; ]]) # parse.lac.* options are useless if LAC isn't actually activated. @@ -1690,7 +1708,7 @@ AT_SETUP([[-Werror is not affected by -Wnone and -Wall]]) AT_DATA([[input.y]], [[%% -foo-bar: ; +foo-bar: %empty; ]]) # -Werror is not enabled by -Wall or equivalent. @@ -1727,7 +1745,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