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.
This commit is contained in:
Akim Demaille
2018-10-02 08:28:46 +02:00
parent 29b1da4e18
commit 3e6a075f7f
6 changed files with 43 additions and 56 deletions

View File

@@ -1667,9 +1667,10 @@ AT_DATA([[input.y]],
start: %empty;
]])
AT_BISON_CHECK([[-fcaret input.y]], [[1]], [[]],
[[input.y:5.9-25: error: %define variable 'api.position.file' requires 'none' or '"..."' values
[[input.y:5.9-25: error: invalid value for %define variable 'api.position.file': 'bogus'
%define api.position.file bogus
^^^^^^^^^^^^^^^^^
input.y:5.9-25: accepted value: 'none'
input.y:4.9-25: error: %define variable 'api.location.file' requires 'none' or '"..."' values
%define api.location.file {bogus}
^^^^^^^^^^^^^^^^^