]> git.saurik.com Git - bison.git/commit
lalr1.cc: don't generate location.hh when location_type is defined
authorAkim Demaille <demaille@gostai.com>
Sun, 9 May 2010 12:29:35 +0000 (14:29 +0200)
committerAkim Demaille <demaille@gostai.com>
Sun, 9 May 2010 12:32:19 +0000 (14:32 +0200)
commit95a2de5695670ae0df98cb3c42141cad549f0204
tree6f6f85b372cfa8733eb3e026a338a31a3489a91a
parent38f9fd6439a8f5e7aa4557c78426333e42fd25ce
lalr1.cc: don't generate location.hh when location_type is defined

* data/bison.m4 (b4_percent_define_use): New.
(b4_percent_define_get): Use it.
Accept a default value.
* data/c++.m4: Do not provide a default value for the %define
variable location_type, rather, use b4_percent_define_get with a
default argument where its value is needed.
* data/lalr1.cc: Do not load location.cc (which outputs both
location.hh and position.hh) if the user defined location_type.
Do not include location.hh either.
* data/glr.cc: Likewise.

(cherry picked from commit 7789b6e3e7199a00437f03591a4605e6c042bdea)

Conflicts:

ChangeLog
data/bison.m4
data/c++.m4
data/lalr1.cc
ChangeLog
data/bison.m4
data/c++.m4
data/glr.cc
data/lalr1.cc