From 34376418e2406162a0a0be177cb4ce0794b42a51 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sun, 14 May 2006 20:48:24 +0000 Subject: [PATCH] * data/glr.cc, data/lalr1.cc: Using %defines is mandatory. * data/glr.cc: b4_location_flag is now b4_locations_flag. --- ChangeLog | 5 +++++ data/glr.cc | 9 ++++++--- data/lalr1.cc | 5 +++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2142b24..4af1d744 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-14 Akim Demaille + + * data/glr.cc, data/lalr1.cc: Using %defines is mandatory. + * data/glr.cc: b4_location_flag is now b4_locations_flag. + 2006-05-14 Akim Demaille Implement --trace=m4. diff --git a/data/glr.cc b/data/glr.cc index 7cd9c10d..d07b5a48 100644 --- a/data/glr.cc +++ b/data/glr.cc @@ -46,10 +46,13 @@ m4_divert(-1) -*- C -*- # user must initialize the first positions (in particular the # filename member). - # We require a pure interface using locations. -m4_define([b4_location_flag], [1]) -m4_define([b4_pure_flag], [1]) +m4_define([b4_locations_flag], [1]) +m4_define([b4_pure_flag], [1]) + +# The header is mandatory. +b4_defines_if([], + [m4_fatal(b4_skeleton[: using %defines is mandatory])]) m4_include(b4_pkgdatadir/[c++.m4]) m4_include(b4_pkgdatadir/[location.cc]) diff --git a/data/lalr1.cc b/data/lalr1.cc index abf459f4..527a8de7 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -20,6 +20,11 @@ m4_divert(-1) # 02110-1301 USA m4_include(b4_pkgdatadir/[c++.m4]) + +# The header is mandatory. +b4_defines_if([], + [m4_fatal(b4_skeleton[: using %defines is mandatory])]) + # Backward compatibility. m4_define([b4_location_constructors]) m4_include(b4_pkgdatadir/[location.cc]) -- 2.47.2