X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/996b1c7e8cb8168c5c533e387b03ddab7d270af7..ab8fe29d0ca22f49bc97a452204935507a269d01:/data/lalr1.cc diff --git a/data/lalr1.cc b/data/lalr1.cc index 1e3162db..34398cc1 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 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]) @@ -89,9 +84,10 @@ m4_define([b4_constructor], # 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])[ + [2002, 2003])[ /* FIXME: This is wrong, we want computed header guards. I don't know why the macros are missing now. :( */ #ifndef PARSER_HEADER_H @@ -141,8 +137,7 @@ b4_syncline([@oline@], [@ofile@])], 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 @@ -250,7 +245,6 @@ 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 TokenNumberType undef_token_; @@ -284,12 +278,12 @@ namespace yy } #endif /* ! defined PARSER_HEADER_H */] -dnl +])dnl @output @output_parser_name@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], - [2002])[ + [2002, 2003]) -#include @output_header_name@ +m4_if(b4_defines_flag, 0, [], [#include @output_header_name@])[ /* Enable debugging if requested. */ #if YYDEBUG @@ -298,13 +292,21 @@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], # define YYCDEBUG if (0) cdebug_ #endif /* !YYDEBUG */ +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrlab1 + + int yy::]b4_parser_class_name[::parse () { int nerrs = 0; int 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); @@ -383,8 +385,10 @@ yy::]b4_parser_class_name[::parse () goto yyacceptlab; /* Shift the lookahead token. */ +#if YYDEBUG YYCDEBUG << "Shifting token " << looka_ - << " (" << name_[ilooka_] << "), "; + << " (" << name_[ilooka_] << "), "; +#endif /* Discard the token being shifted unless it is eof. */ if (looka_ != eof_) @@ -425,8 +429,12 @@ yy::]b4_parser_class_name[::parse () #if YYDEBUG if (debug_) { + // Short files will use "unsigned char" for line numbers, + // in which case they will be output as character litterals + // by "<<". + unsigned yylno = rline_[n_]; YYCDEBUG << "Reducing via rule " << n_ - 1 - << " (line " << rline_[n_] << "), "; + << " (line " << yylno << "), "; for (]b4_int_type_for([b4_prhs])[ i = prhs_[n_]; 0 <= rhs_[i]; ++i) YYCDEBUG << name_[rhs_[i]] << ' '; @@ -490,13 +498,19 @@ b4_syncline([@oline@], [@ofile@])[ message += name_[ilooka_]; { int count = 0; - for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x) + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int xbegin = n_ < 0 ? -n_ : 0; + /* Stay within bounds of both yycheck and yytname. */ + int checklim = last_ - n_; + int xend = checklim < ntokens_ ? checklim : ntokens_; + for (int x = xbegin; x < xend; ++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) + for (int x = xbegin; x < xend; ++x) if (check_[x + n_] == x && x != terror_) { message += (!count++) ? ", expecting " : " or "; @@ -512,7 +526,10 @@ b4_syncline([@oline@], [@ofile@])[ } goto yyerrlab1; - /* Error raised explicitly by an action. */ + + /*----------------------------------------------------. + | yyerrlab1 -- error raised explicitly by an action. | + `----------------------------------------------------*/ yyerrlab1: if (errstatus == 3) { @@ -522,8 +539,10 @@ b4_syncline([@oline@], [@ofile@])[ /* Return failure if at end of input. */ if (looka_ == eof_) goto yyabortlab; +#if YYDEBUG YYCDEBUG << "Discarding token " << looka_ - << " (" << name_[ilooka_] << ")." << std::endl; + << " (" << name_[ilooka_] << ")." << std::endl; +#endif looka_ = empty_; } @@ -547,7 +566,7 @@ b4_syncline([@oline@], [@ofile@])[ } /* Pop the current state because it cannot handle the error token. */ - if (!state_stack_.height ()) + if (state_stack_.height () == 1) goto yyabortlab; #if YYDEBUG @@ -757,7 +776,6 @@ 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 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[; @@ -765,7 +783,7 @@ const yy::]b4_parser_class_name[::TokenNumberType yy::]b4_parser_class_name[::un ]b4_epilogue dnl @output stack.hh -b4_copyright([2002])[ +b4_copyright([Stack handling for Bison C++ parsers], [2002, 2003])[ #ifndef BISON_STACK_HH # define BISON_STACK_HH @@ -861,25 +879,224 @@ namespace yy #endif // not BISON_STACK_HH] dnl +@output position.hh +b4_copyright([Position class for Bison C++ parsers], [2002, 2003])[ + +/** + ** \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 LINES next lines. */ + inline void lines (int lines = 1) + { + column = initial_column; + line += lines; + } + + /** \brief (column related) Advance to the COLUMNS next columns. */ + inline void columns (int columns = 1) + { + int leftmost = initial_column; + int current = column; + if (leftmost <= current + columns) + column += columns; + 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 != "") + 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])[ + +/** + ** \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 COLUMNS next columns. */ + inline void columns (unsigned columns = 1) + { + end += columns; + } + + /** \brief Extend the current location to the LINES next lines. */ + inline void lines (unsigned lines = 1) + { + end.lines (lines); + } + /** \} */ + + + 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 width) + { + Location res = begin; + res.columns (width); + return res; + } + + /** \brief Add and assign a Location */ + inline Location &operator+= (Location& res, unsigned 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]