(_AT_CHECK_PRINTER_AND_DESTRUCTOR,

[bison.git] / tests / actions.at

diff --git a/tests/actions.at b/tests/actions.at
index e0cc49ca6d8d5bf5c5261ca964302ccd5c6bac86..1e8d62f41cffb7096f7aad0fa23d8258bee1f0b2 100644 (file)
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1,5 +1,5 @@
 # Executing Actions.                               -*- Autotest -*-
 # 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
 
 # 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


@@ -157,7 +157,7 @@ yylex (void)
 {
   static char const input[] =
     {
 {
   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', ';',
 
          can be reduced.  */
       'x', 'x', 'x', 'x', 'x', 'x', ';',
 


@@ -304,34 +304,43 @@ AT_CLEANUP
 ## Printers and Destructors.  ##
 ## -------------------------- ##
 
 ## Printers and Destructors.  ##
 ## -------------------------- ##
 

-# _AT_CHECK_PRINTER_AND_DESTRUCTOR($1, $2, $3, $4, 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
 
 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: $5])
+AT_SETUP([Printers and Destructors $6: $5])

 
 # Make sure complex $n work.
 
 
 # Make sure complex $n work.
 

+AT_BISON_OPTION_PUSHDEFS([$5])

 AT_DATA_GRAMMAR([[input.y]],
 [[$5
 %{
 #include <stdio.h>
 #include <stdlib.h>
 AT_DATA_GRAMMAR([[input.y]],
 [[$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
 %error-verbose
 %debug
 %verbose
 %locations

-%union
+]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);])
+[%}
+
+]m4_ifval([$6], [%type <ival> 'x' ';' thing line input])[

 
 %printer { fprintf (yyoutput, "%d@%d-%d", $$, RANGE (@$)); }
    input line thing 'x'
 
 %printer { fprintf (yyoutput, "%d@%d-%d", $$, RANGE (@$)); }
    input line thing 'x'


@@ -406,9 +415,9 @@ thing:
 ;
 %%
 static int
 ;
 %%
 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.  */
     {
       /* Exercise the discarding of stack top and input until `error'
          can be reduced.  */


@@ -424,13 +433,23 @@ yylex (void)
 
   if (counter < (sizeof(input) / sizeof (input[0])))
     {
 
   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.  */
        /* As in BASIC, line numbers go from 10 to 10.  */

-       yylloc.first_line = yylloc.first_column = 10 * counter;
+       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 * c;

        yylloc.last_line = yylloc.last_column = yylloc.first_line + 9;
        printf ("sending: '%c' (%d@%d-%d)\n",
        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
     {
     }
   else
     {


@@ -439,11 +458,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);
 yyerror (const char *msg)
 {
   printf ("%d-%d: %s\n", RANGE (yylloc), msg);

-}
+}])[

 
 int
 main (void)
 
 int
 main (void)


@@ -459,8 +501,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)
 AT_PARSER_CHECK([./input], 1,
 [[sending: 'x' (0@0-9)
 thing (0@0-9): 'x' (0@0-9)


@@ -479,7 +524,7 @@ Freeing token 'x' (4@40-49)
 sending: 'x' (5@50-59)
 Freeing token 'x' (5@50-59)
 sending: ';' (6@60-69)
 sending: 'x' (5@50-59)
 Freeing token 'x' (5@50-59)
 sending: ';' (6@60-69)

-line (-1@50-69): error (@50-59) ';' (6@60-69)
+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)
 sending: 'x' (7@70-79)
 thing (7@70-79): 'x' (7@70-79)
 sending: 'x' (8@80-89)


@@ -495,7 +540,7 @@ sending: 'y' (12@120-129)
 sending: EOF
 Freeing nterm line (10@100-119)
 Freeing nterm line (7@70-99)
 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.
 ]])
 
 Parsing FAILED.
 ]])
 


@@ -503,15 +548,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],
 # Produce `calc.y'.
 m4_define([AT_CHECK_PRINTER_AND_DESTRUCTOR],

-[_AT_CHECK_PRINTER_AND_DESTRUCTOR($[1], $[2], $[3], $[4], [$1])
+[_AT_CHECK_PRINTER_AND_DESTRUCTOR($[1], $[2], $[3], $[4], [$1], [$2])

 ])
 
 
 ])
 
 

-AT_CHECK_PRINTER_AND_DESTRUCTOR()
+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])

 
 

-# This test fails, but the test case is questionable.
+# FIXME.  These test cases fail.

 #AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser])
 #AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser])

+#AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser], [with union])