X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a0e68930d8ba92da9d0e8ca91f418e16a24a2867..be3d9d4219cb668d2c03267e220418f9252a6747:/data/lalr1.cc diff --git a/data/lalr1.cc b/data/lalr1.cc index 57cabda6..817b3833 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -83,13 +83,22 @@ m4_define([b4_constructor], # b4_parse_param_decl # ------------------- -# Constructor's extra arguments. +# Extra formal arguments of the constructor. +# Change the parameter names from "foo" into "foo_yyarg", so that +# there is no collision bw the user chosen attribute name, and the +# argument name in the constructor. m4_define([b4_parse_param_decl], - [m4_ifset([b4_parse_param], [, b4_c_ansi_formals(b4_parse_param)])]) +[m4_ifset([b4_parse_param], + [, m4_map_sep([b4_parse_param_decl_1], [, ], [b4_parse_param])])]) + +m4_define([b4_parse_param_decl_1], +[$1_yyarg]) + + # b4_parse_param_cons # ------------------- -# constructor's extra initialisations. +# Extra initialisations of the constructor. m4_define([b4_parse_param_cons], [m4_ifset([b4_parse_param], [, @@ -98,11 +107,11 @@ m4_define([b4_cc_constructor_calls], [m4_map_sep([b4_cc_constructor_call], [, ], [$@])]) m4_define([b4_cc_constructor_call], - [$2($2)]) + [$2 ($2_yyarg)]) # b4_parse_param_vars # ------------------- -# Extra instance variables. +# Extra instance variables. m4_define([b4_parse_param_vars], [m4_ifset([b4_parse_param], [ @@ -155,16 +164,16 @@ b4_syncline([@oline@], [@ofile@])[ # define YYERROR_VERBOSE ]b4_error_verbose[ #endif -#ifdef YYSTYPE -typedef YYSTYPE yystype; -#else +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) ]m4_ifdef([b4_stype], [b4_syncline([b4_stype_line], [b4_filename]) -typedef union b4_stype yystype; +union YYSTYPE b4_stype; /* Line __line__ of lalr1.cc. */ b4_syncline([@oline@], [@ofile@])], -[typedef int yystype;])[ -# define YYSTYPE yystype +[typedef int YYSTYPE;])[ +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 #endif /* Copy the second part of user declarations. */ @@ -172,27 +181,41 @@ b4_syncline([@oline@], [@ofile@])], ]/* Line __line__ of lalr1.cc. */ b4_syncline([@oline@], [@ofile@])[ +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ + #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - ((Current).end = Rhs[N].end) +# define YYLLOC_DEFAULT(Current, Rhs, N) \ +do { \ + if (N) \ + { \ + (Current).begin = (Rhs)[1].begin; \ + (Current).end = (Rhs)[N].end; \ + } \ + else \ + { \ + (Current).begin = (Current).end = (Rhs)[0].end; \ + } \ +} while (0) #endif namespace yy { class ]b4_parser_class_name[; - template < typename P > + template struct Traits { }; - template < > - struct Traits< ]b4_parser_class_name[ > + template <> + struct Traits<]b4_parser_class_name[> { typedef ]b4_int_type_for([b4_translate])[ TokenNumberType; typedef ]b4_int_type_for([b4_rhs])[ RhsNumberType; - typedef int StateType; - typedef yystype SemanticType; + typedef int StateType; + typedef YYSTYPE SemanticType; typedef ]b4_location_type[ LocationType; }; } @@ -203,46 +226,53 @@ namespace yy { 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; + typedef Stack StateStack; + typedef Stack SemanticStack; + typedef Stack LocationStack; -#if YYLSP_NEEDED - ]b4_parser_class_name[ (bool debug, - LocationType initlocation][]b4_param[]b4_parse_param_decl[) : - ]b4_constructor[][debug_ (debug), - cdebug_ (std::cerr), - initlocation_ (initlocation)]b4_parse_param_cons[ -#else ]b4_parser_class_name[ (bool debug][]b4_param[]b4_parse_param_decl[) : ]b4_constructor[][debug_ (debug), - cdebug_ (std::cerr)]b4_parse_param_cons[ -#endif + yycdebug_ (&std::cerr)]b4_parse_param_cons[ { } + ]b4_parser_class_name[ (bool debug, + LocationType][]b4_param[]b4_parse_param_decl[) : + ]b4_constructor[][debug_ (debug), + yycdebug_ (&std::cerr)]b4_parse_param_cons[ + { + *yycdebug_ << __FILE__ << ':' << __LINE__ + << ": this constructor is provided by backward compatibility" + << ", but will be removed in the near future." + << std::endl; + } + virtual ~]b4_parser_class_name[ () { } virtual int parse (); + /// Return the current debugging stream. + std::ostream& debug_stream () const; + /// Set the current debugging stream. + void set_debug_stream (std::ostream &); + private: 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); + const SemanticType* yyvaluep, + const LocationType* yylocationp); #endif /* ! YYDEBUG */ @@ -280,9 +310,12 @@ namespace yy /* Even more tables. */ inline TokenNumberType translate_ (int token); - inline void destruct_ (const char *yymsg, + inline void destruct_ (const char* yymsg, int yytype, - SemanticType *yyvaluep, LocationType *yylocationp); + SemanticType* yyvaluep, LocationType* yylocationp); + + /// Pop \a n symbols the three stacks. + inline void pop (unsigned int n = 1); /* Constants. */ static const int eof_; @@ -308,7 +341,7 @@ namespace yy /* Debugging. */ int debug_; - std::ostream &cdebug_; + std::ostream* yycdebug_; /* Look-ahead and look-ahead in internal form. */ int looka_; @@ -317,18 +350,17 @@ namespace yy /* Message. */ std::string message; - /* Semantic value and location of look-ahead token. */ + /// Semantic value of the look-ahead. SemanticType value; + /// Location of the look-ahead. LocationType location; - /* Beginning of the last erroneous token popped off. */ - Position error_start_; + /// The locations where the error started and ended. + Location error_range_[2]; - /* @@$ and $$. */ + /// $$. SemanticType yyval; + /// @@$. LocationType yyloc; - - /* Initial location. */ - LocationType initlocation_; ]b4_parse_param_vars[ }; } @@ -341,20 +373,21 @@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], m4_if(b4_defines_flag, 0, [], [#include @output_header_name@])[ +/* A pseudo ostream that takes debug_ into account. */ +# define YYCDEBUG \ + for (bool yydebugcond_ = debug_; yydebugcond_; yydebugcond_ = false) \ + (*yycdebug_) + /* Enable debugging if requested. */ #if YYDEBUG -# define YYCDEBUG \ - if (debug_) \ - cdebug_ - # define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ do { \ if (debug_) \ { \ - cdebug_ << (Title) << ' '; \ + *yycdebug_ << (Title) << ' '; \ symprint_ ((Type), (Value), (Location)); \ - cdebug_ << std::endl; \ + *yycdebug_ << std::endl; \ } \ } while (0) @@ -372,7 +405,6 @@ do { \ #else /* !YYDEBUG */ -# define YYCDEBUG if (0) cdebug_ # define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_REDUCE_PRINT(Rule) # define YY_STACK_PRINT() @@ -390,34 +422,36 @@ do { \ void yy::]b4_parser_class_name[::symprint_ (int yytype, - const SemanticType *yyvaluep, const LocationType *yylocationp) + const SemanticType* yyvaluep, const LocationType* yylocationp) { /* Pacify ``unused variable'' warnings. */ (void) yyvaluep; (void) yylocationp; + /* Backward compatibility, but should be removed eventually. */ + std::ostream& cdebug_ = *yycdebug_; + (void) cdebug_; - cdebug_ << (yytype < ntokens_ ? "token" : "nterm") - << ' ' << name_[yytype] << " ("; + *yycdebug_ << (yytype < ntokens_ ? "token" : "nterm") + << ' ' << name_[yytype] << " (" + << *yylocationp << ": "; switch (yytype) { ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl [ default: break; } - cdebug_ << ')'; + *yycdebug_ << ')'; } #endif /* ! YYDEBUG */ void -yy::]b4_parser_class_name[::destruct_ (const char *yymsg, - int yytype, SemanticType *yyvaluep, LocationType *yylocationp) +yy::]b4_parser_class_name[::destruct_ (const char* yymsg, + int yytype, SemanticType* yyvaluep, LocationType* yylocationp) { /* Pacify ``unused variable'' warnings. */ (void) yyvaluep; (void) yylocationp; - if (!yymsg) - yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); switch (yytype) @@ -428,36 +462,67 @@ yy::]b4_parser_class_name[::destruct_ (const char *yymsg, } } +void +yy::]b4_parser_class_name[::pop (unsigned int n) +{ + state_stack_.pop (n); + semantic_stack_.pop (n); + location_stack_.pop (n); +} + +std::ostream& +yy::]b4_parser_class_name[::debug_stream () const +{ + return *yycdebug_; +} + +void +yy::]b4_parser_class_name[::set_debug_stream (std::ostream& o) +{ + yycdebug_ = &o; +} + + int yy::]b4_parser_class_name[::parse () { + YYCDEBUG << "Starting parse" << std::endl; + nerrs_ = 0; errstatus_ = 0; - /* Initialize the stacks. The initial state will be pushed in + /* Start. */ + state_ = 0; + looka_ = empty_; + +]m4_ifdef([b4_initial_action], [ +m4_pushdef([b4_at_dollar], [location])dnl +m4_pushdef([b4_dollar_dollar], [value])dnl + /* User initialization code. */ + b4_initial_action +m4_popdef([b4_dollar_dollar])dnl +m4_popdef([b4_at_dollar])dnl +/* Line __line__ of yacc.c. */ +b4_syncline([@oline@], [@ofile@])])dnl + +[ /* 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); - - /* Start. */ - state_ = 0; - looka_ = empty_; -#if YYLSP_NEEDED - location = initlocation_; -#endif - YYCDEBUG << "Starting parse" << std::endl; + semantic_stack_ = SemanticStack (0); + location_stack_ = LocationStack (0); + semantic_stack_.push (value); + location_stack_.push (location); /* New state. */ - yynewstate: +yynewstate: state_stack_.push (state_); YYCDEBUG << "Entering state " << state_ << std::endl; goto yybackup; /* Backup. */ - yybackup: +yybackup: /* Try to take a decision without look-ahead. */ n_ = pact_[state_]; @@ -509,10 +574,7 @@ yy::]b4_parser_class_name[::parse () goto yyacceptlab; /* Shift the look-ahead token. */ -#if YYDEBUG - YYCDEBUG << "Shifting token " << looka_ - << " (" << name_[ilooka_] << "), "; -#endif + YY_SYMBOL_PRINT ("Shifting", ilooka_, &value, &location); /* Discard the token being shifted unless it is eof. */ if (looka_ != eof_) @@ -532,7 +594,7 @@ yy::]b4_parser_class_name[::parse () /*-----------------------------------------------------------. | yydefault -- do the default action for the current state. | `-----------------------------------------------------------*/ - yydefault: +yydefault: n_ = defact_[state_]; if (n_ == 0) goto yyerrlab; @@ -541,7 +603,7 @@ yy::]b4_parser_class_name[::parse () /*-----------------------------. | yyreduce -- Do a reduction. | `-----------------------------*/ - yyreduce: +yyreduce: len_ = r2_[n_]; /* If LEN_ is nonzero, implement the default value of the action: `$$ = $1'. Otherwise, use the top of the stack. @@ -550,21 +612,14 @@ yy::]b4_parser_class_name[::parse () 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]; else - { - yyval = semantic_stack_[0]; - yyloc = location_stack_[0]; - } + yyval = semantic_stack_[0]; - if (len_) - { - Slice< LocationType, LocationStack > slice (location_stack_, len_); - YYLLOC_DEFAULT (yyloc, slice, len_); - } + { + Slice slice (location_stack_, len_); + YYLLOC_DEFAULT (yyloc, slice, len_); + } YY_REDUCE_PRINT (n_); switch (n_) { @@ -574,9 +629,7 @@ yy::]b4_parser_class_name[::parse () ]/* Line __line__ of lalr1.cc. */ b4_syncline([@oline@], [@ofile@])[ - state_stack_.pop (len_); - semantic_stack_.pop (len_); - location_stack_.pop (len_); + pop (len_); YY_STACK_PRINT (); @@ -599,7 +652,7 @@ yyerrlab: /* If not already recovering from an error, report this error. */ report_syntax_error_ (); - error_start_ = location.begin; + error_range_[0] = location; if (errstatus_ == 3) { /* If just tried and failed to reuse look-ahead token after an @@ -613,10 +666,8 @@ yyerrlab: if (looka_ == eof_) for (;;) { - error_start_ = location_stack_[0].begin; - state_stack_.pop (); - semantic_stack_.pop (); - location_stack_.pop (); + error_range_[0] = location_stack_[0]; + pop (); if (state_stack_.height () == 1) YYABORT; destruct_ ("Error: popping", @@ -649,10 +700,8 @@ yyerrorlab: goto yyerrorlab; #endif - state_stack_.pop (len_); - semantic_stack_.pop (len_); - error_start_ = location_stack_[len_ - 1].begin; - location_stack_.pop (len_); + error_range_[0] = location_stack_[len_ - 1]; + pop (len_); state_ = state_stack_[0]; goto yyerrlab1; @@ -680,13 +729,10 @@ yyerrlab1: if (state_stack_.height () == 1) YYABORT; + error_range_[0] = location_stack_[0]; destruct_ ("Error: popping", stos_[state_], &semantic_stack_[0], &location_stack_[0]); - error_start_ = location_stack_[0].begin; - - state_stack_.pop (); - semantic_stack_.pop (); - location_stack_.pop (); + pop (); state_ = state_stack_[0]; YY_STACK_PRINT (); } @@ -694,15 +740,16 @@ yyerrlab1: if (n_ == final_) goto yyacceptlab; - YYCDEBUG << "Shifting error token, "; + error_range_[1] = location; + // Using LOCATION is tempting, but would change the location of + // the look-ahead. YYLOC is available though. + YYLLOC_DEFAULT (yyloc, error_range_ - 1, 2); + semantic_stack_.push (value); + location_stack_.push (yyloc); - { - Location errloc; - errloc.begin = error_start_; - errloc.end = location.end; - semantic_stack_.push (value); - location_stack_.push (errloc); - } + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", stos_[n_], + &semantic_stack_[0], &location_stack_[0]); state_ = n_; goto yynewstate; @@ -888,11 +935,11 @@ yy::]b4_parser_class_name[::rline_[] = void yy::]b4_parser_class_name[::stack_print_ () { - cdebug_ << "state stack now"; - for (StateStack::ConstIterator i = state_stack_.begin (); + *yycdebug_ << "Stack now"; + for (StateStack::const_iterator i = state_stack_.begin (); i != state_stack_.end (); ++i) - cdebug_ << ' ' << *i; - cdebug_ << std::endl; + *yycdebug_ << ' ' << *i; + *yycdebug_ << std::endl; } /** Report that the YYRULE is going to be reduced. */ @@ -902,11 +949,12 @@ 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 << "), "; + *yycdebug_ << "Reducing stack by 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; + *yycdebug_ << name_[rhs_[i]] << ' '; + *yycdebug_ << "-> " << name_[r1_[n_]] << std::endl; } #endif // YYDEBUG @@ -950,13 +998,14 @@ b4_copyright([Stack handling for Bison C++ parsers], [2002, 2003, 2004])[ namespace yy { - template < class T, class S = std::deque< T > > + template > class Stack { public: - typedef typename S::iterator Iterator; - typedef typename S::const_iterator ConstIterator; + // Hide our reversed order. + typedef typename S::reverse_iterator iterator; + typedef typename S::const_reverse_iterator const_iterator; Stack () : seq_ () { @@ -1002,15 +1051,15 @@ namespace yy return seq_.size (); } - inline ConstIterator begin () const { return seq_.begin (); } - inline ConstIterator end () const { return seq_.end (); } + inline const_iterator begin () const { return seq_.rbegin (); } + inline const_iterator end () const { return seq_.rend (); } private: S seq_; }; - template < class T, class S = Stack< T > > + template > class Slice { public: @@ -1230,7 +1279,7 @@ namespace yy } /** \brief Add and assign a Location */ - inline Location &operator+= (Location& res, unsigned int width) + inline Location& operator+= (Location& res, unsigned int width) { res.columns (width); return res;