X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f50adbbdb02d476286814f538c2f0e20caa15199..0991e29b75f192570b6fac1ba23657ab4f3509ee:/tests/calc.at diff --git a/tests/calc.at b/tests/calc.at index 63c8604b..14bd20fd 100644 --- a/tests/calc.at +++ b/tests/calc.at @@ -1,20 +1,20 @@ -# Checking the output filenames. -*- Autotest -*- -# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +# Simple calculator. -*- Autotest -*- -# 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, or (at your option) -# any later version. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 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 +# 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., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see . ## ---------------------------------------------------- ## ## Compile the grammar described in the documentation. ## @@ -26,196 +26,122 @@ # ------------------------- # -# _AT_DATA_CALC_Y($1, $2, $3, [CPP-DIRECTIVES]) -# --------------------------------------------- -# Produce `calc.y'. Don't call this macro directly, because it contains -# some occurrences of `$1' etc. which will be interpreted by m4. So -# you should call it with $1, $2, and $3 as arguments, which is what -# AT_DATA_CALC_Y does. +# _AT_DATA_CALC_Y($1, $2, $3, [BISON-DIRECTIVES]) +# ----------------------------------------------- +# Produce `calc.y' and, if %defines was specified, `calc-lex.c' or +# `calc-lex.cc'. +# +# Don't call this macro directly, because it contains some occurrences +# of `$1' etc. which will be interpreted by m4. So you should call it +# with $1, $2, and $3 as arguments, which is what AT_DATA_CALC_Y does. m4_define([_AT_DATA_CALC_Y], [m4_if([$1$2$3], $[1]$[2]$[3], [], [m4_fatal([$0: Invalid arguments: $@])])dnl -AT_DATA([calc.y], -[[/* Infix notation calculator--calc */ - -%{ -#include -/* We don't need a perfect malloc for these tests. */ -#undef malloc -#include - -#if STDC_HEADERS -# include -# include -#else -char *strcat(char *dest, const char *src); -#endif -#include - -static int power (int base, int exponent); -static void yyerror (const char *s); -static int yylex (void); -static int yygetc (void); -static void yyungetc (int c); - -extern void perror (const char *s); - -/* Exercise pre-prologue dependency to %union. */ -typedef int value_t; - -%} - -/* Exercise %union. */ -%union -{ - value_t ival; -}; - -/* Bison Declarations */ -%token CALC_EOF 0 "end of file" -%token NUM "number" -%type exp - -%nonassoc '=' /* comparison */ -%left '-' '+' -%left '*' '/' -%left NEG /* negation--unary minus */ -%right '^' /* exponentiation */ - -]$4[ - -/* Grammar follows */ -%% -input: - line -| input line -; - -line: - '\n' {} -| exp '\n' {} -; - -exp: - NUM { $$ = $1; } -| exp '=' exp - { - if ($1 != $3) - fprintf (stderr, "calc: error: %d != %d\n", $1, $3); - $$ = $1 == $3; - } -| exp '+' exp { $$ = $1 + $3; } -| exp '-' exp { $$ = $1 - $3; } -| exp '*' exp { $$ = $1 * $3; } -| exp '/' exp { $$ = $1 / $3; } -| '-' exp %prec NEG { $$ = -$2; } -| exp '^' exp { $$ = power ($1, $3); } -| '(' exp ')' { $$ = $2; } -| '(' error ')' { $$ = 0; } -; -%% -/* The input. */ -FILE *yyin; +m4_pushdef([AT_CALC_LEX], +[[#include -static void -yyerror (const char *s) -{ -#if YYLSP_NEEDED - fprintf (stderr, "%d.%d-%d.%d: ", - yylloc.first_line, yylloc.first_column, - yylloc.last_line, yylloc.last_column); -#endif - fprintf (stderr, "%s\n", s); -} +int ]AT_NAME_PREFIX[lex (]AT_LEX_FORMALS[); +static int get_char (]AT_LEX_FORMALS[); +static void unget_char (]AT_LEX_PRE_FORMALS[ int c); - -#if YYLSP_NEEDED +]AT_LOCATION_IF([ static YYLTYPE last_yylloc; -#endif +])[ static int -yygetc (void) +get_char (]AT_LEX_FORMALS[) { - int res = getc (yyin); -#if YYLSP_NEEDED - last_yylloc = yylloc; + int res = getc (input); + ]AT_USE_LEX_ARGS[; +]AT_LOCATION_IF([ + last_yylloc = AT_LOC; if (res == '\n') { - yylloc.last_line++; - yylloc.last_column = 1; + AT_LOC.last_line++; + AT_LOC.last_column = 1; } else - yylloc.last_column++; -#endif + AT_LOC.last_column++; +])[ return res; } - static void -yyungetc (int c) +unget_char (]AT_LEX_PRE_FORMALS[ int c) { -#if YYLSP_NEEDED + ]AT_USE_LEX_ARGS[; +]AT_LOCATION_IF([ /* Wrong when C == `\n'. */ - yylloc = last_yylloc; -#endif - ungetc (c, yyin); + AT_LOC = last_yylloc; +])[ + ungetc (c, input); } static int -read_signed_integer (void) +read_signed_integer (]AT_LEX_FORMALS[) { - int c = yygetc (); + int c = get_char (]AT_LEX_ARGS[); int sign = 1; int n = 0; + ]AT_USE_LEX_ARGS[; if (c == '-') { - c = yygetc (); + c = get_char (]AT_LEX_ARGS[); sign = -1; } while (isdigit (c)) { n = 10 * n + (c - '0'); - c = yygetc (); + c = get_char (]AT_LEX_ARGS[); } - yyungetc (c); + unget_char (]AT_LEX_PRE_ARGS[ c); return sign * n; } - /*---------------------------------------------------------------. | Lexical analyzer returns an integer on the stack and the token | | NUM, or the ASCII character read if not a number. Skips all | | blanks and tabs, returns 0 for EOF. | `---------------------------------------------------------------*/ -static int -yylex (void) +int +]AT_NAME_PREFIX[lex (]AT_LEX_FORMALS[) { + static int init = 1; int c; -#if YYLSP_NEEDED - yylloc.first_column = yylloc.last_column; - yylloc.first_line = yylloc.last_line; -#endif + if (init) + { + init = 0; +]AT_LOCATION_IF([ + AT_LOC.last_column = 1; + AT_LOC.last_line = 1; +])[ + } + +]AT_LOCATION_IF([ + AT_LOC.first_column = AT_LOC.last_column; + AT_LOC.first_line = AT_LOC.last_line; +])[ /* Skip white space. */ - while ((c = yygetc ()) == ' ' || c == '\t') + while ((c = get_char (]AT_LEX_ARGS[)) == ' ' || c == '\t') { -#if YYLSP_NEEDED - yylloc.first_column = yylloc.last_column; - yylloc.first_line = yylloc.last_line; -#endif +]AT_LOCATION_IF( +[ AT_LOC.first_column = AT_LOC.last_column; + AT_LOC.first_line = AT_LOC.last_line; +])[ } /* process numbers */ if (c == '.' || isdigit (c)) { - yyungetc (c); - yylval.ival = read_signed_integer (); + unget_char (]AT_LEX_PRE_ARGS[ c); + ]AT_VAL[.ival = read_signed_integer (]AT_LEX_ARGS[); return NUM; } @@ -226,64 +152,229 @@ yylex (void) /* Return single chars. */ return c; } +]]) + +AT_DATA_GRAMMAR([calc.y], +[[/* Infix notation calculator--calc */ +]$4 +AT_SKEL_CC_IF( +[%define global_tokens_and_yystype])[ +%code requires { +/* Exercise pre-prologue dependency to %union. */ +typedef int semantic_value; +} + +/* Exercise %union. */ +%union +{ + semantic_value ival; +}; + +%code provides { +#include +/* The input. */ +extern FILE *input;]AT_SKEL_CC_IF([[ +#ifndef YYLTYPE +# define YYLTYPE ]AT_NAME_PREFIX[::location +#endif +#define first_line begin.line +#define first_column begin.column +#define last_line end.line +#define last_column end.column]])[ +} + +%code { +#include +#include +#if HAVE_UNISTD_H +# include +#else +# undef alarm +# define alarm(seconds) /* empty */ +#endif +#define USE(Var) + +FILE *input; +static semantic_value global_result = 0; +static int global_count = 0; +static int power (int base, int exponent); +]AT_SKEL_CC_IF(, +[/* yyerror receives the location if: + - %location & %pure & %glr + - %location & %pure & %yacc & %parse-param. */ +static void yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *llocp, ]) + AT_PARAM_IF([semantic_value *result, int *count, ]) + const char *s + );])[ +int yylex (]AT_LEX_FORMALS[); +} + +]AT_SKEL_CC_IF([AT_LOCATION_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 { + @$.initialize (0); +} +])])[ + +/* Bison Declarations */ +%token CALC_EOF 0 "end of input" +%token NUM "number" +%type exp + +%nonassoc '=' /* comparison */ +%left '-' '+' +%left '*' '/' +%precedence NEG /* negation--unary minus */ +%right '^' /* exponentiation */ + +/* Grammar follows */ +%% +input: + line +| input line { ]AT_PARAM_IF([++*count; ++global_count;])[ } +; + +line: + '\n' +| exp '\n' { ]AT_PARAM_IF([*result = global_result = $1], [USE ($1)])[; } +; + +exp: + NUM { $$ = $1; } +| exp '=' exp + { + if ($1 != $3) + fprintf (stderr, "calc: error: %d != %d\n", $1, $3); + $$ = $1; + } +| exp '+' exp { $$ = $1 + $3; } +| exp '-' exp { $$ = $1 - $3; } +| exp '*' exp { $$ = $1 * $3; } +| exp '/' exp { $$ = $1 / $3; } +| '-' exp %prec NEG { $$ = -$2; } +| exp '^' exp { $$ = power ($1, $3); } +| '(' exp ')' { $$ = $2; } +| '(' error ')' { $$ = 1111; yyerrok; } +| '!' { $$ = 0; YYERROR; } +| '-' error { $$ = 0; YYERROR; } +; +%% + +]AT_SKEL_CC_IF( +[/* A C++ error reporting function. */ +void +AT_NAME_PREFIX::parser::error (AT_LOCATION_IF([const location& l, ])const std::string& m) +{ + std::cerr << AT_LOCATION_IF([l << ": " << ])m << std::endl; +} + +int +yyparse (AT_PARAM_IF([semantic_value *result, int *count])) +{ + AT_NAME_PREFIX::parser parser[]AT_PARAM_IF([ (result, count)]); +#if YYDEBUG + parser.set_debug_level (1); +#endif + return parser.parse (); +} +], +[static void +yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *llocp, ]) + AT_PARAM_IF([semantic_value *result, int *count, ]) + const char *s) +{ +AT_PARAM_IF([(void) result; (void) count;]) +AT_YYERROR_SEES_LOC_IF([ + fprintf (stderr, "%d.%d", + AT_LOC.first_line, AT_LOC.first_column); + if (AT_LOC.first_line != AT_LOC.last_line) + fprintf (stderr, "-%d.%d", + AT_LOC.last_line, AT_LOC.last_column - 1); + else if (AT_LOC.first_column != AT_LOC.last_column - 1) + fprintf (stderr, "-%d", + AT_LOC.last_column - 1); + fprintf (stderr, ": ");]) + fprintf (stderr, "%s\n", s); +}])[ + +]AT_DEFINES_IF(, [AT_CALC_LEX])[ static int power (int base, int exponent) { int res = 1; if (exponent < 0) - exit (1); + exit (3); for (/* Niente */; exponent; --exponent) res *= base; return res; } + int main (int argc, const char **argv) { - yyin = NULL; + semantic_value result = 0; + int count = 0; + int status; + + /* This used to be alarm (10), but that isn't enough time for + a July 1995 vintage DEC Alphastation 200 4/100 system, + according to Nelson H. F. Beebe. 100 seconds is enough. */ + alarm (100); if (argc == 2) - yyin = fopen (argv[1], "r"); + input = fopen (argv[1], "r"); else - yyin = stdin; + input = stdin; - if (!yyin) + if (!input) { perror (argv[1]); - exit (1); + return 3; } -#if YYDEBUG - yydebug = 1; -#endif -#if YYLSP_NEEDED - yylloc.last_column = 1; - yylloc.last_line = 1; -#endif - yyparse (); - return 0; +]AT_SKEL_CC_IF([], [m4_bmatch([$4], [%debug], +[ yydebug = 1;])])[ + status = yyparse (]AT_PARAM_IF([[&result, &count]])[); + fclose (input); + if (global_result != result) + abort (); + if (global_count != count) + abort (); + return status; } ]]) +AT_DEFINES_IF([AT_DATA_SOURCE([[calc-lex.c]AT_SKEL_CC_IF([[c]])], +[[#include "calc.h]AT_SKEL_CC_IF([[h]])[" + +]AT_CALC_LEX])]) +m4_popdef([AT_CALC_LEX]) ])# _AT_DATA_CALC_Y # AT_DATA_CALC_Y([BISON-OPTIONS]) # ------------------------------- -# Produce `calc.y'. +# Produce `calc.y' and, if %defines was specified, `calc-lex.c' or +# `calc-lex.cc'. m4_define([AT_DATA_CALC_Y], -[_AT_DATA_CALC_Y($[1], $[2], $[3], - [m4_bpatsubst([$1], [--[^ ]*])]) +[_AT_DATA_CALC_Y($[1], $[2], $[3], [$1]) ]) -# _AT_CHECK_CALC(BISON-OPTIONS, INPUT, [NUM-STDERR-LINES = 0]) -# ------------------------------------------------------------ +# _AT_CHECK_CALC(BISON-OPTIONS, INPUT, [NUM-STDERR-LINES]) +# -------------------------------------------------------- # Run `calc' on INPUT and expect no STDOUT nor STDERR. # # If BISON-OPTIONS contains `%debug' but not `%glr-parser', then +# # NUM-STDERR-LINES is the number of expected lines on stderr. +# Currently this is ignored, though, since the output format is fluctuating. # # We don't count GLR's traces yet, since its traces are somewhat # different from LALR's. @@ -292,45 +383,37 @@ m4_define([_AT_CHECK_CALC], [[$2 ]]) AT_PARSER_CHECK([./calc input], 0, [], [stderr]) -m4_bmatch([$1], - [%debug.*%glr\|%glr.*%debug], - [], - [%debug], - [AT_CHECK([wc -l at-stderr mv at-stderr stderr # 2. Create the reference error message. AT_DATA([[expout]], -[$4 +[$5 ]) # 3. If locations are not used, remove them. -m4_bmatch([$1], [--location], [], +AT_YYERROR_SEES_LOC_IF([], [[sed 's/^[-0-9.]*: //' expout >at-expout mv at-expout expout]]) # 4. If error-verbose is not used, strip the`, unexpected....' part. m4_bmatch([$1], [%error-verbose], [], -[[sed 's/parse error, .*$/parse error/' expout >at-expout +[[sed 's/syntax error, .*$/syntax error/' expout >at-expout mv at-expout expout]]) # 5. Check AT_CHECK([cat stderr], 0, [expout]) ]) -# AT_CHECK_CALC([BISON-OPTIONS]) -# ------------------------------ +# AT_CHECK_CALC([BISON-OPTIONS, [EXPECTED-TO-FAIL]]) +# -------------------------------------------------- # Start a testing chunk which compiles `calc' grammar with # BISON-OPTIONS, and performs several tests over the parser. +# However, if EXPECTED-TO-FAIL is nonempty, this test is expected to fail. m4_define([AT_CHECK_CALC], [# We use integers to avoid dependencies upon the precision of doubles. AT_SETUP([Calculator $1]) -AT_DATA_CALC_Y([$1]) +m4_ifval([$2], [AT_CHECK([exit 77])]) -# Specify the output files to avoid problems on different file systems. -AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [%[^ ]*])], - [0], [], []) +AT_BISON_OPTION_PUSHDEFS([$1]) -AT_COMPILE([calc]) +AT_DATA_CALC_Y([$1]) +AT_FULL_COMPILE([calc], [AT_DEFINES_IF([[lex]])]) # Test the priorities. _AT_CHECK_CALC([$1], @@ -394,38 +481,70 @@ _AT_CHECK_CALC([$1], 1 - (2 - 3) = 2 2^2^3 = 256 -(2^2)^3 = 64], [486]) - -# Some parse errors. -_AT_CHECK_CALC_ERROR([$1], [0 0], [11], - [1.3-1.4: parse error, unexpected "number"]) -_AT_CHECK_CALC_ERROR([$1], [1//2], [15], - [1.3-1.4: parse error, unexpected '/', expecting "number" or '-' or '(']) -_AT_CHECK_CALC_ERROR([$1], [error], [4], - [1.1-1.2: parse error, unexpected $undefined, expecting "number" or '-' or '\n' or '(']) -_AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], [22], - [1.7-1.8: parse error, unexpected '=']) -_AT_CHECK_CALC_ERROR([$1], +(2^2)^3 = 64], + [842]) + +# Some syntax errors. +_AT_CHECK_CALC_ERROR([$1], [1], [0 0], [15], + [1.3: syntax error, unexpected number]) +_AT_CHECK_CALC_ERROR([$1], [1], [1//2], [20], + [1.3: syntax error, unexpected '/', expecting number or '-' or '(' or '!']) +_AT_CHECK_CALC_ERROR([$1], [1], [error], [5], + [1.1: syntax error, unexpected $undefined]) +_AT_CHECK_CALC_ERROR([$1], [1], [1 = 2 = 3], [30], + [1.7: syntax error, unexpected '=']) +_AT_CHECK_CALC_ERROR([$1], [1], [ +1], - [14], - [2.1-2.2: parse error, unexpected '+']) + [20], + [2.1: syntax error, unexpected '+']) # Exercise error messages with EOF: work on an empty file. -_AT_CHECK_CALC_ERROR([$1], [/dev/null], [4], - [1.1-1.2: parse error, unexpected "end of file", expecting "number" or '-' or '\n' or '(']) +_AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [4], + [1.1: syntax error, unexpected end of input]) # Exercise the error token: without it, we die at the first error, -# hence be sure i. to have several errors, ii. to test the action -# associated to `error'. -_AT_CHECK_CALC_ERROR([$1], [(1 ++ 2) + (0 0) = 1], [82], -[1.5-1.6: parse error, unexpected '+', expecting "number" or '-' or '(' -1.15-1.16: parse error, unexpected "number" -calc: error: 0 != 1]) - -# Add a studid example demonstrating that Bison can further improve the -# error message. FIXME: Fix this ridiculous message. -_AT_CHECK_CALC_ERROR([$1], [()], [21], -[1.2-1.3: parse error, unexpected ')', expecting "number" or '-' or '(']) +# hence be sure to +# +# - have several errors which exercise different shift/discardings +# - (): nothing to pop, nothing to discard +# - (1 + 1 + 1 +): a lot to pop, nothing to discard +# - (* * *): nothing to pop, a lot to discard +# - (1 + 2 * *): some to pop and discard +# +# - test the action associated to `error' +# +# - check the lookahead that triggers an error is not discarded +# when we enter error recovery. Below, the lookahead causing the +# first error is ")", which is needed to recover from the error and +# produce the "0" that triggers the "0 != 1" error. +# +_AT_CHECK_CALC_ERROR([$1], [0], + [() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1], + [250], +[1.2: syntax error, unexpected ')', expecting number or '-' or '(' or '!' +1.18: syntax error, unexpected ')', expecting number or '-' or '(' or '!' +1.23: syntax error, unexpected '*', expecting number or '-' or '(' or '!' +1.41: syntax error, unexpected '*', expecting number or '-' or '(' or '!' +calc: error: 4444 != 1]) + +# The same, but this time exercising explicitly triggered syntax errors. +# POSIX says the lookahead causing the error should not be discarded. +_AT_CHECK_CALC_ERROR([$1], [0], [(!) + (0 0) = 1], [102], +[1.10: syntax error, unexpected number +calc: error: 2222 != 1]) +_AT_CHECK_CALC_ERROR([$1], [0], [(- *) + (0 0) = 1], [113], +[1.4: syntax error, unexpected '*', expecting number or '-' or '(' or '!' +1.12: syntax error, unexpected number +calc: error: 2222 != 1]) + +# Check that yyerrok works properly: second error is not reported, +# third and fourth are. Parse status is succesfull. +_AT_CHECK_CALC_ERROR([$1], [0], [(* *) + (*) + (*)], [113], +[1.2: syntax error, unexpected '*', expecting number or '-' or '(' or '!' +1.10: syntax error, unexpected '*', expecting number or '-' or '(' or '!' +1.16: syntax error, unexpected '*', expecting number or '-' or '(' or '!']) + +AT_BISON_OPTION_POPDEFS AT_CLEANUP ])# AT_CHECK_CALC @@ -437,7 +556,7 @@ AT_CLEANUP # Simple LALR Calculator. # # ------------------------ # -AT_BANNER([[Simple LALR Calculator.]]) +AT_BANNER([[Simple LALR(1) Calculator.]]) # AT_CHECK_CALC_LALR([BISON-OPTIONS]) # ----------------------------------- @@ -448,19 +567,26 @@ m4_define([AT_CHECK_CALC_LALR], AT_CHECK_CALC_LALR() -AT_CHECK_CALC_LALR([--defines]) -AT_CHECK_CALC_LALR([--locations]) -AT_CHECK_CALC_LALR([--name-prefix=calc]) -AT_CHECK_CALC_LALR([--verbose]) -AT_CHECK_CALC_LALR([--yacc]) +AT_CHECK_CALC_LALR([%defines]) +AT_CHECK_CALC_LALR([%locations]) +AT_CHECK_CALC_LALR([%name-prefix="calc"]) dnl test deprecated `=' +AT_CHECK_CALC_LALR([%verbose]) +AT_CHECK_CALC_LALR([%yacc]) AT_CHECK_CALC_LALR([%error-verbose]) -AT_CHECK_CALC_LALR([%error-verbose --locations]) +AT_CHECK_CALC_LALR([%define api.pure %locations]) +AT_CHECK_CALC_LALR([%define api.push_pull "both" %define api.pure %locations]) +AT_CHECK_CALC_LALR([%error-verbose %locations]) -AT_CHECK_CALC_LALR([%error-verbose --defines --locations --name-prefix=calc --verbose --yacc]) +AT_CHECK_CALC_LALR([%error-verbose %locations %defines %name-prefix "calc" %verbose %yacc]) AT_CHECK_CALC_LALR([%debug]) -AT_CHECK_CALC_LALR([%error-verbose %debug --defines --locations --name-prefix=calc --verbose --yacc]) +AT_CHECK_CALC_LALR([%error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) + +AT_CHECK_CALC_LALR([%define api.pure %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) +AT_CHECK_CALC_LALR([%define api.push_pull "both" %define api.pure %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) + +AT_CHECK_CALC_LALR([%define api.pure %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}]) # ----------------------- # @@ -474,21 +600,81 @@ AT_BANNER([[Simple GLR Calculator.]]) # Start a testing chunk which compiles `calc' grammar with # BISON-OPTIONS and %glr-parser, and performs several tests over the parser. m4_define([AT_CHECK_CALC_GLR], -[AT_CHECK_CALC([%glr_parser] $@)]) +[AT_CHECK_CALC([%glr-parser] $@)]) AT_CHECK_CALC_GLR() -AT_CHECK_CALC_GLR([--defines]) -AT_CHECK_CALC_GLR([--locations]) -AT_CHECK_CALC_GLR([--name-prefix=calc]) -AT_CHECK_CALC_GLR([--verbose]) -AT_CHECK_CALC_GLR([--yacc]) +AT_CHECK_CALC_GLR([%defines]) +AT_CHECK_CALC_GLR([%locations]) +AT_CHECK_CALC_GLR([%name-prefix "calc"]) +AT_CHECK_CALC_GLR([%verbose]) +AT_CHECK_CALC_GLR([%yacc]) AT_CHECK_CALC_GLR([%error-verbose]) -AT_CHECK_CALC_GLR([%error-verbose --locations]) +AT_CHECK_CALC_GLR([%define api.pure %locations]) +AT_CHECK_CALC_GLR([%error-verbose %locations]) -AT_CHECK_CALC_GLR([%error-verbose --defines --locations --name-prefix=calc --verbose --yacc]) +AT_CHECK_CALC_GLR([%error-verbose %locations %defines %name-prefix "calc" %verbose %yacc]) AT_CHECK_CALC_GLR([%debug]) -AT_CHECK_CALC_GLR([%error-verbose %debug --defines --locations --name-prefix=calc --verbose --yacc]) +AT_CHECK_CALC_GLR([%error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) + +AT_CHECK_CALC_GLR([%define api.pure %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) + +AT_CHECK_CALC_GLR([%define api.pure %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}]) + + +# ----------------------------- # +# Simple LALR1 C++ Calculator. # +# ----------------------------- # + +AT_BANNER([[Simple LALR(1) C++ Calculator.]]) + +# First let's try using %skeleton +AT_CHECK_CALC([%skeleton "lalr1.cc" %defines %locations]) + +# 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([%language "C++" %defines] $@)]) + +AT_CHECK_CALC_LALR1_CC([]) +AT_CHECK_CALC_LALR1_CC([%locations]) +AT_CHECK_CALC_LALR1_CC([%locations %error-verbose %name-prefix "calc" %verbose %yacc]) + +AT_CHECK_CALC_LALR1_CC([%locations %error-verbose %debug %name-prefix "calc" %verbose %yacc]) + +AT_CHECK_CALC_LALR1_CC([%locations %pure-parser %error-verbose %debug %name-prefix "calc" %verbose %yacc]) + +AT_CHECK_CALC_LALR1_CC([%locations %pure-parser %error-verbose %debug %name-prefix "calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}]) + + + +# --------------------------- # +# Simple GLR C++ Calculator. # +# --------------------------- # + +AT_BANNER([[Simple GLR C++ Calculator.]]) + +# Again, we try also using %skeleton. +AT_CHECK_CALC([%skeleton "glr.cc" %defines %locations]) + +# 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([%language "C++" %glr-parser %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}])