From 96b15448b9204969e2d3754ac640cf16181ea3be Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 21 Jul 2008 13:46:06 +0200 Subject: [PATCH] Remove parser::rhs_number_type. * data/lalr1-fusion.cc (rhs_number_type): No longer define it. (yyrhs_): Use b4_table_define. --- ChangeLog | 6 ++++++ data/lalr1-fusion.cc | 10 ++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d2b590e..4a211d21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-11-04 Akim Demaille + + Remove parser::rhs_number_type. + * data/lalr1-fusion.cc (rhs_number_type): No longer define it. + (yyrhs_): Use b4_table_define. + 2008-11-04 Akim Demaille Fix iteration type. diff --git a/data/lalr1-fusion.cc b/data/lalr1-fusion.cc index 7ae8ce84..e60ab9e5 100644 --- a/data/lalr1-fusion.cc +++ b/data/lalr1-fusion.cc @@ -386,10 +386,8 @@ m4_ifdef([b4_stype], #endif #if YYDEBUG - /// A type to store symbol numbers and -1. - typedef ]b4_int_type_for([b4_rhs])[ rhs_number_type; /// A `-1'-separated list of the rules' RHS. - static const rhs_number_type yyrhs_[]; + static const ]b4_int_type_for([b4_rhs])[ yyrhs_[]; /// For each rule, the index of the first RHS symbol in \a yyrhs_. static const ]b4_int_type_for([b4_prhs])[ yyprhs_[]; /// For each rule, its source line number. @@ -1142,11 +1140,7 @@ b4_error_verbose_if([ tok])[) #if YYDEBUG /* YYRHS -- A `-1'-separated list of the rules' RHS. */ - const ]b4_parser_class_name[::rhs_number_type - ]b4_parser_class_name[::yyrhs_[] = - { - ]b4_rhs[ - }; + ]b4_table_define([rhs], [b4_rhs])[; /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -- 2.47.2