* data/lalr1.cc (b4_stack_depth_init, yy::Parser::initdepth_):

Remove, useless.
(YYABORT, YYACCEPT, YYERROR): New.
* tests/calc.at: Renable the lalr1.cc test.

diff --git a/ChangeLog b/ChangeLog
index d722b41ec56eba16c285b28fedec14e4d7d3c928..e092838dace6e25ddce2498825bb77e7e6002609 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-19  Akim Demaille  <akim@epita.fr>
+
+       * data/lalr1.cc (b4_stack_depth_init, yy::Parser::initdepth_):
+       Remove, useless.
+       (YYABORT, YYACCEPT, YYERROR): New.
+       * tests/calc.at: Renable the lalr1.cc test.
+
 2003-02-19  Akim Demaille  <akim@epita.fr>
 
        * tests/calc.at (AT_CHECK_CALC): Check different scenarios of

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 670b68e1765aeb9a221c3b078c59859e79298bd8..214adb27aca07381a4bd1f85c968ae325812b2e5 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -21,9 +21,6 @@ m4_divert(-1)
 ## Default values.  ##
 ## ---------------- ##
 
-# Stack parameters.
-m4_define_default([b4_stack_depth_init],  [200])
-
 # Default Parser class name.
 m4_define_default([b4_parser_class_name], [Parser])
 
@@ -248,7 +245,6 @@ namespace yy
     static const int terror_;
     static const int errcode_;
     static const int ntokens_;
-    static const int initdepth_;
     static const unsigned user_token_number_max_;
     static const TokenNumberType undef_token_;
 
@@ -296,6 +292,11 @@ m4_if(b4_defines_flag, 0, [], [#include @output_header_name@])[
 # define YYCDEBUG    if (0) cdebug_
 #endif /* !YYDEBUG */
 
+#define YYACCEPT       goto yyacceptlab
+#define YYABORT                goto yyabortlab
+#define YYERROR                goto yyerrlab1
+
+
 int
 yy::]b4_parser_class_name[::parse ()
 {
@@ -515,7 +516,10 @@ b4_syncline([@oline@], [@ofile@])[
     }
   goto yyerrlab1;
 
-  /* Error raised explicitly by an action.  */
+
+  /*----------------------------------------------------.
+  | yyerrlab1 -- error raised explicitly by an action.  |
+  `----------------------------------------------------*/
  yyerrlab1:
   if (errstatus == 3)
     {
@@ -762,7 +766,6 @@ const int yy::]b4_parser_class_name[::final_ = ]b4_final_state_number[;
 const int yy::]b4_parser_class_name[::terror_ = 1;
 const int yy::]b4_parser_class_name[::errcode_ = 256;
 const int yy::]b4_parser_class_name[::ntokens_ = ]b4_tokens_number[;
-const int yy::]b4_parser_class_name[::initdepth_ = ]b4_stack_depth_init[;
 
 const unsigned yy::]b4_parser_class_name[::user_token_number_max_ = ]b4_user_token_number_max[;
 const yy::]b4_parser_class_name[::TokenNumberType yy::]b4_parser_class_name[::undef_token_ = ]b4_undef_token_number[;

diff --git a/tests/calc.at b/tests/calc.at
index a768fffea178f34eb2464f99f885a9f8fd8e0498..4346fb09aaaed1be0a3443f2c35b42f5cd266db8 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -696,8 +696,7 @@ m4_define([AT_CHECK_CALC_LALR1_CC],
 
 # AT_CHECK_CALC_LALR1_CC()
 
-# FIXME: YYERROR is not supported
-#   AT_CHECK_CALC_LALR1_CC([%defines %pure-parser %locations])
+AT_CHECK_CALC_LALR1_CC([%defines %pure-parser %locations])
 
 # AT_CHECK_CALC_LALR1_CC([%defines])
 # AT_CHECK_CALC_LALR1_CC([%locations])