X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c19988b766d542b4d4c83b1b27579ee83cb5f930..b59d8a44df6bd5fb41088a41d8ba62c27994e9c2:/tests/calc.at diff --git a/tests/calc.at b/tests/calc.at index f09e5249..a6192142 100644 --- a/tests/calc.at +++ b/tests/calc.at @@ -1,5 +1,5 @@ # Checking the output filenames. -*- Autotest -*- -# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003 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 @@ -26,8 +26,8 @@ # ------------------------- # -# _AT_DATA_CALC_Y($1, $2, $3, [CPP-DIRECTIVES]) -# --------------------------------------------- +# _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 @@ -35,72 +35,46 @@ m4_define([_AT_DATA_CALC_Y], [m4_if([$1$2$3], $[1]$[2]$[3], [], [m4_fatal([$0: Invalid arguments: $@])])dnl -AT_DATA([calc.y], +AT_DATA_GRAMMAR([calc.y], [[/* Infix notation calculator--calc */ - +]$4[ %{ -#include -/* We don't need perfect functions for these tests. */ -#undef malloc -#undef memcmp -#undef realloc #include #if STDC_HEADERS # include # include -#else -char *strcat(char *dest, const char *src); #endif #include extern void perror (const char *s); /* Exercise pre-prologue dependency to %union. */ -typedef int value_t; +typedef int value; +static value global_result = 0; +static int global_count = 0; %} /* Exercise %union. */ %union { - value_t ival; + value ival; }; %{ -#if YYPURE -# define LOC (*yylloc) -# define VAL (*yylval) -#else -# define LOC (yylloc) -# define VAL (yylval) -#endif - -#if YYPURE -# if YYLSP_NEEDED -# define LEX_FORMALS YYSTYPE *yylval, YYLTYPE *yylloc -# define LEX_ARGS yylval, yylloc -# define USE_LEX_ARGS (void) yylval; (void) yylloc; -# else -# define LEX_FORMALS YYSTYPE *yylval -# define LEX_ARGS yylval -# define USE_LEX_ARGS (void) yylval -# endif -# 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); -static void yyerror (const char *s); -static int yylex (LEX_FORMALS); -static int yygetc (LEX_FORMALS); -static void yyungetc (LEX_PRE_FORMALS int c); +]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 *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 */ @@ -114,27 +88,25 @@ static void yyungetc (LEX_PRE_FORMALS int c); %left NEG /* negation--unary minus */ %right '^' /* exponentiation */ -]$4[ - /* Grammar follows */ %% input: line -| input line +| input line { ]AT_PARAM_IF([++*count; ++global_count;])[ } ; line: '\n' -| exp '\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 == $3; + if ($1 != $3) + fprintf (stderr, "calc: error: %d != %d\n", $1, $3); + $$ = $1; } | exp '+' exp { $$ = $1 + $3; } | exp '-' exp { $$ = $1 - $3; } @@ -143,78 +115,115 @@ exp: | '-' exp %prec NEG { $$ = -$2; } | exp '^' exp { $$ = power ($1, $3); } | '(' exp ')' { $$ = $2; } -| '(' error ')' { $$ = 0; } +| '(' error ')' { $$ = 1111; } +| '!' { YYERROR; } ; %% /* The input. */ -FILE *yyin; +static FILE *yyin; -static void -yyerror (const char *s) +]AT_LALR1_CC_IF( +[/* Currently, print_ is required in C++. */ +void +yy::Parser::print_ () { -#if YYLSP_NEEDED - fprintf (stderr, "%d.%d-%d.%d: ", - LOC.first_line, LOC.first_column, - LOC.last_line, LOC.last_column); -#endif - fprintf (stderr, "%s\n", s); +AT_LOCATION_IF([ + std::cerr << location;]) } +/* A C++ error reporting function. */ +void +yy::Parser::error_ () +{ + std::cerr << AT_LOCATION_IF([location << ": " << ])message << std::endl; +} -#if YYLSP_NEEDED +int +yyparse (void) +{ + yy::Parser 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); +}])[ + + +]AT_LOCATION_IF([ static YYLTYPE last_yylloc; -#endif +])[ static int -yygetc (LEX_FORMALS) +yygetc (]AT_LEX_FORMALS[) { int res = getc (yyin); - USE_LEX_ARGS; -#if YYLSP_NEEDED - last_yylloc = LOC; + ]AT_USE_LEX_ARGS[; +]AT_LOCATION_IF([ + last_yylloc = AT_LOC; if (res == '\n') { - LOC.last_line++; - LOC.last_column = 1; +AT_LALR1_CC_IF( +[ AT_LOC.end.line++; + AT_LOC.end.column = 0;], +[ AT_LOC.last_line++; + AT_LOC.last_column = 0;]) } else - LOC.last_column++; -#endif +AT_LALR1_CC_IF( +[ AT_LOC.end.column++;], +[ AT_LOC.last_column++;]) +])[ return res; } static void -yyungetc (LEX_PRE_FORMALS int c) +yyungetc (]AT_LEX_PRE_FORMALS[ int c) { - USE_LEX_ARGS; -#if YYLSP_NEEDED + ]AT_USE_LEX_ARGS[; +]AT_LOCATION_IF([ /* Wrong when C == `\n'. */ - LOC = last_yylloc; -#endif + AT_LOC = last_yylloc; +])[ ungetc (c, yyin); } static int -read_signed_integer (LEX_FORMALS) +read_signed_integer (]AT_LEX_FORMALS[) { - int c = yygetc (LEX_ARGS); + int c = yygetc (]AT_LEX_ARGS[); int sign = 1; int n = 0; - USE_LEX_ARGS; + ]AT_USE_LEX_ARGS[; if (c == '-') { - c = yygetc (LEX_ARGS); + c = yygetc (]AT_LEX_ARGS[); sign = -1; } while (isdigit (c)) { n = 10 * n + (c - '0'); - c = yygetc (LEX_ARGS); + c = yygetc (]AT_LEX_ARGS[); } - yyungetc (LEX_PRE_ARGS c); + yyungetc (]AT_LEX_PRE_ARGS[ c); return sign * n; } @@ -228,7 +237,7 @@ read_signed_integer (LEX_FORMALS) `---------------------------------------------------------------*/ static int -yylex (LEX_FORMALS) +yylex (]AT_LEX_FORMALS[) { static int init = 1; int c; @@ -236,31 +245,34 @@ yylex (LEX_FORMALS) if (init) { init = 0; -#if YYLSP_NEEDED - yylloc.last_column = 1; - yylloc.last_line = 1; -#endif +]AT_LALR1_CC_IF([], +[AT_LOCATION_IF([ + AT_LOC.last_column = 0; + AT_LOC.last_line = 1; +])])[ } -#if YYLSP_NEEDED - LOC.first_column = LOC.last_column; - LOC.first_line = LOC.last_line; -#endif +]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 = yygetc (LEX_ARGS)) == ' ' || c == '\t') + while ((c = yygetc (]AT_LEX_ARGS[)) == ' ' || c == '\t') { -#if YYLSP_NEEDED - LOC.first_column = LOC.last_column; - LOC.first_line = LOC.last_line; -#endif +]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; +])])[ } /* process numbers */ if (c == '.' || isdigit (c)) { - yyungetc (LEX_PRE_ARGS c); - VAL.ival = read_signed_integer (LEX_ARGS); + yyungetc (]AT_LEX_PRE_ARGS[ c); + ]AT_VAL[.ival = read_signed_integer (]AT_LEX_ARGS[); return NUM; } @@ -283,10 +295,13 @@ power (int base, int exponent) return res; } + int main (int argc, const char **argv) { - yyin = NULL; + value result = 0; + int count = 0; + int status; if (argc == 2) yyin = fopen (argv[1], "r"); @@ -299,11 +314,14 @@ main (int argc, const char **argv) exit (1); } -#if YYDEBUG - yydebug = 1; -#endif - yyparse (); - return 0; +]AT_LALR1_CC_IF([], [m4_bmatch([$4], [%debug], +[ yydebug = 1;])])[ + status = yyparse (]AT_PARAM_IF([&result, &count])[); + if (global_result != result) + abort (); + if (global_count != count) + abort (); + return status; } ]]) ])# _AT_DATA_CALC_Y @@ -313,8 +331,7 @@ main (int argc, const char **argv) # ------------------------------- # Produce `calc.y'. m4_define([AT_DATA_CALC_Y], -[_AT_DATA_CALC_Y($[1], $[2], $[3], - [m4_bpatsubst([$1], [--[^ ]*])]) +[_AT_DATA_CALC_Y($[1], $[2], $[3], [$1]) ]) @@ -342,35 +359,36 @@ m4_bmatch([$1], ]) -# _AT_CHECK_CALC_ERROR(BISON-OPTIONS, INPUT, [NUM-DEBUG-LINES], -# [ERROR-LOCATION], [IF-YYERROR-VERBOSE]) -# ------------------------------------------------------------ -# Run `calc' on INPUT, and expect a `parse error' message. +# _AT_CHECK_CALC_ERROR(BISON-OPTIONS, EXIT-STATUS, INPUT, +# [NUM-DEBUG-LINES], +# [VERBOSE-AND-LOCATED-ERROR-MESSAGE]) +# --------------------------------------------------------- +# Run `calc' on INPUT, and expect a `syntax error' message. # # If INPUT starts with a slash, it is used as absolute input file name, # otherwise as contents. # -# If BISON-OPTIONS contains `--location', then make sure the ERROR-LOCATION +# If BISON-OPTIONS contains `%location', then make sure the ERROR-LOCATION # is correctly output on stderr. # # If BISON-OPTIONS contains `%error-verbose', then make sure the -# IF-YYERROR-VERBOSE message is properly output after `parse error, ' +# IF-YYERROR-VERBOSE message is properly output after `syntax error, ' # on STDERR. # # If BISON-OPTIONS contains `%debug' but not `%glr', then NUM-STDERR-LINES # is the number of expected lines on stderr. m4_define([_AT_CHECK_CALC_ERROR], -[m4_bmatch([$2], [^/], - [AT_PARSER_CHECK([./calc $2], 0, [], [stderr])], +[m4_bmatch([$3], [^/], + [AT_PARSER_CHECK([./calc $3], $2, [], [stderr])], [AT_DATA([[input]], -[[$2 +[[$3 ]]) -AT_PARSER_CHECK([./calc input], 0, [], [stderr])]) +AT_PARSER_CHECK([./calc input], $2, [], [stderr])]) m4_bmatch([$1], [%debug.*%glr\|%glr.*%debug], [], [%debug], - [AT_CHECK([wc -l 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]) @@ -413,13 +431,15 @@ m4_define([AT_CHECK_CALC], [# We use integers to avoid dependencies upon the precision of doubles. AT_SETUP([Calculator $1]) +AT_BISON_OPTION_PUSHDEFS([$1]) + AT_DATA_CALC_Y([$1]) # Specify the output files to avoid problems on different file systems. -AT_CHECK([bison -o calc.c m4_bpatsubst([$1], [%[^ ]*]) calc.y], - [0], [], []) +AT_CHECK([bison -o calc.c calc.y]) -AT_COMPILE([calc]) +AT_LALR1_CC_IF([AT_COMPILE_CXX([calc])], + [AT_COMPILE([calc])]) # Test the priorities. _AT_CHECK_CALC([$1], @@ -435,38 +455,58 @@ _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], + [486]) + +# 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], [ +1], [14], - [2.1-2.2: parse error, unexpected '+']) + [2.0: 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 input", expecting "number" or '-' or '\n' or '(']) +_AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [4], + [1.0: 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], + [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 '!' +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" +calc: error: 2222 != 1]) +AT_BISON_OPTION_POPDEFS AT_CLEANUP ])# AT_CHECK_CALC @@ -489,22 +529,23 @@ m4_define([AT_CHECK_CALC_LALR], AT_CHECK_CALC_LALR() -AT_CHECK_CALC_LALR([--defines]) +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([%name-prefix="calc"]) +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([%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]) -# FIXME: Not ready yet. -# AT_CHECK_CALC_LALR([%pure-parser %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}]) # ----------------------- # @@ -523,16 +564,56 @@ m4_define([AT_CHECK_CALC_GLR], AT_CHECK_CALC_GLR() -AT_CHECK_CALC_GLR([--defines]) +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([%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([%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([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {value *result} %parse-param {int *count}]) + + +# ----------------------------- # +# Simple LALR1 C++ Calculator. # +# ----------------------------- # + +AT_BANNER([[Simple LALR1 C++ Calculator.]]) + +# 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. +m4_define([AT_CHECK_CALC_LALR1_CC], +[AT_CHECK_CALC([%skeleton "lalr1.cc"] $@)]) + +# 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]) + +# AT_CHECK_CALC_LALR1_CC([%error-verbose %locations]) + +AT_CHECK_CALC_LALR1_CC([%error-verbose %locations %defines %name-prefix="calc" %verbose %yacc]) + +# AT_CHECK_CALC_LALR1_CC([%debug]) +AT_CHECK_CALC_LALR1_CC([%error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc]) + +AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc]) + +# 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}])