X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7a86d7eba9d476afcfb69e97667c9ee6ed23ef61..a5eb1ed262e86657c5af95e4a8eae258a2e49e4b:/tests/actions.at?ds=inline

diff --git a/tests/actions.at b/tests/actions.at
index f1fdab71..e8124e9e 100644
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1,5 +1,5 @@
 # Executing Actions.                               -*- Autotest -*-
-# Copyright (C) 2001, 2002 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
@@ -108,13 +108,13 @@ input:
   /* Nothing. */
     {
       $$ = 0;
-      printf ("input(%d): /* Nothing */\n", $$);
+      printf ("input (%d): /* Nothing */\n", $$);
     }
 | 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): line (%d) input (%d)\n", $$, $1, $2);
     }
 ;
 
@@ -122,23 +122,23 @@ line:
   thing thing thing ';'
     {
       $$ = $1;
-      printf ("line(%d): thing(%d) thing(%d) thing(%d) ';'(%d)\n",
+      printf ("line (%d): thing (%d) thing (%d) thing (%d) ';' (%d)\n",
 	      $$, $1, $2, $3, $4);
     }
 | thing thing ';'
     {
       $$ = $1;
-      printf ("line(%d): thing(%d) thing(%d) ';'(%d)\n", $$, $1, $2, $3);
+      printf ("line (%d): thing (%d) thing (%d) ';' (%d)\n", $$, $1, $2, $3);
     }
 | thing ';'
     {
       $$ = $1;
-      printf ("line(%d): thing(%d) ';'(%d)\n", $$, $1, $2);
+      printf ("line (%d): thing (%d) ';' (%d)\n", $$, $1, $2);
     }
 | error ';'
     {
       $$ = -1;
-      printf ("line(%d): error ';'(%d)\n", $$, $2);
+      printf ("line (%d): error ';' (%d)\n", $$, $2);
     }
 ;
 
@@ -146,7 +146,7 @@ thing:
   'x'
     {
       $$ = $1;
-      printf ("thing(%d): 'x'(%d)\n", $$, $1);
+      printf ("thing (%d): 'x' (%d)\n", $$, $1);
     }
 ;
 %%
@@ -157,7 +157,7 @@ yylex (void)
 {
   static char const input[] =
     {
-      /* Exericise the discarding of stack top and input until `error'
+      /* Exercise the discarding of stack top and input until `error'
          can be reduced.  */
       'x', 'x', 'x', 'x', 'x', 'x', ';',
 
@@ -171,7 +171,7 @@ yylex (void)
   if (counter < sizeof input)
     {
        yylval.ival = counter;
-       printf ("sending: '%c' (value = %d)\n", input[counter], yylval.ival);
+       printf ("sending: '%c' (%d)\n", input[counter], yylval.ival);
        return input[counter++];
     }
   else
@@ -198,29 +198,29 @@ main (void)
 AT_CHECK([bison -o input.c input.y])
 AT_COMPILE([input])
 AT_PARSER_CHECK([./input], 1,
-[[sending: 'x' (value = 0)
-thing(0): 'x'(0)
-sending: 'x' (value = 1)
-thing(1): 'x'(1)
-sending: 'x' (value = 2)
-thing(2): 'x'(2)
-sending: 'x' (value = 3)
+[[sending: 'x' (0)
+thing (0): 'x' (0)
+sending: 'x' (1)
+thing (1): 'x' (1)
+sending: 'x' (2)
+thing (2): 'x' (2)
+sending: 'x' (3)
 4: syntax error
-sending: 'x' (value = 4)
-sending: 'x' (value = 5)
-sending: ';' (value = 6)
-line(-1): error ';'(6)
-sending: 'x' (value = 7)
-thing(7): 'x'(7)
-sending: 'x' (value = 8)
-thing(8): 'x'(8)
-sending: ';' (value = 9)
-line(7): thing(7) thing(8) ';'(9)
-sending: 'x' (value = 10)
-thing(10): 'x'(10)
-sending: ';' (value = 11)
-line(10): thing(10) ';'(11)
-sending: 'y' (value = 12)
+sending: 'x' (4)
+sending: 'x' (5)
+sending: ';' (6)
+line (-1): error ';' (6)
+sending: 'x' (7)
+thing (7): 'x' (7)
+sending: 'x' (8)
+thing (8): 'x' (8)
+sending: ';' (9)
+line (7): thing (7) thing (8) ';' (9)
+sending: 'x' (10)
+thing (10): 'x' (10)
+sending: ';' (11)
+line (10): thing (10) ';' (11)
+sending: 'y' (12)
 13: syntax error
 sending: EOF
 ]])
@@ -304,37 +304,50 @@ AT_CLEANUP
 ## Printers and Destructors.  ##
 ## -------------------------- ##
 
-# _AT_CHECK_PRINTER_AND_DESTRUCTOR($1, $2, $3, BISON-DIRECTIVE)
-# -------------------------------------------------------------
+# _AT_CHECK_PRINTER_AND_DESTRUCTOR($1, $2, $3, $4, BISON-DIRECTIVE, UNION-FLAG)
+# -----------------------------------------------------------------------------
 m4_define([_AT_CHECK_PRINTER_AND_DESTRUCTOR],
 [m4_if([$1$2$3], $[1]$[2]$[3], [],
        [m4_fatal([$0: Invalid arguments: $@])])dnl
 
-AT_SETUP([Printers and Destructors: $4])
+AT_SETUP([Printers and Destructors $6: $5])
 
 # Make sure complex $n work.
 
+AT_BISON_OPTION_PUSHDEFS([$5])
 AT_DATA_GRAMMAR([[input.y]],
-[[$4
+[[$5
 %{
 #include <stdio.h>
 #include <stdlib.h>
-#define RANGE(Location) (Location).first_line, (Location).last_line
-static int yylex (void);
-static void yyerror (const char *msg);
-%}
+]AT_LALR1_CC_IF(
+  [#define RANGE(Location) (Location).begin.line, (Location).end.line],
+  [#define RANGE(Location) (Location).first_line, (Location).last_line])
+[%}
 %error-verbose
 %debug
 %verbose
 %locations
-%union
+]m4_ifval([$6], [%union
 {
   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);])
+[%}
+
+]m4_ifval([$6], [%type <ival> 'x' ';' thing line input])[
 
-%printer { fprintf (yyout, "%d@%d-%d", $$, RANGE (@$)); }
-   input line thing 'x'
+%printer
+  {
+    ]AT_LALR1_CC_IF([cdebug_ << @$ << ": " << $$;],
+                    [fprintf (yyoutput, "%d@%d-%d", $$, RANGE (@$))])[;
+  }
+  input line thing 'x'
 
 %destructor
   { printf ("Freeing nterm input (%d@%d-%d)\n", $$, RANGE (@$)); }
@@ -357,13 +370,13 @@ input:
   /* Nothing. */
     {
       $$ = 0;
-      printf ("input (%d@%d-%d): /* Nothing */';'\n", $$, RANGE (@$));
+      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;
-      printf ("input (%d@%d-%d): line (%d@%d-%d) input (%d@%d-%d)';'\n",
+      printf ("input (%d@%d-%d): line (%d@%d-%d) input (%d@%d-%d)\n",
 	      $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2));
     }
 ;
@@ -372,27 +385,27 @@ line:
   thing thing thing ';'
     {
       $$ = $1;
-      printf ("line (%d@%d-%d): thing (%d@%d-%d) thing (%d@%d-%d) thing (%d@%d-%d) ';'\n",
+      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));
+              $3, RANGE (@3), $4, RANGE (@4));
     }
 | thing thing ';'
     {
       $$ = $1;
-      printf ("line (%d@%d-%d): thing (%d@%d-%d) thing (%d@%d-%d) ';'\n",
-              $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2));
+      printf ("line (%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));
     }
 | thing ';'
     {
       $$ = $1;
-      printf ("line (%d@%d-%d): thing (%d@%d-%d) ';'\n",
-              $$, RANGE (@$), $1, RANGE (@1));
+      printf ("line (%d@%d-%d): thing (%d@%d-%d) ';' (%d@%d-%d)\n",
+              $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2));
     }
 | error ';'
     {
       $$ = -1;
-      printf ("line (%d@%d-%d): error (@%d-%d) ';'\n",
-              $$, RANGE (@$), RANGE (@1));
+      printf ("line (%d@%d-%d): error (@%d-%d) ';' (%d@%d-%d)\n",
+              $$, RANGE (@$), RANGE (@1), $2, RANGE (@2));
     }
 ;
 
@@ -406,9 +419,9 @@ thing:
 ;
 %%
 static int
-yylex (void)
+yylex (]AT_LEX_FORMALS[)
 {
-  static const unsigned int input[] =
+  static const char input[] =
     {
       /* Exercise the discarding of stack top and input until `error'
          can be reduced.  */
@@ -424,13 +437,23 @@ yylex (void)
 
   if (counter < (sizeof(input) / sizeof (input[0])))
     {
-       yylval.ival = counter;
+]AT_LALR1_CC_IF(
+[       int c = m4_ifval([$6], [yylval->ival], [*yylval]) = counter++;
+       /* As in BASIC, line numbers go from 10 to 10.  */
+       yylloc->begin.line = yylloc->begin.column = 10 * c;
+       yylloc->end.line = yylloc->end.column = yylloc->begin.line + 9;
+       printf ("sending: '%c' (%d@%d-%d)\n",
+               input[[c]], c, RANGE (*yylloc));
+       return input[[c]];
+],
+[       int c = m4_ifval([$6], [yylval.ival], [yylval]) = counter++;
        /* As in BASIC, line numbers go from 10 to 10.  */
-       yylloc.first_line = yylloc.first_column = 10 * counter;
+       yylloc.first_line = yylloc.first_column = 10 * c;
        yylloc.last_line = yylloc.last_column = yylloc.first_line + 9;
        printf ("sending: '%c' (%d@%d-%d)\n",
-               input[counter], yylval.ival, RANGE (yylloc));
-       return (int) input[counter++];
+               input[[c]], c, RANGE (yylloc));
+       return input[[c]];
+])[
     }
   else
     {
@@ -439,11 +462,34 @@ yylex (void)
     }
 }
 
-static void
+]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_ ()
+{
+  printf ("%d-%d: %s\n", RANGE (location), message.c_str());
+}
+
+static bool yydebug;
+int
+yyparse ()
+{
+  yy::Parser parser (yydebug, yy::Location ());
+  return parser.parse ();
+}
+],
+[static void
 yyerror (const char *msg)
 {
   printf ("%d-%d: %s\n", RANGE (yylloc), msg);
-}
+}])[
 
 int
 main (void)
@@ -459,8 +505,11 @@ main (void)
 }
 ]])
 
-AT_CHECK([bison -o input.c input.y])
-AT_COMPILE([input])
+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])])
 AT_PARSER_CHECK([./input], 1,
 [[sending: 'x' (0@0-9)
 thing (0@0-9): 'x' (0@0-9)
@@ -479,23 +528,23 @@ Freeing token 'x' (4@40-49)
 sending: 'x' (5@50-59)
 Freeing token 'x' (5@50-59)
 sending: ';' (6@60-69)
-line (-1@50-69): error (@50-59) ';'
+line (-1@0-69): error (@0-59) ';' (6@60-69)
 sending: 'x' (7@70-79)
 thing (7@70-79): 'x' (7@70-79)
 sending: 'x' (8@80-89)
 thing (8@80-89): 'x' (8@80-89)
 sending: ';' (9@90-99)
-line (7@70-99): thing (7@70-79) thing (8@80-89) ';'
+line (7@70-99): thing (7@70-79) thing (8@80-89) ';' (9@90-99)
 sending: 'x' (10@100-109)
 thing (10@100-109): 'x' (10@100-109)
 sending: ';' (11@110-119)
-line (10@100-119): thing (10@100-109) ';'
+line (10@100-119): thing (10@100-109) ';' (11@110-119)
 sending: 'y' (12@120-129)
 120-129: syntax error, unexpected $undefined, expecting $end or 'x'
 sending: EOF
 Freeing nterm line (10@100-119)
 Freeing nterm line (7@70-99)
-Freeing nterm line (-1@50-69)
+Freeing nterm line (-1@0-69)
 Parsing FAILED.
 ]])
 
