Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-19 01:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

getargs: fix the locations of command-line input

Browse Source 
* src/getargs.c (command_line_location): Here.
* tests/input.at: Adjust.
This commit is contained in:
Theophile Ranquet
2012-03-12 10:01:09 +01:00
parent d4e985d587
commit a37131cc63
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/getargs.c
View File

@@ -556,7 +556,7 @@ command_line_location (void)
{ {
location res; location res;
/* "<command line>" is used in GCC's messages about -D. */ /* "<command line>" is used in GCC's messages about -D. */
boundary_set (&res.start, uniqstr_new ("<command line>"), optind, -1); boundary_set (&res.start, uniqstr_new ("<command line>"), optind - 1, -1);
res.end = res.start; res.end = res.start;
return res; return res;
} }

14
tests/input.at
View File

@@ -1042,7 +1042,7 @@ start: ;
]]) ]])
AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [], AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [],
[[input-dg.y:1.9-11: error: %define variable 'var' redefined [[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]], AT_DATA([[input-unused.y]],
@@ -1050,8 +1050,8 @@ AT_DATA([[input-unused.y]],
start: ; start: ;
]]) ]])
AT_BISON_CHECK([[-Dunused-d -Funused-f input-unused.y]], [[1]], [], AT_BISON_CHECK([[-Dunused-d -Funused-f input-unused.y]], [[1]], [],
[[<command line>:2: error: %define variable 'unused-d' is not used [[<command line>:1: error: %define variable 'unused-d' is not used
<command line>:3: error: %define variable 'unused-f' is not used <command line>:2: error: %define variable 'unused-f' is not used
]]) ]])
AT_CLEANUP AT_CLEANUP
@@ -1357,11 +1357,11 @@ start: ;
# parse.lac.* options are useless if LAC isn't actually activated. # parse.lac.* options are useless if LAC isn't actually activated.
AT_BISON_CHECK([[-Dparse.lac.es-capacity-initial=1 input.y]], AT_BISON_CHECK([[-Dparse.lac.es-capacity-initial=1 input.y]],
[[1]], [], [[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]], AT_BISON_CHECK([[-Dparse.lac.memory-trace=full input.y]],
[[1]], [], [[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 AT_CLEANUP
@@ -1420,8 +1420,8 @@ AT_BISON_CHECK([[$2 input.y]], [[1]], [[]],
]) ])
AT_TEST([%define api.prefix foo %name-prefix "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], [<command line>:2]) AT_TEST([], [-Dapi.prefix=foo -p bar], [<command line>:1])
AT_TEST([%name-prefix "bar"], [-Dapi.prefix=foo], [<command line>:2]) AT_TEST([%name-prefix "bar"], [-Dapi.prefix=foo], [<command line>:1])
AT_TEST([%define api.prefix foo], [-p bar], [input.y:1.9-18]) AT_TEST([%define api.prefix foo], [-p bar], [input.y:1.9-18])
m4_popdef([AT_TEST]) m4_popdef([AT_TEST])