From 21846f695d879bc208b6c528f49cd2f5d63c1c9a Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 6 Sep 2002 11:54:05 +0000 Subject: [PATCH] * data/lalr1.cc (struct yyltype): Don't define it, since we use LocationType. (b4_ltype): Default to yy::Location from location.hh. --- ChangeLog | 6 ++++++ data/lalr1.cc | 19 ++++--------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4a4d39b..3546d33d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-09-06 Akim Demaille + + * 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 * data/yacc.c: Guard the declaration of yytoknum also with diff --git a/data/lalr1.cc b/data/lalr1.cc index 3ea4c58d..5f1490a5 100644 --- 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]) -- 2.47.2