[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] getargs: fix the locations of command-line input
From: |
Theophile Ranquet |
Subject: |
[PATCH 2/3] getargs: fix the locations of command-line input |
Date: |
Tue, 4 Dec 2012 15:06:16 +0100 |
* src/getargs.c (command_line_location): Here.
* tests/input.at: Adjust.
---
src/getargs.c | 2 +-
tests/input.at | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/getargs.c b/src/getargs.c
index 226e6de..2b82a15 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -556,7 +556,7 @@ command_line_location (void)
{
location res;
/* "<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;
return res;
}
diff --git a/tests/input.at b/tests/input.at
index faa939c..474b7dd 100644
--- a/tests/input.at
+++ b/tests/input.at
@@ -1042,7 +1042,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]],
@@ -1050,8 +1050,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
@@ -1357,11 +1357,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
@@ -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([], [-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])
--
1.8.0