X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/19c50364f38b72dcd7bf67a998db3c815b7b6a94..a9b8959efaa9aae4e2daf959d371765ac057e7f0:/tests/calc.at diff --git a/tests/calc.at b/tests/calc.at index 9a8acc56..90241b35 100644 --- a/tests/calc.at +++ b/tests/calc.at @@ -1,11 +1,22 @@ -# -*- Autoconf -*- +# Checking the output filenames. -*- Autotest -*- +# Copyright 2000, 2001 Free Software Foundation, Inc. -cat < +/* We don't need a perfect malloc for these tests. */ +#undef malloc #include -#include + +#if STDC_HEADERS +# include +# include +#else +char *strcat(char *dest, const char *src); +#endif #include -]$4[ static int power (int base, int exponent); static void yyerror (const char *s); static int yylex (void); +static int yygetc (void); +static void yyungetc (int c); + extern void perror (const char *s); %} -/* BISON Declarations */ -%token NUM +/* Also exercise %union. */ +%union +{ + int ival; /* A comment to exercise an old bug. */ +}; + +/* Bison Declarations */ +%token CALC_EOF 0 "end of file" +%token NUM "number" +%type exp %nonassoc '=' /* comparison */ %left '-' '+' @@ -52,16 +80,18 @@ extern void perror (const char *s); %left NEG /* negation--unary minus */ %right '^' /* exponentiation */ +]$4[ + /* Grammar follows */ %% input: - /* empty string */ + line | input line ; line: '\n' -| exp '\n' +| exp '\n' {} ; exp: @@ -95,11 +125,16 @@ yyerror (const char *s) fprintf (stderr, "%s\n", s); } + +#if YYLSP_NEEDED +static YYLTYPE last_yylloc; +#endif static int -yygetc () +yygetc (void) { int res = getc (yyin); #if YYLSP_NEEDED + last_yylloc = yylloc; if (res == '\n') { yylloc.last_line++; @@ -117,7 +152,7 @@ yyungetc (int c) { #if YYLSP_NEEDED /* Wrong when C == `\n'. */ - yylloc.last_column--; + yylloc = last_yylloc; #endif ungetc (c, yyin); } @@ -177,13 +212,13 @@ yylex (void) if (c == '.' || isdigit (c)) { yyungetc (c); - yylval = read_signed_integer (); + yylval.ival = read_signed_integer (); return NUM; } /* Return end-of-file. */ if (c == EOF) - return 0; + return CALC_EOF; /* Return single chars. */ return c; @@ -201,14 +236,16 @@ power (int base, int exponent) } int -main (int argn, const char **argv) +main (int argc, const char **argv) { - if (argn == 2) + yyin = NULL; + + if (argc == 2) yyin = fopen (argv[1], "r"); else yyin = stdin; - if (!stdin) + if (!yyin) { perror (argv[1]); exit (1); @@ -231,59 +268,90 @@ main (int argn, const char **argv) # AT_DATA_CALC_Y([BISON-OPTIONS]) # ------------------------------- # Produce `calc.y'. -AT_DEFINE([AT_DATA_CALC_Y], +m4_define([AT_DATA_CALC_Y], [_AT_DATA_CALC_Y($[1], $[2], $[3], - [ifelse(regexp([$1], [--yyerror-verbose]), - [-1], [], - [[#define YYERROR_VERBOSE]])])]) + [m4_bmatch([$1], [--yyerror-verbose], + [[%error-verbose]])])]) -# _AT_CHECK_CALC(BISON-OPTIONS, INPUT) -# ------------------------------------ +# _AT_CHECK_CALC(BISON-OPTIONS, INPUT, [NUM-STDERR-LINES = 0]) +# ------------------------------------------------------------ # Run `calc' on INPUT and expect no STDOUT nor STDERR. -# If `--debug' is passed to bison, discard all the debugging traces -# preserving only the `parse errors'. Note that since there should be -# none, the `grep' will fail with exit status 1. -AT_DEFINE([_AT_CHECK_CALC], -[ifelse(regexp([$1], [--debug]), - [-1], - [AT_CHECK([echo "$2" | calc], - [0], [], [])], - [AT_CHECK([echo "$2" | calc 2>&1 >/dev/null | grep 'parse error' >&2], - [1], [], [])])]) - - -# _AT_CHECK_CALC_ERROR(BISON-OPTIONS, INPUT, +# +# If BISON-OPTIONS contains `--debug', then NUM-STDERR-LINES is the number +# of expected lines on stderr. +m4_define([_AT_CHECK_CALC], +[AT_DATA([[input]], +[[$2 +]]) +AT_CHECK([calc input], 0, [], [stderr])dnl +AT_CHECK([wc -l &1 >/dev/null | grep 'parse error' >&2], 0, - [], -[ifelse(regexp([$1], [--location]), - [-1], [], [$3: ])[]dnl +# Run `calc' on INPUT, and expect a `parse 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 +# is correctly output on stderr. +# +# If BISON-OPTIONS contains `--yyerror-verbose', then make sure the +# IF-YYERROR-VERBOSE message is properly output after `parse error, ' +# on STDERR. +# +# If BISON-OPTIONS contains `--debug', then NUM-STDERR-LINES is the number +# of expected lines on stderr. +m4_define([_AT_CHECK_CALC_ERROR], +[m4_bmatch([$2], [^/], + [AT_CHECK([calc $2], 0, [], [stderr])], + [AT_DATA([[input]], +[[$2 +]]) +AT_CHECK([calc input], 0, [], [stderr])]) + + +AT_CHECK([wc -l at-stderr +mv at-stderr stderr + +AT_CHECK([cat stderr], 0, +[m4_bmatch([$1], [--location], [$4: ])[]dnl parse error[]dnl -ifelse(regexp([$1], [--yyerror-verbose]), - [-1], [], [$4])[]dnl +m4_bmatch([$1], [--yyerror-verbose], [, $5])[]dnl -])]) +]) + +]) # AT_CHECK_CALC([BISON-OPTIONS], [PARSER-EXPECTED-STDERR]) # -------------------------------------------------------- # Start a testing chunk which compiles `calc' grammar with # BISON-OPTIONS, and performs several tests over the parser. -AT_DEFINE([AT_CHECK_CALC], +m4_define([AT_CHECK_CALC], [# We use integers to avoid dependencies upon the precision of doubles. 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 patsubst([$1], [--yyerror-verbose])], +AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])], [0], [], []) -AT_CHECK([$CC $CFLAGS calc.c -o calc], 0, [], []) + +AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [ignore]) # Test the priorities. _AT_CHECK_CALC([$1], @@ -299,28 +367,35 @@ _AT_CHECK_CALC([$1], 1 - (2 - 3) = 2 2^2^3 = 256 -(2^2)^3 = 64], [$2]) +(2^2)^3 = 64], [486]) # Some parse errors. -_AT_CHECK_CALC_ERROR([$1], [+1], - [1.0:1.1], - [, unexpected `'+'']) -_AT_CHECK_CALC_ERROR([$1], [1//2], +_AT_CHECK_CALC_ERROR([$1], [0 0], [10], [1.2:1.3], - [, unexpected `'/'', expecting `NUM' or `'-'' or `'('']) -_AT_CHECK_CALC_ERROR([$1], [error], + [unexpected "number"]) +_AT_CHECK_CALC_ERROR([$1], [1//2], [13], + [1.2:1.3], + [unexpected '/', expecting "number" or '-' or '(']) +_AT_CHECK_CALC_ERROR([$1], [error], [4], [1.0:1.1], - [, unexpected `$undefined.']) -_AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], + [unexpected $undefined., expecting "number" or '-' or '\n' or '(']) +_AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], [19], [1.6:1.7], - [, unexpected `'='']) + [unexpected '=']) _AT_CHECK_CALC_ERROR([$1], [ +1], + [13], [2.0:2.1], - [, unexpected `'+'']) + [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_CLEANUP(calc calc.c calc.h calc.output) +AT_CLEANUP ])# AT_CHECK_CALC @@ -331,8 +406,6 @@ AT_CLEANUP(calc calc.c calc.h calc.output) # ------------------ # AT_CHECK_CALC() -# This one is very suspicious. The test fails, but it might be normal. -AT_CHECK_CALC([--raw]) AT_CHECK_CALC([--defines]) AT_CHECK_CALC([--locations])