From: Akim Demaille <demaille@gostai.com>
Date: Sun, 9 May 2010 12:29:35 +0000 (+0200)
Subject: lalr1.cc: don't generate location.hh when location_type is defined
X-Git-Tag: v2.5_rc1~77
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/95a2de5695670ae0df98cb3c42141cad549f0204?hp=95a2de5695670ae0df98cb3c42141cad549f0204

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
---