* data/lalr1.cc: Use temporary variables instead of casts to

[bison.git] / tests / calc.at

diff --git a/tests/calc.at b/tests/calc.at
index 49cf4e2325c209f8208a473b7f0eab603d08ed09..aade61ccbd0d2439a026fd496c42005fa1053990 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -1,5 +1,5 @@
 # Checking the output filenames.                         -*- Autotest -*-
 # Checking the output filenames.                         -*- Autotest -*-

-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003 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
 
 # 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


@@ -16,8 +16,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
 # 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.  ##
 ## ---------------------------------------------------- ##


@@ -28,8 +26,8 @@ AT_BANNER([[Simple Calculator.]])
 # ------------------------- #
 
 
 # ------------------------- #
 
 

-# _AT_DATA_CALC_Y($1, $2, $3, [CPP-DIRECTIVES])
-# ---------------------------------------------
+# _AT_DATA_CALC_Y($1, $2, $3, [BISON-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
 # 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


@@ -37,35 +35,54 @@ AT_BANNER([[Simple Calculator.]])
 m4_define([_AT_DATA_CALC_Y],
 [m4_if([$1$2$3], $[1]$[2]$[3], [],
        [m4_fatal([$0: Invalid arguments: $@])])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],
+AT_DATA_GRAMMAR([calc.y],

 [[/* Infix notation calculator--calc */
 [[/* Infix notation calculator--calc */

-
+]$4[

 %{
 %{

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

 #include <stdio.h>
 
 #if STDC_HEADERS
 # include <stdlib.h>
 # include <string.h>
 #include <stdio.h>
 
 #if STDC_HEADERS
 # include <stdlib.h>
 # include <string.h>

-#else
-char *strcat(char *dest, const char *src);

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

-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;
+
+static value global_result = 0;
+static int global_count = 0;
+
+]AT_LALR1_CC_IF([typedef yy::Location YYLTYPE;])[
+%}
+
+/* Exercise %union. */
+%union
+{
+  value ival;
+};
+
+%{
+static int power (int base, int exponent);
+]AT_LALR1_CC_IF([], [
+/* yyerror receives the location if:
+   - %location & %pure & %glr
+   - %location & %pure & %yacc & %parse-param. */
+static void yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ])
+                     AT_PARAM_IF([value *result, int *count, ])
+                     const char *s
+                     );])[
+static int yylex (]AT_LEX_FORMALS[);
+static int yygetc (]AT_LEX_FORMALS[);
+static void yyungetc (]AT_LEX_PRE_FORMALS[ int c);

 %}
 
 /* Bison Declarations */
 %}
 
 /* Bison Declarations */

-%token CALC_EOF 0 "end of file"
-%token NUM "number"
+%token CALC_EOF 0 "end of input"
+%token <ival> NUM "number"
+%type  <ival> exp

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


@@ -73,27 +90,25 @@ extern void perror (const char *s);
 %left NEG     /* negation--unary minus */
 %right '^'    /* exponentiation        */
 
 %left NEG     /* negation--unary minus */
 %right '^'    /* exponentiation        */
 

-]$4[
-

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

-| input line
+| input line         { ]AT_PARAM_IF([++*count; ++global_count;])[ }

 ;
 
 line:
   '\n'
 ;
 
 line:
   '\n'

-| exp '\n'
+| exp '\n'           { ]AT_PARAM_IF([*result = global_result = $1;])[ }

 ;
 
 exp:
   NUM                { $$ = $1;             }
 | exp '=' exp
   {
 ;
 
 exp:
   NUM                { $$ = $1;             }
 | exp '=' exp
   {

-     if ($1 != $3)
-       printf ("calc: error: %d != %d\n", $1, $3);
-     $$ = $1 == $3;
+    if ($1 != $3)
+      fprintf (stderr, "calc: error: %d != %d\n", $1, $3);
+    $$ = $1;

   }
 | exp '+' exp        { $$ = $1 + $3;        }
 | exp '-' exp        { $$ = $1 - $3;        }
   }
 | exp '+' exp        { $$ = $1 + $3;        }
 | exp '-' exp        { $$ = $1 - $3;        }


@@ -102,74 +117,116 @@ exp:
 | '-' exp  %prec NEG { $$ = -$2;            }
 | exp '^' exp        { $$ = power ($1, $3); }
 | '(' exp ')'        { $$ = $2;             }
 | '-' exp  %prec NEG { $$ = -$2;            }
 | exp '^' exp        { $$ = power ($1, $3); }
 | '(' exp ')'        { $$ = $2;             }

+| '(' error ')'      { $$ = 1111;           }
+| '!'                { YYERROR;             }

 ;
 %%
 /* The input. */
 ;
 %%
 /* The input. */

-FILE *yyin;
+static FILE *yyin;

 
 

-static void
-yyerror (const char *s)
+]AT_LALR1_CC_IF(
+[/* Currently, print_ is required in C++. */
+void
+yy::Parser::print_ ()

 {
 {

-#if YYLSP_NEEDED
-  fprintf (stderr, "%d.%d:%d.%d: ",
-          yylloc.first_line, yylloc.first_column,
-          yylloc.last_line, yylloc.last_column);
-#endif
-  fprintf (stderr, "%s\n", s);
+AT_LOCATION_IF([
+  std::cerr << location;])
+}
+
+/* A C++ error reporting function. */
+void
+yy::Parser::error_ ()
+{
+  std::cerr << AT_LOCATION_IF([location << ": " << ])message << std::endl;
+}
+
+int
+yyparse (void)
+{
+  yy::Parser parser = yy::Parser (!!YYDEBUG[]AT_LOCATION_IF([,
+                                  yy::Location::Location ()]));
+  return parser.parse ();

 }
 }

+],
+[static void
+yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ])
+         AT_PARAM_IF([value *result, int *count, ])
+         const char *s)
+{
+AT_PARAM_IF([(void) result; (void) count;])
+AT_YYERROR_SEES_LOC_IF([
+  fprintf (stderr, "%d.%d",
+           AT_LOC.first_line, AT_LOC.first_column);
+  if (AT_LOC.first_line != AT_LOC.last_line)
+    fprintf (stderr, "-%d.%d",
+            AT_LOC.last_line,  AT_LOC.last_column - 1);
+  else if (AT_LOC.first_column != AT_LOC.last_column - 1)
+    fprintf (stderr, "-%d",
+            AT_LOC.last_column - 1);
+  fprintf (stderr, ": ");])
+  fprintf (stderr, "%s\n", s);
+}])[

 
 
 
 

-#if YYLSP_NEEDED
+]AT_LOCATION_IF([

 static YYLTYPE last_yylloc;
 static YYLTYPE last_yylloc;

-#endif
+])[

 static int
 static int

-yygetc (void)
+yygetc (]AT_LEX_FORMALS[)

 {
   int res = getc (yyin);
 {
   int res = getc (yyin);

-#if YYLSP_NEEDED
-  last_yylloc = yylloc;
+  ]AT_USE_LEX_ARGS[;
+]AT_LOCATION_IF([
+  last_yylloc = AT_LOC;

   if (res == '\n')
     {
   if (res == '\n')
     {

-      yylloc.last_line++;
-      yylloc.last_column = 0;
+AT_LALR1_CC_IF(
+[     AT_LOC.end.line++;
+      AT_LOC.end.column = 0;],
+[     AT_LOC.last_line++;
+      AT_LOC.last_column = 0;])

     }
   else
     }
   else

-    yylloc.last_column++;
-#endif
+AT_LALR1_CC_IF(
+[    AT_LOC.end.column++;],
+[    AT_LOC.last_column++;])
+])[

   return res;
 }
 
 
 static void
   return res;
 }
 
 
 static void

-yyungetc (int c)
+yyungetc (]AT_LEX_PRE_FORMALS[ int c)

 {
 {

-#if YYLSP_NEEDED
+  ]AT_USE_LEX_ARGS[;
+]AT_LOCATION_IF([

   /* Wrong when C == `\n'. */
   /* Wrong when C == `\n'. */

-  yylloc = last_yylloc;
-#endif
+  AT_LOC = last_yylloc;
+])[

   ungetc (c, yyin);
 }
 
 static int
   ungetc (c, yyin);
 }
 
 static int

-read_signed_integer (void)
+read_signed_integer (]AT_LEX_FORMALS[)

 {
 {

-  int c = yygetc ();
+  int c = yygetc (]AT_LEX_ARGS[);

   int sign = 1;
   int n = 0;
 
   int sign = 1;
   int n = 0;
 

+  ]AT_USE_LEX_ARGS[;

   if (c == '-')
     {
   if (c == '-')
     {

-      c = yygetc ();
+      c = yygetc (]AT_LEX_ARGS[);

       sign = -1;
     }
 
   while (isdigit (c))
     {
       n = 10 * n + (c - '0');
       sign = -1;
     }
 
   while (isdigit (c))
     {
       n = 10 * n + (c - '0');

-      c = yygetc ();
+      c = yygetc (]AT_LEX_ARGS[);

     }
 
     }
 

-  yyungetc (c);
+  yyungetc (]AT_LEX_PRE_ARGS[ c);

 
   return sign * n;
 }
 
   return sign * n;
 }


@@ -183,29 +240,42 @@ read_signed_integer (void)
 `---------------------------------------------------------------*/
 
 static int
 `---------------------------------------------------------------*/
 
 static int

-yylex (void)
+yylex (]AT_LEX_FORMALS[)

 {
 {

+  static int init = 1;

   int c;
 
   int c;
 

-#if YYLSP_NEEDED
-  yylloc.first_column = yylloc.last_column;
-  yylloc.first_line = yylloc.last_line;
-#endif
+  if (init)
+    {
+      init = 0;
+]AT_LALR1_CC_IF([],
+[AT_LOCATION_IF([
+      AT_LOC.last_column = 0;
+      AT_LOC.last_line = 1;
+])])[
+    }
+
+]AT_LOCATION_IF([AT_LALR1_CC_IF(
+[ AT_LOC.begin = AT_LOC.end;],
+[ AT_LOC.first_column = AT_LOC.last_column;
+  AT_LOC.first_line   = AT_LOC.last_line;
+])])[

 
   /* Skip white space.  */
 
   /* Skip white space.  */

-  while ((c = yygetc ()) == ' ' || c == '\t')
+  while ((c = yygetc (]AT_LEX_ARGS[)) == ' ' || c == '\t')

     {
     {

-#if YYLSP_NEEDED
-      yylloc.first_column = yylloc.last_column;
-      yylloc.first_line = yylloc.last_line;
-#endif
+]AT_LOCATION_IF([AT_LALR1_CC_IF(
+[     AT_LOC.begin = AT_LOC.end;],
+[     AT_LOC.first_column = AT_LOC.last_column;
+      AT_LOC.first_line   = AT_LOC.last_line;
+])])[

     }
 
   /* process numbers   */
   if (c == '.' || isdigit (c))
     {
     }
 
   /* process numbers   */
   if (c == '.' || isdigit (c))
     {

-      yyungetc (c);
-      yylval = read_signed_integer ();
+      yyungetc (]AT_LEX_PRE_ARGS[ c);
+      ]AT_VAL[.ival = read_signed_integer (]AT_LEX_ARGS[);

       return NUM;
     }
 
       return NUM;
     }
 


@@ -228,10 +298,13 @@ power (int base, int exponent)
   return res;
 }
 
   return res;
 }
 

+

 int
 main (int argc, const char **argv)
 {
 int
 main (int argc, const char **argv)
 {

-  yyin = NULL;
+  value result = 0;
+  int count = 0;
+  int status;

 
   if (argc == 2)
     yyin = fopen (argv[1], "r");
 
   if (argc == 2)
     yyin = fopen (argv[1], "r");


@@ -244,15 +317,14 @@ main (int argc, const char **argv)
       exit (1);
     }
 
       exit (1);
     }
 

-#if YYDEBUG
-  yydebug = 1;
-#endif
-#if YYLSP_NEEDED
-  yylloc.last_column = 0;
-  yylloc.last_line = 1;
-#endif
-  yyparse ();
-  return 0;
+]AT_LALR1_CC_IF([], [m4_bmatch([$4], [%debug],
+[  yydebug = 1;])])[
+  status = yyparse (]AT_PARAM_IF([&result, &count])[);
+  if (global_result != result)
+    abort ();
+  if (global_count != count)
+    abort ();
+  return status;

 }
 ]])
 ])# _AT_DATA_CALC_Y
 }
 ]])
 ])# _AT_DATA_CALC_Y


