X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/6ad762a8c0c6e01078ec05b45c534f8c8cea3d90..a5eb1ed262e86657c5af95e4a8eae258a2e49e4b:/data/lalr1.cc?ds=inline diff --git a/data/lalr1.cc b/data/lalr1.cc index ba8ebcaa..b07cb193 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -1,6 +1,6 @@ m4_divert(-1) # C++ skeleton for Bison -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,15 +17,10 @@ m4_divert(-1) # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA # 02111-1307 USA -m4_include([c.m4]) - ## ---------------- ## ## Default values. ## ## ---------------- ## -# Stack parameters. -m4_define_default([b4_stack_depth_init], [200]) - # Default Parser class name. m4_define_default([b4_parser_class_name], [Parser]) @@ -86,14 +81,88 @@ m4_define([b4_constructor], [])]) +# b4_parse_param_decl +# ------------------- +# Constructor's extra arguments. +m4_define([b4_parse_param_decl], + [m4_ifset([b4_parse_param], [, b4_c_ansi_formals(b4_parse_param)])]) + +# b4_parse_param_cons +# ------------------- +# constructor's extra initialisations. +m4_define([b4_parse_param_cons], + [m4_ifset([b4_parse_param], + [, + b4_cc_constructor_calls(b4_parse_param)])]) +m4_define([b4_cc_constructor_calls], + [m4_map_sep([b4_cc_constructor_call], [, + ], [$@])]) +m4_define([b4_cc_constructor_call], + [$2($2)]) + +# b4_parse_param_vars +# ------------------- +# Extra instance variables. +m4_define([b4_parse_param_vars], + [m4_ifset([b4_parse_param], + [ + /* User arguments. */ +b4_cc_var_decls(b4_parse_param)])]) +m4_define([b4_cc_var_decls], + [m4_map_sep([b4_cc_var_decl], [ +], [$@])]) +m4_define([b4_cc_var_decl], + [ $1;]) + + +# b4_yysymprint_generate(FUNCTION-DECLARATOR) +# ------------------------------------------- +# Generate the "symprint_" member function. +m4_define([b4_yysymprint_generate], +[[/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +]void +yy::b4_parser_class_name::symprint_ (int yytype, const SemanticType *yyvaluep, const LocationType *yylocationp)[ +{ + /* Pacify ``unused variable'' warnings. */ + (void) yyvaluep; + (void) yylocationp; + + cdebug_ << (yytype < ntokens_ ? "token" : "nterm") + << ' ' << name_[yytype] << " ("; + switch (yytype) + { +]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl +[ default: + break; + } + cdebug_ << ')'; +} +]]) + + +# b4_cxx_destruct_def(IGNORED-ARGUMENTS) +# -------------------------------------- +# Declare the destruct_ method. +m4_define([b4_cxx_destruct_def], +[void +yy::b4_parser_class_name::destruct_ (int yytype, SemanticType *yyvaluep, LocationType *yylocationp)[]dnl +]) + + # We do want M4 expansion after # for CPP macros. m4_changecom() m4_divert(0)dnl -@output @output_header_name@ +m4_if(b4_defines_flag, 0, [], +[@output @output_header_name@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], - [2002]) -#ifndef YYLSP_NEEDED -# define YYLSP_NEEDED + [2002, 2003, 2004])[ +/* FIXME: This is wrong, we want computed header guards. + I don't know why the macros are missing now. :( */ +#ifndef PARSER_HEADER_H +# define PARSER_HEADER_H #include "stack.hh" #include "location.hh" @@ -102,50 +171,51 @@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], #include /* Using locations. */ -#define YYLSP_NEEDED b4_locations_flag +#define YYLSP_NEEDED ]b4_locations_flag[ -b4_token_defines(b4_tokens) +]b4_token_defines(b4_tokens)[ /* Copy the first part of user declarations. */ -b4_pre_prologue +]b4_pre_prologue[ -/* Line __line__ of __file__. */ -b4_syncline([@oline@], [@ofile@]) +]/* Line __line__ of lalr1.cc. */ +b4_syncline([@oline@], [@ofile@])[ /* Enabling traces. */ #ifndef YYDEBUG -# define YYDEBUG b4_debug +# define YYDEBUG ]b4_debug[ #endif /* Enabling verbose error message. */ #ifndef YYERROR_VERBOSE -# define YYERROR_VERBOSE b4_error_verbose +# define YYERROR_VERBOSE ]b4_error_verbose[ #endif -#ifndef YYSTYPE -m4_ifdef([b4_stype], +#ifdef YYSTYPE +typedef YYSTYPE yystype; +#else +]m4_ifdef([b4_stype], [b4_syncline([b4_stype_line], [b4_filename]) typedef union b4_stype yystype; -/* Line __line__ of __file__. */ +/* Line __line__ of lalr1.cc. */ b4_syncline([@oline@], [@ofile@])], -[typedef int yystype;]) +[typedef int yystype;])[ # define YYSTYPE yystype #endif /* Copy the second part of user declarations. */ -b4_post_prologue +]b4_post_prologue[ -/* Line __line__ of __file__. */ -b4_syncline([@oline@], [@ofile@]) +]/* Line __line__ of lalr1.cc. */ +b4_syncline([@oline@], [@ofile@])[ #ifndef YYLLOC_DEFAULT # define YYLLOC_DEFAULT(Current, Rhs, N) \ - Current.last_line = Rhs[[N]].last_line; \ - Current.last_column = Rhs[[N]].last_column; + ((Current).end = Rhs[N].end) #endif namespace yy { - class b4_parser_class_name; + class ]b4_parser_class_name[; template < typename P > struct Traits @@ -153,47 +223,47 @@ namespace yy }; template < > - struct Traits< b4_parser_class_name > + struct Traits< ]b4_parser_class_name[ > { - typedef b4_int_type_for([b4_translate]) TokenNumberType; - typedef b4_int_type_for([b4_rhs]) RhsNumberType; + typedef ]b4_int_type_for([b4_translate])[ TokenNumberType; + typedef ]b4_int_type_for([b4_rhs])[ RhsNumberType; typedef int StateType; typedef yystype SemanticType; - typedef b4_location_type LocationType; + typedef ]b4_location_type[ LocationType; }; } namespace yy { - class b4_parser_class_name b4_inherit + class ]b4_parser_class_name b4_inherit[ { public: - typedef Traits< b4_parser_class_name >::TokenNumberType TokenNumberType; - typedef Traits< b4_parser_class_name >::RhsNumberType RhsNumberType; - typedef Traits< b4_parser_class_name >::StateType StateType; - typedef Traits< b4_parser_class_name >::SemanticType SemanticType; - typedef Traits< b4_parser_class_name >::LocationType LocationType; + typedef Traits< ]b4_parser_class_name[ >::TokenNumberType TokenNumberType; + typedef Traits< ]b4_parser_class_name[ >::RhsNumberType RhsNumberType; + typedef Traits< ]b4_parser_class_name[ >::StateType StateType; + typedef Traits< ]b4_parser_class_name[ >::SemanticType SemanticType; + typedef Traits< ]b4_parser_class_name[ >::LocationType LocationType; typedef Stack< StateType > StateStack; typedef Stack< SemanticType > SemanticStack; typedef Stack< LocationType > LocationStack; #if YYLSP_NEEDED - b4_parser_class_name (bool debug, - LocationType initlocation[]b4_param) : - b4_constructor[]debug_ (debug), + ]b4_parser_class_name[ (bool debug, + LocationType initlocation][]b4_param[]b4_parse_param_decl[) : + ]b4_constructor[][debug_ (debug), cdebug_ (std::cerr), - initlocation_ (initlocation) + initlocation_ (initlocation)]b4_parse_param_cons[ #else - b4_parser_class_name (bool debug[]b4_param) : - b4_constructor[]debug_ (debug), - cdebug_ (std::cerr) + ]b4_parser_class_name[ (bool debug][]b4_param[]b4_parse_param_decl[) : + ]b4_constructor[][debug_ (debug), + cdebug_ (std::cerr)]b4_parse_param_cons[ #endif { } - virtual ~b4_parser_class_name () + virtual ~]b4_parser_class_name[ () { } @@ -204,6 +274,13 @@ namespace yy virtual void lex_ (); virtual void error_ (); virtual void print_ (); + virtual void report_syntax_error_ (); +#if YYDEBUG + virtual void symprint_ (int yytype, + const SemanticType *yyvaluep, + const LocationType *yylocationp); +#endif /* ! YYDEBUG */ + /* Stacks. */ StateStack state_stack_; @@ -211,32 +288,36 @@ namespace yy LocationStack location_stack_; /* Tables. */ - static const b4_int_type_for([b4_pact]) pact_[[]]; - static const b4_int_type_for([b4_pact]) pact_ninf_; - static const b4_int_type_for([b4_defact]) defact_[[]]; - static const b4_int_type_for([b4_pgoto]) pgoto_[[]]; - static const b4_int_type_for([b4_defgoto]) defgoto_[[]]; - static const b4_int_type_for([b4_table]) table_[[]]; - static const b4_int_type_for([b4_table]) table_ninf_; - static const b4_int_type_for([b4_check]) check_[[]]; - static const b4_int_type_for([b4_r1]) r1_[[]]; - static const b4_int_type_for([b4_r2]) r2_[[]]; + static const ]b4_int_type_for([b4_pact])[ pact_[]; + static const ]b4_int_type(b4_pact_ninf, b4_pact_ninf)[ pact_ninf_; + static const ]b4_int_type_for([b4_defact])[ defact_[]; + static const ]b4_int_type_for([b4_pgoto])[ pgoto_[]; + static const ]b4_int_type_for([b4_defgoto])[ defgoto_[]; + static const ]b4_int_type_for([b4_table])[ table_[]; + static const ]b4_int_type(b4_table_ninf, b4_table_ninf)[ table_ninf_; + static const ]b4_int_type_for([b4_check])[ check_[]; + static const ]b4_int_type_for([b4_stos])[ stos_[]; + static const ]b4_int_type_for([b4_r1])[ r1_[]; + static const ]b4_int_type_for([b4_r2])[ r2_[]; #if YYDEBUG || YYERROR_VERBOSE - static const char* const name_[[]]; + static const char* const name_[]; #endif /* More tables, for debugging. */ #if YYDEBUG - static const RhsNumberType rhs_[[]]; - static const b4_int_type_for([b4_prhs]) prhs_[[]]; - static const b4_int_type_for([b4_rline]) rline_[[]]; - static const b4_int_type_for([b4_stos]) stos_[[]]; - static const b4_int_type_for([b4_toknum]) token_number_[[]]; + static const RhsNumberType rhs_[]; + static const ]b4_int_type_for([b4_prhs])[ prhs_[]; + static const ]b4_int_type_for([b4_rline])[ rline_[]; + static const ]b4_int_type_for([b4_toknum])[ token_number_[]; + virtual void reduce_print_ (int yyrule); + virtual void stack_print_ (); #endif /* Even more tables. */ static inline TokenNumberType translate_ (int token); + static inline void destruct_ (int yytype, SemanticType *yyvaluep, + LocationType *yylocationp); /* Constants. */ static const int eof_; @@ -248,8 +329,7 @@ namespace yy static const int terror_; static const int errcode_; static const int ntokens_; - static const int initdepth_; - static const unsigned user_token_number_max_; + static const unsigned int user_token_number_max_; static const TokenNumberType undef_token_; /* State. */ @@ -257,20 +337,26 @@ namespace yy int len_; int state_; + /* Error handling. */ + int nerrs_; + int errstatus_; + /* Debugging. */ int debug_; std::ostream &cdebug_; - /* Lookahead and lookahead in internal form. */ + /* Look-ahead and look-ahead in internal form. */ int looka_; int ilooka_; /* Message. */ std::string message; - /* Semantic value and location of lookahead token. */ + /* Semantic value and location of look-ahead token. */ SemanticType value; LocationType location; + /* Beginning of the last erroneous token popped off. */ + Position error_start_; /* @@$ and $$. */ SemanticType yyval; @@ -278,31 +364,56 @@ namespace yy /* Initial location. */ LocationType initlocation_; +]b4_parse_param_vars[ }; } -#endif /* ! defined YYLSP_NEEDED */ -dnl +#endif /* ! defined PARSER_HEADER_H */] +])dnl @output @output_parser_name@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], - [2002]) + [2002, 2003, 2004]) -#include @output_header_name@ +m4_if(b4_defines_flag, 0, [], [#include @output_header_name@])[ /* Enable debugging if requested. */ #if YYDEBUG # define YYCDEBUG if (debug_) cdebug_ +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (debug_) \ + reduce_print_ (Rule); \ +} while (0) +# define YY_STACK_PRINT() \ +do { \ + if (debug_) \ + stack_print_ (); \ +} while (0) #else /* !YYDEBUG */ # define YYCDEBUG if (0) cdebug_ +# define YY_REDUCE_PRINT(Rule) +# define YY_STACK_PRINT() #endif /* !YYDEBUG */ +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + +#if YYDEBUG +]b4_yysymprint_generate([b4_cxx_symprint_def])[ +#endif /* ! YYDEBUG */ +]b4_yydestruct_generate([b4_cxx_destruct_def])[ + int -yy::b4_parser_class_name::parse () +yy::]b4_parser_class_name[::parse () { - int nerrs = 0; - int errstatus = 0; + nerrs_ = 0; + errstatus_ = 0; - /* Initialize stack. */ + /* Initialize the stacks. The initial state will be pushed in + yynewstate, since the latter expects the semantical and the + location values to have been already stored, initialize these + stacks with a primary value. */ state_stack_ = StateStack (0); semantic_stack_ = SemanticStack (1); location_stack_ = LocationStack (1); @@ -324,12 +435,12 @@ yy::b4_parser_class_name::parse () /* Backup. */ yybackup: - /* Try to take a decision without lookahead. */ - n_ = pact_[[state_]]; + /* Try to take a decision without look-ahead. */ + n_ = pact_[state_]; if (n_ == pact_ninf_) goto yydefault; - /* Read a lookahead token. */ + /* Read a look-ahead token. */ if (looka_ == empty_) { YYCDEBUG << "Reading a token: "; @@ -349,20 +460,21 @@ yy::b4_parser_class_name::parse () #if YYDEBUG if (debug_) { - YYCDEBUG << "Next token is " << looka_ - << " (" << name_[[ilooka_]]; - print_ (); - YYCDEBUG << ')' << std::endl; + cdebug_ << "Next token is "; + symprint_ (ilooka_, &value, &location); + cdebug_ << std::endl; } #endif } + /* If the proper action on seeing token ILOOKA_ is to reduce or to + detect an error, take that action. */ n_ += ilooka_; - if (n_ < 0 || last_ < n_ || check_[[n_]] != ilooka_) + if (n_ < 0 || last_ < n_ || check_[n_] != ilooka_) goto yydefault; /* Reduce or error. */ - n_ = table_[[n_]]; + n_ = table_[n_]; if (n_ < 0) { if (n_ == table_ninf_) @@ -380,9 +492,11 @@ yy::b4_parser_class_name::parse () if (n_ == final_) goto yyacceptlab; - /* Shift the lookahead token. */ + /* Shift the look-ahead token. */ +#if YYDEBUG YYCDEBUG << "Shifting token " << looka_ - << " (" << name_[[ilooka_]] << "), "; + << " (" << name_[ilooka_] << "), "; +#endif /* Discard the token being shifted unless it is eof. */ if (looka_ != eof_) @@ -393,197 +507,196 @@ yy::b4_parser_class_name::parse () /* Count tokens shifted since error; after three, turn off error status. */ - if (errstatus) - --errstatus; + if (errstatus_) + --errstatus_; state_ = n_; goto yynewstate; - /* Default action. */ +/*-----------------------------------------------------------. +| yydefault -- do the default action for the current state. | +`-----------------------------------------------------------*/ yydefault: - n_ = defact_[[state_]]; + n_ = defact_[state_]; if (n_ == 0) goto yyerrlab; goto yyreduce; - /* Reduce. */ +/*-----------------------------. +| yyreduce -- Do a reduction. | +`-----------------------------*/ yyreduce: - len_ = r2_[[n_]]; + len_ = r2_[n_]; + /* If LEN_ is nonzero, implement the default value of the action: + `$$ = $1'. Otherwise, use the top of the stack. + + Otherwise, the following line sets YYVAL to garbage. + This behavior is undocumented and Bison + users should not rely upon it. */ if (len_) { - yyval = semantic_stack_[[len_ - 1]]; - yyloc = location_stack_[[len_ - 1]]; + yyval = semantic_stack_[len_ - 1]; + yyloc = location_stack_[len_ - 1]; } else { - yyval = semantic_stack_[[0]]; - yyloc = location_stack_[[0]]; + yyval = semantic_stack_[0]; + yyloc = location_stack_[0]; } -#if YYDEBUG - if (debug_) - { - YYCDEBUG << "Reducing via rule " << n_ - 1 - << " (line " << rline_[[n_]] << "), "; - for (b4_int_type_for([b4_prhs]) i = prhs_[[n_]]; - 0 <= rhs_[[i]]; ++i) - YYCDEBUG << name_[[rhs_[i]]] << ' '; - YYCDEBUG << "-> " << name_[[r1_[n_]]] << std::endl; - } -#endif - if (len_) { Slice< LocationType, LocationStack > slice (location_stack_, len_); YYLLOC_DEFAULT (yyloc, slice, len_); } - + YY_REDUCE_PRINT (n_); switch (n_) { - b4_actions + ]b4_actions[ } -/* Line __line__ of __file__. */ -b4_syncline([@oline@], [@ofile@]) +]/* Line __line__ of lalr1.cc. */ +b4_syncline([@oline@], [@ofile@])[ state_stack_.pop (len_); semantic_stack_.pop (len_); location_stack_.pop (len_); -#if YYDEBUG - if (debug_) - { - YYCDEBUG << "state stack now"; - for (StateStack::ConstIterator i = state_stack_.begin (); - i != state_stack_.end (); ++i) - YYCDEBUG << ' ' << *i; - YYCDEBUG << std::endl; - } -#endif + YY_STACK_PRINT (); semantic_stack_.push (yyval); location_stack_.push (yyloc); /* Shift the result of the reduction. */ - n_ = r1_[[n_]]; - state_ = pgoto_[[n_ - ntokens_]] + state_stack_[[0]]; - if (0 <= state_ && state_ <= last_ && check_[[state_]] == state_stack_[[0]]) - state_ = table_[[state_]]; + n_ = r1_[n_]; + state_ = pgoto_[n_ - ntokens_] + state_stack_[0]; + if (0 <= state_ && state_ <= last_ && check_[state_] == state_stack_[0]) + state_ = table_[state_]; else - state_ = defgoto_[[n_ - ntokens_]]; + state_ = defgoto_[n_ - ntokens_]; goto yynewstate; - /* Report and recover from errors. This is very incomplete. */ +/*------------------------------------. +| yyerrlab -- here on detecting error | +`------------------------------------*/ yyerrlab: /* If not already recovering from an error, report this error. */ - if (!errstatus) + report_syntax_error_ (); + + error_start_ = location.begin; + if (errstatus_ == 3) { - ++nerrs; + /* If just tried and failed to reuse look-ahead token after an + error, discard it. */ -#if YYERROR_VERBOSE - n_ = pact_[[state_]]; - if (pact_ninf_ < n_ && n_ < last_) - { - message = "parse error, unexpected "; - message += name_[[ilooka_]]; - { - int count = 0; - for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x) - if (check_[[x + n_]] == x && x != terror_) - ++count; - if (count < 5) - { - count = 0; - for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x) - if (check_[[x + n_]] == x && x != terror_) - { - message += (!count++) ? ", expecting " : " or "; - message += name_[[x]]; - } - } - } - } + /* Return failure if at end of input. */ + if (looka_ <= eof_) + { + /* If at end of input, pop the error token, + then the rest of the stack, then return failure. */ + if (looka_ == eof_) + for (;;) + { + error_start_ = location_stack_[0].begin; + state_stack_.pop (); + semantic_stack_.pop (); + location_stack_.pop (); + if (state_stack_.height () == 1) + YYABORT; +#if YYDEBUG + if (debug_) + { + cdebug_ << "Error: popping "; + symprint_ (stos_[state_stack_[0]], + &semantic_stack_[0], + &location_stack_[0]); + cdebug_ << std::endl; + } +#endif // YYDEBUG + destruct_ (stos_[state_stack_[0]], + &semantic_stack_[0], + &location_stack_[0]); + } + } else + { +#if YYDEBUG + if (debug_) + { + cdebug_ << "Error: discarding "; + symprint_ (ilooka_, &value, &location); + cdebug_ << std::endl; + } #endif - message = "parse error"; - error_ (); + destruct_ (ilooka_, &value, &location); + looka_ = empty_; + } } + + /* Else will try to reuse look-ahead token after shifting the error + token. */ goto yyerrlab1; - /* Error raised explicitly by an action. */ - yyerrlab1: - if (errstatus == 3) - { - /* If just tried and failed to reuse lookahead token after an - error, discard it. */ - /* Return failure if at end of input. */ - if (looka_ == eof_) - goto yyabortlab; - YYCDEBUG << "Discarding token " << looka_ - << " (" << name_[[ilooka_]] << ")." << std::endl; - looka_ = empty_; - } +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: - /* Else will try to reuse lookahead token after shifting the error - token. */ +#ifdef __GNUC__ + /* Pacify GCC when the user code never invokes YYERROR and the label + yyerrorlab therefore never appears in user code. */ + if (0) + goto yyerrorlab; +#endif - errstatus = 3; + state_stack_.pop (len_); + semantic_stack_.pop (len_); + error_start_ = location_stack_[len_ - 1].begin; + location_stack_.pop (len_); + state_ = state_stack_[0]; + goto yyerrlab1; + +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ +yyerrlab1: + errstatus_ = 3; /* Each real token shifted decrements this. */ for (;;) { - n_ = pact_[[state_]]; + n_ = pact_[state_]; if (n_ != pact_ninf_) { n_ += terror_; - if (0 <= n_ && n_ <= last_ && check_[[n_]] == terror_) + if (0 <= n_ && n_ <= last_ && check_[n_] == terror_) { - n_ = table_[[n_]]; + n_ = table_[n_]; if (0 < n_) break; } } /* Pop the current state because it cannot handle the error token. */ - if (!state_stack_.height ()) - goto yyabortlab; + if (state_stack_.height () == 1) + YYABORT; #if YYDEBUG if (debug_) { - if (stos_[[state_]] < ntokens_) - { - YYCDEBUG << "Error: popping token " - << token_number_[[stos_[state_]]] - << " (" << name_[[stos_[state_]]]; -# ifdef YYPRINT - YYPRINT (stderr, token_number_[[stos_[state_]]], - semantic_stack_.top ()); -# endif - YYCDEBUG << ')' << std::endl; - } - else - { - YYCDEBUG << "Error: popping nonterminal (" - << name_[[stos_[state_]]] << ')' << std::endl; - } + cdebug_ << "Error: popping "; + symprint_ (stos_[state_], &semantic_stack_[0], &location_stack_[0]); + cdebug_ << std::endl; } #endif + destruct_ (stos_[state_], &semantic_stack_[0], &location_stack_[0]); + error_start_ = location_stack_[0].begin; - state_ = (state_stack_.pop (), state_stack_[[0]]); + state_stack_.pop (); semantic_stack_.pop (); - location_stack_.pop ();; - -#if YYDEBUG - if (debug_) - { - YYCDEBUG << "Error: state stack now"; - for (StateStack::ConstIterator i = state_stack_.begin (); - i != state_stack_.end (); ++i) - YYCDEBUG << ' ' << *i; - YYCDEBUG << std::endl; - } -#endif + location_stack_.pop (); + state_ = state_stack_[0]; + YY_STACK_PRINT (); } if (n_ == final_) @@ -591,8 +704,13 @@ b4_syncline([@oline@], [@ofile@]) YYCDEBUG << "Shifting error token, "; - semantic_stack_.push (value); - location_stack_.push (location); + { + Location errloc; + errloc.begin = error_start_; + errloc.end = location.end; + semantic_stack_.push (value); + location_stack_.push (errloc); + } state_ = n_; goto yynewstate; @@ -607,7 +725,7 @@ b4_syncline([@oline@], [@ofile@]) } void -yy::b4_parser_class_name::lex_ () +yy::]b4_parser_class_name[::lex_ () { #if YYLSP_NEEDED looka_ = yylex (&value, &location); @@ -616,154 +734,219 @@ yy::b4_parser_class_name::lex_ () #endif } -/* YYPACT[[STATE-NUM]] -- Index in YYTABLE of the portion describing +/** Generate an error message, and invoke yyerror. */ +void +yy::]b4_parser_class_name[::report_syntax_error_ () +{ + /* If not already recovering from an error, report this error. */ + if (!errstatus_) + { + ++nerrs_; + +#if YYERROR_VERBOSE + n_ = pact_[state_]; + if (pact_ninf_ < n_ && n_ < last_) + { + message = "syntax error, unexpected "; + message += name_[ilooka_]; + { + int count = 0; + for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x) + if (check_[x + n_] == x && x != terror_) + ++count; + if (count < 5) + { + count = 0; + for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x) + if (check_[x + n_] == x && x != terror_) + { + message += (!count++) ? ", expecting " : " or "; + message += name_[x]; + } + } + } + } + else +#endif + message = "syntax error"; + error_ (); + } +} + + +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -const b4_int_type_for([b4_pact]) yy::b4_parser_class_name::pact_ninf_ = b4_pact_ninf; -const b4_int_type_for([b4_pact]) -yy::b4_parser_class_name::pact_[[]] = +const ]b4_int_type(b4_pact_ninf, b4_pact_ninf) yy::b4_parser_class_name::pact_ninf_ = b4_pact_ninf[; +const ]b4_int_type_for([b4_pact])[ +yy::]b4_parser_class_name[::pact_[] = { - b4_pact + ]b4_pact[ }; -/* YYDEFACT[[S]] -- default rule to reduce with in state S when YYTABLE +/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ -const b4_int_type_for([b4_defact]) -yy::b4_parser_class_name::defact_[[]] = +const ]b4_int_type_for([b4_defact])[ +yy::]b4_parser_class_name[::defact_[] = { - b4_defact + ]b4_defact[ }; -/* YYPGOTO[[NTERM-NUM]]. */ -const b4_int_type_for([b4_pgoto]) -yy::b4_parser_class_name::pgoto_[[]] = +/* YYPGOTO[NTERM-NUM]. */ +const ]b4_int_type_for([b4_pgoto])[ +yy::]b4_parser_class_name[::pgoto_[] = { - b4_pgoto + ]b4_pgoto[ }; -/* YYDEFGOTO[[NTERM-NUM]]. */ -const b4_int_type_for([b4_defgoto]) -yy::b4_parser_class_name::defgoto_[[]] = +/* YYDEFGOTO[NTERM-NUM]. */ +const ]b4_int_type_for([b4_defgoto])[ +yy::]b4_parser_class_name[::defgoto_[] = { - b4_defgoto + ]b4_defgoto[ }; -/* YYTABLE[[YYPACT[STATE-NUM]]]. What to do in state STATE-NUM. If +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. */ -const b4_int_type_for([b4_table]) yy::b4_parser_class_name::table_ninf_ = b4_table_ninf; -const b4_int_type_for([b4_table]) -yy::b4_parser_class_name::table_[[]] = +const ]b4_int_type(b4_table_ninf, b4_table_ninf) yy::b4_parser_class_name::table_ninf_ = b4_table_ninf[; +const ]b4_int_type_for([b4_table])[ +yy::]b4_parser_class_name[::table_[] = { - b4_table + ]b4_table[ }; /* YYCHECK. */ -const b4_int_type_for([b4_check]) -yy::b4_parser_class_name::check_[[]] = +const ]b4_int_type_for([b4_check])[ +yy::]b4_parser_class_name[::check_[] = { - b4_check + ]b4_check[ }; -#if YYDEBUG -/* STOS_[[STATE-NUM]] -- The (internal number of the) accessing +/* STOS_[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ -const b4_int_type_for([b4_stos]) -yy::b4_parser_class_name::stos_[[]] = +const ]b4_int_type_for([b4_stos])[ +yy::]b4_parser_class_name[::stos_[] = { - b4_stos + ]b4_stos[ }; -/* TOKEN_NUMBER_[[YYLEX-NUM]] -- Internal token number corresponding +#if YYDEBUG +/* TOKEN_NUMBER_[YYLEX-NUM] -- Internal token number corresponding to YYLEX-NUM. */ -const b4_int_type_for([b4_toknum]) -yy::b4_parser_class_name::token_number_[[]] = +const ]b4_int_type_for([b4_toknum])[ +yy::]b4_parser_class_name[::token_number_[] = { - b4_toknum + ]b4_toknum[ }; #endif -/* YYR1[[YYN]] -- Symbol number of symbol that rule YYN derives. */ -const b4_int_type_for([b4_r1]) -yy::b4_parser_class_name::r1_[[]] = +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +const ]b4_int_type_for([b4_r1])[ +yy::]b4_parser_class_name[::r1_[] = { - b4_r1 + ]b4_r1[ }; -/* YYR2[[YYN]] -- Number of symbols composing right hand side of rule YYN. */ -const b4_int_type_for([b4_r2]) -yy::b4_parser_class_name::r2_[[]] = +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +const ]b4_int_type_for([b4_r2])[ +yy::]b4_parser_class_name[::r2_[] = { - b4_r2 + ]b4_r2[ }; #if YYDEBUG || YYERROR_VERBOSE -/* YYTNAME[[SYMBOL-NUM]] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at NTOKENS_, nonterminals. */ const char* -const yy::b4_parser_class_name::name_[[]] = +const yy::]b4_parser_class_name[::name_[] = { - b4_tname + ]b4_tname[ }; #endif #if YYDEBUG /* YYRHS -- A `-1'-separated list of the rules' RHS. */ -const yy::b4_parser_class_name::RhsNumberType -yy::b4_parser_class_name::rhs_[[]] = +const yy::]b4_parser_class_name[::RhsNumberType +yy::]b4_parser_class_name[::rhs_[] = { - b4_rhs + ]b4_rhs[ }; -/* YYPRHS[[YYN]] -- Index of the first RHS symbol of rule number YYN in +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -const b4_int_type_for([b4_prhs]) -yy::b4_parser_class_name::prhs_[[]] = +const ]b4_int_type_for([b4_prhs])[ +yy::]b4_parser_class_name[::prhs_[] = { - b4_prhs + ]b4_prhs[ }; -/* YYRLINE[[YYN]] -- source line where rule number YYN was defined. */ -const b4_int_type_for([b4_rline]) -yy::b4_parser_class_name::rline_[[]] = +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +const ]b4_int_type_for([b4_rline])[ +yy::]b4_parser_class_name[::rline_[] = { - b4_rline + ]b4_rline[ }; -#endif + +/** Print the state stack from its BOTTOM up to its TOP (included). */ + +void +yy::]b4_parser_class_name[::stack_print_ () +{ + cdebug_ << "state stack now"; + for (StateStack::ConstIterator i = state_stack_.begin (); + i != state_stack_.end (); ++i) + cdebug_ << ' ' << *i; + cdebug_ << std::endl; +} + +/** Report that the YYRULE is going to be reduced. */ + +void +yy::]b4_parser_class_name[::reduce_print_ (int yyrule) +{ + unsigned int yylno = rline_[yyrule]; + /* Print the symbols being reduced, and their result. */ + cdebug_ << "Reducing via rule " << n_ - 1 << " (line " << yylno << "), "; + for (]b4_int_type_for([b4_prhs])[ i = prhs_[n_]; + 0 <= rhs_[i]; ++i) + cdebug_ << name_[rhs_[i]] << ' '; + cdebug_ << "-> " << name_[r1_[n_]] << std::endl; +} +#endif // YYDEBUG /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -yy::b4_parser_class_name::TokenNumberType -yy::b4_parser_class_name::translate_ (int token) +yy::]b4_parser_class_name[::TokenNumberType +yy::]b4_parser_class_name[::translate_ (int token) { static const TokenNumberType - translate_[[]] = + translate_table[] = { - b4_translate + ]b4_translate[ }; - if ((unsigned) token <= user_token_number_max_) - return translate_[[token]]; + if ((unsigned int) token <= user_token_number_max_) + return translate_table[token]; else return undef_token_; } -const int yy::b4_parser_class_name::eof_ = 0; -const int yy::b4_parser_class_name::last_ = b4_last; -const int yy::b4_parser_class_name::nnts_ = b4_nterms_number; -const int yy::b4_parser_class_name::empty_ = -2; -const int yy::b4_parser_class_name::final_ = b4_final_state_number; -const int yy::b4_parser_class_name::terror_ = 1; -const int yy::b4_parser_class_name::errcode_ = 256; -const int yy::b4_parser_class_name::ntokens_ = b4_tokens_number; -const int yy::b4_parser_class_name::initdepth_ = b4_stack_depth_init; +const int yy::]b4_parser_class_name[::eof_ = 0; +const int yy::]b4_parser_class_name[::last_ = ]b4_last[; +const int yy::]b4_parser_class_name[::nnts_ = ]b4_nterms_number[; +const int yy::]b4_parser_class_name[::empty_ = -2; +const int yy::]b4_parser_class_name[::final_ = ]b4_final_state_number[; +const int yy::]b4_parser_class_name[::terror_ = 1; +const int yy::]b4_parser_class_name[::errcode_ = 256; +const int yy::]b4_parser_class_name[::ntokens_ = ]b4_tokens_number[; -const unsigned yy::b4_parser_class_name::user_token_number_max_ = b4_user_token_number_max; -const yy::b4_parser_class_name::TokenNumberType yy::b4_parser_class_name::undef_token_ = b4_undef_token_number; +const unsigned int yy::]b4_parser_class_name[::user_token_number_max_ = ]b4_user_token_number_max[; +const yy::]b4_parser_class_name[::TokenNumberType yy::]b4_parser_class_name[::undef_token_ = ]b4_undef_token_number[; -b4_epilogue +]b4_epilogue dnl @output stack.hh -b4_copyright([2002]) +b4_copyright([Stack handling for Bison C++ parsers], [2002, 2003, 2004])[ #ifndef BISON_STACK_HH # define BISON_STACK_HH @@ -784,22 +967,22 @@ namespace yy { } - Stack (unsigned n) : seq_ (n) + Stack (unsigned int n) : seq_ (n) { } inline T& - operator [[]] (unsigned index) + operator [] (unsigned int i) { - return seq_[[index]]; + return seq_[i]; } inline const T& - operator [[]] (unsigned index) const + operator [] (unsigned int i) const { - return seq_[[index]]; + return seq_[i]; } inline @@ -811,14 +994,14 @@ namespace yy inline void - pop (unsigned n = 1) + pop (unsigned int n = 1) { for (; n; --n) seq_.pop_front (); } inline - unsigned + unsigned int height () const { return seq_.size (); @@ -838,46 +1021,245 @@ namespace yy public: Slice (const S& stack, - unsigned range) : stack_ (stack), - range_ (range) + unsigned int range) : stack_ (stack), + range_ (range) { } inline const T& - operator [[]] (unsigned index) const + operator [] (unsigned int i) const { - return stack_[[range_ - index]]; + return stack_[range_ - i]; } private: const S& stack_; - unsigned range_; + unsigned int range_; }; } -#endif // not BISON_STACK_HH +#endif // not BISON_STACK_HH] dnl +@output position.hh +b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004])[ + +/** + ** \file position.hh + ** Define the Location class. + */ + +#ifndef BISON_POSITION_HH +# define BISON_POSITION_HH + +# include +# include + +namespace yy +{ + /** \brief Abstract a Position. */ + class Position + { + public: + /** \brief Initial column number. */ + static const unsigned int initial_column = 0; + /** \brief Initial line number. */ + static const unsigned int initial_line = 1; + + /** \name Ctor & dtor. + ** \{ */ + public: + /** \brief Construct a Position. */ + Position () : + filename (), + line (initial_line), + column (initial_column) + { + } + /** \} */ + + + /** \name Line and Column related manipulators + ** \{ */ + public: + /** \brief (line related) Advance to the COUNT next lines. */ + inline void lines (int count = 1) + { + column = initial_column; + line += count; + } + + /** \brief (column related) Advance to the COUNT next columns. */ + inline void columns (int count = 1) + { + int leftmost = initial_column; + int current = column; + if (leftmost <= current + count) + column += count; + else + column = initial_column; + } + /** \} */ + + public: + /** \brief File name to which this position refers. */ + std::string filename; + /** \brief Current line number. */ + unsigned int line; + /** \brief Current column number. */ + unsigned int column; + }; + + /** \brief Add and assign a Position. */ + inline const Position& + operator+= (Position& res, const int width) + { + res.columns (width); + return res; + } + + /** \brief Add two Position objects. */ + inline const Position + operator+ (const Position& begin, const int width) + { + Position res = begin; + return res += width; + } + + /** \brief Add and assign a Position. */ + inline const Position& + operator-= (Position& res, const int width) + { + return res += -width; + } + + /** \brief Add two Position objects. */ + inline const Position + operator- (const Position& begin, const int width) + { + return begin + -width; + } + + /** \brief Intercept output stream redirection. + ** \param ostr the destination output stream + ** \param pos a reference to the Position to redirect + */ + inline std::ostream& + operator<< (std::ostream& ostr, const Position& pos) + { + if (!pos.filename.empty ()) + ostr << pos.filename << ':'; + return ostr << pos.line << '.' << pos.column; + } + +} +#endif // not BISON_POSITION_HH] @output location.hh -b4_copyright([2002]) +b4_copyright([Location class for Bison C++ parsers], [2002, 2003, 2004])[ + +/** + ** \file location.hh + ** Define the Location class. + */ #ifndef BISON_LOCATION_HH # define BISON_LOCATION_HH +# include +# include +# include "position.hh" + namespace yy { - struct Position + + /** \brief Abstract a Location. */ + class Location { - int line; - int column; + /** \name Ctor & dtor. + ** \{ */ + public: + /** \brief Construct a Location. */ + Location (void) : + begin (), + end () + { + } + /** \} */ + + + /** \name Line and Column related manipulators + ** \{ */ + public: + /** \brief Reset initial location to final location. */ + inline void step (void) + { + begin = end; + } + + /** \brief Extend the current location to the COUNT next columns. */ + inline void columns (unsigned int count = 1) + { + end += count; + } + + /** \brief Extend the current location to the COUNT next lines. */ + inline void lines (unsigned int count = 1) + { + end.lines (count); + } + /** \} */ + + + public: + /** \brief Beginning of the located region. */ + Position begin; + /** \brief End of the located region. */ + Position end; }; - struct Location + /** \brief Join two Location objects to create a Location. */ + inline const Location operator+ (const Location& begin, const Location& end) { - Position first; - Position last; - }; + Location res = begin; + res.end = end.end; + return res; + } + + /** \brief Add two Location objects */ + inline const Location operator+ (const Location& begin, unsigned int width) + { + Location res = begin; + res.columns (width); + return res; + } + + /** \brief Add and assign a Location */ + inline Location &operator+= (Location& res, unsigned int width) + { + res.columns (width); + return res; + } + + /** \brief Intercept output stream redirection. + ** \param ostr the destination output stream + ** \param loc a reference to the Location to redirect + ** + ** Avoid duplicate information. + */ + inline std::ostream& operator<< (std::ostream& ostr, const Location& loc) + { + Position last = loc.end - 1; + ostr << loc.begin; + if (loc.begin.filename != last.filename) + ostr << '-' << last; + else if (loc.begin.line != last.line) + ostr << '-' << last.line << '.' << last.column; + else if (loc.begin.column != last.column) + ostr << '-' << last.column; + return ostr; + } + } -#endif // not BISON_LOCATION_HH +#endif // not BISON_LOCATION_HH]