diff options
| author | Akim Demaille <akim.demaille@gmail.com> | 2018-10-02 08:28:46 +0200 |
|---|---|---|
| committer | Akim Demaille <akim.demaille@gmail.com> | 2018-10-06 17:17:25 +0200 |
| commit | 3e6a075f7fe90fa9991656967c63822a1a407e72 (patch) | |
| tree | f377a50b84b88ba75b8c341367596278b9d2dfab /tests/output.at | |
| parent | 29b1da4e186ebdca94826aec2ac99ef486d34b94 (diff) | |
| download | bison-3e6a075f7fe90fa9991656967c63822a1a407e72.tar.gz | |
c++: make position.hh completely useless
Let's put the definition of position into location.hh, there's no real
value in keeping them separate: they are small, and share the same
requirements.
To help users transition to this new model, still generate position.hh
by default, but as a simple include to location.hh.
* data/location.cc (api.position.file): Accept only 'none' as possible
value.
(position.hh): Make it a stub.
(location.hh): Adjust.
(b4_position_define): Merge into...
(b4_location_define): this.
* data/glr.cc, data/lalr1.cc, tests/input.at, tests/output.at: Adjust.
Diffstat (limited to 'tests/output.at')
| -rw-r--r-- | tests/output.at | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/tests/output.at b/tests/output.at index 78af8be5..1684fa04 100644 --- a/tests/output.at +++ b/tests/output.at @@ -195,26 +195,18 @@ AT_CHECK_OUTPUT([foo.yy], [], [foo.tab.cc foo.tab.hh location.hh]) +# api.location.file=none => api.position.file=none AT_CHECK_OUTPUT([foo.yy], - [%skeleton "lalr1.cc" %defines %define api.stack.file none %locations %define api.position.file none %define api.location.file none], + [%skeleton "lalr1.cc" %defines %define api.stack.file none %locations %define api.location.file none], [], [foo.tab.cc foo.tab.hh]) +# api.location.file="*" => api.position.file=none AT_CHECK_OUTPUT([foo.yy], - [%skeleton "lalr1.cc" %defines %define api.stack.file none %locations %define api.position.file none %define api.location.file "foo.loc.hh"], + [%skeleton "lalr1.cc" %defines %define api.stack.file none %locations %define api.location.file "foo.loc.hh"], [], [foo.loc.hh foo.tab.cc foo.tab.hh]) -AT_CHECK_OUTPUT([foo.yy], - [%skeleton "lalr1.cc" %defines %define api.stack.file none %locations %define api.position.file "foo.pos.hh" %define api.location.file "foo.loc.hh"], - [], - [foo.loc.hh foo.pos.hh foo.tab.cc foo.tab.hh]) - -AT_CHECK_OUTPUT([gram_dir/foo.yy], - [%skeleton "lalr1.cc" %verbose %defines %file-prefix "output_dir/foo"], - [], - [output_dir/foo.output output_dir/foo.tab.cc output_dir/foo.tab.hh]) - # AT_CHECK_CONFLICTING_OUTPUT(INPUT-FILE, DIRECTIVES, FLAGS, STDERR, # [EXIT-STATUS]) |