X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/064e42b0aca1db0ca84b06b01cac5a40f3016591..9c4788b7ee33cf142775a827f67bb9747ba1d2ca:/tests/input.at?ds=sidebyside diff --git a/tests/input.at b/tests/input.at index 98a67847..f9ed33d2 100644 --- a/tests/input.at +++ b/tests/input.at @@ -169,42 +169,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. ## @@ -465,7 +532,7 @@ tagged: { } ; AT_BISON_CHECK([input.y], [0], [], [[input.y:6.8-45: warning: unset value: $$ [-Wother] -input.y:6.8-45: warning: unused value: $2 [-Wother] +input.y:6.12-14: warning: unused value: $2 [-Wother] input.y:7.6-8: warning: unset value: $$ [-Wother] ]]) @@ -481,7 +548,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] ]]) @@ -506,7 +573,7 @@ end: { } ; AT_BISON_CHECK([input.y], [0], [], [[input.y:6.8-22: warning: unset value: $$ [-Wother] -input.y:6.8-22: warning: unused value: $2 [-Wother] +input.y:6.12-14: warning: unused value: $2 [-Wother] input.y:7.6-8: warning: unset value: $$ [-Wother] ]]) @@ -925,6 +992,25 @@ input.y:19.13-20.0: error: missing '}' at end of file input.y:20.1: error: syntax error, unexpected end of file ]]) +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 +]]) + AT_CLEANUP @@ -1157,6 +1243,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: ; @@ -1172,7 +1270,7 @@ AT_CLEANUP ## %define Boolean variables. ## ## --------------------------- ## -AT_SETUP([[%define Boolean variables]]) +AT_SETUP([["%define" Boolean variables]]) AT_DATA([Input.y], [[%language "Java" @@ -1192,7 +1290,11 @@ 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]], @@ -1200,22 +1302,25 @@ AT_DATA([[input.y]], %% start: ; ]]) -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: ; ]]) -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' @@ -1227,53 +1332,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_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-state' [-Wdeprecated] -input.y:1.9-34: error: invalid value for %define Boolean variable 'lr.keep-unreachable-state' -]]) +AT_SETUP([["%define" backward compatibility]]) +# The error messages tell us whether the variables are properly updated. 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 @@ -1380,12 +1469,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], @@ -1397,10 +1496,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], @@ -1412,10 +1511,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 @@ -1529,7 +1628,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) # -------------------------------------------- @@ -1569,19 +1668,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