X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c7442984e3d29b3282247e19b6be352a007f35aa..75fbe357c896d84b9dedff98c8b0d43ca536bc95:/tests/input.at diff --git a/tests/input.at b/tests/input.at index ac5a1fb3..895ec202 100644 --- a/tests/input.at +++ b/tests/input.at @@ -1,6 +1,6 @@ # Checking the Bison scanner. -*- Autotest -*- -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 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; }; ^^^^^^^ @@ -313,104 +336,67 @@ AT_CLEANUP AT_SETUP([Default %printer and %destructor redeclared]) -AT_DATA([[input.y]], -[[%destructor { destroy ($$); } <*> <*> -%printer { print ($$); } <*> <*> - -%destructor { destroy ($$); } <*> -%printer { print ($$); } <*> - -%destructor { destroy ($$); } <> <> -%printer { print ($$); } <> <> +# AT_TEST([*]) +# ------------ +m4_pushdef([AT_TEST], +[AT_DATA([[input.y]], +[[%destructor { destroy ($$); } <$1> <$1> +%printer { print ($$); } <$1> <$1> -%destructor { destroy ($$); } <> -%printer { print ($$); } <> +%destructor { destroy ($$); } <$1> +%printer { print ($$); } <$1> %% -start: ; - -%destructor { destroy ($$); } <*>; -%printer { print ($$); } <*>; +start: %empty; -%destructor { destroy ($$); } <>; -%printer { print ($$); } <>; +%destructor { destroy ($$); } <$1>; +%printer { print ($$); } <$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 <> +[[input.y:1.13-29: error: %destructor redeclaration for <> %destructor { destroy ($$); } <> <> ^^^^^^^^^^^^^^^^^ -input.y:7.13-29: previous declaration +input.y:1.13-29: previous declaration %destructor { destroy ($$); } <> <> ^^^^^^^^^^^^^^^^^ -input.y:8.10-24: error: %printer redeclaration for <> +input.y:2.10-24: error: %printer redeclaration for <> %printer { print ($$); } <> <> ^^^^^^^^^^^^^^^ -input.y:8.10-24: previous declaration +input.y:2.10-24: previous declaration %printer { print ($$); } <> <> ^^^^^^^^^^^^^^^ -input.y:10.13-29: error: %destructor redeclaration for <> +input.y:4.13-29: error: %destructor redeclaration for <> %destructor { destroy ($$); } <> ^^^^^^^^^^^^^^^^^ -input.y:7.13-29: previous declaration +input.y:1.13-29: previous declaration %destructor { destroy ($$); } <> <> ^^^^^^^^^^^^^^^^^ -input.y:11.10-24: error: %printer redeclaration for <> +input.y:5.10-24: error: %printer redeclaration for <> %printer { print ($$); } <> ^^^^^^^^^^^^^^^ -input.y:8.10-24: previous declaration +input.y:2.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 <> +input.y:11.13-29: error: %destructor redeclaration for <> %destructor { destroy ($$); } <>; ^^^^^^^^^^^^^^^^^ -input.y:10.13-29: previous declaration - %destructor { destroy ($$); } <> +input.y:1.13-29: previous declaration + %destructor { destroy ($$); } <> <> ^^^^^^^^^^^^^^^^^ -input.y:21.10-24: error: %printer redeclaration for <> +input.y:12.10-24: error: %printer redeclaration for <> %printer { print ($$); } <>; ^^^^^^^^^^^^^^^ -input.y:11.10-24: previous declaration - %printer { print ($$); } <> +input.y:2.10-24: previous declaration + %printer { print ($$); } <> <> ^^^^^^^^^^^^^^^ ]]) +]) + +AT_TEST([], [], []) +AT_TEST([], [*], [*]) +m4_popdef([AT_TEST]) AT_CLEANUP @@ -430,7 +416,7 @@ AT_DATA([[input.y]], %% -start: ; +start: %empty; %destructor { destroy ($$); } ; %printer { print ($$); } ; @@ -440,19 +426,19 @@ AT_BISON_CHECK([input.y], [1], [], [[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:1.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:2.10-24: previous declaration input.y:11.13-29: error: %destructor redeclaration for input.y:1.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:2.10-24: previous declaration -input.y:12.10-24: error: %printer redeclaration for -input.y:5.10-24: previous declaration ]]) AT_CLEANUP @@ -668,50 +654,118 @@ AT_CLEANUP AT_SETUP([Incompatible Aliases]) -AT_DATA([input.y], -[[%token foo "foo" +m4_pushdef([AT_TEST], +[AT_DATA([input.y], [$1]) +AT_BISON_CHECK([-fcaret input.y], [1], [], [$2]) +]) -%type foo -%printer {bar} foo -%destructor {bar} foo -%left foo +# Use the string-alias first to check the order between "first +# declaration" and second. -%type "foo" -%printer {baz} "foo" -%destructor {baz} "foo" -%left "foo" +AT_TEST([[%token foo "foo" +%type "foo" +%type foo +%% +exp: foo; +]], +[[input.y:3.7-11: error: %type redeclaration for foo + %type foo + ^^^^^ +input.y:2.7-11: previous declaration + %type "foo" + ^^^^^ +]]) +AT_TEST([[%token foo "foo" +%printer {bar} "foo" +%printer {baz} foo %% exp: foo; +]], +[[input.y:3.10-14: error: %printer redeclaration for foo + %printer {baz} foo + ^^^^^ +input.y:2.10-14: previous declaration + %printer {bar} "foo" + ^^^^^ ]]) -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" +AT_TEST([[%token foo "foo" +%destructor {bar} "foo" +%destructor {baz} foo +%% +exp: foo; +]], +[[input.y:3.13-17: error: %destructor redeclaration for foo + %destructor {baz} foo ^^^^^ -input.y:5.13-17: previous declaration - %destructor {bar} foo +input.y:2.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" +]]) + +AT_TEST([[%token foo "foo" +%left "foo" +%left foo +%% +exp: foo; +]], +[[input.y:3.1-5: error: %left redeclaration for foo + %left foo + ^^^^^ +input.y:2.1-5: previous declaration + %left "foo" + ^^^^^ +]]) + +# This time, declare the alias after its use. + +# Precedence/associativity. +AT_TEST([[%left "foo" +%left foo +%token foo "foo" +%% +exp: foo; +]], +[[input.y:2.1-5: error: %left redeclaration for foo + %left foo ^^^^^ -input.y:6.1-5: previous declaration - %left foo +input.y:1.1-5: previous declaration + %left "foo" ^^^^^ ]]) +# Printer. +AT_TEST([[%printer {} "foo" +%printer {} foo +%token foo "foo" +%% +exp: foo; +]], +[[input.y:2.10-11: error: %printer redeclaration for foo + %printer {} foo + ^^ +input.y:1.10-11: previous declaration + %printer {} "foo" + ^^ +]]) + +# Destructor. +AT_TEST([[%destructor {} "foo" +%destructor {} foo +%token foo "foo" +%% +exp: foo; +]], +[[input.y:2.13-14: error: %destructor redeclaration for foo + %destructor {} foo + ^^ +input.y:1.13-14: previous declaration + %destructor {} "foo" + ^^ +]]) + +m4_popdef([AT_TEST]) AT_CLEANUP @@ -826,7 +880,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. */ @@ -908,7 +962,7 @@ m4_define([AT_CHECK_REQUIRE], AT_DATA_GRAMMAR([input.y], [[%require "$1"; %% -empty_file: /* empty */; +empty_file: %empty; ]]) AT_BISON_CHECK([-o input.c input.y], $2, [], ignore) AT_CLEANUP @@ -970,15 +1024,9 @@ without_period: "WITHOUT.PERIOD"; 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] -]]) - -# 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] +AT_BISON_CHECK([--yacc input.y], [1], [], +[[input.y:9.8-16: error: POSIX Yacc forbids dashes in symbol names: WITH-DASH [-Werror=yacc] +input.y:20.8-16: error: POSIX Yacc forbids dashes in symbol names: with-dash [-Werror=yacc] ]]) # Dashes are fine for GNU Bison. @@ -1066,7 +1114,7 @@ AT_DATA([input.y], %% -start: ; +start: %empty; // Used to report a syntax error because it didn't see any kind of symbol // identifier. @@ -1111,7 +1159,7 @@ AT_SETUP([%start after first rule]) AT_DATA([input.y], [[%% -false_start: ; +false_start: %empty; start: false_start ; %start start; ]]) @@ -1132,7 +1180,7 @@ AT_SETUP([%prec takes a token]) AT_DATA([input.y], [[%% start: PREC %prec PREC ; -PREC: ; +PREC: %empty; ]]) AT_BISON_CHECK([input.y], [1], [], @@ -1174,7 +1222,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 @@ -1188,7 +1236,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 @@ -1201,7 +1249,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 @@ -1214,7 +1262,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 @@ -1227,7 +1275,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 @@ -1240,7 +1288,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 @@ -1251,6 +1299,45 @@ special-char-@:>@.y:3.7: error: %code qualifier 'q' is not used AT_CLEANUP +## ---------------- ## +## Multiple %code. ## +## ---------------- ## + +AT_SETUP([Multiple %code]) + +# Make sure that repeated arguments to %code are separated by +# end-of-lines. At some point, a missing eol would leave synclines +# appended to the previous value. Here, we use CPP directive to +# introduce dependency on the absence/presence of the eol. +AT_BISON_OPTION_PUSHDEFS + +AT_DATA([input.y], +[[%code {#include } +%code {#define A B} +%code {#define B C} +%code {#define C D} +%code {#define D 42} +%code { + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ +} +%% +start: %empty; +%% +]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE[ +int main (void) +{ + assert (A == 42); + return 0; +} +]]) +AT_FULL_COMPILE([input]) +AT_PARSER_CHECK([./input]) + +AT_BISON_OPTION_POPDEFS +AT_CLEANUP() + ## ---------------- ## ## %define errors. ## ## ---------------- ## @@ -1264,7 +1351,7 @@ AT_DATA([input-redefined.y], %define special1 "@:>@" %define special2 "@<:@" %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[input-redefined.y]], [[1]], [], @@ -1277,7 +1364,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]], [], @@ -1305,7 +1392,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 \ @@ -1322,7 +1409,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 @@ -1332,7 +1419,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 @@ -1343,7 +1430,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 @@ -1360,10 +1447,10 @@ AT_SETUP([["%define" Boolean variables]]) AT_DATA([Input.y], [[%language "Java" -%define public "maybe" -%define parser_class_name "Input" +%define public maybe +%define parser_class_name {Input} %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[Input.y]], [1], [], @@ -1372,6 +1459,72 @@ AT_BISON_CHECK([[Input.y]], [1], [], AT_CLEANUP +## ------------------------ ## +## %define code variables. ## +## ------------------------ ## + +AT_SETUP([["%define" code variables]]) + +m4_pushdef([AT_TEST], +[AT_DATA([input.yy], +[[%skeleton "lalr1.cc" %locations +%define api.location.type ]$1[quux]$2[ +%define api.namespace ]$1[quux]$2[ +%define api.prefix ]$1[quux]$2[ +%define api.token.prefix ]$1[quux]$2[ +%token TOK // Otherwise api.token.prefix is unused. +%% +start: TOK; +]]) + +AT_BISON_CHECK([[input.yy]], [0], [], +[[input.yy:2.9-25: warning: %define variable 'api.location.type' requires '{...}' values [-Wdeprecated] +input.yy:4.9-18: warning: %define variable 'api.prefix' requires '{...}' values [-Wdeprecated] +input.yy:5.9-24: warning: %define variable 'api.token.prefix' requires '{...}' values [-Wdeprecated] +input.yy:3.9-21: warning: %define variable 'api.namespace' requires '{...}' values [-Wdeprecated] +]]) +]) + +AT_TEST([], []) +AT_TEST(["], ["]) +m4_popdef([AT_TEST]) + +AT_CLEANUP + + +## --------------------------- ## +## %define keyword variables. ## +## --------------------------- ## + +AT_SETUP([["%define" keyword variables]]) + +m4_pushdef([AT_TEST], +[AT_DATA([input.y], +[[%define api.pure ]$1[true]$2[ +%define api.push-pull ]$1[both]$2[ +%define lr.default-reduction ]$1[most]$2[ +%define lr.keep-unreachable-state ]$1[true]$2[ +%define lr.type ]$1[lalr]$2[ +%% +exp: %empty +]]) + +AT_BISON_CHECK([[input.y]], [0], [], +[[input.y:5.9-15: warning: %define variable 'lr.type' requires keyword values [-Wdeprecated] +input.y:3.9-28: warning: %define variable 'lr.default-reduction' requires keyword values [-Wdeprecated] +input.y:4.9-33: warning: %define variable 'lr.keep-unreachable-state' requires keyword values [-Wdeprecated] +input.y:2.9-21: warning: %define variable 'api.push-pull' requires keyword values [-Wdeprecated] +input.y:1.9-16: warning: %define variable 'api.pure' requires keyword values [-Wdeprecated] +]]) +]) + +AT_TEST(["], ["]) +AT_TEST([{], [}]) +m4_popdef([AT_TEST]) + +AT_CLEANUP + + ## ------------------------ ## ## %define enum variables. ## ## ------------------------ ## @@ -1386,7 +1539,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' @@ -1401,7 +1554,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' @@ -1425,10 +1578,10 @@ AT_DATA([[input.y]], [[%define api.push_pull both %define lr.keep_unreachable_states maybe %define namespace "foo" -%define api.namespace "foo" +%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] @@ -1441,7 +1594,7 @@ input.y:3.9-17: warning: deprecated directive, use '%define api.namespace foo' [ %define namespace "foo" ^^^^^^^^^ input.y:4.9-21: error: %define variable 'api.namespace' redefined - %define api.namespace "foo" + %define api.namespace {foo} ^^^^^^^^^^^^^ input.y:3.9-17: previous definition %define namespace "foo" @@ -1461,7 +1614,7 @@ AT_SETUP([[Unused %define api.pure]]) # AT_CHECK_API_PURE(DECLS, VALUE) # ------------------------------- -# Make sure Bison reports that `%define api.pure VALUE' is unused when DECLS +# Make sure Bison reports that '%define api.pure VALUE' is unused when DECLS # are specified. m4_define([AT_CHECK_API_PURE], [ @@ -1469,7 +1622,7 @@ AT_DATA([[input.y]], [[%define api.pure ]$2[ ]$1[ %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[input.y]], [[1]], [], @@ -1477,10 +1630,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]]) @@ -1500,9 +1653,9 @@ m4_define([AT_CHECK_NAMESPACE_ERROR], AT_DATA([[input.y]], [[%language "C++" %defines -%define api.namespace "]$1[" +%define api.namespace {]$1[} %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[input.y]], [1], [], @@ -1513,22 +1666,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 "::"]]) @@ -1662,7 +1815,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. @@ -1677,35 +1830,47 @@ AT_BISON_CHECK([[-Dparse.lac.memory-trace=full input.y]], AT_CLEANUP -## --------------------------------------------- ## -## -Werror is not affected by -Wnone and -Wall. ## -## --------------------------------------------- ## +## ---------------------- ## +## -Werror combinations. ## +## ---------------------- ## -AT_SETUP([[-Werror is not affected by -Wnone and -Wall]]) +AT_SETUP([[-Werror combinations]]) AT_DATA([[input.y]], [[%% -foo-bar: ; +a: '0' { $$ = $; }; ]]) # -Werror is not enabled by -Wall or equivalent. AT_BISON_CHECK([[-Wall input.y]], [[0]], [[]], -[[input.y:2.1-7: warning: POSIX Yacc forbids dashes in symbol names: foo-bar [-Wyacc] +[[input.y:2.15: warning: stray '$' [-Wother] ]]) AT_BISON_CHECK([[-W input.y]], [[0]], [[]], -[[input.y:2.1-7: warning: POSIX Yacc forbids dashes in symbol names: foo-bar [-Wyacc] +[[input.y:2.15: warning: stray '$' [-Wother] ]]) AT_BISON_CHECK([[-Wno-none input.y]], [[0]], [[]], -[[input.y:2.1-7: warning: POSIX Yacc forbids dashes in symbol names: foo-bar [-Wyacc] +[[input.y:2.15: warning: stray '$' [-Wother] ]]) # -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] +AT_BISON_CHECK([[-Werror,none,other input.y]], [[1]], [[]], +[[input.y:2.15: error: stray '$' [-Werror=other] +]]) +AT_BISON_CHECK([[-Werror,no-all,other input.y]], [[1]], [[]], +[[input.y:2.15: error: stray '$' [-Werror=other] +]]) + +# Check that -Wno-error keeps warnings enabled, but non fatal. +AT_BISON_CHECK([[-Werror -Wno-error=other input.y]], [[0]], [[]], +[[input.y:2.15: warning: stray '$' [-Wother] ]]) -[mv stderr experr] -AT_BISON_CHECK([[-Werror,no-all,yacc input.y]], [[1]], [[]], [[experr]]) + +AT_BISON_CHECK([[-Wno-error=other -Werror input.y]], [[0]], [[]], +[[input.y:2.15: warning: stray '$' [-Wother] +]]) + +AT_BISON_CHECK([[-Werror=other -Wno-other input.y]], [[0]], [[]], +[[]]) AT_CLEANUP @@ -1722,23 +1887,68 @@ m4_pushdef([AT_TEST], [AT_DATA([[input.y]], [[$1 %% -exp: /* empty */; +exp: %empty; ]]) 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]) +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 +## ----------------------- ## +## Redefined %union name. ## +## ----------------------- ## + +AT_SETUP([[Redefined %union name]]) + +# AT_TEST(DIRECTIVES, ERROR) +# -------------------------- +m4_pushdef([AT_TEST], +[AT_DATA([[input.y]], +[$1 +%% +exp: %empty; +]) + +AT_BISON_CHECK([[input.y]], [[1]], [[]], +[$2]) +]) + +AT_TEST([[%union foo {}; +%union {}; +%union foo {}; +%define api.value.union.name foo]], +[[input.y:3.8-10: error: %define variable 'api.value.union.name' redefined +input.y:1.8-10: previous definition +input.y:4.9-28: error: %define variable 'api.value.union.name' redefined +input.y:3.8-10: previous definition +]]) + +AT_TEST([[%define api.value.union.name {foo}]], +[[input.y:1.9-28: error: %define variable 'api.value.union.name' requires keyword values +input.y:1.9-28: error: %define variable 'api.value.union.name' is not used +]]) + +AT_TEST([[%define api.value.union.name "foo"]], +[[input.y:1.9-28: error: %define variable 'api.value.union.name' requires keyword values +input.y:1.9-28: error: %define variable 'api.value.union.name' is not used +]]) + +m4_popdef([AT_TEST]) +AT_CLEANUP + + + + ## -------------- ## ## Stray $ or @. ## ## -------------- ##