* data/glr.cc, data/lalr1.cc: Using %defines is mandatory.

* data/glr.cc: b4_location_flag is now b4_locations_flag.

diff --git a/ChangeLog b/ChangeLog
index c2142b2421cb3ec2ff91d785741a4c64de51db0a..4af1d7444f7059f7ffc2838a2f7f02e6c685eca6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-14  Akim Demaille  <akim@lrde.epita.fr>
+
+       * 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  <akim@lrde.epita.fr>
 
        Implement --trace=m4.
 2006-05-14  Akim Demaille  <akim@lrde.epita.fr>
 
        Implement --trace=m4.

diff --git a/data/glr.cc b/data/glr.cc
index 7cd9c10ddc464feba570a1893bea7f1b20cfe7de..d07b5a48b87c4e00ce7c44a2d65ae3de68e51829 100644 (file)
--- 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).
 
 #   user must initialize the first positions (in particular the
 #   filename member).
 

-

 # We require a pure interface using locations.
 # 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])
 
 m4_include(b4_pkgdatadir/[c++.m4])
 m4_include(b4_pkgdatadir/[location.cc])

diff --git a/data/lalr1.cc b/data/lalr1.cc
index abf459f4404fc1d67656baa165d3d56947004ba0..527a8de796b146e9d9adf8fa50307fefc0f8a386 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -20,6 +20,11 @@ m4_divert(-1)
 # 02110-1301  USA
 
 m4_include(b4_pkgdatadir/[c++.m4])
 # 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])
 # Backward compatibility.
 m4_define([b4_location_constructors])
 m4_include(b4_pkgdatadir/[location.cc])