X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4e8c79eb7ff24dd31ce7d1f6be8a164aea505185..a005a9c4dc5588fc017a1cb1d19c1560e0e68943:/tests/calc.at
diff --git a/tests/calc.at b/tests/calc.at
index d566c1db..2fb4d72b 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 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. ##
@@ -37,73 +37,70 @@ m4_define([_AT_DATA_CALC_Y],
[m4_fatal([$0: Invalid arguments: $@])])dnl
AT_DATA_GRAMMAR([calc.y],
[[/* Infix notation calculator--calc */
-]$4[
+]$4
+AT_SKEL_CC_IF(
+[%define global_tokens_and_yystype])[
%{
#include
-#if STDC_HEADERS
-# include
-# include
+#include
+#include
+#if HAVE_UNISTD_H
+# include
+#else
+# undef alarm
+# define alarm(seconds) /* empty */
#endif
#include
-#include
-
-extern void perror (const char *s);
+#define USE(Var)
/* Exercise pre-prologue dependency to %union. */
-typedef int value_t;
+typedef int semantic_value;
-static value_t global_result = 0;
+static semantic_value global_result = 0;
static int global_count = 0;
-
%}
/* Exercise %union. */
%union
{
- value_t ival;
+ semantic_value ival;
};
%{
-#if YYPURE
-# define LOC (*yylloc)
-# define VAL (*yylval)
-#else
-# define LOC (yylloc)
-# define VAL (yylval)
-#endif
-
-#define YYLLOC_FORMAL ]AT_LOCATION_IF([, YYLTYPE *yylloc])[
-#define YYLLOC_ARG ]AT_LOCATION_IF([, yylloc])[
-#define USE_YYLLOC ]AT_LOCATION_IF([(void) yylloc;])[
-
-#if YYPURE
-# define LEX_FORMALS YYSTYPE *yylval YYLLOC_FORMAL
-# define LEX_ARGS yylval YYLLOC_ARG
-# define USE_LEX_ARGS (void) yylval; USE_YYLLOC
-# define LEX_PRE_FORMALS LEX_FORMALS,
-# define LEX_PRE_ARGS LEX_ARGS,
-#else
-# define LEX_FORMALS void
-# define LEX_PRE_FORMALS
-# define LEX_ARGS
-# define LEX_PRE_ARGS
-# define USE_LEX_ARGS
-#endif
-
static int power (int base, int exponent);
-/* yyerror receives the location if:
+]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
+],
+[/* yyerror receives the location if:
- %location & %pure & %glr
- %location & %pure & %yacc & %parse-param. */
-static void yyerror (]AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ])[
- ]AT_PARAM_IF([value_t *result, int *count, ])[
+static void yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *llocp, ])
+ AT_PARAM_IF([semantic_value *result, int *count, ])
const char *s
- );
-static int yylex (LEX_FORMALS);
-static int yygetc (LEX_FORMALS);
-static void yyungetc (LEX_PRE_FORMALS int c);
+ );])[
+static int yylex (]AT_LEX_FORMALS[);
+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 {
+ @$.initialize (0);
+}
+])[
+
/* Bison Declarations */
%token CALC_EOF 0 "end of input"
%token NUM "number"
@@ -124,7 +121,7 @@ input:
line:
'\n'
-| exp '\n' { ]AT_PARAM_IF([*result = global_result = $1;])[ }
+| exp '\n' { ]AT_PARAM_IF([*result = global_result = $1], [USE ($1)])[; }
;
exp:
@@ -142,82 +139,107 @@ exp:
| '-' exp %prec NEG { $$ = -$2; }
| exp '^' exp { $$ = power ($1, $3); }
| '(' exp ')' { $$ = $2; }
-| '(' error ')' { $$ = 0; }
+| '(' error ')' { $$ = 1111; }
+| '!' { $$ = 0; YYERROR; }
+| '-' error { $$ = 0; YYERROR; }
;
%%
-/* The input. */
-static FILE *yyin;
+/* The input. */
+static FILE *input;
-static void
-yyerror (]AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ])[
- ]AT_PARAM_IF([value_t *result, int *count, ])[
- const char *s
- )
+]AT_SKEL_CC_IF(
+[/* A C++ error reporting function. */
+void
+AT_NAME_PREFIX::parser::error (const location& l, const std::string& m)
{
-]AT_PARAM_IF([(void) result; (void) count; ])[
-]AT_YYERROR_SEES_LOC_IF([
- fprintf (stderr, "%d.%d-%d.%d: ",
- LOC.first_line, LOC.first_column,
- LOC.last_line, LOC.last_column);
-])[
- fprintf (stderr, "%s\n", s);
+ (void) l;
+ 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_LOCATION_IF([
static YYLTYPE last_yylloc;
])[
static int
-yygetc (LEX_FORMALS)
+get_char (]AT_LEX_FORMALS[)
{
- int res = getc (yyin);
- USE_LEX_ARGS;
+ int res = getc (input);
+ ]AT_USE_LEX_ARGS[;
]AT_LOCATION_IF([
- last_yylloc = LOC;
+ last_yylloc = AT_LOC;
if (res == '\n')
{
- LOC.last_line++;
- LOC.last_column = 1;
+ AT_LOC.last_line++;
+ AT_LOC.last_column = 1;
}
else
- LOC.last_column++;
+ AT_LOC.last_column++;
])[
return res;
}
static void
-yyungetc (LEX_PRE_FORMALS int c)
+unget_char (]AT_LEX_PRE_FORMALS[ int c)
{
- USE_LEX_ARGS;
+ ]AT_USE_LEX_ARGS[;
]AT_LOCATION_IF([
/* Wrong when C == `\n'. */
- LOC = last_yylloc;
+ AT_LOC = last_yylloc;
])[
- ungetc (c, yyin);
+ ungetc (c, input);
}
static int
-read_signed_integer (LEX_FORMALS)
+read_signed_integer (]AT_LEX_FORMALS[)
{
- int c = yygetc (LEX_ARGS);
+ int c = get_char (]AT_LEX_ARGS[);
int sign = 1;
int n = 0;
- USE_LEX_ARGS;
+ ]AT_USE_LEX_ARGS[;
if (c == '-')
{
- c = yygetc (LEX_ARGS);
+ c = get_char (]AT_LEX_ARGS[);
sign = -1;
}
while (isdigit (c))
{
n = 10 * n + (c - '0');
- c = yygetc (LEX_ARGS);
+ c = get_char (]AT_LEX_ARGS[);
}
- yyungetc (LEX_PRE_ARGS c);
+ unget_char (]AT_LEX_PRE_ARGS[ c);
return sign * n;
}
@@ -231,7 +253,7 @@ read_signed_integer (LEX_FORMALS)
`---------------------------------------------------------------*/
static int
-yylex (LEX_FORMALS)
+yylex (]AT_LEX_FORMALS[)
{
static int init = 1;
int c;
@@ -240,30 +262,30 @@ yylex (LEX_FORMALS)
{
init = 0;
]AT_LOCATION_IF([
- LOC.last_column = 1;
- LOC.last_line = 1;
+ AT_LOC.last_column = 1;
+ AT_LOC.last_line = 1;
])[
}
]AT_LOCATION_IF([
- LOC.first_column = LOC.last_column;
- LOC.first_line = LOC.last_line;
+ AT_LOC.first_column = AT_LOC.last_column;
+ AT_LOC.first_line = AT_LOC.last_line;
])[
/* Skip white space. */
- while ((c = yygetc (LEX_ARGS)) == ' ' || c == '\t')
+ while ((c = get_char (]AT_LEX_ARGS[)) == ' ' || c == '\t')
{
-]AT_LOCATION_IF([
- LOC.first_column = LOC.last_column;
- LOC.first_line = LOC.last_line;
+]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 (LEX_PRE_ARGS c);
- VAL.ival = read_signed_integer (LEX_ARGS);
+ unget_char (]AT_LEX_PRE_ARGS[ c);
+ ]AT_VAL[.ival = read_signed_integer (]AT_LEX_ARGS[);
return NUM;
}
@@ -280,36 +302,44 @@ 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)
{
- value_t result = 0;
+ 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
- status = yyparse (]AT_PARAM_IF([&result, &count])[);
- assert (global_result == result);
- assert (global_count == count);
+]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;
}
]])
@@ -325,12 +355,14 @@ m4_define([AT_DATA_CALC_Y],
-# _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.
@@ -339,17 +371,11 @@ 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.
@@ -412,72 +439,26 @@ AT_CHECK([cat stderr], 0, [expout])
])
-# AT_CALC_PUSHDEFS($1, $2, [BISON-OPTIONS])
-# -----------------------------------------
-# This macro works around the impossibility to define macros
-# inside macros, because issuing `[$1]' is not possible in M4 :(.
-# This sucks hard, GNU M4 should really provide M5 like $$1.
-m4_define([AT_CHECK_PUSHDEFS],
-[m4_if([$1$2], $[1]$[2], [],
- [m4_fatal([$0: Invalid arguments: $@])])dnl
-m4_pushdef([AT_PARAM_IF],
-[m4_bmatch([$3], [%parse-param], [$1], [$2])])
-m4_pushdef([AT_LOCATION_IF],
-[m4_bmatch([$3], [%locations], [$1], [$2])])
-m4_pushdef([AT_PURE_IF],
-[m4_bmatch([$3], [%pure-parser], [$1], [$2])])
-m4_pushdef([AT_GLR_IF],
-[m4_bmatch([$3], [%glr-parser], [$1], [$2])])
-m4_pushdef([AT_PURE_AND_LOC_IF],
-[m4_bmatch([$3], [%locations.*%pure-parser\|%pure-parser.*%locations],
- [$1], [$2])])
-m4_pushdef([AT_GLR_OR_PARAM_IF],
-[m4_bmatch([$3], [%glr-parser\|%parse-param], [$1], [$2])])
-
-# yyerror receives the location if %location & %pure & (%glr or %parse-param).
-m4_pushdef([AT_YYERROR_ARG_LOC_IF],
-[AT_GLR_OR_PARAM_IF([AT_PURE_AND_LOC_IF([$1], [$2])],
- [$2])])
-# yyerror cannot see the locations if !glr & pure & !param.
-m4_pushdef([AT_YYERROR_SEES_LOC_IF],
-[AT_LOCATION_IF([AT_GLR_IF([$1],
- [AT_PURE_IF([AT_PARAM_IF([$1], [$2])],
- [$1])])],
- [$2])])
-])
-
-
-# AT_CALC_POPDEFS
-# ---------------
-m4_define([AT_CHECK_POPDEFS],
-[m4_popdef([AT_YYERROR_SEES_LOC_IF])
-m4_popdef([AT_YYERROR_ARG_LOC_IF])
-m4_popdef([AT_GLR_OR_PARAM_IF])
-m4_popdef([AT_PURE_AND_LOC_IF])
-m4_popdef([AT_GLR_IF])
-m4_popdef([AT_LOCATION_IF])
-m4_popdef([AT_PARAM_IF])
-])
-
-
-
-# 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_CHECK_PUSHDEFS($[1], $[2], [$1])
+m4_ifval([$2], [AT_CHECK([exit 77])])
-AT_DATA_CALC_Y([$1])
+AT_BISON_OPTION_PUSHDEFS([$1])
-# Specify the output files to avoid problems on different file systems.
-AT_CHECK([bison -o calc.c calc.y],
- [0], [], [])
+AT_DATA_CALC_Y([$1])
-AT_COMPILE([calc])
+AT_SKEL_CC_IF(
+ [AT_CHECK([bison -o calc.cc calc.y])
+ AT_COMPILE_CXX([calc])],
+ [AT_CHECK([bison -o calc.c calc.y])
+ AT_COMPILE([calc])])
# Test the priorities.
_AT_CHECK_CALC([$1],
@@ -494,35 +475,61 @@ _AT_CHECK_CALC([$1],
2^2^3 = 256
(2^2)^3 = 64],
- [486])
+ [842])
# Some syntax errors.
-_AT_CHECK_CALC_ERROR([$1], [1], [0 0], [11],
- [1.3-1.4: syntax error, unexpected "number"])
-_AT_CHECK_CALC_ERROR([$1], [1], [1//2], [15],
- [1.3-1.4: syntax error, unexpected '/', expecting "number" or '-' or '('])
-_AT_CHECK_CALC_ERROR([$1], [1], [error], [4],
- [1.1-1.2: syntax error, unexpected $undefined, expecting "number" or '-' or '\n' or '('])
-_AT_CHECK_CALC_ERROR([$1], [1], [1 = 2 = 3], [22],
- [1.7-1.8: syntax error, unexpected '='])
+_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: syntax error, unexpected '+'])
+ [20],
+ [2.1: syntax error, unexpected '+'])
# Exercise error messages with EOF: work on an empty file.
_AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [4],
- [1.1-1.2: syntax error, unexpected "end of input", expecting "number" or '-' or '\n' or '('])
+ [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], [0], [(1 ++ 2) + (0 0) = 1], [82],
-[1.5-1.6: syntax error, unexpected '+', expecting "number" or '-' or '('
-1.15-1.16: syntax error, unexpected "number"
-calc: error: 0 != 1])
-
-AT_CHECK_POPDEFS
+# 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])
+AT_BISON_OPTION_POPDEFS
AT_CLEANUP
])# AT_CHECK_CALC
@@ -534,7 +541,7 @@ AT_CLEANUP
# Simple LALR Calculator. #
# ------------------------ #
-AT_BANNER([[Simple LALR Calculator.]])
+AT_BANNER([[Simple LALR(1) Calculator.]])
# AT_CHECK_CALC_LALR([BISON-OPTIONS])
# -----------------------------------
@@ -547,21 +554,24 @@ 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([%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([%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 %locations %defines %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 %locations %defines %name-prefix="calc" %verbose %yacc])
+AT_CHECK_CALC_LALR([%error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc])
-AT_CHECK_CALC_LALR([%pure-parser %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([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {value_t *result}, {result} %parse-param {int *count}, {count}])
+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}])
# ----------------------- #
@@ -582,18 +592,73 @@ 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([%name-prefix "calc"])
AT_CHECK_CALC_GLR([%verbose])
AT_CHECK_CALC_GLR([%yacc])
AT_CHECK_CALC_GLR([%error-verbose])
+AT_CHECK_CALC_GLR([%define api.pure %locations])
AT_CHECK_CALC_GLR([%error-verbose %locations])
-AT_CHECK_CALC_GLR([%error-verbose %locations %defines %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 %locations %defines %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 %locations] $@)])
+
+AT_CHECK_CALC_LALR1_CC([])
+AT_CHECK_CALC_LALR1_CC([%error-verbose %name-prefix "calc" %verbose %yacc])
+
+AT_CHECK_CALC_LALR1_CC([%error-verbose %debug %name-prefix "calc" %verbose %yacc])
+
+AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %name-prefix "calc" %verbose %yacc])
+
+AT_CHECK_CALC_LALR1_CC([%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([%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_GLR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {value_t *result}, {result} %parse-param {int *count}, {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}])