From: Akim Demaille Date: Tue, 3 Jan 2006 09:06:22 +0000 (+0000) Subject: Have glr.cc pass (some of) the calc.at tests. X-Git-Tag: v2.3b~525 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/8f7e3cf9d0a38a128619e968f3101a6dc36d0475 Have glr.cc pass (some of) the calc.at tests. * data/glr.cc (b4_parse_param_orig): New. (b4_parse_param): Improve its definition, and bound it more clearly in the skeleton. (b4_epilogue): Append, instead of prepending, in order to keep #line consistency. Simplify the generation of auxiliary functions: locations and purity are mandated. (b4_global_tokens_and_yystype): Honor it. * data/location.cc (c++.m4): Don't include it. * tests/local.at (_AT_BISON_OPTION_PUSHDEFS): Define AT_GLR_CC_IF and AT_SKEL_CC_IF. * tests/calc.at (AT_CHECK_CALC): Rely on AT_SKEL_CC_IF instead of AT_LALR1_CC_IF. Be sure to initialize the first position's filename. (AT_CHECK_CALC_LALR1_CC): Add %location and %defines, they are mandated anyway. (AT_CHECK_CALC_GLR_CC): New. Use it to exercise glr.cc as a lalr1.cc drop-in replacement. --- diff --git a/ChangeLog b/ChangeLog index 346b675b..5748fed8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2006-01-03 Akim Demaille + + Have glr.cc pass (some of) the calc.at tests. + * data/glr.cc (b4_parse_param_orig): New. + (b4_parse_param): Improve its definition, and bound it more + clearly in the skeleton. + (b4_epilogue): Append, instead of prepending, in order to keep + #line consistency. + Simplify the generation of auxiliary functions: locations and + purity are mandated. + (b4_global_tokens_and_yystype): Honor it. + * data/location.cc (c++.m4): Don't include it. + * tests/local.at (_AT_BISON_OPTION_PUSHDEFS): Define AT_GLR_CC_IF + and AT_SKEL_CC_IF. + * tests/calc.at (AT_CHECK_CALC): Rely on AT_SKEL_CC_IF instead of + AT_LALR1_CC_IF. + Be sure to initialize the first position's filename. + (AT_CHECK_CALC_LALR1_CC): Add %location and %defines, they are + mandated anyway. + (AT_CHECK_CALC_GLR_CC): New. + Use it to exercise glr.cc as a lalr1.cc drop-in replacement. + 2006-01-02 Akim Demaille * src/output.c (output_skeleton): Don't hard wire the inclusion of diff --git a/data/c.m4 b/data/c.m4 index d8465107..4eee7f3a 100644 --- a/data/c.m4 +++ b/data/c.m4 @@ -95,6 +95,7 @@ m4_define_default([b4_parse_param]) m4_define([b4_parse_param], b4_parse_param)) + # b4_parse_param_for(DECL, FORMAL, BODY) # --------------------------------------- # Iterate over the user parameters, binding the declaration to DECL, diff --git a/data/glr.cc b/data/glr.cc index 0a364dbf..7b265e5c 100644 --- a/data/glr.cc +++ b/data/glr.cc @@ -18,6 +18,35 @@ m4_divert(-1) -*- C -*- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 USA + +# This skeleton produces a C++ class that encapsulates a C glr parser. +# This is in order to reduce the maintenance burden. The glr.c +# skeleton is clean and pure enough so that there are no real +# problems. The C++ interface is the same as that of lalr1.cc. In +# fact, glr.c can replace yacc.c without the user noticing any +# difference, and similarly for glr.cc replacing lalr1.cc. +# +# The passing of parse-params +# +# 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 +# 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 +# (and c.m4 strips one level of quotes). This is a PITA, and +# explains why there are so many levels of quotes. +# +# 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 +# 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]) @@ -26,17 +55,16 @@ m4_include(b4_pkgdatadir/[c++.m4]) m4_include(b4_pkgdatadir/[location.cc]) +# Save the parse parameters. +m4_define([b4_parse_param_orig], m4_defn([b4_parse_param])) + + # b4_yy_symbol_print_generate # --------------------------- # Bypass the default implementation to generate the "yy_symbol_print" # and "yy_symbol_value_print" functions. m4_define([b4_yy_symbol_print_generate], -[b4_c_ansi_function_decl([yyerror], - [static void], - [[yy::b4_parser_class_name::location_type *yylocationp], [yylocationp]], - b4_parse_param, - [[const char* msg], [msg]])[ - +[[ /*--------------------. | Print this symbol. | `--------------------*/ @@ -46,19 +74,33 @@ m4_define([b4_yy_symbol_print_generate], [[FILE *], []], [[int yytype], [yytype]], [[const yy::b4_parser_class_name::semantic_type *yyvaluep], - [yyvaluep]][]dnl -b4_location_if([, + [yyvaluep]], [[const yy::b4_parser_class_name::location_type *yylocationp], - [yylocationp]]])[]dnl -m4_ifset([b4_parse_param], [, b4_parse_param]))[ + [yylocationp]], + b4_parse_param)[ { ]b4_parse_param_use[]dnl [ yyparser.yy_symbol_print_ (yytype, yyvaluep]b4_location_if([, yylocationp])[); } ]]) -m4_prepend([b4_epilogue], -[[ + +# Declare yyerror. +m4_append([b4_post_prologue], +[/* Line __line__ of glr.cc. */ +b4_syncline([@oline@], [@ofile@]) + +b4_c_ansi_function_decl([yyerror], + [static void], + [[yy::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@])[ /*------------------. | Report an error. | `------------------*/ @@ -76,10 +118,9 @@ m4_prepend([b4_epilogue], namespace yy { -]dnl Restore the actual parser params. -m4_popdef([b4_parse_param])dnl -[ - /// Build a parser object. +]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[ { @@ -153,16 +194,24 @@ m4_popdef([b4_parse_param])dnl } #endif /* ! YYDEBUG */ - -} // namespace yy +]m4_popdef([b4_parse_param])dnl +[} // namespace yy ]]) -# Let glr.c believe that the user arguments are only the parser itself. -m4_pushdef([b4_parse_param], - [[yy::b4_parser_class_name& yyparser, yyparser],] - m4_defn([b4_parse_param])) + +# Let glr.c believe that the user arguments include the parser itself. +m4_ifset([b4_parse_param], +[m4_pushdef([b4_parse_param], + m4_dquote([[[yy::b4_parser_class_name& yyparser], [[yyparser]]],] +m4_defn([b4_parse_param])))], +[m4_pushdef([b4_parse_param], + [[[[yy::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])[ @@ -328,8 +377,15 @@ b4_syncline([@oline@], [@ofile@])], }; ]dnl Redirections for glr.c. -[#define YYSTYPE yy::]b4_parser_class_name[::semantic_type -#define YYLTYPE yy::]b4_parser_class_name[::location_type +m4_ifset([b4_global_tokens_and_yystype], +[b4_token_defines(b4_tokens)]) +[ +#ifndef YYSTYPE +# define YYSTYPE yy::]b4_parser_class_name[::semantic_type +#endif +#ifndef YYLTYPE +# define YYLTYPE yy::]b4_parser_class_name[::location_type +#endif } diff --git a/data/location.cc b/data/location.cc index a134bfa8..65f649f1 100644 --- a/data/location.cc +++ b/data/location.cc @@ -2,7 +2,7 @@ m4_divert(-1) # C++ skeleton for Bison -# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2004, 2005, 2006 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 @@ -19,8 +19,6 @@ m4_divert(-1) # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 USA -m4_include(b4_pkgdatadir/[c++.m4]) - # We do want M4 expansion after # for CPP macros. m4_changecom() m4_divert(0)dnl diff --git a/tests/calc.at b/tests/calc.at index 65d430cc..1e9756f0 100644 --- a/tests/calc.at +++ b/tests/calc.at @@ -1,6 +1,6 @@ # Simple calculator. -*- Autotest -*- -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -40,7 +40,7 @@ m4_define([_AT_DATA_CALC_Y], AT_DATA_GRAMMAR([calc.y], [[/* Infix notation calculator--calc */ ]$4 -AT_LALR1_CC_IF( +AT_SKEL_CC_IF( [%define "global_tokens_and_yystype"])[ %{ #include @@ -71,8 +71,10 @@ static int global_count = 0; %{ static int power (int base, int exponent); -]AT_LALR1_CC_IF( -[typedef yy::location YYLTYPE; +]AT_SKEL_CC_IF( +[#ifndef YYLTYPE +# define YYLTYPE yy::location +#endif #define first_line begin.line #define first_column begin.column #define last_line end.line @@ -90,6 +92,17 @@ static int get_char (]AT_LEX_FORMALS[); static void unget_char (]AT_LEX_PRE_FORMALS[ int c); %} +]AT_SKEL_CC_IF( +[/* The lalr1.cc skeleton, for backward compatibility, defines + a constructor for position that initializes the filename. The + glr.cc skeleton does not (and in fact cannot: location/position + are stored in a union, from which objects with constructors are + excluded in C++. */ +%initial-action { + @$.begin.filename = @$.end.filename = 0; +} +])[ + /* Bison Declarations */ %token CALC_EOF 0 "end of input" %token NUM "number" @@ -136,7 +149,7 @@ exp: /* The input. */ static FILE *input; -]AT_LALR1_CC_IF( +]AT_SKEL_CC_IF( [/* A C++ error reporting function. */ void yy::parser::error (const location& l, const std::string& m) @@ -319,7 +332,7 @@ main (int argc, const char **argv) return 3; } -]AT_LALR1_CC_IF([], [m4_bmatch([$4], [%debug], +]AT_SKEL_CC_IF([], [m4_bmatch([$4], [%debug], [ yydebug = 1;])])[ status = yyparse (]AT_PARAM_IF([&result, &count])[); if (global_result != result) @@ -438,7 +451,7 @@ AT_BISON_OPTION_PUSHDEFS([$1]) AT_DATA_CALC_Y([$1]) -AT_LALR1_CC_IF( +AT_SKEL_CC_IF( [AT_CHECK([bison -o calc.cc calc.y]) AT_COMPILE_CXX([calc])], [AT_CHECK([bison -o calc.c calc.y]) @@ -525,7 +538,7 @@ AT_CLEANUP # Simple LALR Calculator. # # ------------------------ # -AT_BANNER([[Simple LALR Calculator.]]) +AT_BANNER([[Simple LALR(1) Calculator.]]) # AT_CHECK_CALC_LALR([BISON-OPTIONS]) # ----------------------------------- @@ -596,34 +609,45 @@ AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations %defines %name- # Simple LALR1 C++ Calculator. # # ----------------------------- # -AT_BANNER([[Simple LALR1 C++ Calculator.]]) +AT_BANNER([[Simple LALR(1) C++ Calculator.]]) # AT_CHECK_CALC_LALR1_CC([BISON-OPTIONS]) # --------------------------------------- # Start a testing chunk which compiles `calc' grammar with # the C++ skeleton, and performs several tests over the parser. m4_define([AT_CHECK_CALC_LALR1_CC], -[AT_CHECK_CALC([%skeleton "lalr1.cc"] $@)]) +[AT_CHECK_CALC([%skeleton "lalr1.cc" %defines %locations] $@)]) + +AT_CHECK_CALC_LALR1_CC([]) +AT_CHECK_CALC_LALR1_CC([%error-verbose %name-prefix="calc" %verbose %yacc]) -# AT_CHECK_CALC_LALR1_CC() +AT_CHECK_CALC_LALR1_CC([%error-verbose %debug %name-prefix="calc" %verbose %yacc]) -AT_CHECK_CALC_LALR1_CC([%defines %locations]) +AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %name-prefix="calc" %verbose %yacc]) -AT_CHECK_CALC_LALR1_CC([%defines]) -# AT_CHECK_CALC_LALR1_CC([%locations]) -# AT_CHECK_CALC_LALR1_CC([%name-prefix="calc"]) -# AT_CHECK_CALC_LALR1_CC([%verbose]) -# AT_CHECK_CALC_LALR1_CC([%yacc]) -# AT_CHECK_CALC_LALR1_CC([%error-verbose]) +AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %name-prefix="calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}]) -# AT_CHECK_CALC_LALR1_CC([%pure-parser %locations]) -# AT_CHECK_CALC_LALR1_CC([%error-verbose %locations]) -AT_CHECK_CALC_LALR1_CC([%error-verbose %locations %defines %name-prefix="calc" %verbose %yacc]) -# AT_CHECK_CALC_LALR1_CC([%debug]) -AT_CHECK_CALC_LALR1_CC([%error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc]) +# --------------------------- # +# Simple GLR C++ Calculator. # +# --------------------------- # + +AT_BANNER([[Simple GLR C++ Calculator.]]) + +# AT_CHECK_CALC_GLR_CC([BISON-OPTIONS]) +# ------------------------------------- +# Start a testing chunk which compiles `calc' grammar with +# the GLR C++ skeleton, and performs several tests over the parser. +m4_define([AT_CHECK_CALC_GLR_CC], +[AT_CHECK_CALC([%skeleton "glr.cc" %defines %locations] $@)]) + +#AT_CHECK_CALC_GLR_CC([]) +#AT_CHECK_CALC_GLR_CC([%error-verbose %name-prefix="calc" %verbose %yacc]) + +# AT_CHECK_CALC_GLR_CC([%debug]) +#AT_CHECK_CALC_GLR_CC([%error-verbose %debug %name-prefix="calc" %verbose %yacc]) -AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc]) +AT_CHECK_CALC_GLR_CC([%pure-parser %error-verbose %debug %name-prefix="calc" %verbose %yacc]) -AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}]) +AT_CHECK_CALC_GLR_CC([%pure-parser %error-verbose %debug %name-prefix="calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}]) diff --git a/tests/local.at b/tests/local.at index 4f065abc..35b82ece 100644 --- a/tests/local.at +++ b/tests/local.at @@ -1,7 +1,7 @@ # Process this -*- Autotest -*- file with autom4te. # Macros for the GNU Bison Test suite. -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 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 @@ -43,6 +43,10 @@ m4_define([_AT_BISON_OPTION_PUSHDEFS], [m4_fatal([$0: Invalid arguments: $@])])dnl m4_pushdef([AT_LALR1_CC_IF], [m4_bmatch([$3], ["lalr1.cc"], [$1], [$2])]) +m4_pushdef([AT_GLR_CC_IF], +[m4_bmatch([$3], ["glr.cc"], [$1], [$2])]) +m4_pushdef([AT_SKEL_CC_IF], +[m4_bmatch([$3], ["\(glr\|lalr1\).cc"], [$1], [$2])]) m4_pushdef([AT_GLR_IF], [m4_bmatch([$3], [%glr-parser], [$1], [$2])]) # Using yacc.c? @@ -122,6 +126,8 @@ m4_popdef([AT_LOCATION_IF]) m4_popdef([AT_PARAM_IF]) m4_popdef([AT_YACC_IF]) m4_popdef([AT_GLR_IF]) +m4_popdef([AT_SKEL_CC_IF]) +m4_popdef([AT_GLR_CC_IF]) m4_popdef([AT_LALR1_CC_IF]) ])# AT_BISON_OPTION_POPDEFS