X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0b86fc416c177b8fa87131dabf4242999332e8b9..3c5362b825a9d01eafe257943b7faad92ea43a05:/tests/calc.at?ds=sidebyside diff --git a/tests/calc.at b/tests/calc.at index a768fffe..52051ef7 100644 --- a/tests/calc.at +++ b/tests/calc.at @@ -1,20 +1,20 @@ -# Checking the output filenames. -*- Autotest -*- -# Copyright (C) 2000, 2001, 2002, 2003 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, +# 2009 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. ## @@ -28,217 +28,88 @@ # _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 - -#if STDC_HEADERS -# include -# include -#endif -#include - -extern void perror (const char *s); - -/* Exercise pre-prologue dependency to %union. */ -typedef int value; - -static value global_result = 0; -static int global_count = 0; - -]AT_LALR1_CC_IF([typedef yy::Location YYLTYPE;])[ -%} - -/* Exercise %union. */ -%union -{ - value ival; -}; - -%{ -static int power (int base, int exponent); -/* 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 *result, int *count, ])[ - const char *s - ); -static int yylex (]AT_LEX_FORMALS[); -static int yygetc (]AT_LEX_FORMALS[); -static void yyungetc (]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; } -; -%% -/* The input. */ -static FILE *yyin; - -]AT_LALR1_CC_IF( -[/* Currently, print_ is required in C++. */ -void -yy::Parser::print_ () -{ - std::cerr << location; -} - -/* A C++ error reporting function. */ -void -yy::Parser::error_ () -{ - std::cerr << location << ": " << message << std::endl; -} - -int -yyparse (void) -{ - yy::Parser parser = yy::Parser (!!YYDEBUG[]AT_LOCATION_IF([, - yy::Location::Location ()])); - return parser.parse (); -} -], -[static void -yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ]) - AT_PARAM_IF([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); -}])[ +m4_pushdef([AT_CALC_LEX], +[[#include +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); ]AT_LOCATION_IF([ static YYLTYPE last_yylloc; ])[ static int -yygetc (]AT_LEX_FORMALS[) +get_char (]AT_LEX_FORMALS[) { - int res = getc (yyin); + int res = getc (input); ]AT_USE_LEX_ARGS[; ]AT_LOCATION_IF([ 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 -yyungetc (]AT_LEX_PRE_FORMALS[ int c) +unget_char (]AT_LEX_PRE_FORMALS[ int c) { ]AT_USE_LEX_ARGS[; ]AT_LOCATION_IF([ /* Wrong when C == `\n'. */ AT_LOC = last_yylloc; ])[ - ungetc (c, yyin); + ungetc (c, input); } static int read_signed_integer (]AT_LEX_FORMALS[) { - int c = yygetc (]AT_LEX_ARGS[); + int c = get_char (]AT_LEX_ARGS[); int sign = 1; int n = 0; ]AT_USE_LEX_ARGS[; if (c == '-') { - c = yygetc (]AT_LEX_ARGS[); + c = get_char (]AT_LEX_ARGS[); sign = -1; } while (isdigit (c)) { n = 10 * n + (c - '0'); - c = yygetc (]AT_LEX_ARGS[); + c = get_char (]AT_LEX_ARGS[); } - yyungetc (]AT_LEX_PRE_ARGS[ 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 (]AT_LEX_FORMALS[) +int +]AT_NAME_PREFIX[lex (]AT_LEX_FORMALS[) { static int init = 1; int c; @@ -246,53 +117,198 @@ yylex (]AT_LEX_FORMALS[) if (init) { init = 0; -]AT_LALR1_CC_IF([], -[AT_LOCATION_IF([ - AT_LOC.last_column = 0; +]AT_LOCATION_IF([ + AT_LOC.last_column = 1; AT_LOC.last_line = 1; -])])[ +])[ } -]AT_LALR1_CC_IF( -[ AT_LOC.begin = AT_LOC.end;], -[AT_LOCATION_IF([ - AT_LOC.first_column = AT_LOC.last_column; +]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 (]AT_LEX_ARGS[)) == ' ' || c == '\t') + while ((c = get_char (]AT_LEX_ARGS[)) == ' ' || c == '\t') { -]AT_LALR1_CC_IF( -[ AT_LOC.begin = AT_LOC.end;], -[AT_LOCATION_IF([ - AT_LOC.first_column = AT_LOC.last_column; +]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 (]AT_LEX_PRE_ARGS[ c); + unget_char (]AT_LEX_PRE_ARGS[ c); ]AT_VAL[.ival = read_signed_integer (]AT_LEX_ARGS[); - return NUM; + return ]AT_TOKEN_PREFIX[NUM; } /* Return end-of-file. */ if (c == EOF) - return CALC_EOF; + return ]AT_TOKEN_PREFIX[CALC_EOF; /* 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; @@ -302,25 +318,30 @@ power (int base, int exponent) int main (int argc, const char **argv) { - value 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])[); +]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) @@ -328,24 +349,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 +383,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. @@ -419,7 +443,7 @@ 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], [], +m4_bmatch([$1], [%define parse.error verbose], [], [[sed 's/syntax error, .*$/syntax error/' expout >at-expout mv at-expout expout]]) # 5. Check @@ -427,117 +451,21 @@ 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_LALR1_CC_IF], -[m4_bmatch([$3], ["lalr1.cc"], [$1], [$2])]) -m4_pushdef([AT_GLR_IF], -[m4_bmatch([$3], [%glr-parser], [$1], [$2])]) -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_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_LALR1_CC_IF([$1], - [AT_LOCATION_IF([AT_GLR_IF([$1], - [AT_PURE_IF([AT_PARAM_IF([$1], - [$2])], - [$1])])], - [$2])])]) - -# The interface is pure: either because %pure-parser, or because we -# are using the C++ parsers. -m4_pushdef([AT_PURE_LEX_IF], -[AT_PURE_IF([$1], - [AT_LALR1_CC_IF([$1], [$2])])]) - -AT_PURE_LEX_IF( -[m4_pushdef([AT_LOC], [(*yylloc)]) - m4_pushdef([AT_VAL], [(*yylval)]) - m4_pushdef([AT_LEX_FORMALS], - [YYSTYPE *yylval[]AT_LOCATION_IF([, YYLTYPE *yylloc])]) - m4_pushdef([AT_LEX_ARGS], - [yylval[]AT_LOCATION_IF([, yylloc])]) - m4_pushdef([AT_USE_LEX_ARGS], - [(void) yylval;AT_LOCATION_IF([(void) yylloc])]) - m4_pushdef([AT_LEX_PRE_FORMALS], - [AT_LEX_FORMALS, ]) - m4_pushdef([AT_LEX_PRE_ARGS], - [AT_LEX_ARGS, ]) -], -[m4_pushdef([AT_LOC], [(yylloc)]) - m4_pushdef([AT_VAL], [(yylval)]) - m4_pushdef([AT_LEX_FORMALS], [void]) - m4_pushdef([AT_LEX_ARGS], []) - m4_pushdef([AT_USE_LEX_ARGS], []) - m4_pushdef([AT_LEX_PRE_FORMALS], []) - m4_pushdef([AT_LEX_PRE_ARGS], []) -]) -])# AT_CALC_PUSHDEFS - - -# AT_CALC_POPDEFS -# --------------- -m4_define([AT_CHECK_POPDEFS], -[m4_popdef([AT_LEX_PRE_ARGS]) -m4_popdef([AT_LEX_PRE_FORMALS]) -m4_popdef([AT_USE_LEX_ARGS]) -m4_popdef([AT_LEX_ARGS]) -m4_popdef([AT_LEX_FORMALS]) -m4_popdef([AT_VAL]) -m4_popdef([AT_LOC]) -m4_popdef([AT_PURE_LEX_IF]) -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_LOCATION_IF]) -m4_popdef([AT_PARAM_IF]) -m4_popdef([AT_GLR_IF]) -m4_popdef([AT_LALR1_CC_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]) - -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 -o calc.c calc.y], - [0], [], []) +AT_BISON_OPTION_PUSHDEFS([$1]) -AT_LALR1_CC_IF( -[AT_CHECK([$CXX --version || exit 77], 0, ignore, ignore) -AT_COMPILE_CXX([calc])], -[AT_COMPILE([calc])]) +AT_DATA_CALC_Y([$1]) +AT_FULL_COMPILE([calc], [AT_DEFINES_IF([[lex]])]) # Test the priorities. _AT_CHECK_CALC([$1], @@ -554,25 +482,25 @@ _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.2: syntax error, unexpected "number"]) -_AT_CHECK_CALC_ERROR([$1], [1], [1//2], [15], - [1.2: syntax error, unexpected '/', expecting "number" or '-' or '(' or '!']) -_AT_CHECK_CALC_ERROR([$1], [1], [error], [4], - [1.0: syntax error, unexpected $undefined]) -_AT_CHECK_CALC_ERROR([$1], [1], [1 = 2 = 3], [22], - [1.6: 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.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 @@ -592,19 +520,31 @@ _AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [4], # _AT_CHECK_CALC_ERROR([$1], [0], [() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1], - [156], -[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 lookahead causing the error should not be discarded. -_AT_CHECK_CALC_ERROR([$1], [0], [(!) + (0 0) = 1], [64], -[1.9: syntax error, unexpected "number" +_AT_CHECK_CALC_ERROR([$1], [0], [(!) + (0 0) = 1], [102], +[1.10: syntax error, unexpected number calc: error: 2222 != 1]) -AT_CHECK_POPDEFS +_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 @@ -616,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]) # ----------------------------------- @@ -629,21 +569,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([%define parse.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([%define parse.error verbose %locations]) -AT_CHECK_CALC_LALR([%error-verbose %locations %defines %name-prefix="calc" %verbose %yacc]) +AT_CHECK_CALC_LALR([%define parse.error verbose %locations %defines %name-prefix "calc" %verbose %yacc]) +AT_CHECK_CALC_LALR([%define parse.error verbose %locations %defines %name-prefix "calc" %define api.tokens.prefix "TOK_" %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([%define parse.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 %define parse.error verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) +AT_CHECK_CALC_LALR([%define api.push-pull both %define api.pure %define parse.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 *result} %parse-param {int *count}]) +AT_CHECK_CALC_LALR([%define api.pure %define parse.error verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}]) # ----------------------- # @@ -664,55 +608,77 @@ 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 parse.error verbose]) -AT_CHECK_CALC_GLR([%error-verbose %locations]) +AT_CHECK_CALC_GLR([%define api.pure %locations]) +AT_CHECK_CALC_GLR([%define parse.error verbose %locations]) -AT_CHECK_CALC_GLR([%error-verbose %locations %defines %name-prefix="calc" %verbose %yacc]) +AT_CHECK_CALC_GLR([%define parse.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([%define parse.error verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) +AT_CHECK_CALC_GLR([%define parse.error verbose %debug %locations %defines %name-prefix "calc" %define api.tokens.prefix "TOK_" %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 %define parse.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 {value *result} %parse-param {int *count}]) +AT_CHECK_CALC_GLR([%define api.pure %define parse.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 -# BISON-OPTIONS and %glr-parser, and performs several tests over the parser. +# 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] $@)]) -# AT_CHECK_CALC_LALR1_CC() +AT_CHECK_CALC_LALR1_CC([]) +AT_CHECK_CALC_LALR1_CC([%locations]) +AT_CHECK_CALC_LALR1_CC([%locations %define parse.error verbose %name-prefix "calc" %verbose %yacc]) -# FIXME: YYERROR is not supported -# AT_CHECK_CALC_LALR1_CC([%defines %pure-parser %locations]) +AT_CHECK_CALC_LALR1_CC([%locations %define parse.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([%locations %pure-parser %define parse.error verbose %debug %name-prefix "calc" %verbose %yacc]) +AT_CHECK_CALC_LALR1_CC([%locations %pure-parser %define parse.error verbose %debug %name-prefix "calc" %define api.tokens.prefix "TOK_" %verbose %yacc]) -# AT_CHECK_CALC_LALR1_CC([%error-verbose %locations]) +AT_CHECK_CALC_LALR1_CC([%locations %pure-parser %define parse.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_LALR1_CC([%error-verbose %locations %defines %name-prefix="calc" %verbose %yacc]) +AT_CHECK_CALC_GLR_CC([]) +AT_CHECK_CALC_GLR_CC([%define parse.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([%define parse.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 %define parse.error verbose %debug %name-prefix "calc" %verbose %yacc]) +AT_CHECK_CALC_GLR_CC([%pure-parser %define parse.error verbose %debug %name-prefix "calc" %define api.tokens.prefix "TOK_" %verbose %yacc]) -# AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {value *result} %parse-param {int *count}]) +AT_CHECK_CALC_GLR_CC([%pure-parser %define parse.error verbose %debug %name-prefix "calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}])