summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog14
-rw-r--r--tests/calc.m4132
2 files changed, 106 insertions, 40 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d284958..fef6a3fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2000-10-02 Akim Demaille <akim@epita.fr>
+ Also test parse error messages, including with YYERROR_VERBOSE.
+
+ * tests/calc.m4 (calc.y): Add support for `exp = exp' (non
+ associative).
+ Use it to check the computations.
+ Use it to check `nonassoc' is honored.
+ (AT_DATA_CALC_Y): Equip `calc.y' with YYERROR_VERBOSE when passed
+ `--yyerror-verbose'.
+ (_AT_CHECK_CALC): Adjust to this option.
+ (_AT_CHECK_CALC_ERROR): New macro to check parse error messages.
+
+
+2000-10-02 Akim Demaille <akim@epita.fr>
+
Test also `--verbose', `--defines' and `--name-prefix'. Testing
the latter demonstrates a flaw in the handling of non debugging
parsers introduced by myself on 2000-03-16: `#define yydebug 0'
diff --git a/tests/calc.m4 b/tests/calc.m4
index de0f33f1..af1b298d 100644
--- a/tests/calc.m4
+++ b/tests/calc.m4
@@ -17,21 +17,25 @@ EOF
# ------------------------- #
-# _AT_DATA_CALC_Y($1, $2, $3)
-# ---------------------------
+# _AT_DATA_CALC_Y($1, $2, $3, [CPP-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.
AT_DEFINE([_AT_DATA_CALC_Y],
-[AT_DATA([calc.y],
+[ifelse([$1$2$3],
+ $[1]$[2]$[3], [],
+ [errprint([$0: Invalid arguments: $@
+])m4exit(1)])dnl
+AT_DATA([calc.y],
[[/* Infix notation calculator--calc */
%{
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
-#define YYSTYPE int
+]$4[
static int power (int base, int exponent);
static int read_signed_integer (FILE *stream);
@@ -42,6 +46,8 @@ extern void perror (const char *s);
/* BISON Declarations */
%token NUM
+
+%nonassoc '=' /* comparison */
%left '-' '+'
%left '*' '/'
%left NEG /* negation--unary minus */
@@ -49,22 +55,31 @@ extern void perror (const char *s);
/* Grammar follows */
%%
-input: /* empty string */
- | input line
+input:
+ /* empty string */
+| input line
;
-line: '\n'
- | exp '\n' { printf ("%d", $1); }
+line:
+ '\n'
+| exp '\n'
;
-exp: NUM { $$ = $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; }
+exp:
+ NUM { $$ = $1; }
+| exp '=' exp
+ {
+ if ($1 != $3)
+ printf ("calc: error: %d != %d\n", $1, $3);
+ $$ = $1 == $3;
+ }
+| 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; }
;
%%
/* The input. */
@@ -163,18 +178,41 @@ main (int argn, const char **argv)
])# _AT_DATA_CALC_Y
-# AT_DATA_CALC_Y
-# --------------
+# AT_DATA_CALC_Y([BISON-OPTIONS])
+# -------------------------------
# Produce `calc.y'.
AT_DEFINE([AT_DATA_CALC_Y],
-[_AT_DATA_CALC_Y($[1], $[2], $[3])])
+[_AT_DATA_CALC_Y($[1], $[2], $[3],
+ [ifelse(regexp([$1], [--yyerror-verbose]),
+ [-1], [],
+ [[#define YYERROR_VERBOSE]])])])
+
-# _AT_CHECK_CALC(INPUT, OUTPUT, [STDERR])
-# ---------------------------------------
-# Run `calc' on INPUT, and expect OUTPUT and STDERR.
+# _AT_CHECK_CALC(BISON-OPTIONS, INPUT)
+# ------------------------------------
+# 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],
-[AT_CHECK([echo "$1" | calc], 0, [$2], [$3])])
+[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-YYERROR-VERBOSE])
+# ----------------------------------------------------------------
+# Run `calc' on INPUT, and expect STDERR.
+AT_DEFINE([_AT_CHECK_CALC_ERROR],
+[AT_CHECK([echo "$2" | calc 2>&1 >/dev/null | grep 'parse error' >&2], 0,
+ [],
+ [parse error[]ifelse(regexp([$1], [--yyerror-verbose]),
+ [-1], [], [$3])
+])])
# AT_CHECK_CALC([BISON-OPTIONS], [PARSER-EXPECTED-STDERR])
@@ -185,36 +223,49 @@ AT_DEFINE([AT_CHECK_CALC],
[# We use integers to avoid dependencies upon the precision of doubles.
AT_SETUP([Calculator $1])
-AT_DATA_CALC_Y
+AT_DATA_CALC_Y([$1])
# Specify the output files to avoid problems on different file systems.
-AT_CHECK([bison calc.y -o calc.c $1], 0, [], [])
+AT_CHECK([bison calc.y -o calc.c patsubst([$1], [--yyerror-verbose])],
+ [0], [], [])
AT_CHECK([$CC $CFLAGS calc.c -o calc], 0, [], [])
# Test the priorities.
-_AT_CHECK_CALC([1 + 2 * 3], [7], [$2])
-_AT_CHECK_CALC([1 + 2 * -3], [-5], [$2])
+_AT_CHECK_CALC([$1],
+[1 + 2 * 3 = 7
+1 + 2 * -3 = -5
+
+-1^2 = -1
+(-1)^2 = 1
-_AT_CHECK_CALC([-1^2], [-1], [$2])
-_AT_CHECK_CALC([(-1)^2], [1], [$2])
+---1 = -1
-_AT_CHECK_CALC([---1], [-1], [$2])
+1 - 2 - 3 = -4
+1 - (2 - 3) = 2
-_AT_CHECK_CALC([1 - 2 - 3], [-4], [$2])
-_AT_CHECK_CALC([1 - (2 - 3)], [2], [$2])
+2^2^3 = 256
+(2^2)^3 = 64], [$2])
-_AT_CHECK_CALC([2^2^3], [256], [$2])
-_AT_CHECK_CALC([(2^2)^3], [64], [$2])
+# Some parse errors.
+_AT_CHECK_CALC_ERROR([$1], [+1],
+ [, unexpected `'+''])
+_AT_CHECK_CALC_ERROR([$1], [1//2],
+ [, unexpected `'/'', expecting `NUM' or `'-'' or `'(''])
+_AT_CHECK_CALC_ERROR([$1], [error],
+ [, unexpected `$undefined.'])
+_AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3],
+ [, unexpected `'=''])
AT_CLEANUP(calc calc.c calc.h calc.output)
])# AT_CHECK_CALC
-# -------------- #
-# Actual tests. #
-# -------------- #
+# ------------------ #
+# Test the parsers. #
+# ------------------ #
+
AT_CHECK_CALC()
# This one is very suspicious. The test fails, but it might be normal.
AT_CHECK_CALC([--raw])
@@ -223,8 +274,9 @@ AT_CHECK_CALC([--defines])
AT_CHECK_CALC([--name-prefix=calc])
AT_CHECK_CALC([--verbose])
AT_CHECK_CALC([--yacc])
-AT_CHECK_CALC([--defines --name-prefix=calc --verbose --yacc])
+AT_CHECK_CALC([--yyerror-verbose])
+AT_CHECK_CALC([--defines --name-prefix=calc --verbose --yacc --yyerror-verbose])
# When --debug, a lot of data is sent to STDERR, we can't test it.
-AT_CHECK_CALC([--debug], ignore)
-AT_CHECK_CALC([--debug --defines --name-prefix=calc --verbose --yacc], ignore)
+AT_CHECK_CALC([--debug])
+AT_CHECK_CALC([--debug --defines --name-prefix=calc --verbose --yacc --yyerror-verbose])
View Lorry Controller Status