X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ebc3737ebfb51af5e59932b4167dd5927363cb11..56d60c19479822159e56960616cb3602e31f2a2c:/tests/calc.at?ds=inline diff --git a/tests/calc.at b/tests/calc.at index 913a13ae..c5040083 100644 --- a/tests/calc.at +++ b/tests/calc.at @@ -1,22 +1,19 @@ # Simple calculator. -*- Autotest -*- -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software -# Foundation, Inc. +# Copyright (C) 2000-2012 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, or (at your option) -# any later version. - +# 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 . ## ---------------------------------------------------- ## ## Compile the grammar described in the documentation. ## @@ -30,139 +27,21 @@ # _AT_DATA_CALC_Y($1, $2, $3, [BISON-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. +# 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_GRAMMAR([calc.y], -[[/* Infix notation calculator--calc */ -]$4[ -%{ -#include +m4_pushdef([AT_CALC_LEX], +[[#include -#include -#include -#if HAVE_UNISTD_H -# include -#else -# undef alarm -# define alarm(seconds) /* empty */ -#endif -#include - -/* Exercise pre-prologue dependency to %union. */ -typedef int semantic_value; - -static semantic_value global_result = 0; -static int global_count = 0; -%} - -/* Exercise %union. */ -%union -{ - semantic_value ival; -}; - -%{ -static int power (int base, int exponent); -]AT_LALR1_CC_IF([typedef yy::location YYLTYPE;], -[/* 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 - );])[ -static int yylex (]AT_LEX_FORMALS[); +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); -%} - -/* Bison Declarations */ -%token CALC_EOF 0 "end of input" -%token NUM "number" -%type exp - -%nonassoc '=' /* comparison */ -%left '-' '+' -%left '*' '/' -%left 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;])[ } -; - -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; } -| '!' { YYERROR; } -| '-' error { YYERROR; } -; -%% -/* The input. */ -static FILE *input; - -]AT_LALR1_CC_IF( -[/* A C++ error reporting function. */ -void -yy::parser::error (const location& l, const std::string& m) -{ - (void) l; - std::cerr << AT_LOCATION_IF([l << ": " << ])m << std::endl; -} - -int -yyparse (AT_PARAM_IF([semantic_value *result, int *count])) -{ - yy::parser parser[]AT_PARAM_IF([ (result, count)]); - parser.set_debug_level (!!YYDEBUG); - 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; @@ -176,21 +55,15 @@ get_char (]AT_LEX_FORMALS[) last_yylloc = AT_LOC; if (res == '\n') { -AT_LALR1_CC_IF( -[ AT_LOC.end.line++; - AT_LOC.end.column = 0;], -[ AT_LOC.last_line++; - AT_LOC.last_column = 0;]) + AT_LOC_LAST_LINE++; + AT_LOC_LAST_COLUMN = 1; } else -AT_LALR1_CC_IF( -[ AT_LOC.end.column++;], -[ AT_LOC.last_column++;]) + AT_LOC_LAST_COLUMN++; ])[ return res; } - static void unget_char (]AT_LEX_PRE_FORMALS[ int c) { @@ -228,15 +101,14 @@ read_signed_integer (]AT_LEX_FORMALS[) } - /*---------------------------------------------------------------. | 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 (]AT_LEX_FORMALS[) +int +]AT_NAME_PREFIX[lex (]AT_LEX_FORMALS[) { static int init = 1; int c; @@ -244,28 +116,21 @@ yylex (]AT_LEX_FORMALS[) if (init) { init = 0; -]AT_LALR1_CC_IF([], -[AT_LOCATION_IF([ - AT_LOC.last_column = 0; - AT_LOC.last_line = 1; -])])[ +]AT_LOCATION_IF([ + AT_LOC_LAST_COLUMN = 1; + AT_LOC_LAST_LINE = 1; +])[ } -]AT_LOCATION_IF([AT_LALR1_CC_IF( -[ AT_LOC.begin = AT_LOC.end;], -[ AT_LOC.first_column = AT_LOC.last_column; - AT_LOC.first_line = AT_LOC.last_line; -])])[ - - /* Skip white space. */ - while ((c = get_char (]AT_LEX_ARGS[)) == ' ' || c == '\t') + /* Skip current token, then white spaces. */ + do { -]AT_LOCATION_IF([AT_LALR1_CC_IF( -[ AT_LOC.begin = AT_LOC.end;], -[ AT_LOC.first_column = AT_LOC.last_column; - AT_LOC.first_line = AT_LOC.last_line; -])])[ +]AT_LOCATION_IF( +[ AT_LOC_FIRST_COLUMN = AT_LOC_LAST_COLUMN; + AT_LOC_FIRST_LINE = AT_LOC_LAST_LINE; +])[ } + while ((c = get_char (]AT_LEX_ARGS[)) == ' ' || c == '\t'); /* process numbers */ if (c == '.' || isdigit (c)) @@ -282,19 +147,215 @@ yylex (]AT_LEX_FORMALS[) /* 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 +{ +]AT_LOCATION_TYPE_IF([[ +# include + struct Point + { + int l; + int c; + }; + + struct Span + { + Point first; + Point last; + }; + +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (N) \ + { \ + (Current).first = YYRHSLOC (Rhs, 1).first; \ + (Current).last = YYRHSLOC (Rhs, N).last; \ + } \ + else \ + { \ + (Current).first = (Current).last = YYRHSLOC (Rhs, 0).last; \ + } \ + while (false) + +]])[ + /* 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[::parser::location_type +#endif +]])[ +} + +%code +{ +#include +#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_TYPE_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 (); +} +])])[ + +/* Bison Declarations */ +%token CALC_EOF 0 "end of input" +%token NUM "number" +%type exp + +%nonassoc '=' /* comparison */ +%left '-' '+' +%left '*' '/' +%left 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( +[AT_LOCATION_TYPE_IF([[ + std::ostream& + operator<< (std::ostream& o, const Span& s) + { + o << s.first.l << '.' << s.first.c; + if (s.first.l != s.last.l) + o << '-' << s.last.l << '.' << s.last.c - 1; + else if (s.first.c != s.last.c - 1) + o << '-' << s.last.c - 1; + return o; + } +]]) + +/* A C++ error reporting function. */ +void +AT_NAME_PREFIX::parser::error (const location_type& l, const std::string& m) +{ + (void) l; + std::cerr << AT_LOCATION_IF([l << ": " << ])m << std::endl; +} + +/* A C++ yyparse that simulates the C signature. */ +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 (); +} +], +[/* A C error reporting function. */ +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 (3); + assert (0 <= exponent); for (/* Niente */; exponent; --exponent) res *= base; return res; } +/* A C main function. */ int main (int argc, const char **argv) { @@ -318,9 +379,11 @@ 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])[); + status = yyparse (]AT_PARAM_IF([[&result, &count]])[); + if (fclose (input)) + perror ("fclose"); if (global_result != result) abort (); if (global_count != count) @@ -328,24 +391,32 @@ main (int argc, const char **argv) 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], [$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. @@ -354,17 +425,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. @@ -428,8 +493,8 @@ AT_CHECK([cat stderr], 0, [expout]) ]) -# AT_CHECK_CALC([BISON-OPTIONS [, EXPECTED-TO-FAIL]]) -# ------------------------------ +# 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. @@ -442,12 +507,7 @@ m4_ifval([$2], [AT_CHECK([exit 77])]) AT_BISON_OPTION_PUSHDEFS([$1]) AT_DATA_CALC_Y([$1]) - -AT_LALR1_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])]) +AT_FULL_COMPILE([calc], [AT_DEFINES_IF([[lex]])]) # Test the priorities. _AT_CHECK_CALC([$1], @@ -464,25 +524,25 @@ _AT_CHECK_CALC([$1], 2^2^3 = 256 (2^2)^3 = 64], - [571]) + [842]) # Some syntax errors. -_AT_CHECK_CALC_ERROR([$1], [1], [0 0], [13], - [1.2: syntax error, unexpected number]) -_AT_CHECK_CALC_ERROR([$1], [1], [1//2], [18], - [1.2: syntax error, unexpected '/', expecting number or '-' or '(' or '!']) +_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.0: syntax error, unexpected $undefined]) -_AT_CHECK_CALC_ERROR([$1], [1], [1 = 2 = 3], [26], - [1.6: syntax error, unexpected '=']) + [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], - [16], - [2.0: 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.0: syntax error, unexpected end of input]) + [1.1: syntax error, unexpected end of input]) # Exercise the error token: without it, we die at the first error, # hence be sure to @@ -495,29 +555,37 @@ _AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [4], # # - test the action associated to `error' # -# - check the look-ahead that triggers an error is not discarded -# when we enter error recovery. Below, the look-ahead causing the +# - 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], - [189], -[1.1: syntax error, unexpected ')', expecting number or '-' or '(' or '!' -1.17: syntax error, unexpected ')', expecting number or '-' or '(' or '!' -1.22: syntax error, unexpected '*', expecting number or '-' or '(' or '!' -1.40: syntax error, unexpected '*', expecting number or '-' or '(' or '!' + [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 look-ahead causing the error should not be discarded. -_AT_CHECK_CALC_ERROR([$1], [0], [(!) + (0 0) = 1], [76], -[1.9: syntax error, unexpected number +# 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], [86], -[1.3: syntax error, unexpected '*', expecting number or '-' or '(' or '!' -1.11: syntax error, unexpected number +_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 @@ -530,7 +598,7 @@ AT_CLEANUP # Simple LALR Calculator. # # ------------------------ # -AT_BANNER([[Simple LALR Calculator.]]) +AT_BANNER([[Simple LALR(1) Calculator.]]) # AT_CHECK_CALC_LALR([BISON-OPTIONS]) # ----------------------------------- @@ -543,22 +611,25 @@ 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([%pure-parser %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 %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 {semantic_value *result} %parse-param {int *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}]) # ----------------------- # @@ -579,56 +650,74 @@ 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([%pure-parser %locations]) +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([%pure-parser %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([%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([%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 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([%skeleton "lalr1.cc"] $@)]) +[AT_CHECK_CALC([%language "C++" %defines %locations] $@)]) + +AT_CHECK_CALC_LALR1_CC([]) +AT_CHECK_CALC_LALR1_CC([%define location_type Span]) +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}]) -# AT_CHECK_CALC_LALR1_CC() -AT_CHECK_CALC_LALR1_CC([%defines %locations]) -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]) +# --------------------------- # +# Simple GLR C++ Calculator. # +# --------------------------- # -# AT_CHECK_CALC_LALR1_CC([%pure-parser %locations]) -# AT_CHECK_CALC_LALR1_CC([%error-verbose %locations]) +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_LALR1_CC([%error-verbose %locations %defines %name-prefix="calc" %verbose %yacc]) +AT_CHECK_CALC_GLR_CC([]) +AT_CHECK_CALC_GLR_CC([%define location_type Span]) +AT_CHECK_CALC_GLR_CC([%error-verbose %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_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}])