m4_divert(-1)
+
# C++ skeleton for Bison
-# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+
+# Copyright (C) 2002, 2003, 2004, 2005 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
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA
## ---------------- ##
## Default values. ##
## ---------------- ##
-# Default Parser class name.
-m4_define_default([b4_parser_class_name], [Parser])
+# Default parser class name.
+m4_define_default([b4_parser_class_name], [parser])
# --------------------
# Expansion of $<TYPE>$.
m4_define([b4_lhs_value],
-[yyval[]m4_ifval([$1], [.$1])])
+[(yyval[]m4_ifval([$1], [.$1]))])
# b4_rhs_value(RULE-LENGTH, NUM, [TYPE])
# Expansion of $<TYPE>NUM, where the current rule has RULE-LENGTH
# symbols on RHS.
m4_define([b4_rhs_value],
-[yysemantic_stack_@{m4_eval([$1 - $2])@}m4_ifval([$3], [.$3])])
+[(yysemantic_stack_@{m4_eval([$1 - $2])@}m4_ifval([$3], [.$3]))])
-m4_define_default([b4_location_type], [Location])
+m4_define_default([b4_location_type], [location])
+m4_define_default([b4_filename_type], [std::string])
# b4_lhs_location()
# -----------------
# Expansion of @$.
m4_define([b4_lhs_location],
-[yyloc])
+[(yyloc)])
# b4_rhs_location(RULE-LENGTH, NUM)
# Expansion of @NUM, where the current rule has RULE-LENGTH symbols
# on RHS.
m4_define([b4_rhs_location],
-[yylocation_stack_@{m4_eval([$1 - $2])@}])
+[(yylocation_stack_@{m4_eval([$1 - $2])@})])
# b4_parse_param_decl
m4_if(b4_defines_flag, 0, [],
[@output @output_header_name@
b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
- [2002, 2003, 2004])[
+ [2002, 2003, 2004, 2005])[
/* 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"
-
#include <string>
#include <iostream>
/* Using locations. */
#define YYLSP_NEEDED ]b4_locations_flag[
+namespace yy
+{
+ class position;
+ class location;
+}
+
]b4_token_defines(b4_tokens)[
/* Copy the first part of user declarations. */
]/* Line __line__ of lalr1.cc. */
b4_syncline([@oline@], [@ofile@])[
+#include "stack.hh"
+#include "location.hh"
+
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG ]b4_debug[
class ]b4_parser_class_name[;
template <typename P>
- struct Traits
+ struct traits
{
};
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 int StateType;
- typedef YYSTYPE SemanticType;
- typedef ]b4_location_type[ LocationType;
+ typedef ]b4_int_type_for([b4_translate])[ token_number_type;
+ typedef ]b4_int_type_for([b4_rhs])[ rhs_number_type;
+ typedef int state_type;
+ typedef YYSTYPE semantic_type;
+ typedef ]b4_location_type[ location_type;
};
}
namespace yy
{
+ /// A Bison parser.
class ]b4_parser_class_name[
{
- public:
- /// Internal symbol numbers.
- typedef Traits<]b4_parser_class_name[>::TokenNumberType TokenNumberType;
- /// A type to store symbol numbers and -1.
- typedef Traits<]b4_parser_class_name[>::RhsNumberType RhsNumberType;
- /// State numbers.
- typedef Traits<]b4_parser_class_name[>::StateType StateType;
/// Symbol semantic values.
- typedef Traits<]b4_parser_class_name[>::SemanticType SemanticType;
+ typedef traits<]b4_parser_class_name[>::semantic_type semantic_type;
/// Symbol locations.
- typedef Traits<]b4_parser_class_name[>::LocationType LocationType;
-
- typedef Stack<StateType> StateStack;
- typedef Stack<SemanticType> SemanticStack;
- typedef Stack<LocationType> LocationStack;
+ typedef traits<]b4_parser_class_name[>::location_type location_type;
+ public:
+ /// Build a parser object.
]b4_parser_class_name[ (]b4_parse_param_decl[) :
yydebug_ (false),
yycdebug_ (&std::cerr)]b4_parse_param_cons[
/// Call the scanner.
virtual void yylex_ ();
- virtual void error_ ();
- /// Generate an error message, and invoke error. */
+
+ /// Report a syntax error.
+ /// \param loc where the syntax error is found.
+ /// \param msg a description of the syntax error.
+ virtual void error (const location_type& loc, const std::string& msg);
+
+ /// Generate an error message, and invoke error.
virtual void yyreport_syntax_error_ ();
+
#if YYDEBUG
/// \brief Report a symbol on the debug stream.
/// \param yytype The token type.
/// \param yyvaluep Its semantic value.
/// \param yylocationp Its location.
virtual void yysymprint_ (int yytype,
- const SemanticType* yyvaluep,
- const LocationType* yylocationp);
+ const semantic_type* yyvaluep,
+ const location_type* yylocationp);
#endif /* ! YYDEBUG */
+ /// State numbers.
+ typedef traits<]b4_parser_class_name[>::state_type state_type;
+ /// State stack type.
+ typedef stack<state_type> state_stack_type;
+ /// Semantic value stack type.
+ typedef stack<semantic_type> semantic_stack_type;
+ /// location stack type.
+ typedef stack<location_type> location_stack_type;
+
/// The state stack.
- StateStack yystate_stack_;
+ state_stack_type yystate_stack_;
/// The semantic value stack.
- SemanticStack yysemantic_stack_;
+ semantic_stack_type yysemantic_stack_;
/// The location stack.
- LocationStack yylocation_stack_;
+ location_stack_type yylocation_stack_;
+ /// Internal symbol numbers.
+ typedef traits<]b4_parser_class_name[>::token_number_type token_number_type;
/* Tables. */
+ /// For a state, the index in \a yytable_ of its portion.
static const ]b4_int_type_for([b4_pact])[ yypact_[];
static const ]b4_int_type(b4_pact_ninf, b4_pact_ninf)[ yypact_ninf_;
+
+ /// For a state, default rule to reduce.
+ /// Unless\a yytable_ specifies something else to do.
+ /// Zero means the default is an error.
static const ]b4_int_type_for([b4_defact])[ yydefact_[];
+
static const ]b4_int_type_for([b4_pgoto])[ yypgoto_[];
static const ]b4_int_type_for([b4_defgoto])[ yydefgoto_[];
+
+ /// What to do in a state.
+ /// \a yytable_[yypact_[s]]: what to do in state \a s.
+ /// - if positive, shift that token.
+ /// - if negative, reduce the rule which number is the opposite.
+ /// - if zero, do what YYDEFACT says.
static const ]b4_int_type_for([b4_table])[ yytable_[];
static const ]b4_int_type(b4_table_ninf, b4_table_ninf)[ yytable_ninf_;
+
static const ]b4_int_type_for([b4_check])[ yycheck_[];
+
+ /// For a state, its accessing symbol.
static const ]b4_int_type_for([b4_stos])[ yystos_[];
+
+ /// For a rule, its LHS.
static const ]b4_int_type_for([b4_r1])[ yyr1_[];
+ /// For a rule, its RHS length.
static const ]b4_int_type_for([b4_r2])[ yyr2_[];
#if YYDEBUG || YYERROR_VERBOSE
+ /// For a symbol, its name in clear.
static const char* const yyname_[];
#endif
#if YYDEBUG
+ /// A type to store symbol numbers and -1.
+ typedef traits<]b4_parser_class_name[>::rhs_number_type rhs_number_type;
/// A `-1'-separated list of the rules' RHS.
- static const RhsNumberType yyrhs_[];
+ static const rhs_number_type 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.
static const ]b4_int_type_for([b4_rline])[ yyrline_[];
/// For each scanner token number, its symbol number.
static const ]b4_int_type_for([b4_toknum])[ yytoken_number_[];
- /// Report on the debug stream that the rule \a yyrule is going to be reduced.
- virtual void yyreduce_print_ (int yyrule);
-/// Print the state stack on the debug stream.
+ /// Report on the debug stream that the rule \a r is going to be reduced.
+ virtual void yyreduce_print_ (int r);
+ /// Print the state stack on the debug stream.
virtual void yystack_print_ ();
#endif
/// Convert a scanner token number to a symbol number.
- inline TokenNumberType yytranslate_ (int token);
+ inline token_number_type yytranslate_ (int token);
/// \brief Reclaim the memory associated to a symbol.
/// \param yymsg Why this token is reclaimed.
/// \param yylocationp Its location.
inline void yydestruct_ (const char* yymsg,
int yytype,
- SemanticType* yyvaluep,
- LocationType* yylocationp);
+ semantic_type* yyvaluep,
+ location_type* yylocationp);
/// Pop \a n symbols the three stacks.
inline void yypop_ (unsigned int n = 1);
static const int yyerrcode_;
static const int yyntokens_;
static const unsigned int yyuser_token_number_max_;
- static const TokenNumberType yyundef_token_;
+ static const token_number_type yyundef_token_;
/* State. */
int yyn_;
int yylooka_;
int yyilooka_;
- /* Message. */
- std::string message;
-
/// Semantic value of the look-ahead.
- SemanticType value;
+ semantic_type yylval;
/// Location of the look-ahead.
- LocationType location;
+ location_type yylloc;
/// The locations where the error started and ended.
- Location yyerror_range_[2];
+ location yyerror_range_[2];
/// $$.
- SemanticType yyval;
+ semantic_type yyval;
/// @@$.
- LocationType yyloc;
+ location_type yyloc;
]b4_parse_param_vars[
};
}
])dnl
@output @output_parser_name@
b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
- [2002, 2003, 2004])
+ [2002, 2003, 2004, 2005])
+m4_if(b4_prefix[], [yy], [],
+[
+// Take the name prefix into account.
+#define yylex b4_prefix[]lex])
+m4_if(b4_defines_flag, 0, [],
+[
+#include @output_header_name@])[
-m4_if(b4_defines_flag, 0, [], [#include @output_header_name@])[
+/* INFRINGES ON USER NAME SPACE */
+#ifndef _
+# define _(msgid) msgid
+#endif
/* A pseudo ostream that takes yydebug_ into account. */
# define YYCDEBUG \
void
yy::]b4_parser_class_name[::yysymprint_ (int yytype,
- const SemanticType* yyvaluep, const LocationType* yylocationp)
+ const semantic_type* yyvaluep, const location_type* yylocationp)
{
/* Pacify ``unused variable'' warnings. */
(void) yyvaluep;
void
yy::]b4_parser_class_name[::yydestruct_ (const char* yymsg,
- int yytype, SemanticType* yyvaluep, LocationType* yylocationp)
+ int yytype, semantic_type* yyvaluep, location_type* yylocationp)
{
/* Pacify ``unused variable'' warnings. */
+ (void) yymsg;
(void) yyvaluep;
(void) yylocationp;
int
yy::]b4_parser_class_name[::parse ()
{
- YYCDEBUG << "Starting parse" << std::endl;
+ int yyresult_;
+
+ YYCDEBUG << _("Starting parse") << std::endl;
yynerrs_ = 0;
yyerrstatus_ = 0;
yylooka_ = yyempty_;
]m4_ifdef([b4_initial_action], [
-m4_pushdef([b4_at_dollar], [location])dnl
-m4_pushdef([b4_dollar_dollar], [value])dnl
+m4_pushdef([b4_at_dollar], [yylloc])dnl
+m4_pushdef([b4_dollar_dollar], [yylval])dnl
/* User initialization code. */
b4_initial_action
m4_popdef([b4_dollar_dollar])dnl
yynewstate, since the latter expects the semantical and the
location values to have been already stored, initialize these
stacks with a primary value. */
- yystate_stack_ = StateStack (0);
- yysemantic_stack_ = SemanticStack (0);
- yylocation_stack_ = LocationStack (0);
- yysemantic_stack_.push (value);
- yylocation_stack_.push (location);
+ yystate_stack_ = state_stack_type (0);
+ yysemantic_stack_ = semantic_stack_type (0);
+ yylocation_stack_ = location_stack_type (0);
+ yysemantic_stack_.push (yylval);
+ yylocation_stack_.push (yylloc);
/* New state. */
yynewstate:
yystate_stack_.push (yystate_);
- YYCDEBUG << "Entering state " << yystate_ << std::endl;
+ YYCDEBUG << _("Entering state ") << yystate_ << std::endl;
goto yybackup;
/* Backup. */
if (yylooka_ <= yyeof_)
{
yylooka_ = yyilooka_ = yyeof_;
- YYCDEBUG << "Now at end of input." << std::endl;
+ YYCDEBUG << _("Now at end of input.") << std::endl;
}
else
{
yyilooka_ = yytranslate_ (yylooka_);
- YY_SYMBOL_PRINT ("Next token is", yyilooka_, &value, &location);
+ YY_SYMBOL_PRINT (_("Next token is"), yyilooka_, &yylval, &yylloc);
}
/* If the proper action on seeing token ILOOKA_ is to reduce or to
goto yyacceptlab;
/* Shift the look-ahead token. */
- YY_SYMBOL_PRINT ("Shifting", yyilooka_, &value, &location);
+ YY_SYMBOL_PRINT (_("Shifting"), yyilooka_, &yylval, &yylloc);
/* Discard the token being shifted unless it is eof. */
if (yylooka_ != yyeof_)
yylooka_ = yyempty_;
- yysemantic_stack_.push (value);
- yylocation_stack_.push (location);
+ yysemantic_stack_.push (yylval);
+ yylocation_stack_.push (yylloc);
/* Count tokens shifted since error; after three, turn off error
status. */
yyval = yysemantic_stack_[0];
{
- Slice<LocationType, LocationStack> slice (yylocation_stack_, yylen_);
+ slice<location_type, location_stack_type> slice (yylocation_stack_, yylen_);
YYLLOC_DEFAULT (yyloc, slice, yylen_);
}
YY_REDUCE_PRINT (yyn_);
switch (yyn_)
{
]b4_actions[
+ default: break;
}
]/* Line __line__ of lalr1.cc. */
/* If not already recovering from an error, report this error. */
yyreport_syntax_error_ ();
- yyerror_range_[0] = location;
+ yyerror_range_[0] = yylloc;
if (yyerrstatus_ == 3)
{
/* If just tried and failed to reuse look-ahead token after an
yypop_ ();
if (yystate_stack_.height () == 1)
YYABORT;
- yydestruct_ ("Error: popping",
+ yydestruct_ (_("Error: popping"),
yystos_[yystate_stack_[0]],
&yysemantic_stack_[0],
&yylocation_stack_[0]);
}
else
{
- yydestruct_ ("Error: discarding", yyilooka_, &value, &location);
+ yydestruct_ (_("Error: discarding"), yyilooka_, &yylval, &yylloc);
yylooka_ = yyempty_;
}
}
`---------------------------------------------------*/
yyerrorlab:
-#ifdef __GNUC__
- /* Pacify GCC when the user code never invokes YYERROR and the label
- yyerrorlab therefore never appears in user code. */
- if (0)
+ /* Pacify compilers like GCC when the user code never invokes
+ YYERROR and the label yyerrorlab therefore never appears in user
+ code. */
+ if (false)
goto yyerrorlab;
-#endif
yyerror_range_[0] = yylocation_stack_[yylen_ - 1];
yypop_ (yylen_);
YYABORT;
yyerror_range_[0] = yylocation_stack_[0];
- yydestruct_ ("Error: popping",
+ yydestruct_ (_("Error: popping"),
yystos_[yystate_],
&yysemantic_stack_[0], &yylocation_stack_[0]);
yypop_ ();
if (yyn_ == yyfinal_)
goto yyacceptlab;
- yyerror_range_[1] = location;
- // Using LOCATION is tempting, but would change the location of
+ yyerror_range_[1] = yylloc;
+ // Using YYLLOC is tempting, but would change the location of
// the look-ahead. YYLOC is available though.
YYLLOC_DEFAULT (yyloc, yyerror_range_ - 1, 2);
- yysemantic_stack_.push (value);
+ yysemantic_stack_.push (yylval);
yylocation_stack_.push (yyloc);
/* Shift the error token. */
- YY_SYMBOL_PRINT ("Shifting", yystos_[yyn_],
+ YY_SYMBOL_PRINT (_("Shifting"), yystos_[yyn_],
&yysemantic_stack_[0], &yylocation_stack_[0]);
yystate_ = yyn_;
/* Accept. */
yyacceptlab:
- return 0;
+ yyresult_ = 0;
+ goto yyreturn;
/* Abort. */
yyabortlab:
- /* Free the lookahead. */
- yydestruct_ ("Error: discarding lookahead", yyilooka_, &value, &location);
- yylooka_ = yyempty_;
- return 1;
+ yyresult_ = 1;
+ goto yyreturn;
+
+yyreturn:
+ if (yylooka_ != yyeof_ && yylooka_ != yyempty_)
+ yydestruct_ (_("Error: discarding lookahead"), yyilooka_, &yylval, &yylloc);
+ return yyresult_;
}
void
yy::]b4_parser_class_name[::yylex_ ()
{
- YYCDEBUG << "Reading a token: ";
-#if YYLSP_NEEDED
- yylooka_ = ]m4_default(b4_prefix, [yy])[lex (&value, &location);
-#else
- yylooka_ = ]m4_default(b4_prefix, [yy])[lex (&value);
-#endif
+ YYCDEBUG << _("Reading a token: ");
+ yylooka_ = ]b4_c_function_call([yylex], [int],
+[[YYSTYPE*], [&yylval]][]dnl
+b4_location_if([, [[location*], [&yylloc]]])dnl
+m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
}
// Generate an error message, and invoke error.
if (!yyerrstatus_)
{
++yynerrs_;
-
+ std::string message;
#if YYERROR_VERBOSE
yyn_ = yypact_[yystate_];
if (yypact_ninf_ < yyn_ && yyn_ < yylast_)
{
- message = "syntax error, unexpected ";
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. */
+ int yyxbegin = yyn_ < 0 ? -yyn_ : 0;
+
+ /* Stay within bounds of both yycheck and yytname. */
+ int yychecklim = yylast_ - yyn_;
+ int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;
+ int count = 0;
+ for (int x = yyxbegin; x < yyxend; ++x)
+ if (yycheck_[x + yyn_] == x && x != yyterror_)
+ ++count;
+
+ message = _("syntax error, unexpected ");
message += yyname_[yyilooka_];
- {
- int count = 0;
- for (int x = (yyn_ < 0 ? -yyn_ : 0); x < yyntokens_ + yynnts_; ++x)
- if (yycheck_[x + yyn_] == x && x != yyterror_)
- ++count;
- if (count < 5)
- {
- count = 0;
- for (int x = (yyn_ < 0 ? -yyn_ : 0); x < yyntokens_ + yynnts_; ++x)
- if (yycheck_[x + yyn_] == x && x != yyterror_)
- {
- message += (!count++) ? ", expecting " : " or ";
- message += yyname_[x];
- }
- }
- }
+ if (count < 5)
+ {
+ count = 0;
+ for (int x = yyxbegin; x < yyxend; ++x)
+ if (yycheck_[x + yyn_] == x && x != yyterror_)
+ {
+ message += (!count++) ? _(", expecting ") : _(" or ");
+ message += yyname_[x];
+ }
+ }
}
else
#endif
- message = "syntax error";
- error_ ();
+ message = _("syntax error");
+ error (yylloc, message);
}
}
#if YYDEBUG
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-const yy::]b4_parser_class_name[::RhsNumberType
+const yy::]b4_parser_class_name[::rhs_number_type
yy::]b4_parser_class_name[::yyrhs_[] =
{
]b4_rhs[
void
yy::]b4_parser_class_name[::yystack_print_ ()
{
- *yycdebug_ << "Stack now";
- for (StateStack::const_iterator i = yystate_stack_.begin ();
+ *yycdebug_ << _("Stack now");
+ for (state_stack_type::const_iterator i = yystate_stack_.begin ();
i != yystate_stack_.end (); ++i)
*yycdebug_ << ' ' << *i;
*yycdebug_ << std::endl;
{
unsigned int yylno = yyrline_[yyrule];
/* Print the symbols being reduced, and their result. */
- *yycdebug_ << "Reducing stack by rule " << yyn_ - 1
- << " (line " << yylno << "), ";
+ *yycdebug_ << _("Reducing stack by rule ") << yyn_ - 1
+ << " (" << _("line") << ' ' << yylno << "), ";
for (]b4_int_type_for([b4_prhs])[ i = yyprhs_[yyn_];
0 <= yyrhs_[i]; ++i)
*yycdebug_ << yyname_[yyrhs_[i]] << ' ';
#endif // YYDEBUG
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
-yy::]b4_parser_class_name[::TokenNumberType
+yy::]b4_parser_class_name[::token_number_type
yy::]b4_parser_class_name[::yytranslate_ (int token)
{
static
- const TokenNumberType
+ const token_number_type
translate_table[] =
{
]b4_translate[
const int yy::]b4_parser_class_name[::yyntokens_ = ]b4_tokens_number[;
const unsigned int yy::]b4_parser_class_name[::yyuser_token_number_max_ = ]b4_user_token_number_max[;
-const yy::]b4_parser_class_name[::TokenNumberType yy::]b4_parser_class_name[::yyundef_token_ = ]b4_undef_token_number[;
+const yy::]b4_parser_class_name[::token_number_type yy::]b4_parser_class_name[::yyundef_token_ = ]b4_undef_token_number[;
]b4_epilogue
dnl
@output stack.hh
-b4_copyright([Stack handling for Bison C++ parsers], [2002, 2003, 2004])[
+b4_copyright([stack handling for Bison C++ parsers], [2002, 2003, 2004, 2005])[
#ifndef BISON_STACK_HH
# define BISON_STACK_HH
namespace yy
{
template <class T, class S = std::deque<T> >
- class Stack
+ class stack
{
public:
typedef typename S::reverse_iterator iterator;
typedef typename S::const_reverse_iterator const_iterator;
- Stack () : seq_ ()
+ stack () : seq_ ()
{
}
- Stack (unsigned int n) : seq_ (n)
+ stack (unsigned int n) : seq_ (n)
{
}
S seq_;
};
- template <class T, class S = Stack<T> >
- class Slice
+ /// Present a slice of the top of a stack.
+ template <class T, class S = stack<T> >
+ class slice
{
public:
- Slice (const S& stack,
+ slice (const S& stack,
unsigned int range) : stack_ (stack),
range_ (range)
{
#endif // not BISON_STACK_HH]
dnl
@output position.hh
-b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004])[
+b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004, 2005])[
/**
** \file position.hh
- ** Define the Location class.
+ ** Define the position class.
*/
#ifndef BISON_POSITION_HH
namespace yy
{
- /// Abstract a Position.
- class Position
+ /// Abstract a position.
+ class position
{
public:
/// Initial column number.
/** \name Ctor & dtor.
** \{ */
public:
- /// Construct a Position.
- Position () :
- filename (),
+ /// Construct a position.
+ position () :
+ filename (0),
line (initial_line),
column (initial_column)
{
public:
/// File name to which this position refers.
- std::string filename;
+ ]b4_filename_type[* filename;
/// Current line number.
unsigned int line;
/// Current column number.
unsigned int column;
};
- /// Add and assign a Position.
- inline const Position&
- operator+= (Position& res, const int width)
+ /// Add and assign a position.
+ inline const position&
+ operator+= (position& res, const int width)
{
res.columns (width);
return res;
}
- /// Add two Position objects.
- inline const Position
- operator+ (const Position& begin, const int width)
+ /// Add two position objects.
+ inline const position
+ operator+ (const position& begin, const int width)
{
- Position res = begin;
+ position res = begin;
return res += width;
}
- /// Add and assign a Position.
- inline const Position&
- operator-= (Position& res, const int width)
+ /// Add and assign a position.
+ inline const position&
+ operator-= (position& res, const int width)
{
return res += -width;
}
- /// Add two Position objects.
- inline const Position
- operator- (const Position& begin, const int width)
+ /// 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
+ ** \param pos a reference to the position to redirect
*/
inline std::ostream&
- operator<< (std::ostream& ostr, const Position& pos)
+ operator<< (std::ostream& ostr, const position& pos)
{
- if (!pos.filename.empty ())
- ostr << pos.filename << ':';
+ if (pos.filename)
+ ostr << *pos.filename << ':';
return ostr << pos.line << '.' << pos.column;
}
}
#endif // not BISON_POSITION_HH]
@output location.hh
-b4_copyright([Location class for Bison C++ parsers], [2002, 2003, 2004])[
+b4_copyright([Location class for Bison C++ parsers], [2002, 2003, 2004, 2005])[
/**
** \file location.hh
- ** Define the Location class.
+ ** Define the location class.
*/
#ifndef BISON_LOCATION_HH
namespace yy
{
- /// Abstract a Location.
- class Location
+ /// Abstract a location.
+ class location
{
/** \name Ctor & dtor.
** \{ */
public:
- /// Construct a Location.
- Location (void) :
+ /// Construct a location.
+ location () :
begin (),
end ()
{
** \{ */
public:
/// Reset initial location to final location.
- inline void step (void)
+ inline void step ()
{
begin = end;
}
public:
/// Beginning of the located region.
- Position begin;
+ position begin;
/// End of the located region.
- Position end;
+ position end;
};
- /// Join two Location objects to create a Location.
- inline const Location operator+ (const Location& begin, const Location& end)
+ /// Join two location objects to create a location.
+ inline const location operator+ (const location& begin, const location& end)
{
- Location res = begin;
+ location res = begin;
res.end = end.end;
return res;
}
- /// Add two Location objects.
- inline const Location operator+ (const Location& begin, unsigned int width)
+ /// Add two location objects.
+ inline const location operator+ (const location& begin, unsigned int width)
{
- Location res = begin;
+ location res = begin;
res.columns (width);
return res;
}
- /// Add and assign a Location.
- inline Location& operator+= (Location& res, unsigned int width)
+ /// 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
+ ** \param loc a reference to the location to redirect
**
** Avoid duplicate information.
*/
- inline std::ostream& operator<< (std::ostream& ostr, const Location& loc)
+ inline std::ostream& operator<< (std::ostream& ostr, const location& loc)
{
- Position last = loc.end - 1;
+ position last = loc.end - 1;
ostr << loc.begin;
- if (loc.begin.filename != last.filename)
+ if (last.filename
+ && (!loc.begin.filename
+ || *loc.begin.filename != *last.filename))
ostr << '-' << last;
else if (loc.begin.line != last.line)
ostr << '-' << last.line << '.' << last.column;
projects / bison.git / blobdiff