@@ -262,9 +334,8 @@ main (int argc, const char **argv)
 # -------------------------------
 # Produce `calc.y'.
 m4_define([AT_DATA_CALC_Y],
 # -------------------------------
 # Produce `calc.y'.
 m4_define([AT_DATA_CALC_Y],

-[_AT_DATA_CALC_Y($[1], $[2], $[3],
-                 [m4_bmatch([$1], [--yyerror-verbose],
-                            [[%error-verbose]])])])
+[_AT_DATA_CALC_Y($[1], $[2], $[3], [$1])
+])

 
 
 
 
 
 


@@ -272,90 +343,203 @@ m4_define([AT_DATA_CALC_Y],
 # ------------------------------------------------------------
 # Run `calc' on INPUT and expect no STDOUT nor STDERR.
 #
 # ------------------------------------------------------------
 # Run `calc' on INPUT and expect no STDOUT nor STDERR.
 #

-# If BISON-OPTIONS contains `--debug', then NUM-STDERR-LINES is the number
-# of expected lines on stderr.
+# If BISON-OPTIONS contains `%debug' but not `%glr-parser', then
+# NUM-STDERR-LINES is the number of expected lines on stderr.
+#
+# We don't count GLR's traces yet, since its traces are somewhat
+# different from LALR's.

 m4_define([_AT_CHECK_CALC],
 [AT_DATA([[input]],
 [[$2
 ]])
 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_PARSER_CHECK([./calc input], 0, [], [stderr])
+m4_bmatch([$1],
+  [%debug.*%glr\|%glr.*%debug],
+     [],
+  [%debug],
+     [AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0, [$3
+])])

 ])
 
 
 ])
 
 

