Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-16 07:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Have glr.cc pass (some of) the calc.at tests.

Browse Source 
* 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.
This commit is contained in:
Akim Demaille
2006-01-03 09:06:22 +00:00
parent 0a96ba819f
commit 8f7e3cf9d0
6 changed files with 160 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
tests/calc.at
View File

@@ -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 <stdio.h>
@@ -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 <ival> 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([])
AT_CHECK_CALC_LALR1_CC([%error-verbose %name-prefix="calc" %verbose %yacc])
AT_CHECK_CALC_LALR1_CC([%defines %locations])
AT_CHECK_CALC_LALR1_CC([%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])
# AT_CHECK_CALC_LALR1_CC([%pure-parser %locations])
# AT_CHECK_CALC_LALR1_CC([%error-verbose %locations])
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([%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])
AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])
# --------------------------- #
# Simple GLR C++ Calculator. #
# --------------------------- #
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_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_GLR_CC([%pure-parser %error-verbose %debug %name-prefix="calc" %verbose %yacc])
AT_CHECK_CALC_GLR_CC([%pure-parser %error-verbose %debug %name-prefix="calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}])

8
tests/local.at
View File

@@ -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