X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/6e2d1146f214b11892a89e1be9fa62b71d4897bf..1c72905811fa75e0715eb5ec1066dfcae520d070:/data/glr.cc?ds=sidebyside
diff --git a/data/glr.cc b/data/glr.cc
index 4507c778..0d9e0496 100644
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -1,22 +1,19 @@
-m4_divert(-1) -*- C -*-
-
# C++ GLR skeleton for Bison
-# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-
+#
# 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
+# along with this program. If not, see .
# This skeleton produces a C++ class that encapsulates a C glr parser.
@@ -30,7 +27,7 @@ m4_divert(-1) -*- C -*-
#
# The additional arguments are stored as members of the parser
# object, yyparser. The C routines need to carry yyparser
-# throughout the C parser; that easy: just let yyparser become an
+# throughout the C parser; that's easy: make yyparser an
# additional parse-param. But because the C++ skeleton needs to
# know the "real" original parse-param, we save them
# (b4_parse_param_orig). Note that b4_parse_param is overquoted
@@ -40,20 +37,25 @@ m4_divert(-1) -*- C -*-
# The locations
#
# We use location.cc just like lalr1.cc, but because glr.c stores
-# the locations in a (C++) union, the position and location classes
+# the locations in a union, the position and location classes
# must not have a constructor. Therefore, contrary to lalr1.cc, we
# must not define "b4_location_constructors". As a consequence the
# user must initialize the first positions (in particular the
# filename member).
-
# We require a pure interface using locations.
-m4_define([b4_location_flag], [1])
-m4_define([b4_pure], [1])
+m4_define([b4_percent_define(locations)], [])
+m4_define([b4_pure_flag], [1])
+
+# The header is mandatory.
+b4_defines_if([],
+ [b4_fatal([b4_skeleton[: using %%defines is mandatory]])])
m4_include(b4_pkgdatadir/[c++.m4])
m4_include(b4_pkgdatadir/[location.cc])
+m4_define([b4_parser_class_name],
+ [b4_percent_define_get([[parser_class_name]])])
# Save the parse parameters.
m4_define([b4_parse_param_orig], m4_defn([b4_parse_param]))
@@ -73,41 +75,39 @@ m4_define([b4_yy_symbol_print_generate],
[static void],
[[FILE *], []],
[[int yytype], [yytype]],
- [[const b4_namespace::b4_parser_class_name::semantic_type *yyvaluep],
+ [[const b4_namespace_ref::b4_parser_class_name::semantic_type *yyvaluep],
[yyvaluep]],
- [[const b4_namespace::b4_parser_class_name::location_type *yylocationp],
+ [[const b4_namespace_ref::b4_parser_class_name::location_type *yylocationp],
[yylocationp]],
b4_parse_param)[
{
]b4_parse_param_use[]dnl
-[ yyparser.yy_symbol_print_ (yytype, yyvaluep]b4_location_if([, yylocationp])[);
+[ yyparser.yy_symbol_print_ (yytype, yyvaluep]b4_locations_if([, yylocationp])[);
}
]])
# Declare yyerror.
m4_append([b4_post_prologue],
-[/* Line __line__ of glr.cc. */
-b4_syncline([@oline@], [@ofile@])
+[b4_syncline([@oline@], [@ofile@])
b4_c_ansi_function_decl([yyerror],
[static void],
- [[b4_namespace::b4_parser_class_name::location_type *yylocationp], [yylocationp]],
+ [[b4_namespace_ref::b4_parser_class_name::location_type *yylocationp], [yylocationp]],
b4_parse_param,
[[const char* msg], [msg]])])
# Define yyerror.
m4_append([b4_epilogue],
-[/* Line __line__ of glr.cc. */
-b4_syncline([@oline@], [@ofile@])[
+[b4_syncline([@oline@], [@ofile@])[
/*------------------.
| Report an error. |
`------------------*/
]b4_c_ansi_function_def([yyerror],
[static void],
- [[b4_namespace::b4_parser_class_name::location_type *yylocationp], [yylocationp]],
+ [[b4_namespace_ref::b4_parser_class_name::location_type *yylocationp], [yylocationp]],
b4_parse_param,
[[const char* msg], [msg]])[
{
@@ -116,13 +116,15 @@ b4_syncline([@oline@], [@ofile@])[
}
-namespace ]b4_namespace[
-{
+]b4_namespace_open[
]dnl In this section, the parse param are the original parse_params.
m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
[ /// Build a parser object.
- ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)
- : yycdebug_ (&std::cerr)]b4_parse_param_cons[
+ ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [
+ :])[
+#if YYDEBUG
+ ]m4_ifset([b4_parse_param], [ ], [ :])[yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[
+#endif]b4_parse_param_cons[
{
}
@@ -150,7 +152,7 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
YYUSE (yylocationp);
switch (yytype)
{
- ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl
+]b4_symbol_foreach([b4_symbol_printer])dnl
[ default:
break;
}
@@ -184,79 +186,60 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
]b4_parser_class_name[::debug_level_type
]b4_parser_class_name[::debug_level () const
{
- return ::yydebug;
+ return yydebug;
}
void
]b4_parser_class_name[::set_debug_level (debug_level_type l)
{
- ::yydebug = l;
+ yydebug = l;
}
-#endif /* ! YYDEBUG */
+#endif
]m4_popdef([b4_parse_param])dnl
-[} // namespace ]b4_namespace[
-
+b4_namespace_close[
]])
# Let glr.c believe that the user arguments include the parser itself.
m4_ifset([b4_parse_param],
[m4_pushdef([b4_parse_param],
- m4_dquote([[[b4_namespace::b4_parser_class_name& yyparser], [[yyparser]]],]
+ m4_dquote([[[b4_namespace_ref::b4_parser_class_name& yyparser], [[yyparser]]],]
m4_defn([b4_parse_param])))],
[m4_pushdef([b4_parse_param],
- [[[[b4_namespace::b4_parser_class_name& yyparser], [[yyparser]]]]])
+ [[[[b4_namespace_ref::b4_parser_class_name& yyparser], [[yyparser]]]]])
])
m4_include(b4_pkgdatadir/[glr.c])
m4_popdef([b4_parse_param])
-
-@output @output_header_name@
-b4_copyright([C++ Skeleton parser for GLALR(1) parsing with Bison],
- [2002, 2003, 2004, 2005, 2006])[
+m4_divert_push(0)
+@output(b4_spec_defines_file@)@
+b4_copyright([Skeleton interface for Bison GLR parsers in C++],
+ [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009])[
/* C++ GLR parser skeleton written by Akim Demaille. */
#ifndef PARSER_HEADER_H
# define PARSER_HEADER_H
+]b4_percent_code_get([[requires]])[
+
#include
#include
/* Using locations. */
-#define YYLSP_NEEDED ]b4_locations_flag[
+#define YYLSP_NEEDED ]b4_locations_if([1], [0])[
-namespace ]b4_namespace[
-{
+]b4_namespace_open[
class position;
class location;
-}
-
-/* Copy the first part of user declarations. */
-]b4_pre_prologue[
-
-]/* Line __line__ of glr.cc. */
-b4_syncline([@oline@], [@ofile@])[
+]b4_namespace_close[
#include "location.hh"
/* Enabling traces. */
#ifndef YYDEBUG
-# define YYDEBUG ]b4_debug[
-#endif
-
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE ]b4_error_verbose[
-#endif
-
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE ]b4_token_table[
+# define YYDEBUG ]b4_parse_trace_if([1], [0])[
#endif
/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
@@ -278,33 +261,12 @@ b4_syncline([@oline@], [@ofile@])[
while (/*CONSTCOND*/ 0)
#endif
-namespace ]b4_namespace[
-{
+]b4_namespace_open[
/// A Bison parser.
class ]b4_parser_class_name[
{
public:
- /// Symbol semantic values.
-#ifndef YYSTYPE
-]m4_ifdef([b4_stype],
-[ union semantic_type
-b4_stype
-/* Line __line__ of lalr1.cc. */
-b4_syncline([@oline@], [@ofile@])
- ;],
-[ typedef int semantic_type;])[
-#else
- typedef YYSTYPE semantic_type;
-#endif
- /// Symbol locations.
- typedef ]b4_location_type[ location_type;
- /// Tokens.
- struct token
- {
- ]b4_token_enums(b4_tokens)[
- };
- /// Token type.
- typedef token::yytokentype token_type;
+]b4_public_types_declare[
/// Build a parser object.
]b4_parser_class_name[ (]b4_parse_param_decl[);
@@ -326,14 +288,11 @@ b4_syncline([@oline@], [@ofile@])
/// Set the current debugging level.
void set_debug_level (debug_level_type l);
- private:
-
public:
/// 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);
- private:
#if YYDEBUG
public:
@@ -352,8 +311,9 @@ b4_syncline([@oline@], [@ofile@])
const semantic_type* yyvaluep,
const location_type* yylocationp);
private:
-#endif /* ! YYDEBUG */
-
+ /* Debugging. */
+ std::ostream* yycdebug_;
+#endif
/// \brief Reclaim the memory associated to a symbol.
/// \param yymsg Why this token is reclaimed.
@@ -365,22 +325,23 @@ b4_syncline([@oline@], [@ofile@])
semantic_type* yyvaluep,
location_type* yylocationp);
- /* Debugging. */
- std::ostream* yycdebug_;
]b4_parse_param_vars[
};
]dnl Redirections for glr.c.
-m4_ifset([b4_global_tokens_and_yystype],
+b4_percent_define_flag_if([[global_tokens_and_yystype]],
[b4_token_defines(b4_tokens)])
[
#ifndef YYSTYPE
-# define YYSTYPE ]b4_namespace[::]b4_parser_class_name[::semantic_type
+# define YYSTYPE ]b4_namespace_ref[::]b4_parser_class_name[::semantic_type
#endif
#ifndef YYLTYPE
-# define YYLTYPE ]b4_namespace[::]b4_parser_class_name[::location_type
+# define YYLTYPE ]b4_namespace_ref[::]b4_parser_class_name[::location_type
#endif
-}
+]b4_namespace_close[
+
+]b4_percent_code_get([[provides]])[]dnl
-#endif /* ! defined PARSER_HEADER_H */]
+[#endif /* ! defined PARSER_HEADER_H */]
+m4_divert_pop(0)