* src/state.h, src/state.c (state_rule_lookaheads_print): New.

[bison.git] / tests / calc.at

diff --git a/tests/calc.at b/tests/calc.at
index 40f23fd8cb5478c86b6ee46bd71bb846b0814c5a..28e16f956a5096fb7bb3d92bbd90dada2fac5543 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -1,11 +1,22 @@
-#                                                        -*- Autoconf -*-
+# Checking the output filenames.                         -*- Autotest -*-
+# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.

 
 

-cat <<EOF
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.

 
 

-Simple Calculator.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.

 
 

-EOF
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.

 
 

+AT_BANNER([[Simple Calculator.]])

 
 ## ---------------------------------------------------- ##
 ## Compile the grammar described in the documentation.  ##
 
 ## ---------------------------------------------------- ##
 ## Compile the grammar described in the documentation.  ##


@@ -23,28 +34,62 @@ EOF
 # 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.
 # 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],
-[ifelse([$1$2$3],
-        $[1]$[2]$[3], [],
-        [errprint([$0: Invalid arguments: $@
-])m4exit(1)])dnl
+m4_define([_AT_DATA_CALC_Y],
+[m4_if([$1$2$3], $[1]$[2]$[3], [],
+       [m4_fatal([$0: Invalid arguments: $@])])dnl

 AT_DATA([calc.y],
 [[/* Infix notation calculator--calc */
 
 %{
 AT_DATA([calc.y],
 [[/* Infix notation calculator--calc */
 
 %{

+#include <config.h>
+/* We don't need a perfect malloc for these tests. */
+#undef malloc

 #include <stdio.h>
 #include <stdio.h>

-#include <stdlib.h>
+
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <string.h>
+#else
+char *strcat(char *dest, const char *src);
+#endif

 #include <ctype.h>
 #include <ctype.h>

-]$4[

 
 static int power (int base, int exponent);
 static void yyerror (const char *s);
 static int yylex (void);
 
 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);
 extern void perror (const char *s);

+
+/* Exercise pre-prologue dependency to %union.  */
+typedef int value_t;
+
+%}
+
+/* Exercise M4 quoting: '@:>@@:>@', 0.  */
+
+/* Also exercise %union. */
+%union
+{
+  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 NUM
+/* Bison Declarations */
+%token CALC_EOF 0 "end of file"
+%token <ival> NUM "number"
+%type  <ival> exp
+
+/* Exercise quotes in strings.  */
+%token FAKE "fake @>:@@>:@,"

 
 %nonassoc '=' /* comparison           */
 %left '-' '+'
 
 %nonassoc '=' /* comparison           */
 %left '-' '+'


@@ -52,24 +97,31 @@ extern void perror (const char *s);
 %left NEG     /* negation--unary minus */
 %right '^'    /* exponentiation        */
 
 %left NEG     /* negation--unary minus */
 %right '^'    /* exponentiation        */
 

+]$4[
+

 /* Grammar follows */
 %%
 input:
 /* Grammar follows */
 %%
 input:

-  /* empty string */
+  line

 | input line
 ;
 
 line:
   '\n'
 | exp '\n'
 | input line
 ;
 
 line:
   '\n'
 | exp '\n'

+  {
+    /* Exercise quotes in braces.  */
+    char tmp[] = "@>:@@:>@,";
+  }

 ;
 
 ;
 

+/* Exercise M4 quoting: '@:>@@:>@', 1.  */

 exp:
   NUM                { $$ = $1;             }
 | exp '=' exp
   {
      if ($1 != $3)
 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;        }
      $$ = $1 == $3;
   }
 | exp '+' exp        { $$ = $1 + $3;        }


@@ -79,31 +131,38 @@ exp:
 | '-' exp  %prec NEG { $$ = -$2;            }
 | exp '^' exp        { $$ = power ($1, $3); }
 | '(' exp ')'        { $$ = $2;             }
 | '-' exp  %prec NEG { $$ = -$2;            }
 | exp '^' exp        { $$ = power ($1, $3); }
 | '(' exp ')'        { $$ = $2;             }

+| '(' error ')'      { $$ = 0;              }

 ;
 %%
 /* The input. */
 FILE *yyin;
 
 ;
 %%
 /* The input. */
 FILE *yyin;
 

+/* Exercise M4 quoting: '@:>@@:>@', 2.  */

 static void
 yyerror (const char *s)
 {
 #if YYLSP_NEEDED
 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
   fprintf (stderr, "%s\n", s);
 }
 
           yylloc.first_line, yylloc.first_column,
           yylloc.last_line, yylloc.last_column);
 #endif
   fprintf (stderr, "%s\n", s);
 }
 

+
+#if YYLSP_NEEDED
+static YYLTYPE last_yylloc;
+#endif

 static int
 static int

-yygetc ()
+yygetc (void)

 {
   int res = getc (yyin);
 #if YYLSP_NEEDED
 {
   int res = getc (yyin);
 #if YYLSP_NEEDED

+  last_yylloc = yylloc;

   if (res == '\n')
     {
       yylloc.last_line++;
   if (res == '\n')
     {
       yylloc.last_line++;

-      yylloc.last_column = 0;
+      yylloc.last_column = 1;

     }
   else
     yylloc.last_column++;
     }
   else
     yylloc.last_column++;


@@ -117,7 +176,7 @@ yyungetc (int c)
 {
 #if YYLSP_NEEDED
   /* Wrong when C == `\n'. */
 {
 #if YYLSP_NEEDED
   /* Wrong when C == `\n'. */

-  yylloc.last_column--;
+  yylloc = last_yylloc;

 #endif
   ungetc (c, yyin);
 }
 #endif
   ungetc (c, yyin);
 }


@@ -177,13 +236,13 @@ yylex (void)
   if (c == '.' || isdigit (c))
     {
       yyungetc (c);
   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 NUM;
     }
 
   /* Return end-of-file.  */
   if (c == EOF)

-    return 0;
+    return CALC_EOF;

 
   /* Return single chars. */
   return c;
 
   /* Return single chars. */
   return c;


@@ -200,15 +259,22 @@ power (int base, int exponent)
   return res;
 }
 
   return res;
 }
 

+void
+id (YYSTYPE* lval)
+{
+}
+

 int
 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;
 
     yyin = fopen (argv[1], "r");
   else
     yyin = stdin;
 

-  if (!stdin)
+  if (!yyin)

     {
       perror (argv[1]);
       exit (1);
     {
       perror (argv[1]);
       exit (1);


@@ -218,7 +284,7 @@ main (int argn, const char **argv)
   yydebug = 1;
 #endif
 #if YYLSP_NEEDED
   yydebug = 1;
 #endif
 #if YYLSP_NEEDED

-  yylloc.last_column = 0;
+  yylloc.last_column = 1;

   yylloc.last_line = 1;
 #endif
   yyparse ();
   yylloc.last_line = 1;
 #endif
   yyparse ();


@@ -231,59 +297,97 @@ main (int argn, const char **argv)
 # AT_DATA_CALC_Y([BISON-OPTIONS])
 # -------------------------------
 # Produce `calc.y'.
 # 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],
 [_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.
 # 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 <stderr | sed 's/[[^0-9]]//g'], 0,
+         [m4_bmatch([$1], [--debug],
+                    [$3], [0])
+])
+])
+
+
+# _AT_CHECK_CALC_ERROR(BISON-OPTIONS, INPUT, [NUM-DEBUG-LINES],

 #                      [ERROR-LOCATION], [IF-YYERROR-VERBOSE])
 # ------------------------------------------------------------
 #                      [ERROR-LOCATION], [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,
-          [],
-[ifelse(regexp([$1], [--location]),
-        [-1], [], [$3: ])[]dnl
-parse error[]dnl
-ifelse(regexp([$1], [--yyerror-verbose]),
-       [-1], [], [$4])[]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])])

 
 

+m4_bmatch([$1], [--debug],
+[AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0, [$3

 ])])
 
 ])])
 

