First set of tests: use the `calc' example from the documentation.

* src/bison.s1 (yyparse): Condition the code using `yytname' which
is defined only when YYDEBUG is.
* m4/atconfig.m4 (AT_CONFIG): Adjust to Autoconf 2.13.
* src/files.c (tryopen, tryclose): Formatting changes.
Move to the top and be static.
* src/reader.c (read_signed_integer): Likewise.
* tests/calc.m4: New file.
* Makefile.am, suite.m4: Adjust.
* m4/atconfig.m4: Set BISON_SIMPLE and BISON_HAIRY.

tests/Makefile.am

@@ -21,7 +21,7 @@
 # Distribute the testsuite since GNU M4 is needed to build it.
 noinst_SCRIPTS = testsuite
 
-SUITE =
+SUITE = calc.m4
 
 EXTRA_DIST = atgeneral.m4 suite.m4 $(SUITE)
 

tests/atconfig.in

@@ -49,11 +49,11 @@
 # This debugging script has been automatically generated from `make check'.
 # Call it with `--help' to get a quick usage summary.
 
-at_package=@PACKAGE@
-at_version=@VERSION@
+at_package='@PACKAGE@'
+at_version='@VERSION@'
 # Snippet )1
 # Snippet (2
-at_n=@ECHO_N@
+at_n='@ECHO_N@'
 at_c='@ECHO_C@'
 test -f atlocal && . ./atlocal
 
@@ -71,12 +71,24 @@ top_srcdir=@top_srcdir@
 # Use absolute file notations, as the test might change directories.
 at_srcdir=`cd @srcdir@ && pwd`
 at_top_srcdir=`cd @top_srcdir@ && pwd`
+at_builddir=`pwd`
+at_top_builddir=`cd .. && pwd`
 if test -n "@AT_TESTPATH@"; then
   export PATH; PATH=`pwd`:`cd @AT_TESTPATH@ && pwd`:$PATH
 else
   export PATH; PATH=`pwd`:$PATH
 fi
 
-# We need GNU m4.
-M4=@M4@
+# We need GNU M4.
+M4='@M4@'
+
+# We need a C compiler.
+CC='@CC@'
+CFLAGS='@CFLAGS@'
+
+# We want to use the files shipped with Bison.
+BISON_SIMPLE=$at_top_builddir/src/bison.simple
+export BISON_SIMPLE
+BISON_HAIRY=$at_top_builddir/src/bison.hairy
+export BISON_HAIRY
 # Snippet )2

tests/calc.m4

@@ -0,0 +1,166 @@
+#                                                        -*- Autoconf -*-
+
+cat <<EOF
+
+Simple Calculator.
+
+EOF
+
+## ---------------------------------------------------- ##
+## Compile the grammar described in the documentation.  ##
+## ---------------------------------------------------- ##
+
+# We use integers to avoid dependencies upon the precision of doubles.
+AT_SETUP(Compiling a grammar)
+
+AT_DATA([calc.y],
+[[/* Infix notation calculator--calc */
+
+%{
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#define YYSTYPE int
+
+static int power (int base, int exponent);
+static int read_signed_integer (FILE *stream);
+extern void perror (const char *s);
+%}
+
+/* BISON Declarations */
+%token NUM
+%left '-' '+'
+%left '*' '/'
+%left NEG     /* negation--unary minus */
+%right '^'    /* exponentiation        */
+
+/* Grammar follows */
+%%
+input:    /* empty string */
+        | input line
+;
+
+line:     '\n'
+        | exp '\n'  { printf ("%d", $1);     }
+;
+
+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;             }
+;
+%%
+int
+main (int argn, const char **argv)
+{
+  if (argn == 2)
+    stdin = fopen (argv[1], "r");
+  if (!stdin)
+    {
+      perror (argv[1]);
+      exit (1);
+    }
+  yyparse ();
+  return 0;
+}
+
+int
+yyerror (const char *s)
+{
+  fprintf (stderr, "%s\n", s);
+}
+
+static int
+read_signed_integer (FILE *stream)
+{
+  int c = getc (stream);
+  int sign = 1;
+  int n = 0;
+
+  if (c == '-')
+    {
+      c = getc (stream);
+      sign = -1;
+    }
+
+  while (isdigit (c))
+    {
+      n = 10 * n + (c - '0');
+      c = getc (stream);
+    }
+
+  ungetc (c, stream);
+
+  return sign * n;
+}
+
+/*---------------------------------------------------------------.
+| Lexical analyzer returns an integer on the stack and the token |
+| NUM, or the ASCII character read if not a number.  Skips all   |
+| blanks and tabs, returns 0 for EOF.                            |
+`---------------------------------------------------------------*/
+
+int
+yylex ()
+{
+  int c;
+
+  /* Skip white space.  */
+  while ((c = getchar ()) == ' ' || c == '\t')
+    ;
+  /* process numbers   */
+  if (c == '.' || isdigit (c))
+    {
+      ungetc (c, stdin);
+      yylval = read_signed_integer (stdin);
+      return NUM;
+    }
+  /* Return end-of-file.  */
+  if (c == EOF)
+    return 0;
+  /* Return single chars. */
+  return c;
+}
+
+static int
+power (int base, int exponent)
+{
+  int res = 1;
+  if (exponent < 0)
+    exit (1);
+  for (/* Niente */; exponent; --exponent)
+    res *= base;
+  return res;
+}
+]])
+
+# Specify the output files to avoid problems on different file systems.
+AT_CHECK([bison calc.y -o calc.c], 0, [], [])
+AT_CHECK([$CC $CFLAGS calc.c -o calc], 0, [], [])
+
+# AT_CHECK_CALC(INPUT, OUTPUT)
+# ----------------------------
+# Run `calc' on INPUT, and expect OUTPUT.
+AT_DEFINE([AT_CHECK_CALC],
+[AT_CHECK([echo "$1" | calc], 0, [$2], [])])
+
+# Test the priorities.
+AT_CHECK_CALC([1 + 2 * 3],   [7])
+AT_CHECK_CALC([1 + 2 * -3], [-5])
+
+AT_CHECK_CALC([-1^2],  [-1])
+AT_CHECK_CALC([(-1)^2], [1])
+
+AT_CHECK_CALC([---1], [-1])
+
+AT_CHECK_CALC([1 - 2 - 3],  [-4])
+AT_CHECK_CALC([1 - (2 - 3)], [2])
+
+AT_CHECK_CALC([2^2^3],  [256])
+AT_CHECK_CALC([(2^2)^3], [64])
+
+AT_CLEANUP(calc calc.c)

tests/suite.m4

@@ -2,4 +2,6 @@
 # Validation suite for Bison.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 
-AT_INIT(bison)
+AT_INIT([bison])
+
+AT_INCLUDE([calc.m4])