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],
-[semantic_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],
-[location_stack_@{m4_eval([$1 - $2])@}])
-
-
-m4_define([b4_inherit],
- [m4_ifdef([b4_root],
- [: public b4_root
-],
- [])])
-
-m4_define([b4_param],
- [m4_ifdef([b4_root],
- [,
- const Param& param],
- [])])
-
-m4_define([b4_constructor],
- [m4_ifdef([b4_root],
- [b4_root (param),
- ],
- [])])
+[(yylocation_stack_@{m4_eval([$1 - $2])@})])
# 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],
[,
[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],
[
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[
# 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. */
]/* Line __line__ of lalr1.cc. */
b4_syncline([@oline@], [@ofile@])[
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. */
+/* 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) \
-do { \
- ((Current).begin = (Rhs)[1].begin); \
- ((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
{
class ]b4_parser_class_name[;
- template < typename P >
- struct Traits
+ template <typename P>
+ 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 ]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
{
- class ]b4_parser_class_name b4_inherit[
+ /// A Bison parser.
+ class ]b4_parser_class_name[
{
- public:
+ /// Symbol semantic values.
+ typedef traits<]b4_parser_class_name[>::semantic_type semantic_type;
+ /// Symbol locations.
+ typedef traits<]b4_parser_class_name[>::location_type location_type;
- 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;
-
- ]b4_parser_class_name[ (bool debug][]b4_param[]b4_parse_param_decl[) :
- ]b4_constructor[][debug_ (debug),
- cdebug_ (std::cerr)]b4_parse_param_cons[
+ public:
+ /// Build a parser object.
+ ]b4_parser_class_name[ (]b4_parse_param_decl[) :
+ yydebug_ (false),
+ yycdebug_ (&std::cerr)]b4_parse_param_cons[
{
}
{
}
+ /// Parse.
+ /// \returns 0 iff parsing succeeded.
virtual int parse ();
+ /// The current debugging stream.
+ std::ostream& debug_stream () const;
+ /// Set the current debugging stream.
+ void set_debug_stream (std::ostream &);
+
+ /// Type for debugging levels.
+ typedef int debug_level_type;
+ /// The current debugging level.
+ debug_level_type debug_level () const;
+ /// Set the current debugging level.
+ void set_debug_level (debug_level_type l);
+
private:
- virtual void lex_ ();
- virtual void error_ ();
- virtual void print_ ();
- virtual void report_syntax_error_ ();
+ /// Call the scanner.
+ virtual void yylex_ ();
+
+ /// 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
- virtual void symprint_ (int yytype,
- const SemanticType *yyvaluep,
- const LocationType *yylocationp);
+ /// \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 semantic_type* yyvaluep,
+ const location_type* yylocationp);
#endif /* ! YYDEBUG */
- /* Stacks. */
- StateStack state_stack_;
- SemanticStack semantic_stack_;
- LocationStack location_stack_;
-
+ /// 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.
+ state_stack_type yystate_stack_;
+ /// The semantic value stack.
+ semantic_stack_type yysemantic_stack_;
+ /// The location stack.
+ location_stack_type yylocation_stack_;
+
+ /// Internal symbol numbers.
+ typedef traits<]b4_parser_class_name[>::token_number_type token_number_type;
/* Tables. */
- 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_[];
+ /// 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
- static const char* const name_[];
+ /// For a symbol, its name in clear.
+ static const char* const yyname_[];
#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_toknum])[ token_number_[];
- virtual void reduce_print_ (int yyrule);
- virtual void stack_print_ ();
+ /// 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 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 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
- /* Even more tables. */
- inline TokenNumberType translate_ (int token);
- inline void destruct_ (const char *yymsg,
- int yytype,
- SemanticType *yyvaluep, LocationType *yylocationp);
+ /// Convert a scanner token number to a symbol number.
+ inline token_number_type yytranslate_ (int token);
+
+ /// \brief Reclaim the memory associated to a symbol.
+ /// \param yymsg Why this token is reclaimed.
+ /// \param yytype The symbol type.
+ /// \param yyvaluep Its semantic value.
+ /// \param yylocationp Its location.
+ inline void yydestruct_ (const char* yymsg,
+ int yytype,
+ semantic_type* yyvaluep,
+ location_type* yylocationp);
/// Pop \a n symbols the three stacks.
- inline void pop (unsigned int n = 1);
+ inline void yypop_ (unsigned int n = 1);
/* Constants. */
- static const int eof_;
+ static const int yyeof_;
/* LAST_ -- Last index in TABLE_. */
- static const int last_;
- static const int nnts_;
- static const int empty_;
- static const int final_;
- static const int terror_;
- static const int errcode_;
- static const int ntokens_;
- static const unsigned int user_token_number_max_;
- static const TokenNumberType undef_token_;
+ static const int yylast_;
+ static const int yynnts_;
+ static const int yyempty_;
+ static const int yyfinal_;
+ static const int yyterror_;
+ static const int yyerrcode_;
+ static const int yyntokens_;
+ static const unsigned int yyuser_token_number_max_;
+ static const token_number_type yyundef_token_;
/* State. */
- int n_;
- int len_;
- int state_;
+ int yyn_;
+ int yylen_;
+ int yystate_;
/* Error handling. */
- int nerrs_;
- int errstatus_;
+ int yynerrs_;
+ int yyerrstatus_;
/* Debugging. */
- int debug_;
- std::ostream &cdebug_;
+ int yydebug_;
+ std::ostream* yycdebug_;
/* Look-ahead and look-ahead in internal form. */
- int looka_;
- int ilooka_;
-
- /* Message. */
- std::string message;
+ int yylooka_;
+ int yyilooka_;
/// 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 error_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@])[
+
+/* INFRINGES ON USER NAME SPACE */
+#ifndef _
+# define _(msgid) msgid
+#endif
-m4_if(b4_defines_flag, 0, [], [#include @output_header_name@])[
+/* A pseudo ostream that takes yydebug_ into account. */
+# define YYCDEBUG \
+ for (bool yydebugcond_ = yydebug_; 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_) \
+ if (yydebug_) \
{ \
- cdebug_ << (Title) << ' '; \
- symprint_ ((Type), (Value), (Location)); \
- cdebug_ << std::endl; \
+ *yycdebug_ << (Title) << ' '; \
+ yysymprint_ ((Type), (Value), (Location)); \
+ *yycdebug_ << std::endl; \
} \
} while (0)
# define YY_REDUCE_PRINT(Rule) \
do { \
- if (debug_) \
- reduce_print_ (Rule); \
+ if (yydebug_) \
+ yyreduce_print_ (Rule); \
} while (0)
# define YY_STACK_PRINT() \
do { \
- if (debug_) \
- stack_print_ (); \
+ if (yydebug_) \
+ yystack_print_ (); \
} while (0)
#else /* !YYDEBUG */
-# define YYCDEBUG if (0) cdebug_
# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
# define YY_REDUCE_PRINT(Rule)
# define YY_STACK_PRINT()
`--------------------------------*/
void
-yy::]b4_parser_class_name[::symprint_ (int yytype,
- const SemanticType *yyvaluep, const LocationType *yylocationp)
+yy::]b4_parser_class_name[::yysymprint_ (int yytype,
+ const semantic_type* yyvaluep, const location_type* 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] << " ("
- << *yylocationp << ": ";
+ *yycdebug_ << (yytype < yyntokens_ ? "token" : "nterm")
+ << ' ' << yyname_[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[::yydestruct_ (const char* yymsg,
+ int yytype, semantic_type* yyvaluep, location_type* yylocationp)
{
/* Pacify ``unused variable'' warnings. */
+ (void) yymsg;
(void) yyvaluep;
(void) yylocationp;
}
void
-yy::]b4_parser_class_name[::pop (unsigned int n)
+yy::]b4_parser_class_name[::yypop_ (unsigned int n)
+{
+ yystate_stack_.pop (n);
+ yysemantic_stack_.pop (n);
+ yylocation_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;
+}
+
+
+yy::]b4_parser_class_name[::debug_level_type
+yy::]b4_parser_class_name[::debug_level () const
{
- state_stack_.pop (n);
- semantic_stack_.pop (n);
- location_stack_.pop (n);
+ return yydebug_;
}
+void
+yy::]b4_parser_class_name[::set_debug_level (debug_level_type l)
+{
+ yydebug_ = l;
+}
+
+
int
yy::]b4_parser_class_name[::parse ()
{
- YYCDEBUG << "Starting parse" << std::endl;
+ int yyresult_;
+
+ YYCDEBUG << _("Starting parse") << std::endl;
- nerrs_ = 0;
- errstatus_ = 0;
+ yynerrs_ = 0;
+ yyerrstatus_ = 0;
/* Start. */
- state_ = 0;
- looka_ = empty_;
+ yystate_ = 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. */
- state_stack_ = StateStack (0);
- semantic_stack_ = SemanticStack (0);
- location_stack_ = LocationStack (0);
- semantic_stack_.push (value);
- location_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:
- state_stack_.push (state_);
- YYCDEBUG << "Entering state " << state_ << std::endl;
+ yystate_stack_.push (yystate_);
+ YYCDEBUG << _("Entering state ") << yystate_ << std::endl;
goto yybackup;
/* Backup. */
yybackup:
/* Try to take a decision without look-ahead. */
- n_ = pact_[state_];
- if (n_ == pact_ninf_)
+ yyn_ = yypact_[yystate_];
+ if (yyn_ == yypact_ninf_)
goto yydefault;
/* Read a look-ahead token. */
- if (looka_ == empty_)
- {
- YYCDEBUG << "Reading a token: ";
- lex_ ();
- }
+ if (yylooka_ == yyempty_)
+ yylex_ ();
/* Convert token to internal form. */
- if (looka_ <= eof_)
+ if (yylooka_ <= yyeof_)
{
- looka_ = ilooka_ = eof_;
- YYCDEBUG << "Now at end of input." << std::endl;
+ yylooka_ = yyilooka_ = yyeof_;
+ YYCDEBUG << _("Now at end of input.") << std::endl;
}
else
{
- ilooka_ = translate_ (looka_);
- YY_SYMBOL_PRINT ("Next token is", ilooka_, &value, &location);
+ yyilooka_ = yytranslate_ (yylooka_);
+ YY_SYMBOL_PRINT (_("Next token is"), yyilooka_, &yylval, &yylloc);
}
/* 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_)
+ yyn_ += yyilooka_;
+ if (yyn_ < 0 || yylast_ < yyn_ || yycheck_[yyn_] != yyilooka_)
goto yydefault;
/* Reduce or error. */
- n_ = table_[n_];
- if (n_ < 0)
+ yyn_ = yytable_[yyn_];
+ if (yyn_ < 0)
{
- if (n_ == table_ninf_)
+ if (yyn_ == yytable_ninf_)
goto yyerrlab;
else
{
- n_ = -n_;
+ yyn_ = -yyn_;
goto yyreduce;
}
}
- else if (n_ == 0)
+ else if (yyn_ == 0)
goto yyerrlab;
/* Accept? */
- if (n_ == final_)
+ if (yyn_ == yyfinal_)
goto yyacceptlab;
/* Shift the look-ahead token. */
- YY_SYMBOL_PRINT ("Shifting", ilooka_, &value, &location);
+ YY_SYMBOL_PRINT (_("Shifting"), yyilooka_, &yylval, &yylloc);
/* Discard the token being shifted unless it is eof. */
- if (looka_ != eof_)
- looka_ = empty_;
+ if (yylooka_ != yyeof_)
+ yylooka_ = yyempty_;
- semantic_stack_.push (value);
- location_stack_.push (location);
+ yysemantic_stack_.push (yylval);
+ yylocation_stack_.push (yylloc);
/* Count tokens shifted since error; after three, turn off error
status. */
- if (errstatus_)
- --errstatus_;
+ if (yyerrstatus_)
+ --yyerrstatus_;
- state_ = n_;
+ yystate_ = yyn_;
goto yynewstate;
/*-----------------------------------------------------------.
| yydefault -- do the default action for the current state. |
`-----------------------------------------------------------*/
yydefault:
- n_ = defact_[state_];
- if (n_ == 0)
+ yyn_ = yydefact_[yystate_];
+ if (yyn_ == 0)
goto yyerrlab;
goto yyreduce;
| yyreduce -- Do a reduction. |
`-----------------------------*/
yyreduce:
- len_ = r2_[n_];
+ yylen_ = yyr2_[yyn_];
/* 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];
- }
+ if (yylen_)
+ yyval = yysemantic_stack_[yylen_ - 1];
else
- {
- yyval = semantic_stack_[0];
- yyloc = location_stack_[0];
- }
+ yyval = yysemantic_stack_[0];
- if (len_)
- {
- Slice< LocationType, LocationStack > slice (location_stack_, len_);
- YYLLOC_DEFAULT (yyloc, slice, len_);
- }
- YY_REDUCE_PRINT (n_);
- switch (n_)
+ {
+ 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. */
b4_syncline([@oline@], [@ofile@])[
- pop (len_);
+ yypop_ (yylen_);
YY_STACK_PRINT ();
- semantic_stack_.push (yyval);
- location_stack_.push (yyloc);
+ yysemantic_stack_.push (yyval);
+ yylocation_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_];
+ yyn_ = yyr1_[yyn_];
+ yystate_ = yypgoto_[yyn_ - yyntokens_] + yystate_stack_[0];
+ if (0 <= yystate_ && yystate_ <= yylast_
+ && yycheck_[yystate_] == yystate_stack_[0])
+ yystate_ = yytable_[yystate_];
else
- state_ = defgoto_[n_ - ntokens_];
+ yystate_ = yydefgoto_[yyn_ - yyntokens_];
goto yynewstate;
/*------------------------------------.
`------------------------------------*/
yyerrlab:
/* If not already recovering from an error, report this error. */
- report_syntax_error_ ();
+ yyreport_syntax_error_ ();
- error_range_[0] = location;
- if (errstatus_ == 3)
+ yyerror_range_[0] = yylloc;
+ if (yyerrstatus_ == 3)
{
/* If just tried and failed to reuse look-ahead token after an
error, discard it. */
/* Return failure if at end of input. */
- if (looka_ <= eof_)
+ if (yylooka_ <= yyeof_)
{
/* If at end of input, pop the error token,
then the rest of the stack, then return failure. */
- if (looka_ == eof_)
+ if (yylooka_ == yyeof_)
for (;;)
{
- error_range_[0] = location_stack_[0];
- pop ();
- if (state_stack_.height () == 1)
+ yyerror_range_[0] = yylocation_stack_[0];
+ yypop_ ();
+ if (yystate_stack_.height () == 1)
YYABORT;
- destruct_ ("Error: popping",
- stos_[state_stack_[0]],
- &semantic_stack_[0],
- &location_stack_[0]);
+ yydestruct_ (_("Error: popping"),
+ yystos_[yystate_stack_[0]],
+ &yysemantic_stack_[0],
+ &yylocation_stack_[0]);
}
}
else
{
- destruct_ ("Error: discarding", ilooka_, &value, &location);
- looka_ = empty_;
+ 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
- error_range_[0] = location_stack_[len_ - 1];
- pop (len_);
- state_ = state_stack_[0];
+ yyerror_range_[0] = yylocation_stack_[yylen_ - 1];
+ yypop_ (yylen_);
+ yystate_ = yystate_stack_[0];
goto yyerrlab1;
/*-------------------------------------------------------------.
| yyerrlab1 -- common code for both syntax error and YYERROR. |
`-------------------------------------------------------------*/
yyerrlab1:
- errstatus_ = 3; /* Each real token shifted decrements this. */
+ yyerrstatus_ = 3; /* Each real token shifted decrements this. */
for (;;)
{
- n_ = pact_[state_];
- if (n_ != pact_ninf_)
+ yyn_ = yypact_[yystate_];
+ if (yyn_ != yypact_ninf_)
{
- n_ += terror_;
- if (0 <= n_ && n_ <= last_ && check_[n_] == terror_)
+ yyn_ += yyterror_;
+ if (0 <= yyn_ && yyn_ <= yylast_ && yycheck_[yyn_] == yyterror_)
{
- n_ = table_[n_];
- if (0 < n_)
+ yyn_ = yytable_[yyn_];
+ if (0 < yyn_)
break;
}
}
/* Pop the current state because it cannot handle the error token. */
- if (state_stack_.height () == 1)
+ if (yystate_stack_.height () == 1)
YYABORT;
- error_range_[0] = location_stack_[0];
- destruct_ ("Error: popping",
- stos_[state_], &semantic_stack_[0], &location_stack_[0]);
- pop ();
- state_ = state_stack_[0];
+ yyerror_range_[0] = yylocation_stack_[0];
+ yydestruct_ (_("Error: popping"),
+ yystos_[yystate_],
+ &yysemantic_stack_[0], &yylocation_stack_[0]);
+ yypop_ ();
+ yystate_ = yystate_stack_[0];
YY_STACK_PRINT ();
}
- if (n_ == final_)
+ if (yyn_ == yyfinal_)
goto yyacceptlab;
- error_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, error_range_ - 1, 2);
- semantic_stack_.push (value);
- location_stack_.push (yyloc);
+ YYLLOC_DEFAULT (yyloc, yyerror_range_ - 1, 2);
+ yysemantic_stack_.push (yylval);
+ yylocation_stack_.push (yyloc);
/* Shift the error token. */
- YY_SYMBOL_PRINT ("Shifting", stos_[n_],
- &semantic_stack_[0], &location_stack_[0]);
+ YY_SYMBOL_PRINT (_("Shifting"), yystos_[yyn_],
+ &yysemantic_stack_[0], &yylocation_stack_[0]);
- state_ = n_;
+ yystate_ = yyn_;
goto yynewstate;
/* Accept. */
yyacceptlab:
- return 0;
+ yyresult_ = 0;
+ goto yyreturn;
/* Abort. */
yyabortlab:
- /* Free the lookahead. */
- destruct_ ("Error: discarding lookahead", ilooka_, &value, &location);
- looka_ = empty_;
- 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[::lex_ ()
+yy::]b4_parser_class_name[::yylex_ ()
{
-#if YYLSP_NEEDED
- looka_ = yylex (&value, &location);
-#else
- looka_ = yylex (&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 yyerror. */
+// Generate an error message, and invoke error.
void
-yy::]b4_parser_class_name[::report_syntax_error_ ()
+yy::]b4_parser_class_name[::yyreport_syntax_error_ ()
{
/* If not already recovering from an error, report this error. */
- if (!errstatus_)
+ if (!yyerrstatus_)
{
- ++nerrs_;
-
+ ++yynerrs_;
+ std::string message;
#if YYERROR_VERBOSE
- n_ = pact_[state_];
- if (pact_ninf_ < n_ && n_ < last_)
+ yyn_ = yypact_[yystate_];
+ if (yypact_ninf_ < yyn_ && yyn_ < yylast_)
{
- 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];
- }
- }
- }
+ /* 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_];
+ 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);
}
}
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-const ]b4_int_type(b4_pact_ninf, b4_pact_ninf) yy::b4_parser_class_name::pact_ninf_ = b4_pact_ninf[;
+const ]b4_int_type(b4_pact_ninf, b4_pact_ninf) yy::b4_parser_class_name::yypact_ninf_ = b4_pact_ninf[;
const ]b4_int_type_for([b4_pact])[
-yy::]b4_parser_class_name[::pact_[] =
+yy::]b4_parser_class_name[::yypact_[] =
{
]b4_pact[
};
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_[] =
+yy::]b4_parser_class_name[::yydefact_[] =
{
]b4_defact[
};
/* YYPGOTO[NTERM-NUM]. */
const ]b4_int_type_for([b4_pgoto])[
-yy::]b4_parser_class_name[::pgoto_[] =
+yy::]b4_parser_class_name[::yypgoto_[] =
{
]b4_pgoto[
};
/* YYDEFGOTO[NTERM-NUM]. */
const ]b4_int_type_for([b4_defgoto])[
-yy::]b4_parser_class_name[::defgoto_[] =
+yy::]b4_parser_class_name[::yydefgoto_[] =
{
]b4_defgoto[
};
/* 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(b4_table_ninf, b4_table_ninf) yy::b4_parser_class_name::table_ninf_ = b4_table_ninf[;
+const ]b4_int_type(b4_table_ninf, b4_table_ninf) yy::b4_parser_class_name::yytable_ninf_ = b4_table_ninf[;
const ]b4_int_type_for([b4_table])[
-yy::]b4_parser_class_name[::table_[] =
+yy::]b4_parser_class_name[::yytable_[] =
{
]b4_table[
};
/* YYCHECK. */
const ]b4_int_type_for([b4_check])[
-yy::]b4_parser_class_name[::check_[] =
+yy::]b4_parser_class_name[::yycheck_[] =
{
]b4_check[
};
/* 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_[] =
+yy::]b4_parser_class_name[::yystos_[] =
{
]b4_stos[
};
#if YYDEBUG
-/* TOKEN_NUMBER_[YYLEX-NUM] -- Internal token number corresponding
+/* TOKEN_NUMBER_[YYLEX-NUM] -- Internal symbol number corresponding
to YYLEX-NUM. */
const ]b4_int_type_for([b4_toknum])[
-yy::]b4_parser_class_name[::token_number_[] =
+yy::]b4_parser_class_name[::yytoken_number_[] =
{
]b4_toknum[
};
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
const ]b4_int_type_for([b4_r1])[
-yy::]b4_parser_class_name[::r1_[] =
+yy::]b4_parser_class_name[::yyr1_[] =
{
]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_[] =
+yy::]b4_parser_class_name[::yyr2_[] =
{
]b4_r2[
};
#if YYDEBUG || YYERROR_VERBOSE
/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
- First, the terminals, then, starting at NTOKENS_, nonterminals. */
+ First, the terminals, then, starting at \a yyntokens_, nonterminals. */
const char*
-const yy::]b4_parser_class_name[::name_[] =
+const yy::]b4_parser_class_name[::yyname_[] =
{
]b4_tname[
};
#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[::rhs_number_type
+yy::]b4_parser_class_name[::yyrhs_[] =
{
]b4_rhs[
};
/* 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_[] =
+yy::]b4_parser_class_name[::yyprhs_[] =
{
]b4_prhs[
};
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
const ]b4_int_type_for([b4_rline])[
-yy::]b4_parser_class_name[::rline_[] =
+yy::]b4_parser_class_name[::yyrline_[] =
{
]b4_rline[
};
-/** Print the state stack from its BOTTOM up to its TOP (included). */
-
+// Print the state stack on the debug stream.
void
-yy::]b4_parser_class_name[::stack_print_ ()
+yy::]b4_parser_class_name[::yystack_print_ ()
{
- cdebug_ << "Stack now";
- for (StateStack::const_iterator i = state_stack_.begin ();
- i != state_stack_.end (); ++i)
- cdebug_ << ' ' << *i;
- cdebug_ << std::endl;
+ *yycdebug_ << _("Stack now");
+ for (state_stack_type::const_iterator i = yystate_stack_.begin ();
+ i != yystate_stack_.end (); ++i)
+ *yycdebug_ << ' ' << *i;
+ *yycdebug_ << std::endl;
}
-/** Report that the YYRULE is going to be reduced. */
-
+// Report on the debug stream that the rule \a yyrule is going to be reduced.
void
-yy::]b4_parser_class_name[::reduce_print_ (int yyrule)
+yy::]b4_parser_class_name[::yyreduce_print_ (int yyrule)
{
- unsigned int yylno = rline_[yyrule];
+ unsigned int yylno = yyrline_[yyrule];
/* Print the symbols being reduced, and their result. */
- cdebug_ << "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_ << _("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]] << ' ';
+ *yycdebug_ << "-> " << yyname_[yyr1_[yyn_]] << 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[::token_number_type
+yy::]b4_parser_class_name[::yytranslate_ (int token)
{
static
- const TokenNumberType
+ const token_number_type
translate_table[] =
{
]b4_translate[
};
- if ((unsigned int) token <= user_token_number_max_)
+ if ((unsigned int) token <= yyuser_token_number_max_)
return translate_table[token];
else
- return undef_token_;
+ return yyundef_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[::yyeof_ = 0;
+const int yy::]b4_parser_class_name[::yylast_ = ]b4_last[;
+const int yy::]b4_parser_class_name[::yynnts_ = ]b4_nterms_number[;
+const int yy::]b4_parser_class_name[::yyempty_ = -2;
+const int yy::]b4_parser_class_name[::yyfinal_ = ]b4_final_state_number[;
+const int yy::]b4_parser_class_name[::yyterror_ = 1;
+const int yy::]b4_parser_class_name[::yyerrcode_ = 256;
+const int yy::]b4_parser_class_name[::yyntokens_ = ]b4_tokens_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[;
+const unsigned int yy::]b4_parser_class_name[::yyuser_token_number_max_ = ]b4_user_token_number_max[;
+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
+ template <class T, class S = std::deque<T> >
+ 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
{
- /** \brief Abstract a Position. */
- class Position
+ /// Abstract a position.
+ class position
{
public:
- /** \brief Initial column number. */
+ /// Initial column number.
static const unsigned int initial_column = 0;
- /** \brief Initial line number. */
+ /// Initial line number.
static const unsigned int initial_line = 1;
/** \name Ctor & dtor.
** \{ */
public:
- /** \brief Construct a Position. */
- Position () :
- filename (),
+ /// Construct a position.
+ position () :
+ filename (0),
line (initial_line),
column (initial_column)
{
/** \name Line and Column related manipulators
** \{ */
public:
- /** \brief (line related) Advance to the COUNT next lines. */
+ /// (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. */
+ /// (column related) Advance to the COUNT next columns.
inline void columns (int count = 1)
{
int leftmost = initial_column;
/** \} */
public:
- /** \brief File name to which this position refers. */
- std::string filename;
- /** \brief Current line number. */
+ /// File name to which this position refers.
+ ]b4_filename_type[* filename;
+ /// Current line number.
unsigned int line;
- /** \brief Current column number. */
+ /// Current column number.
unsigned int column;
};
- /** \brief 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;
}
- /** \brief 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;
}
- /** \brief 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;
}
- /** \brief 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
{
- /** \brief Abstract a Location. */
- class Location
+ /// Abstract a location.
+ class location
{
/** \name Ctor & dtor.
** \{ */
public:
- /** \brief Construct a Location. */
- Location (void) :
+ /// Construct a location.
+ location () :
begin (),
end ()
{
/** \name Line and Column related manipulators
** \{ */
public:
- /** \brief Reset initial location to final location. */
- inline void step (void)
+ /// Reset initial location to final location.
+ inline void step ()
{
begin = end;
}
- /** \brief Extend the current location to the COUNT next columns. */
+ /// 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. */
+ /// 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;
+ /// Beginning of the located region.
+ position begin;
+ /// End of the located region.
+ position end;
};
- /** \brief 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;
}
- /** \brief 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;
}
- /** \brief 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