+# Normalize the observed and expected error messages, depending upon the
+# options.
+# 1. Remove the traces from observed.
+egrep -v '^((Start|Enter|Read|Reduc|Shift)ing|state|Error:|Next|Discarding) ' stderr >at-stderr
+mv at-stderr stderr
+# 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])
+])
+

 
 # 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_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.
 [# 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], [], [])
          [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],
 
 # Test the priorities.
 _AT_CHECK_CALC([$1],


@@ -299,28 +403,46 @@ _AT_CHECK_CALC([$1],
 1 - (2 - 3) = 2
 
 2^2^3 = 256
 1 - (2 - 3) = 2
 
 2^2^3 = 256

-(2^2)^3 = 64], [$2])
+(2^2)^3 = 64], [486])

 
 # Some parse errors.
 
 # Some parse errors.

-_AT_CHECK_CALC_ERROR([$1], [+1],
-                     [1.0:1.1],
-                     [, unexpected `'+''])
-_AT_CHECK_CALC_ERROR([$1], [1//2],
-                     [1.2:1.3],
-                     [, unexpected `'/'', expecting `NUM' or `'-'' or `'(''])
-_AT_CHECK_CALC_ERROR([$1], [error],
-                     [1.0:1.1],
-                     [, unexpected `$undefined.'])
-_AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3],
-                     [1.6:1.7],
-                     [, unexpected `'=''])
+_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.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],
 _AT_CHECK_CALC_ERROR([$1],
                      [
 +1],

-                     [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.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 error or "number" or '-' or '('])

 
 

-AT_CLEANUP(calc calc.c calc.h calc.output)
+AT_CLEANUP

 ])# AT_CHECK_CALC
 
 
 ])# AT_CHECK_CALC