-# _AT_CHECK_CALC_ERROR(BISON-OPTIONS, INPUT, [NUM-DEBUG-LINES],
-#                      [ERROR-LOCATION], [IF-YYERROR-VERBOSE])
-# ------------------------------------------------------------
-# Run `calc' on INPUT, and expect a `parse error' message.
+# _AT_CHECK_CALC_ERROR(BISON-OPTIONS, EXIT-STATUS, INPUT,
+#                      [NUM-DEBUG-LINES],
+#                      [VERBOSE-AND-LOCATED-ERROR-MESSAGE])
+# ---------------------------------------------------------
+# Run `calc' on INPUT, and expect a `syntax error' message.

 #
 # If INPUT starts with a slash, it is used as absolute input file name,
 # otherwise as contents.
 #
 #
 # 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
+# If BISON-OPTIONS contains `%location', then make sure the ERROR-LOCATION

 # is correctly output on stderr.
 #
 # 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, '
+# If BISON-OPTIONS contains `%error-verbose', then make sure the
+# IF-YYERROR-VERBOSE message is properly output after `syntax error, '

 # on STDERR.
 #
 # on STDERR.
 #

-# If BISON-OPTIONS contains `--debug', then NUM-STDERR-LINES is the number
-# of expected lines on stderr.
+# If BISON-OPTIONS contains `%debug' but not `%glr', then NUM-STDERR-LINES
+# is the number of expected lines on stderr.

 m4_define([_AT_CHECK_CALC_ERROR],
 m4_define([_AT_CHECK_CALC_ERROR],

-[m4_bmatch([$2], [^/],
-           [AT_CHECK([calc $2], 0, [], [stderr])],
+[m4_bmatch([$3], [^/],
+           [AT_PARSER_CHECK([./calc $3], $2, [], [stderr])],

            [AT_DATA([[input]],
            [AT_DATA([[input]],

-[[$2
+[[$3

 ]])
 ]])

-AT_CHECK([calc input], 0, [], [stderr])])
-
-
-AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
-         [m4_bmatch([$1], [--debug],
-                    [$3], [1])
-])
-
-egrep -v '^((Start|Enter|Read|Reduc|Shift)ing|state|Error:) ' stderr >at-stderr
+AT_PARSER_CHECK([./calc input], $2, [], [stderr])])
+m4_bmatch([$1],
+  [%debug.*%glr\|%glr.*%debug],
+     [],
+  [%debug],
+     [AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0, [$4
+])])
+
+# Normalize the observed and expected error messages, depending upon the
+# options.
+# 1. Remove the traces from observed.
+sed '/^Starting/d
+/^Entering/d
+/^Stack/d
+/^Reading/d
+/^Reducing/d
+/^Shifting/d
+/^state/d
+/^Error:/d
+/^Next/d
+/^Discarding/d
+/^yydestructor:/d' stderr >at-stderr

 mv at-stderr stderr
 mv at-stderr stderr

+# 2. Create the reference error message.
+AT_DATA([[expout]],
+[$5
+])
+# 3. If locations are not used, remove them.
+AT_YYERROR_SEES_LOC_IF([],
+[[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], [%error-verbose], [],
+[[sed 's/syntax error, .*$/syntax error/' expout >at-expout
+mv at-expout expout]])
+# 5. Check
+AT_CHECK([cat stderr], 0, [expout])
+])

 
 

-AT_CHECK([cat stderr], 0,
-[m4_bmatch([$1], [--location], [$4: ])[]dnl
-parse error[]dnl
-m4_bmatch([$1], [--yyerror-verbose], [, $5])[]dnl

 
 

+# AT_CALC_PUSHDEFS($1, $2, [BISON-OPTIONS])
+# -----------------------------------------
+# This macro works around the impossibility to define macros
+# inside macros, because issuing `[$1]' is not possible in M4 :(.
+# This sucks hard, GNU M4 should really provide M5 like $$1.
+m4_define([AT_CHECK_PUSHDEFS],
+[m4_if([$1$2], $[1]$[2], [],
+       [m4_fatal([$0: Invalid arguments: $@])])dnl
+m4_pushdef([AT_LALR1_CC_IF],
+[m4_bmatch([$3], ["lalr1.cc"], [$1], [$2])])
+m4_pushdef([AT_GLR_IF],
+[m4_bmatch([$3], [%glr-parser], [$1], [$2])])
+# Using yacc.c?
+m4_pushdef([AT_YACC_IF],
+[m4_bmatch([$3], [%glr-parser\|%skeleton], [$2], [$1])])
+m4_pushdef([AT_PARAM_IF],
+[m4_bmatch([$3], [%parse-param], [$1], [$2])])
+m4_pushdef([AT_LOCATION_IF],
+[m4_bmatch([$3], [%locations], [$1], [$2])])
+m4_pushdef([AT_PURE_IF],
+[m4_bmatch([$3], [%pure-parser], [$1], [$2])])
+m4_pushdef([AT_PURE_AND_LOC_IF],
+[m4_bmatch([$3], [%locations.*%pure-parser\|%pure-parser.*%locations],
+           [$1], [$2])])
+m4_pushdef([AT_GLR_OR_PARAM_IF],
+[m4_bmatch([$3], [%glr-parser\|%parse-param], [$1], [$2])])
+
+# yyerror receives the location if %location & %pure & (%glr or %parse-param).
+m4_pushdef([AT_YYERROR_ARG_LOC_IF],
+[AT_GLR_OR_PARAM_IF([AT_PURE_AND_LOC_IF([$1], [$2])],
+                    [$2])])
+# yyerror always sees the locations (when activated), except if
+# yacc & pure & !param.
+m4_pushdef([AT_YYERROR_SEES_LOC_IF],
+[AT_LOCATION_IF([AT_YACC_IF([AT_PURE_IF([AT_PARAM_IF([$1], [$2])],
+                                        [$1])],
+                            [$1])],
+                [$2])])
+
+# The interface is pure: either because %pure-parser, or because we
+# are using the C++ parsers.
+m4_pushdef([AT_PURE_LEX_IF],
+[AT_PURE_IF([$1],
+            [AT_LALR1_CC_IF([$1], [$2])])])
+
+AT_PURE_LEX_IF(
+[m4_pushdef([AT_LOC], [(*yylloc)])
+ m4_pushdef([AT_VAL], [(*yylval)])
+ m4_pushdef([AT_LEX_FORMALS],
+            [YYSTYPE *yylval[]AT_LOCATION_IF([, YYLTYPE *yylloc])])
+ m4_pushdef([AT_LEX_ARGS],
+            [yylval[]AT_LOCATION_IF([, yylloc])])
+ m4_pushdef([AT_USE_LEX_ARGS],
+            [(void) yylval;AT_LOCATION_IF([(void) yylloc])])
+ m4_pushdef([AT_LEX_PRE_FORMALS],
+            [AT_LEX_FORMALS, ])
+ m4_pushdef([AT_LEX_PRE_ARGS],
+            [AT_LEX_ARGS, ])
+],
+[m4_pushdef([AT_LOC], [(yylloc)])
+ m4_pushdef([AT_VAL], [(yylval)])
+ m4_pushdef([AT_LEX_FORMALS],     [void])
+ m4_pushdef([AT_LEX_ARGS],        [])
+ m4_pushdef([AT_USE_LEX_ARGS],    [])
+ m4_pushdef([AT_LEX_PRE_FORMALS], [])
+ m4_pushdef([AT_LEX_PRE_ARGS],    [])

 ])
 ])

-
+])# AT_CALC_PUSHDEFS
+
+
+# AT_CALC_POPDEFS
+# ---------------
+m4_define([AT_CHECK_POPDEFS],
+[m4_popdef([AT_LEX_PRE_ARGS])
+m4_popdef([AT_LEX_PRE_FORMALS])
+m4_popdef([AT_USE_LEX_ARGS])
+m4_popdef([AT_LEX_ARGS])
+m4_popdef([AT_LEX_FORMALS])
+m4_popdef([AT_VAL])
+m4_popdef([AT_LOC])
+m4_popdef([AT_PURE_LEX_IF])
+m4_popdef([AT_YYERROR_SEES_LOC_IF])
+m4_popdef([AT_YYERROR_ARG_LOC_IF])
+m4_popdef([AT_GLR_OR_PARAM_IF])
+m4_popdef([AT_PURE_AND_LOC_IF])
+m4_popdef([AT_LOCATION_IF])
+m4_popdef([AT_PARAM_IF])
+m4_popdef([AT_YACC_IF])
+m4_popdef([AT_GLR_IF])
+m4_popdef([AT_LALR1_CC_IF])

 ])
 
 
 ])
 
 

