X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/30d2f3d50f9a4f3f2604a03664c989c99b991983..1ce5149ac8ffb10e03301661ac3abcc39de31702:/tests/calc.at?ds=sidebyside diff --git a/tests/calc.at b/tests/calc.at index f813c462..3b2e1378 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 @@ -61,19 +61,36 @@ 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; + %} +/* Exercise M4 quoting: '@:>@@:>@', 0. */ + /* Also exercise %union. */ %union { - int ival; /* A comment to exercise an old bug. */ + value_t ival; /* A comment to exercise an old bug. */ }; +/* Exercise post-prologue dependency to %union. */ +%{ +static void id (YYSTYPE *lval); + +/* Exercise quotes in declarations. */ +char quote[] = "@:>@@:>@,"; +%} + /* Bison Declarations */ %token CALC_EOF 0 "end of file" %token NUM "number" %type exp +/* Exercise quotes in strings. */ +%token FAKE "fake @>:@@>:@," + %nonassoc '=' /* comparison */ %left '-' '+' %left '*' '/' @@ -91,15 +108,20 @@ input: line: '\n' -| exp '\n' {} +| exp '\n' + { + /* Exercise quotes in braces. */ + char tmp[] = "@>:@@:>@,"; + } ; +/* Exercise M4 quoting: '@:>@@:>@', 1. */ exp: NUM { $$ = $1; } | 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,16 +131,18 @@ exp: | '-' exp %prec NEG { $$ = -$2; } | exp '^' exp { $$ = power ($1, $3); } | '(' exp ')' { $$ = $2; } +| '(' error ')' { $$ = 0; } ; %% /* The input. */ FILE *yyin; +/* Exercise M4 quoting: '@:>@@:>@', 2. */ 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 +162,7 @@ yygetc (void) if (res == '\n') { yylloc.last_line++; - yylloc.last_column = 0; + yylloc.last_column = 1; } else yylloc.last_column++; @@ -235,6 +259,11 @@ power (int base, int exponent) return res; } +void +id (YYSTYPE* lval) +{ +} + int main (int argc, const char **argv) { @@ -255,7 +284,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 (); @@ -318,22 +347,38 @@ m4_define([_AT_CHECK_CALC_ERROR], ]]) AT_CHECK([./calc input], 0, [], [stderr])]) - -AT_CHECK([wc -l at-stderr +m4_bmatch([$1], [--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], [--yyerror-verbose], [], +[[sed 's/parse error, .*$/parse error/' expout >at-expout +mv at-expout expout]]) +# 5. Check +AT_CHECK([cat stderr], 0, [expout]) ]) @@ -370,30 +415,41 @@ _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], [12], + [1.3-1.4: parse error, unexpected "number"]) +_AT_CHECK_CALC_ERROR([$1], [1//2], [17], + [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], [25], + [1.7-1.8: parse error, unexpected '=']) _AT_CHECK_CALC_ERROR([$1], [ +1], - [13], - [2.0:2.1], - [unexpected '+']) + [15], + [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 '(']) + [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], + [91], +[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 error or "number" or '-' or '(']) AT_CLEANUP ])# AT_CHECK_CALC