mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-11 05:13:04 +00:00
Merge remote-tracking branch 'origin/maint'
* origin/maint: getargs: don't label --language/-l as experimental getargs: fix the locations of command-line input errors: indent missing action code semicolon warning Conflicts: NEWS src/scan-code.l tests/actions.at
This commit is contained in:
@@ -1154,7 +1154,7 @@ start: ;
|
||||
]])
|
||||
AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [],
|
||||
[[input-dg.y:1.9-11: error: %define variable 'var' redefined
|
||||
<command line>:2: previous definition
|
||||
<command line>:1: previous definition
|
||||
]])
|
||||
|
||||
AT_DATA([[input-unused.y]],
|
||||
@@ -1162,8 +1162,8 @@ AT_DATA([[input-unused.y]],
|
||||
start: ;
|
||||
]])
|
||||
AT_BISON_CHECK([[-Dunused-d -Funused-f input-unused.y]], [[1]], [],
|
||||
[[<command line>:2: error: %define variable 'unused-d' is not used
|
||||
<command line>:3: error: %define variable 'unused-f' is not used
|
||||
[[<command line>:1: error: %define variable 'unused-d' is not used
|
||||
<command line>:2: error: %define variable 'unused-f' is not used
|
||||
]])
|
||||
|
||||
AT_CLEANUP
|
||||
@@ -1483,11 +1483,11 @@ start: ;
|
||||
# parse.lac.* options are useless if LAC isn't actually activated.
|
||||
AT_BISON_CHECK([[-Dparse.lac.es-capacity-initial=1 input.y]],
|
||||
[[1]], [],
|
||||
[[<command line>:2: error: %define variable 'parse.lac.es-capacity-initial' is not used
|
||||
[[<command line>:1: error: %define variable 'parse.lac.es-capacity-initial' is not used
|
||||
]])
|
||||
AT_BISON_CHECK([[-Dparse.lac.memory-trace=full input.y]],
|
||||
[[1]], [],
|
||||
[[<command line>:2: error: %define variable 'parse.lac.memory-trace' is not used
|
||||
[[<command line>:1: error: %define variable 'parse.lac.memory-trace' is not used
|
||||
]])
|
||||
|
||||
AT_CLEANUP
|
||||
@@ -1545,8 +1545,8 @@ AT_BISON_CHECK([[$2 input.y]], [[1]], [[]],
|
||||
])
|
||||
|
||||
AT_TEST([%define api.prefix foo %name-prefix "bar"], [], [input.y:1.9-18])
|
||||
AT_TEST([], [-Dapi.prefix=foo -p bar], [<command line>:2])
|
||||
AT_TEST([%name-prefix "bar"], [-Dapi.prefix=foo], [<command line>:2])
|
||||
AT_TEST([], [-Dapi.prefix=foo -p bar], [<command line>:1])
|
||||
AT_TEST([%name-prefix "bar"], [-Dapi.prefix=foo], [<command line>:1])
|
||||
AT_TEST([%define api.prefix foo], [-p bar], [input.y:1.9-18])
|
||||
|
||||
m4_popdef([AT_TEST])
|
||||
|
||||
Reference in New Issue
Block a user