Let the initial-action act on the look-ahead, and use it for the

[bison.git] / tests / actions.at

diff --git a/tests/actions.at b/tests/actions.at
index 5331bfc61cb14b85a3e38468663eaf796d39898d..2ffaffb204c829e7a11d1bac00e33dae21de7afe 100644 (file)
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1,5 +1,5 @@
 # Executing Actions.                               -*- Autotest -*-
 # Executing Actions.                               -*- Autotest -*-

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


@@ -29,7 +29,7 @@ AT_SETUP([Mid-rule actions])
 # instead of being attached to the empty rule dedicated to this
 # action.
 
 # instead of being attached to the empty rule dedicated to this
 # action.
 

-AT_DATA([[input.y]],
+AT_DATA_GRAMMAR([[input.y]],

 [[%{
 # include <stdio.h>
 # include <stdlib.h>
 [[%{
 # include <stdio.h>
 # include <stdlib.h>


@@ -72,9 +72,9 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([bison input.y -d -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input], 0,
+AT_CHECK([bison -d -v -o input.c input.y])
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input], 0,

 [[0123456789
 ]])
 
 [[0123456789
 ]])
 


@@ -82,13 +82,15 @@ AT_CLEANUP
 
 
 
 
 
 

+
+

 ## ---------------- ##
 ## Exotic Dollars.  ##
 ## ---------------- ##
 
 AT_SETUP([Exotic Dollars])
 
 ## ---------------- ##
 ## Exotic Dollars.  ##
 ## ---------------- ##
 
 AT_SETUP([Exotic Dollars])
 

-AT_DATA([[input.y]],
+AT_DATA_GRAMMAR([[input.y]],

 [[%{
 # include <stdio.h>
 # include <stdlib.h>
 [[%{
 # include <stdio.h>
 # include <stdlib.h>


@@ -103,18 +105,18 @@ AT_DATA([[input.y]],
   int val;
 };
 
   int val;
 };
 

-%type <val> a_1 a_2 a_4 a_5
+%type <val> a_1 a_2 a_5

             sum_of_the_five_previous_values
 
 %%
             sum_of_the_five_previous_values
 
 %%

-exp: a_1 a_2 { $<val>$ = 3; } a_4 a_5 sum_of_the_five_previous_values
+exp: a_1 a_2 { $<val>$ = 3; } { $<val>$ = $<val>3 + 1; } a_5
+     sum_of_the_five_previous_values

     {
        printf ("%d\n", $6);
     }
 ;
 a_1: { $$ = 1; };
 a_2: { $$ = 2; };
     {
        printf ("%d\n", $6);
     }
 ;
 a_1: { $$ = 1; };
 a_2: { $$ = 2; };

-a_4: { $$ = 4; };

 a_5: { $$ = 5; };
 
 sum_of_the_five_previous_values:
 a_5: { $$ = 5; };
 
 sum_of_the_five_previous_values:


@@ -143,9 +145,9 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([bison input.y -d -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input], 0,
+AT_CHECK([bison -d -v -o input.c input.y])
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input], 0,

 [[15
 ]])
 
 [[15
 ]])
 


@@ -157,57 +159,88 @@ AT_CLEANUP
 ## Printers and Destructors.  ##
 ## -------------------------- ##
 
 ## Printers and Destructors.  ##
 ## -------------------------- ##
 

-AT_SETUP([Printers and Destructors])
-
-# Make sure complex $n work.
-
-AT_DATA([[input.y]],
+# _AT_CHECK_PRINTER_AND_DESTRUCTOR($1, $2, $3, $4, BISON-DIRECTIVE, UNION-FLAG)
+# -----------------------------------------------------------------------------
+m4_define([_AT_CHECK_PRINTER_AND_DESTRUCTOR],
+[# Make sure complex $n work.
+m4_if([$1$2$3], $[1]$[2]$[3], [],
+       [m4_fatal([$0: Invalid arguments: $@])])dnl
+
+# Be sure to pass all the %directives to this macro to have correct
+# helping macros.  So don't put any directly in the Bison file.
+AT_BISON_OPTION_PUSHDEFS([$5])
+AT_DATA_GRAMMAR([[input.y]],

 [[%{
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 [[%{
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>

+]AT_LALR1_CC_IF(
+  [#define RANGE(Location) (Location).begin.line, (Location).end.line],
+  [#define RANGE(Location) (Location).first_line, (Location).last_line])
+[%}

 
 

-#define YYERROR_VERBOSE 1
-#define YYDEBUG 1
-%}
-%verbose
-%union
+$5]
+m4_ifval([$6], [%union

 {
   int ival;
 {
   int ival;

-}
-%type <ival> 'x' thing line input
+}])
+[
+%{
+]AT_LALR1_CC_IF([typedef yy::Location YYLTYPE;
+                m4_ifval([$6], , [#define YYSTYPE int])])
+[static int yylex (]AT_LEX_FORMALS[);
+]AT_LALR1_CC_IF([], [static void yyerror (const char *msg);])
+[%}

 
 

-%printer { fprintf (yyout, "%d from %d", $$, @$.first_line); }
-   input line thing 'x'
+]m4_ifval([$6], [%type <ival> '(' 'x' 'y' ')' ';' thing line input])[

 
 

-%destructor
+%printer

   {
   {

-    fprintf (stdout, "Freeing ");
-    /* FIXME: Ouch: INTERNAL DETAILS EXPOSED HERE. */
-    /* Cannot use $$ which is the union member, not the union itself. */
-    yysymprint (stdout, yytype, yyvalue, @$);
-    fprintf (stdout, "\n");
+    ]AT_LALR1_CC_IF([cdebug_ << $$;],
+                    [fprintf (yyoutput, "%d", $$)])[;

   }
   }

-  input line thing 'x'
+  input line thing 'x' 'y'

 
 

-%{
-static int yylex (void);
-static void yyerror (const char *msg);
-%}
+%destructor
+  { printf ("Freeing nterm input (%d@%d-%d)\n", $$, RANGE (@$)); }
+  input

 
 

+%destructor
+  { printf ("Freeing nterm line (%d@%d-%d)\n", $$, RANGE (@$)); }
+  line
+
+%destructor
+  { printf ("Freeing nterm thing (%d@%d-%d)\n", $$, RANGE (@$)); }
+  thing
+
+%destructor
+  { printf ("Freeing token 'x' (%d@%d-%d)\n", $$, RANGE (@$)); }
+  'x'
+
+%destructor
+  { printf ("Freeing token 'y' (%d@%d-%d)\n", $$, RANGE (@$)); }
+  'y'

 
 %%
 
 %%

+/*
+   This grammar is made to exercise error recovery.
+   "Lines" starting with `(' support error recovery, with
+   ')' as synchronizing token.  Lines starting with 'x' can never
+   be recovered from if in error.
+*/
+

 input:
   /* Nothing. */
     {
       $$ = 0;
 input:
   /* Nothing. */
     {
       $$ = 0;

-      printf ("input(%d): /* Nothing */';'\n", $$);
+      printf ("input (%d@%d-%d): /* Nothing */\n", $$, RANGE (@$));

     }
 | line input /* Right recursive to load the stack so that popping at
                EOF can be exercised.  */
     {
       $$ = 2;
     }
 | line input /* Right recursive to load the stack so that popping at
                EOF can be exercised.  */
     {
       $$ = 2;

-      printf ("input(%d): line(%d) input(%d)';'\n", $$, $1, $2);
+      printf ("input (%d@%d-%d): line (%d@%d-%d) input (%d@%d-%d)\n",
+             $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2));

     }
 ;
 
     }
 ;
 


@@ -215,22 +248,28 @@ line:
   thing thing thing ';'
     {
       $$ = $1;
   thing thing thing ';'
     {
       $$ = $1;

-      printf ("line(%d): thing(%d) thing(%d) thing(%d) ';'\n", $$, $1, $2, $3);
+      printf ("line (%d@%d-%d): thing (%d@%d-%d) thing (%d@%d-%d) thing (%d@%d-%d) ';' (%d@%d-%d)\n",
+              $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2),
+              $3, RANGE (@3), $4, RANGE (@4));

     }
     }

-| thing thing ';'
+| '(' thing thing ')'

     {
       $$ = $1;
     {
       $$ = $1;

-      printf ("line(%d): thing(%d) thing(%d) ';'\n", $$, $1, $2);
+      printf ("line (%d@%d-%d): '(' (%d@%d-%d) thing (%d@%d-%d) thing (%d@%d-%d) ')' (%d@%d-%d)\n",
+              $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2),
+              $3, RANGE (@3), $4, RANGE (@4));

     }
     }

-| thing ';'
+| '(' thing ')'

     {
       $$ = $1;
     {
       $$ = $1;

-      printf ("line(%d): thing(%d) ';'\n", $$, $1);
+      printf ("line (%d@%d-%d): '(' (%d@%d-%d) thing (%d@%d-%d) ')' (%d@%d-%d)\n",
+              $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2), $3, RANGE (@3));

     }
     }

-| error ';'
+| '(' error ')'

     {
       $$ = -1;
     {
       $$ = -1;

-      printf ("line(%d): error ';'\n", $$);
+      printf ("line (%d@%d-%d): '(' (%d@%d-%d) error (@%d-%d) ')' (%d@%d-%d)\n",
+              $$, RANGE (@$), $1, RANGE (@1), RANGE (@2), $3, RANGE (@3));

     }
 ;
 
     }
 ;
 


@@ -238,101 +277,199 @@ thing:
   'x'
     {
       $$ = $1;
   'x'
     {
       $$ = $1;

-      printf ("thing(%d): 'x'(%d)\n", $$, $1);
+      printf ("thing (%d@%d-%d): 'x' (%d@%d-%d)\n",
+              $$, RANGE (@$), $1, RANGE (@1));

     }
 ;
 %%
     }
 ;
 %%

+/* Alias to ARGV[1]. */
+const char *yysource = 0;
+

 static int
 static int

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

 {
 {

-  static const unsigned int input[] =
-    {
-      /* Exericise the discarding of stack top and input until `error'
-         can be reduced.  */
-      'x', 'x', 'x', 'x', 'x', 'x', ';',
-
-      /* Load the stack and provoke an error that cannot be caught by
-         the grammar, to check that the stack is cleared. */
-      'x', 'x', ';',
-      'x', ';',
-      'y'
-    };

   static unsigned int counter = 0;
 
   static unsigned int counter = 0;
 

-  if (counter < (sizeof(input) / sizeof (input[0])))
-    {
-       yylval.ival = counter;
-       /* As in BASIC, line numbers go from 10 to 10.  */
-       yylloc.first_line = 10 * counter;
-       printf ("sending: '%c' (value = %d, line %d)\n",
-               input[counter], yylval.ival, yylloc.first_line);
-       return (int) input[counter++];
-    }
+  int c = ]AT_VAL[]m4_ifval([$6], [.ival])[ = counter++;
+  /* As in BASIC, line numbers go from 10 to 10.  */
+]AT_LALR1_CC_IF(
+[ AT_LOC.begin.line = AT_LOC.begin.column = 10 * c;
+  AT_LOC.end.line = AT_LOC.end.column = AT_LOC.begin.line + 9;
+],
+[ AT_LOC.first_line = AT_LOC.first_column = 10 * c;
+  AT_LOC.last_line = AT_LOC.last_column = AT_LOC.first_line + 9;
+])[
+
+  if (yysource[c])
+    printf ("sending: '%c'", yysource[c]);

   else
   else

-    {
-      printf ("sending: EOF\n");
-      return EOF;
-    }
+    printf ("sending: EOF");
+  printf (" (%d@%d-%d)\n", c, RANGE (]AT_LOC[));
+  return yysource[c];

 }
 
 }
 

-static void
-yyerror (const char *msg)
+]AT_LALR1_CC_IF(
+[/* Currently, print_ is required in C++. */
+void
+yy::Parser::print_ ()
+{
+  std::cerr << location;
+}
+
+/* A C++ error reporting function. */
+void
+yy::Parser::error_ ()

 {
 {

-  fprintf (stdout, "%d: %s\n", yylloc.first_line, msg);
+  printf ("%d-%d: %s\n", RANGE (location), message.c_str());

 }
 
 }
 

+static bool yydebug;

 int
 int

-main (void)
+yyparse ()
+{
+  yy::Parser parser (yydebug);
+  return parser.parse ();
+}
+],
+[static void
+yyerror (const char *msg)
+{
+  printf ("%d-%d: %s\n", RANGE (yylloc), msg);
+}])[
+
+int
+main (int argc, const char *argv[])

 {
   yydebug = !!getenv ("YYDEBUG");
 {
   yydebug = !!getenv ("YYDEBUG");

+  assert (argc == 2);
+  yysource = argv[1];

   if (yyparse ())
     {
   if (yyparse ())
     {

-      fprintf (stdout, "Parsing FAILED.\n");
+      printf ("Parsing FAILED.\n");

       exit (1);
     }
       exit (1);
     }

-  fprintf (stdout, "Successful parse.\n");
+  printf ("Successful parse.\n");

   return 0;
 }
 ]])
 
   return 0;
 }
 ]])
 

-AT_CHECK([bison input.y --location -d -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input], 1,
-[[sending: 'x' (value = 0, line 0)
-thing(0): 'x'(0)
-sending: 'x' (value = 1, line 10)
-thing(1): 'x'(1)
-sending: 'x' (value = 2, line 20)
-thing(2): 'x'(2)
-sending: 'x' (value = 3, line 30)
-30: parse error, unexpected 'x', expecting ';'
-Freeing nterm thing (2 from 20)
-Freeing nterm thing (1 from 10)
-Freeing nterm thing (0 from 0)
-Freeing token 'x' (3 from 30)
-sending: 'x' (value = 4, line 40)
-Freeing token 'x' (4 from 40)
-sending: 'x' (value = 5, line 50)
-Freeing token 'x' (5 from 50)
-sending: ';' (value = 6, line 60)
-line(-1): error ';'
-sending: 'x' (value = 7, line 70)
-thing(7): 'x'(7)
-sending: 'x' (value = 8, line 80)
-thing(8): 'x'(8)
-sending: ';' (value = 9, line 90)
-line(7): thing(7) thing(8) ';'
-sending: 'x' (value = 10, line 100)
-thing(10): 'x'(10)
-sending: ';' (value = 11, line 110)
-line(10): thing(10) ';'
-sending: 'y' (value = 12, line 120)
-120: parse error, unexpected $undefined., expecting $ or error or 'x'
-sending: EOF
-Freeing nterm line (10 from 100)
-Freeing nterm line (7 from 70)
-Freeing nterm line (-1 from 50)
+AT_LALR1_CC_IF(
+  [AT_CHECK([bison -o input.cc input.y])
+   AT_COMPILE_CXX([input])],
+  [AT_CHECK([bison -o input.c input.y])
+   AT_COMPILE([input])])
+
+
+# Check the location of "empty"
+# -----------------------------
+# I.e., epsilon-reductions, as in "(x)" which ends by reducing
+# an empty "line" nterm.
+# FIXME: This location is not satisfying.  Depend on the lookahead?
+AT_PARSER_CHECK([./input '(x)'], 0,
+[[sending: '(' (0@0-9)
+sending: 'x' (1@10-19)
+thing (1@10-19): 'x' (1@10-19)
+sending: ')' (2@20-29)
+line (0@0-29): '(' (0@0-9) thing (1@10-19) ')' (2@20-29)
+sending: EOF (3@30-39)
+input (0@0-29): /* Nothing */
+input (2@0-29): line (0@0-29) input (0@0-29)
+Successful parse.
+]])
+
+
+# Check locations in error recovery
+# ---------------------------------
+# '(y)' is an error, but can be recovered from.  But what's the location
+# of the error itself ('y'), and of the resulting reduction ('(error)').
+AT_PARSER_CHECK([./input '(y)'], 0,
+[[sending: '(' (0@0-9)
+sending: 'y' (1@10-19)
+10-19: syntax error, unexpected 'y', expecting 'x'
+Freeing token 'y' (1@10-19)
+sending: ')' (2@20-29)
+line (-1@0-29): '(' (0@0-9) error (@10-19) ')' (2@20-29)
+sending: EOF (3@30-39)
+input (0@0-29): /* Nothing */
+input (2@0-29): line (-1@0-29) input (0@0-29)
+Successful parse.
+]])
+
+
+# Syntax errors caught by the parser
+# ----------------------------------
+# Exercise the discarding of stack top and input until `error'
+# can be reduced.
+#
+#     '(', 'x', 'x', 'x', 'x', 'x', ')',
+#
+# Load the stack and provoke an error that cannot be caught by the
+# grammar, to check that the stack is cleared.  And make sure the
+# lookahead is freed.
+#
+#     '(', 'x', ')',
+#     '(', 'x', ')',
+#     'y'
+AT_PARSER_CHECK([./input '(xxxxx)(x)(x)y'], 1,
+[[sending: '(' (0@0-9)
+sending: 'x' (1@10-19)
+thing (1@10-19): 'x' (1@10-19)
+sending: 'x' (2@20-29)
+thing (2@20-29): 'x' (2@20-29)
+sending: 'x' (3@30-39)
+30-39: syntax error, unexpected 'x', expecting ')'
+Freeing nterm thing (2@20-29)
+Freeing nterm thing (1@10-19)
+Freeing token 'x' (3@30-39)
+sending: 'x' (4@40-49)
+Freeing token 'x' (4@40-49)
+sending: 'x' (5@50-59)
+Freeing token 'x' (5@50-59)
+sending: ')' (6@60-69)
+line (-1@0-69): '(' (0@0-9) error (@10-59) ')' (6@60-69)
+sending: '(' (7@70-79)
+sending: 'x' (8@80-89)
+thing (8@80-89): 'x' (8@80-89)
+sending: ')' (9@90-99)
+line (7@70-99): '(' (7@70-79) thing (8@80-89) ')' (9@90-99)
+sending: '(' (10@100-109)
+sending: 'x' (11@110-119)
+thing (11@110-119): 'x' (11@110-119)
+sending: ')' (12@120-129)
+line (10@100-129): '(' (10@100-109) thing (11@110-119) ')' (12@120-129)
+sending: 'y' (13@130-139)
+input (0@100-129): /* Nothing */
+input (2@100-129): line (10@100-129) input (0@100-129)
+input (2@70-129): line (7@70-99) input (2@100-129)
+input (2@0-129): line (-1@0-69) input (2@70-129)
+130-139: syntax error, unexpected 'y', expecting $end
+Freeing nterm input (2@0-129)
+Freeing token 'y' (13@130-139)

 Parsing FAILED.
 ]])
 
 Parsing FAILED.
 ]])
 

+])
+
+
+# AT_CHECK_PRINTER_AND_DESTRUCTOR([BISON-OPTIONS], [UNION-FLAG])
+# --------------------------------------------------------------
+m4_define([AT_CHECK_PRINTER_AND_DESTRUCTOR],
+[AT_SETUP([Printers and Destructors $2: $1])
+
+_AT_CHECK_PRINTER_AND_DESTRUCTOR($[1], $[2], $[3], $[4],
+[%error-verbose
+%debug
+%verbose
+%locations
+$1], [$2])
+

 AT_CLEANUP
 AT_CLEANUP

+])
+
+
+AT_CHECK_PRINTER_AND_DESTRUCTOR([])
+AT_CHECK_PRINTER_AND_DESTRUCTOR([], [with union])
+AT_CHECK_PRINTER_AND_DESTRUCTOR([%defines %skeleton "lalr1.cc"])
+AT_CHECK_PRINTER_AND_DESTRUCTOR([%defines %skeleton "lalr1.cc"], [with union])
+AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser])
+AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser], [with union])