-# AT_CHECK_CALC([BISON-OPTIONS], [PARSER-EXPECTED-STDERR])
-# --------------------------------------------------------
+
+# AT_CHECK_CALC([BISON-OPTIONS])
+# ------------------------------

 # Start a testing chunk which compiles `calc' grammar with
 # BISON-OPTIONS, and performs several tests over the parser.
 m4_define([AT_CHECK_CALC],
 [# We use integers to avoid dependencies upon the precision of doubles.
 AT_SETUP([Calculator $1])
 
 # Start a testing chunk which compiles `calc' grammar with
 # BISON-OPTIONS, and performs several tests over the parser.
 m4_define([AT_CHECK_CALC],
 [# We use integers to avoid dependencies upon the precision of doubles.
 AT_SETUP([Calculator $1])
 

+AT_CHECK_PUSHDEFS($[1], $[2], [$1])
+

 AT_DATA_CALC_Y([$1])
 
 # Specify the output files to avoid problems on different file systems.
 AT_DATA_CALC_Y([$1])
 
 # Specify the output files to avoid problems on different file systems.

-AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])],
+AT_CHECK([bison -o calc.c calc.y],

          [0], [], [])
 
          [0], [], [])
 

-# Some compilers issue warnings we don't want to hear about.
-# Maybe some day we will have proper Autoconf macros to disable these
-# warnings, but this place is not the right one for that.
-# So let's keep only GCC warnings, which we know are sane.
-# Well, that's only part of the story: some assemblers issue warnings
-# which can be totally useless, and actually polluting.  It seems that
-# the best bet be to completely ignore stderr, but to pass -Werror
-# to GCC.
-if test "$GCC" = yes; then
-  CFLAGS="$CFLAGS -Werror"
-fi
-AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [ignore])
+AT_LALR1_CC_IF(
+[AT_CHECK([$CXX --version || exit 77], 0, ignore, ignore)
+AT_COMPILE_CXX([calc])],
+[AT_COMPILE([calc])])

 
 # Test the priorities.
 _AT_CHECK_CALC([$1],
 
 # Test the priorities.
 _AT_CHECK_CALC([$1],


@@ -371,33 +555,58 @@ _AT_CHECK_CALC([$1],
 1 - (2 - 3) = 2
 
 2^2^3 = 256
 1 - (2 - 3) = 2
 
 2^2^3 = 256

-(2^2)^3 = 64], [488])
-
-# 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], [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 '='])
-_AT_CHECK_CALC_ERROR([$1],
+(2^2)^3 = 64],
+               [486])
+
+# Some syntax errors.
+_AT_CHECK_CALC_ERROR([$1], [1], [0 0], [11],
+                     [1.2: syntax error, unexpected "number"])
+_AT_CHECK_CALC_ERROR([$1], [1], [1//2], [15],
+                     [1.2: syntax error, unexpected '/', expecting "number" or '-' or '(' or '!'])
+_AT_CHECK_CALC_ERROR([$1], [1], [error], [4],
+                     [1.0: syntax error, unexpected $undefined])
+_AT_CHECK_CALC_ERROR([$1], [1], [1 = 2 = 3], [22],
+                     [1.6: syntax error, unexpected '='])
+_AT_CHECK_CALC_ERROR([$1], [1],

                      [
 +1],
                      [
 +1],

-                     [13],
-                     [2.0:2.1],
-                     [unexpected '+'])
+                     [14],
+                     [2.0: syntax error, unexpected '+'])

 # Exercise error messages with EOF: work on an empty file.
 # 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_CHECK_CALC_ERROR([$1], [1], [/dev/null], [4],
