Regenerate.

[bison.git] / tests / calc.at

diff --git a/tests/calc.at b/tests/calc.at
index 81297bc478ad0b40c743081e72bcbde26725bdc0..dedf568ed9a99f34899a1d18408d86c9b4e0b678 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -1,6 +1,6 @@
 # Simple calculator.                         -*- Autotest -*-
 
 # Simple calculator.                         -*- Autotest -*-
 

-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software

 # Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify


@@ -40,7 +40,7 @@ m4_define([_AT_DATA_CALC_Y],
 AT_DATA_GRAMMAR([calc.y],
 [[/* Infix notation calculator--calc */
 ]$4
 AT_DATA_GRAMMAR([calc.y],
 [[/* Infix notation calculator--calc */
 ]$4

-AT_LALR1_CC_IF(
+AT_SKEL_CC_IF(

 [%define "global_tokens_and_yystype"])[
 %{
 #include <stdio.h>
 [%define "global_tokens_and_yystype"])[
 %{
 #include <stdio.h>


@@ -71,8 +71,10 @@ static int global_count = 0;
 
 %{
 static int power (int base, int exponent);
 
 %{
 static int power (int base, int exponent);

-]AT_LALR1_CC_IF(
-[typedef yy::location YYLTYPE;
+]AT_SKEL_CC_IF(
+[#ifndef YYLTYPE
+[#] define YYLTYPE AT_NAME_PREFIX::location
+#endif

 #define first_line   begin.line
 #define first_column begin.column
 #define last_line    end.line
 #define first_line   begin.line
 #define first_column begin.column
 #define last_line    end.line


@@ -90,6 +92,17 @@ static int get_char (]AT_LEX_FORMALS[);
 static void unget_char (]AT_LEX_PRE_FORMALS[ int c);
 %}
 
 static void unget_char (]AT_LEX_PRE_FORMALS[ int c);
 %}
 

+]AT_SKEL_CC_IF(
+[/* The lalr1.cc skeleton, for backward compatibility, defines
+   a constructor for position that initializes the filename.  The
+   glr.cc skeleton does not (and in fact cannot: location/position
+   are stored in a union, from which objects with constructors are
+   excluded in C++. */
+%initial-action {
+  @$.initialize (0);
+}
+])[
+

 /* Bison Declarations */
 %token CALC_EOF 0 "end of input"
 %token <ival> NUM "number"
 /* Bison Declarations */
 %token CALC_EOF 0 "end of input"
 %token <ival> NUM "number"


@@ -129,17 +142,17 @@ exp:
 | exp '^' exp        { $$ = power ($1, $3); }
 | '(' exp ')'        { $$ = $2;             }
 | '(' error ')'      { $$ = 1111;           }
 | exp '^' exp        { $$ = power ($1, $3); }
 | '(' exp ')'        { $$ = $2;             }
 | '(' error ')'      { $$ = 1111;           }

-| '!'                { YYERROR;             }
-| '-' error          { YYERROR;             }
+| '!'                { $$ = 0; YYERROR;     }
+| '-' error          { $$ = 0; YYERROR;     }

 ;
 %%
 ;
 %%

-/* The input. */
+/* The input.  */

 static FILE *input;
 
 static FILE *input;
 

-]AT_LALR1_CC_IF(
-[/* A C++ error reporting function. */
+]AT_SKEL_CC_IF(
+[/* A C++ error reporting function.  */

 void
 void

-yy::parser::error (const location& l, const std::string& m)
+AT_NAME_PREFIX::parser::error (const location& l, const std::string& m)

 {
   (void) l;
   std::cerr << AT_LOCATION_IF([l << ": " << ])m << std::endl;
 {
   (void) l;
   std::cerr << AT_LOCATION_IF([l << ": " << ])m << std::endl;


@@ -148,7 +161,7 @@ yy::parser::error (const location& l, const std::string& m)
 int
 yyparse (AT_PARAM_IF([semantic_value *result, int *count]))
 {
 int
 yyparse (AT_PARAM_IF([semantic_value *result, int *count]))
 {

-  yy::parser parser[]AT_PARAM_IF([ (result, count)]);
+  AT_NAME_PREFIX::parser parser[]AT_PARAM_IF([ (result, count)]);

   parser.set_debug_level (!!YYDEBUG);
   return parser.parse ();
 }
   parser.set_debug_level (!!YYDEBUG);
   return parser.parse ();
 }


@@ -319,7 +332,7 @@ main (int argc, const char **argv)
       return 3;
     }
 
       return 3;
     }
 

-]AT_LALR1_CC_IF([], [m4_bmatch([$4], [%debug],
+]AT_SKEL_CC_IF([], [m4_bmatch([$4], [%debug],

 [  yydebug = 1;])])[
   status = yyparse (]AT_PARAM_IF([&result, &count])[);
   if (global_result != result)
 [  yydebug = 1;])])[
   status = yyparse (]AT_PARAM_IF([&result, &count])[);
   if (global_result != result)


@@ -438,7 +451,7 @@ AT_BISON_OPTION_PUSHDEFS([$1])
 
 AT_DATA_CALC_Y([$1])
 
 
 AT_DATA_CALC_Y([$1])
 

-AT_LALR1_CC_IF(
+AT_SKEL_CC_IF(

   [AT_CHECK([bison -o calc.cc calc.y])
    AT_COMPILE_CXX([calc])],
   [AT_CHECK([bison -o calc.c calc.y])
   [AT_CHECK([bison -o calc.cc calc.y])
    AT_COMPILE_CXX([calc])],
   [AT_CHECK([bison -o calc.c calc.y])


@@ -525,7 +538,7 @@ AT_CLEANUP
 # Simple LALR Calculator.  #
 # ------------------------ #
 
 # Simple LALR Calculator.  #
 # ------------------------ #
 

-AT_BANNER([[Simple LALR Calculator.]])
+AT_BANNER([[Simple LALR(1) Calculator.]])

 
 # AT_CHECK_CALC_LALR([BISON-OPTIONS])
 # -----------------------------------
 
 # AT_CHECK_CALC_LALR([BISON-OPTIONS])
 # -----------------------------------


@@ -596,34 +609,45 @@ AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations %defines %name-
 # Simple LALR1 C++ Calculator.  #
 # ----------------------------- #
 
 # Simple LALR1 C++ Calculator.  #
 # ----------------------------- #
 

-AT_BANNER([[Simple LALR1 C++ Calculator.]])
+AT_BANNER([[Simple LALR(1) C++ Calculator.]])

 
 # AT_CHECK_CALC_LALR1_CC([BISON-OPTIONS])
 # ---------------------------------------
 # Start a testing chunk which compiles `calc' grammar with
 # the C++ skeleton, and performs several tests over the parser.
 m4_define([AT_CHECK_CALC_LALR1_CC],
 
 # AT_CHECK_CALC_LALR1_CC([BISON-OPTIONS])
 # ---------------------------------------
 # Start a testing chunk which compiles `calc' grammar with
 # the C++ skeleton, and performs several tests over the parser.
 m4_define([AT_CHECK_CALC_LALR1_CC],

-[AT_CHECK_CALC([%skeleton "lalr1.cc"] $@)])
+[AT_CHECK_CALC([%skeleton "lalr1.cc" %defines %locations] $@)])
+
+AT_CHECK_CALC_LALR1_CC([])
+AT_CHECK_CALC_LALR1_CC([%error-verbose %name-prefix="calc" %verbose %yacc])

 
 

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

 
 

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

 
 

-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_LALR1_CC([%pure-parser %error-verbose %debug %name-prefix="calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}])

 
 

-# AT_CHECK_CALC_LALR1_CC([%pure-parser %locations])
-# AT_CHECK_CALC_LALR1_CC([%error-verbose %locations])

 
 

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

 
 

-# AT_CHECK_CALC_LALR1_CC([%debug])
-AT_CHECK_CALC_LALR1_CC([%error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])
+# --------------------------- #
+# Simple GLR C++ Calculator.  #
+# --------------------------- #
+
+AT_BANNER([[Simple GLR C++ Calculator.]])
+
+# AT_CHECK_CALC_GLR_CC([BISON-OPTIONS])
+# -------------------------------------
+# Start a testing chunk which compiles `calc' grammar with
+# the GLR C++ skeleton, and performs several tests over the parser.
+m4_define([AT_CHECK_CALC_GLR_CC],
+[AT_CHECK_CALC([%skeleton "glr.cc" %defines %locations] $@)])
+
+#AT_CHECK_CALC_GLR_CC([])
+#AT_CHECK_CALC_GLR_CC([%error-verbose %name-prefix="calc" %verbose %yacc])
+
+# AT_CHECK_CALC_GLR_CC([%debug])
+#AT_CHECK_CALC_GLR_CC([%error-verbose %debug %name-prefix="calc" %verbose %yacc])

 
 

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

 
 

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