@@ -503,13 +552,20 @@ AT_CLEANUP
 ])
 
 
-# AT_CHECK_PRINTER_AND_DESTRUCTOR([BISON-OPTIONS])
-# ------------------------------------------------
+# AT_CHECK_PRINTER_AND_DESTRUCTOR([BISON-OPTIONS], [UNION-FLAG])
+# --------------------------------------------------------------
 # Produce `calc.y'.
 m4_define([AT_CHECK_PRINTER_AND_DESTRUCTOR],
-[_AT_CHECK_PRINTER_AND_DESTRUCTOR($[1], $[2], $[3], [$1])
+[_AT_CHECK_PRINTER_AND_DESTRUCTOR($[1], $[2], $[3], $[4], [$1], [$2])
 ])
 
 
-AT_CHECK_PRINTER_AND_DESTRUCTOR()
-AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser])
+AT_CHECK_PRINTER_AND_DESTRUCTOR([])
+AT_CHECK_PRINTER_AND_DESTRUCTOR([], [with union])
+AT_CHECK_PRINTER_AND_DESTRUCTOR([%locations %defines %skeleton "lalr1.cc"])
+AT_CHECK_PRINTER_AND_DESTRUCTOR([%locations %defines %skeleton "lalr1.cc"],
+			        [with union])
+
+# FIXME.  These test cases fail.
+#AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser])
+#AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser], [with union])