X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/213e640e1e78a687369fe4760b82385c602ca876..f7737e2e16cb9a49c258ac4b82b2b5f4fa9d0f18:/tests/calc.at diff --git a/tests/calc.at b/tests/calc.at index d12fffc9..34cac69d 100644 --- a/tests/calc.at +++ b/tests/calc.at @@ -1,5 +1,5 @@ # Checking the output filenames. -*- Autotest -*- -# Copyright 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002 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 @@ -16,8 +16,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -AT_BANNER([[Simple Calculator.]]) - ## ---------------------------------------------------- ## ## Compile the grammar described in the documentation. ## ## ---------------------------------------------------- ## @@ -61,12 +59,16 @@ static int yygetc (void); static void yyungetc (int c); extern void perror (const char *s); + +/* Exercise pre-prologue dependency to %union. */ +typedef int value_t; + %} -/* Also exercise %union. */ +/* Exercise %union. */ %union { - int ival; /* A comment to exercise an old bug. */ + value_t ival; }; /* Bison Declarations */ @@ -90,8 +92,8 @@ input: ; line: - '\n' -| exp '\n' {} + '\n' {} +| exp '\n' {} ; exp: @@ -99,7 +101,7 @@ exp: | exp '=' exp { if ($1 != $3) - printf ("calc: error: %d != %d\n", $1, $3); + fprintf (stderr, "calc: error: %d != %d\n", $1, $3); $$ = $1 == $3; } | exp '+' exp { $$ = $1 + $3; } @@ -109,6 +111,7 @@ exp: | '-' exp %prec NEG { $$ = -$2; } | exp '^' exp { $$ = power ($1, $3); } | '(' exp ')' { $$ = $2; } +| '(' error ')' { $$ = 0; } ; %% /* The input. */ @@ -118,7 +121,7 @@ static void yyerror (const char *s) { #if YYLSP_NEEDED - fprintf (stderr, "%d.%d:%d.%d: ", + fprintf (stderr, "%d.%d-%d.%d: ", yylloc.first_line, yylloc.first_column, yylloc.last_line, yylloc.last_column); #endif @@ -138,7 +141,7 @@ yygetc (void) if (res == '\n') { yylloc.last_line++; - yylloc.last_column = 0; + yylloc.last_column = 1; } else yylloc.last_column++; @@ -255,7 +258,7 @@ main (int argc, const char **argv) yydebug = 1; #endif #if YYLSP_NEEDED - yylloc.last_column = 0; + yylloc.last_column = 1; yylloc.last_line = 1; #endif yyparse (); @@ -270,8 +273,8 @@ main (int argc, const char **argv) # Produce `calc.y'. m4_define([AT_DATA_CALC_Y], [_AT_DATA_CALC_Y($[1], $[2], $[3], - [m4_bmatch([$1], [--yyerror-verbose], - [[%error-verbose]])])]) + [m4_bpatsubst([$1], [--[^ ]*])]) +]) @@ -279,17 +282,22 @@ m4_define([AT_DATA_CALC_Y], # ------------------------------------------------------------ # Run `calc' on INPUT and expect no STDOUT nor STDERR. # -# If BISON-OPTIONS contains `--debug', then NUM-STDERR-LINES is the number -# of expected lines on stderr. +# If BISON-OPTIONS contains `%debug' but not `%glr-parser', then +# NUM-STDERR-LINES is the number of expected lines on stderr. +# +# We don't count GLR's traces yet, since its traces are somewhat +# different from LALR's. m4_define([_AT_CHECK_CALC], [AT_DATA([[input]], [[$2 ]]) -AT_CHECK([calc input], 0, [], [stderr])dnl -AT_CHECK([wc -l at-stderr +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 - -AT_CHECK([cat stderr], 0, -[m4_bmatch([$1], [--location], [$4: ])[]dnl -parse error[]dnl -m4_bmatch([$1], [--yyerror-verbose], [, $5])[]dnl - +# 2. Create the reference error message. +AT_DATA([[expout]], +[$4 ]) - +# 3. If locations are not used, remove them. +m4_bmatch([$1], [--location], [], +[[sed 's/^[-0-9.]*: //' expout >at-expout +mv at-expout expout]]) +# 4. If error-verbose is not used, strip the`, unexpected....' part. +m4_bmatch([$1], [%error-verbose], [], +[[sed 's/parse error, .*$/parse error/' expout >at-expout +mv at-expout expout]]) +# 5. Check +AT_CHECK([cat stderr], 0, [expout]) ]) -# AT_CHECK_CALC([BISON-OPTIONS], [PARSER-EXPECTED-STDERR]) -# -------------------------------------------------------- +# AT_CHECK_CALC([BISON-OPTIONS]) +# ------------------------------ # Start a testing chunk which compiles `calc' grammar with # BISON-OPTIONS, and performs several tests over the parser. m4_define([AT_CHECK_CALC], @@ -348,21 +375,10 @@ AT_SETUP([Calculator $1]) AT_DATA_CALC_Y([$1]) # Specify the output files to avoid problems on different file systems. -AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])], +AT_CHECK([bison -o calc.c m4_bpatsubst([$1], [%[^ ]*]) calc.y], [0], [], []) -# Some compilers issue warnings we don't want to hear about. -# Maybe some day we will have proper Autoconf macros to disable these -# warnings, but this place is not the right one for that. -# So let's keep only GCC warnings, which we know are sane. -# Well, that's only part of the story: some assemblers issue warnings -# which can be totally useless, and actually polluting. It seems that -# the best bet be to completely ignore stderr, but to pass -Werror -# to GCC. -if test "$GCC" = yes; then - CFLAGS="$CFLAGS -Werror" -fi -AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [ignore]) +AT_COMPILE([calc]) # Test the priorities. _AT_CHECK_CALC([$1], @@ -381,30 +397,35 @@ _AT_CHECK_CALC([$1], (2^2)^3 = 64], [486]) # Some parse errors. -_AT_CHECK_CALC_ERROR([$1], [0 0], [10], - [1.2:1.3], - [unexpected "number"]) -_AT_CHECK_CALC_ERROR([$1], [1//2], [13], - [1.2:1.3], - [unexpected '/', expecting "number" or '-' or '(']) +_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.0:1.1], - [unexpected $undefined., expecting "number" or '-' or '\n' or '(']) -_AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], [19], - [1.6:1.7], - [unexpected '=']) + [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], [ +1], - [13], - [2.0:2.1], - [unexpected '+']) + [14], + [2.1-2.2: parse error, unexpected '+']) # Exercise error messages with EOF: work on an empty file. -_AT_CHECK_CALC_ERROR([$1], - [/dev/null], - [4], - [1.0:1.1], - [unexpected "end of file", expecting "number" or '-' or '\n' or '(']) +_AT_CHECK_CALC_ERROR([$1], [/dev/null], [4], + [1.1-1.2: parse error, unexpected "end of file", expecting "number" or '-' or '\n' or '(']) + +# 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 '(']) AT_CLEANUP ])# AT_CHECK_CALC @@ -412,22 +433,62 @@ AT_CLEANUP -# ------------------ # -# Test the parsers. # -# ------------------ # +# ------------------------ # +# Simple LALR Calculator. # +# ------------------------ # + +AT_BANNER([[Simple LALR Calculator.]]) + +# AT_CHECK_CALC_LALR([BISON-OPTIONS]) +# ----------------------------------- +# Start a testing chunk which compiles `calc' grammar with +# BISON-OPTIONS, and performs several tests over the parser. +m4_define([AT_CHECK_CALC_LALR], +[AT_CHECK_CALC($@)]) + +AT_CHECK_CALC_LALR() + +AT_CHECK_CALC_LALR([--defines]) +AT_CHECK_CALC_LALR([--locations]) +AT_CHECK_CALC_LALR([--name-prefix=calc]) +AT_CHECK_CALC_LALR([--verbose]) +AT_CHECK_CALC_LALR([--yacc]) +AT_CHECK_CALC_LALR([%error-verbose]) + +AT_CHECK_CALC_LALR([%error-verbose --locations]) + +AT_CHECK_CALC_LALR([%error-verbose --defines --locations --name-prefix=calc --verbose --yacc]) + +AT_CHECK_CALC_LALR([%debug]) +AT_CHECK_CALC_LALR([%error-verbose %debug --defines --locations --name-prefix=calc --verbose --yacc]) + + +# ----------------------- # +# Simple GLR Calculator. # +# ----------------------- # + +AT_BANNER([[Simple GLR Calculator.]]) + +# AT_CHECK_CALC_GLR([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_GLR], +[AT_CHECK_CALC([%glr_parser] $@)]) + -AT_CHECK_CALC() +AT_CHECK_CALC_GLR() -AT_CHECK_CALC([--defines]) -AT_CHECK_CALC([--locations]) -AT_CHECK_CALC([--name-prefix=calc]) -AT_CHECK_CALC([--verbose]) -AT_CHECK_CALC([--yacc]) -AT_CHECK_CALC([--yyerror-verbose]) +AT_CHECK_CALC_GLR([--defines]) +AT_CHECK_CALC_GLR([--locations]) +AT_CHECK_CALC_GLR([--name-prefix=calc]) +AT_CHECK_CALC_GLR([--verbose]) +AT_CHECK_CALC_GLR([--yacc]) +AT_CHECK_CALC_GLR([%error-verbose]) -AT_CHECK_CALC([--locations --yyerror-verbose]) +AT_CHECK_CALC_GLR([%error-verbose --locations]) -AT_CHECK_CALC([--defines --locations --name-prefix=calc --verbose --yacc --yyerror-verbose]) +AT_CHECK_CALC_GLR([%error-verbose --defines --locations --name-prefix=calc --verbose --yacc]) -AT_CHECK_CALC([--debug]) -AT_CHECK_CALC([--debug --defines --locations --name-prefix=calc --verbose --yacc --yyerror-verbose]) +AT_CHECK_CALC_GLR([%debug]) +AT_CHECK_CALC_GLR([%error-verbose %debug --defines --locations --name-prefix=calc --verbose --yacc])