X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/6d58c632025cb6928a90e4176577982bfb9c3981..75fbe357c896d84b9dedff98c8b0d43ca536bc95:/tests/input.at diff --git a/tests/input.at b/tests/input.at index f7f5adfc..895ec202 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-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. ## ## ---------------- ## @@ -39,11 +62,7 @@ default: 'a' } 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: error: invalid character: '\0' -input.y:1.1: error: invalid character: '\001' -input.y:1.1: error: invalid character: '\002' -input.y:1.1: error: invalid character: '\377' -input.y:1.2: error: invalid character: '?' +[[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: '%' @@ -89,13 +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([input.y], [1], [], -[[input.y:2.13-14: error: integer out of range: '$1' -input.y:3.13-14: error: integer out of range: '@1' +AT_BISON_CHECK([-fcaret input.y], [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,16 +137,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] -input.y:7.5: warning: empty rule for typed nonterminal, and no action [-Wother] + | foo + ^^^ +input.y:7.6-11: warning: empty rule for typed nonterminal, and no action [-Wother] + | %empty + ^^^^^^ ]]) AT_CLEANUP @@ -159,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[; }; @@ -173,42 +206,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] -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] -]]]))]) - +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.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; }; + ^^^^^^^ +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. ## @@ -236,56 +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([input.y], [1], [], -[[input.y:1.13-29: error: %destructor redeclaration for <*> +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 -input.y:2.10-24: error: %printer redeclaration for <*> + %destructor { destroy ($$); } <> <> + ^^^^^^^^^^^^^^^^^ +input.y:2.10-24: error: %printer redeclaration for <> + %printer { print ($$); } <> <> + ^^^^^^^^^^^^^^^ input.y:2.10-24: previous declaration -input.y:4.13-29: error: %destructor redeclaration for <*> + %printer { print ($$); } <> <> + ^^^^^^^^^^^^^^^ +input.y:4.13-29: error: %destructor redeclaration for <> + %destructor { destroy ($$); } <> + ^^^^^^^^^^^^^^^^^ input.y:1.13-29: previous declaration -input.y:5.10-24: error: %printer redeclaration for <*> + %destructor { destroy ($$); } <> <> + ^^^^^^^^^^^^^^^^^ +input.y:5.10-24: error: %printer redeclaration for <> + %printer { print ($$); } <> + ^^^^^^^^^^^^^^^ 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 + %printer { print ($$); } <> <> + ^^^^^^^^^^^^^^^ +input.y:11.13-29: error: %destructor redeclaration for <> + %destructor { destroy ($$); } <>; + ^^^^^^^^^^^^^^^^^ +input.y:1.13-29: previous declaration + %destructor { destroy ($$); } <> <> + ^^^^^^^^^^^^^^^^^ +input.y:12.10-24: error: %printer redeclaration for <> + %printer { print ($$); } <>; + ^^^^^^^^^^^^^^^ +input.y:2.10-24: previous declaration + %printer { print ($$); } <> <> + ^^^^^^^^^^^^^^^ ]]) +]) + +AT_TEST([], [], []) +AT_TEST([], [*], [*]) +m4_popdef([AT_TEST]) AT_CLEANUP @@ -305,7 +416,7 @@ AT_DATA([[input.y]], %% -start: ; +start: %empty; %destructor { destroy ($$); } ; %printer { print ($$); } ; @@ -315,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 @@ -346,11 +457,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 @@ -467,10 +586,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]], @@ -485,7 +610,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] ]]) @@ -508,10 +633,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 @@ -523,34 +654,118 @@ AT_CLEANUP AT_SETUP([Incompatible Aliases]) -AT_DATA([input.y], -[[%token foo "foo" - -%type foo -%printer {bar} foo -%destructor {bar} foo -%left foo +m4_pushdef([AT_TEST], +[AT_DATA([input.y], [$1]) +AT_BISON_CHECK([-fcaret input.y], [1], [], [$2]) +]) -%type "foo" -%printer {baz} "foo" -%destructor {baz} "foo" -%left "foo" +# Use the string-alias first to check the order between "first +# declaration" and second. +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_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:2.13-17: previous declaration + %destructor {bar} "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" + ^^^^^ ]]) -AT_BISON_CHECK([input.y], [1], [], -[[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 +# 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: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 @@ -574,8 +789,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 {...} + {} + ^^ ]]) @@ -663,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. */ @@ -696,12 +913,7 @@ AT_DATA([main.c], #include "input.h" int yyparse (void); - -int -main (void) -{ - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) AT_BISON_OPTION_POPDEFS @@ -750,7 +962,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 @@ -812,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. @@ -908,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. @@ -920,12 +1126,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 ]]) @@ -943,7 +1159,7 @@ AT_SETUP([%start after first rule]) AT_DATA([input.y], [[%% -false_start: ; +false_start: %empty; start: false_start ; %start start; ]]) @@ -964,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], [], @@ -1006,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 @@ -1020,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 @@ -1033,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 @@ -1046,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 @@ -1059,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 @@ -1072,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 @@ -1083,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. ## ## ---------------- ## @@ -1096,7 +1351,7 @@ AT_DATA([input-redefined.y], %define special1 "@:>@" %define special2 "@<:@" %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[input-redefined.y]], [[1]], [], @@ -1109,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]], [], @@ -1137,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 \ @@ -1154,16 +1409,28 @@ 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 :2: previous definition ]]) +AT_DATA([[input-dg.y]], +[[%define var "gram" +%% +start: %empty; +]]) +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: ; +start: %empty; ]]) AT_BISON_CHECK([[-Dunused-d -Funused-f input-unused.y]], [[1]], [], [[:2: error: %define variable 'unused-d' is not used @@ -1176,14 +1443,14 @@ AT_CLEANUP ## %define Boolean variables. ## ## --------------------------- ## -AT_SETUP([[%define Boolean variables]]) +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], [], @@ -1192,34 +1459,107 @@ 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. ## ## ------------------------ ## -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-reduction bogus %% -start: ; +start: %empty; ]]) -AT_BISON_CHECK([[input.y]], [[1]], [[]], +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: ; +start: %empty; ]]) -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' @@ -1231,53 +1571,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" +[[%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-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-state' [-Wdeprecated] -input.y:1.9-34: error: invalid value for %define Boolean variable 'lr.keep-unreachable-state' -]]) - -AT_DATA([[input.y]], -[[%define namespace "foo" -%define api.namespace "foo" -%% -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 +start: %empty; +]]) +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 @@ -1290,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], [ @@ -1298,7 +1622,7 @@ AT_DATA([[input.y]], [[%define api.pure ]$2[ ]$1[ %% -start: ; +start: %empty; ]]) AT_BISON_CHECK([[input.y]], [[1]], [], @@ -1306,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]]) @@ -1329,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], [], @@ -1342,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 "::"]]) @@ -1384,12 +1708,22 @@ start: ' ]]) 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], @@ -1401,10 +1735,10 @@ 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], @@ -1416,10 +1750,10 @@ 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 @@ -1481,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. @@ -1496,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] +]]) + +AT_BISON_CHECK([[-Wno-error=other -Werror 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([[-Werror=other -Wno-other input.y]], [[0]], [[]], +[[]]) AT_CLEANUP @@ -1533,7 +1879,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) # -------------------------------------------- @@ -1541,23 +1887,68 @@ 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 ]]) ]) -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 @. ## ## -------------- ## @@ -1573,19 +1964,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