+                     [1.0: syntax error, unexpected "end of input"])
+
+# Exercise the error token: without it, we die at the first error,
+# hence be sure to
+#
+# - have several errors which exercise different shift/discardings
+#   - (): nothing to pop, nothing to discard
+#   - (1 + 1 + 1 +): a lot to pop, nothing to discard
+#   - (* * *): nothing to pop, a lot to discard
+#   - (1 + 2 * *): some to pop and discard
+#
+# - test the action associated to `error'
+#
+# - check the lookahead that triggers an error is not discarded
+#   when we enter error recovery.  Below, the lookahead causing the
+#   first error is ")", which is needed to recover from the error and
+#   produce the "0" that triggers the "0 != 1" error.
+#
+_AT_CHECK_CALC_ERROR([$1], [0],
+                     [() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1],
+                     [156],
+[1.1: syntax error, unexpected ')', expecting "number" or '-' or '(' or '!'
+1.17: syntax error, unexpected ')', expecting "number" or '-' or '(' or '!'
+1.22: syntax error, unexpected '*', expecting "number" or '-' or '(' or '!'
+1.40: syntax error, unexpected '*', expecting "number" or '-' or '(' or '!'
+calc: error: 4444 != 1])
+
+# The same, but this time exercising explicitly triggered syntax errors.
+# POSIX says the lookahead causing the error should not be discarded.
+_AT_CHECK_CALC_ERROR([$1], [0], [(!) + (0 0) = 1], [64],
+[1.9: syntax error, unexpected "number"
+calc: error: 2222 != 1])
+AT_CHECK_POPDEFS

 
 AT_CLEANUP
 ])# AT_CHECK_CALC
 
 AT_CLEANUP
 ])# AT_CHECK_CALC


