* data/lalr1.cc (struct yyltype): Don't define it, since we use

LocationType.
(b4_ltype): Default to yy::Location from location.hh.

diff --git a/ChangeLog b/ChangeLog
index d4a4d39b94093310a29d0a76ad97fbf7ac94d212..3546d33d325cf2728e1300aa139dc19961b4b133 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-06  Akim Demaille  <akim@epita.fr>
+
+       * data/lalr1.cc (struct yyltype): Don't define it, since we use
+       LocationType.
+       (b4_ltype): Default to yy::Location from location.hh.
+
 2002-09-04  Jim Meyering  <jim@meyering.net>
 
        * data/yacc.c: Guard the declaration of yytoknum also with

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 3ea4c58dda601b0085a508979d6d332b3e6b069c..5f1490a52101107fc2f8f6e3a82137bc3921e3df 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -33,6 +33,7 @@ m4_define([b4_lhs_value],
 m4_define([b4_rhs_value],
 [semantic_stack_@<:@m4_eval([$1 - $2])@:>@m4_ifval([$3], [.$3])])
 
+m4_define_default([b4_ltype], [Location])
 
 # b4_lhs_location()
 # -----------------
@@ -143,18 +144,6 @@ b4_post_prologue
    Current.last_column = Rhs[[N]].last_column;
 #endif
 
-m4_if(b4_locations_flag, [0], [],
-[#ifndef YYLTYPE
-typedef struct yyltype
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-} yyltype;
-# define YYLTYPE yyltype
-#endif])
-
 namespace yy
 {
   class b4_name;
@@ -293,7 +282,7 @@ namespace yy
 }
 
 #endif /* not b4_header_guard */
-
+dnl
 #output "b4_output_prefix[]b4_output_infix[].cc"
 b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
              [2002])
@@ -772,7 +761,7 @@ const unsigned yy::b4_name::user_token_number_max_ = b4_user_token_number_max;
 const yy::b4_name::TokenNumberType yy::b4_name::undef_token_ = b4_undef_token_number;
 
 b4_epilogue
-
+dnl
 #output "stack.hh"
 b4_copyright([2002])
 
@@ -869,7 +858,7 @@ namespace yy
 }
 
 #endif // not BISON_STACK_HH
-
+dnl
 #output "location.hh"
 b4_copyright([2002])