@@ -405,22 +614,106 @@ AT_CLEANUP
 
 
 
 
 
 

-# ------------------ #
-# Test the parsers.  #
-# ------------------ #
+# ------------------------ #
+# Simple LALR Calculator.  #
+# ------------------------ #
+
+AT_BANNER([[Simple LALR Calculator.]])
+
+# AT_CHECK_CALC_LALR([BISON-OPTIONS])
+# -----------------------------------
+# Start a testing chunk which compiles `calc' grammar with
+# BISON-OPTIONS, and performs several tests over the parser.
+m4_define([AT_CHECK_CALC_LALR],
+[AT_CHECK_CALC($@)])
+
+AT_CHECK_CALC_LALR()
+
+AT_CHECK_CALC_LALR([%defines])
+AT_CHECK_CALC_LALR([%locations])
+AT_CHECK_CALC_LALR([%name-prefix="calc"])
+AT_CHECK_CALC_LALR([%verbose])
+AT_CHECK_CALC_LALR([%yacc])
+AT_CHECK_CALC_LALR([%error-verbose])
+
+AT_CHECK_CALC_LALR([%error-verbose %locations])
+
+AT_CHECK_CALC_LALR([%error-verbose %locations %defines %name-prefix="calc" %verbose %yacc])
+
+AT_CHECK_CALC_LALR([%debug])
+AT_CHECK_CALC_LALR([%error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])
+
+AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])
+
+AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {value *result} %parse-param {int *count}])
+
+
+# ----------------------- #
+# Simple GLR Calculator.  #
+# ----------------------- #
+
+AT_BANNER([[Simple GLR Calculator.]])
+
+# AT_CHECK_CALC_GLR([BISON-OPTIONS])
+# ----------------------------------
+# Start a testing chunk which compiles `calc' grammar with
+# BISON-OPTIONS and %glr-parser, and performs several tests over the parser.
+m4_define([AT_CHECK_CALC_GLR],
+[AT_CHECK_CALC([%glr-parser] $@)])
+
+
+AT_CHECK_CALC_GLR()
+
+AT_CHECK_CALC_GLR([%defines])
+AT_CHECK_CALC_GLR([%locations])
+AT_CHECK_CALC_GLR([%name-prefix="calc"])
+AT_CHECK_CALC_GLR([%verbose])
+AT_CHECK_CALC_GLR([%yacc])
+AT_CHECK_CALC_GLR([%error-verbose])
+
+AT_CHECK_CALC_GLR([%error-verbose %locations])
+
+AT_CHECK_CALC_GLR([%error-verbose %locations %defines %name-prefix="calc" %verbose %yacc])
+
+AT_CHECK_CALC_GLR([%debug])
+AT_CHECK_CALC_GLR([%error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])
+
+AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])
+
+AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {value *result} %parse-param {int *count}])
+
+
+# ----------------------------- #
+# Simple LALR1 C++ Calculator.  #
+# ----------------------------- #
+
+AT_BANNER([[Simple LALR1 C++ Calculator.]])
+
+# AT_CHECK_CALC_LALR1_CC([BISON-OPTIONS])
+# ---------------------------------------
+# Start a testing chunk which compiles `calc' grammar with
+# BISON-OPTIONS and %glr-parser, and performs several tests over the parser.
+m4_define([AT_CHECK_CALC_LALR1_CC],
+[AT_CHECK_CALC([%skeleton "lalr1.cc"] $@)])
+
+# AT_CHECK_CALC_LALR1_CC()
+
+AT_CHECK_CALC_LALR1_CC([%defines %locations])
+
+AT_CHECK_CALC_LALR1_CC([%defines])
+# AT_CHECK_CALC_LALR1_CC([%locations])
+# AT_CHECK_CALC_LALR1_CC([%name-prefix="calc"])
+# AT_CHECK_CALC_LALR1_CC([%verbose])
+# AT_CHECK_CALC_LALR1_CC([%yacc])
+# AT_CHECK_CALC_LALR1_CC([%error-verbose])

 
 

-AT_CHECK_CALC()
+# AT_CHECK_CALC_LALR1_CC([%error-verbose %locations])

 
 

-AT_CHECK_CALC([--defines])
-AT_CHECK_CALC([--locations])
-AT_CHECK_CALC([--name-prefix=calc])
-AT_CHECK_CALC([--verbose])
-AT_CHECK_CALC([--yacc])
-AT_CHECK_CALC([--yyerror-verbose])
+AT_CHECK_CALC_LALR1_CC([%error-verbose %locations %defines %name-prefix="calc" %verbose %yacc])

 
 

-AT_CHECK_CALC([--locations --yyerror-verbose])
+# AT_CHECK_CALC_LALR1_CC([%debug])
+AT_CHECK_CALC_LALR1_CC([%error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])

 
 

-AT_CHECK_CALC([--defines --locations --name-prefix=calc --verbose --yacc --yyerror-verbose])
+AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])

 
 

-AT_CHECK_CALC([--debug])
-AT_CHECK_CALC([--debug --defines --locations --name-prefix=calc --verbose --yacc --yyerror-verbose])
+# AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {value *result} %parse-param {int *count}])