yacc.c: style changes

[bison.git] / data / lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 75eaf571e6c82afaa021c4245ac3b7fdcfa3d0e5..37522aa3a1827f9d9ec86bd2ca6a89990b9289e4 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -120,10 +120,9 @@ m4_pushdef([b4_copyright_years],
 m4_define([b4_parser_class_name],
           [b4_percent_define_get([[parser_class_name]])])
 
 m4_define([b4_parser_class_name],
           [b4_percent_define_get([[parser_class_name]])])
 

-b4_locations_if([b4_percent_define_ifdef([[location_type]], [],
-  [# Backward compatibility.
+b4_bison_locations_if([# Backward compatibility.

    m4_define([b4_location_constructors])
    m4_define([b4_location_constructors])

-   m4_include(b4_pkgdatadir/[location.cc])])])
+   m4_include(b4_pkgdatadir/[location.cc])])

 m4_include(b4_pkgdatadir/[stack.hh])
 b4_variant_if([m4_include(b4_pkgdatadir/[variant.hh])])
 
 m4_include(b4_pkgdatadir/[stack.hh])
 b4_variant_if([m4_include(b4_pkgdatadir/[variant.hh])])
 


@@ -139,8 +138,7 @@ m4_define([b4_shared_declarations],
 # include <stdexcept>
 # include <string>]b4_defines_if([[
 # include "stack.hh"
 # include <stdexcept>
 # include <string>]b4_defines_if([[
 # include "stack.hh"

-]b4_locations_if([b4_percent_define_ifdef([[location_type]], [],
-                                          [[# include "location.hh"]])])])[
+]b4_bison_locations_if([[# include "location.hh"]])])[

 
 ]b4_YYDEBUG_define[
 
 
 ]b4_YYDEBUG_define[
 


@@ -148,9 +146,8 @@ m4_define([b4_shared_declarations],
 
 ]b4_defines_if([],
 [b4_stack_define
 
 ]b4_defines_if([],
 [b4_stack_define

-b4_locations_if([b4_percent_define_ifdef([[location_type]], [],
-                                         [b4_position_define
-b4_location_define])])])[
+b4_bison_locations_if([b4_position_define
+b4_location_define])])[

 
 ]b4_variant_if([b4_variant_define])[
 
 
 ]b4_variant_if([b4_variant_define])[
 


@@ -239,7 +236,7 @@ b4_location_define])])])[
 #endif // ]b4_api_PREFIX[DEBUG
 
     /// Convert a scanner token number \a t to a symbol number.
 #endif // ]b4_api_PREFIX[DEBUG
 
     /// Convert a scanner token number \a t to a symbol number.

-    static inline token_number_type yytranslate_ (]b4_lex_symbol_if([token_type], [int])[ t);
+    static inline token_number_type yytranslate_ (]b4_token_ctor_if([token_type], [int])[ t);

 
 #if ]b4_api_PREFIX[DEBUG
     /// \brief Display a symbol type, value and location.
 
 #if ]b4_api_PREFIX[DEBUG
     /// \brief Display a symbol type, value and location.


@@ -320,7 +317,7 @@ b4_location_define])])])[
 ]b4_parse_param_vars[
   };
 
 ]b4_parse_param_vars[
   };
 

-]b4_lex_symbol_if([b4_yytranslate_define
+]b4_token_ctor_if([b4_yytranslate_define

 b4_public_types_define])[
 ]b4_namespace_close[
 
 b4_public_types_define])[
 ]b4_namespace_close[
 


@@ -352,12 +349,11 @@ b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++])
 ]b4_cpp_guard_open([b4_spec_defines_file])[
 ]b4_shared_declarations[
 ]b4_cpp_guard_close([b4_spec_defines_file])
 ]b4_cpp_guard_open([b4_spec_defines_file])[
 ]b4_shared_declarations[
 ]b4_cpp_guard_close([b4_spec_defines_file])

-m4_divert_pop(0)dnl
+b4_output_end()

 ])
 
 
 ])
 
 

-m4_divert_push(0)dnl
-@output(b4_parser_file_name@)@
+b4_output_begin([b4_parser_file_name])

 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++])
 b4_percent_code_get([[top]])[]dnl
 m4_if(b4_prefix, [yy], [],
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++])
 b4_percent_code_get([[top]])[]dnl
 m4_if(b4_prefix, [yy], [],


@@ -500,7 +496,7 @@ m4_if(b4_prefix, [yy], [],
   | Symbol types.  |
   `---------------*/
 
   | Symbol types.  |
   `---------------*/
 

-]b4_lex_symbol_if([], [b4_public_types_define])[
+]b4_token_ctor_if([], [b4_public_types_define])[

 
   // stack_symbol_type.
   ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type ()
 
   // stack_symbol_type.
   ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type ()


@@ -663,11 +659,11 @@ m4_if(b4_prefix, [yy], [],
     /// Whether yyla contains a lookahead.
     bool yyempty = true;
 
     /// Whether yyla contains a lookahead.
     bool yyempty = true;
 

-    /* State.  */
+    // State.

     int yyn;
     int yylen = 0;
 
     int yyn;
     int yylen = 0;
 

-    /* Error handling.  */
+    // Error handling.

     int yynerrs_ = 0;
     int yyerrstatus_ = 0;
 
     int yynerrs_ = 0;
     int yyerrstatus_ = 0;
 


@@ -683,6 +679,10 @@ m4_if(b4_prefix, [yy], [],
     /// The return value of parse ().
     int yyresult;
 
     /// The return value of parse ().
     int yyresult;
 

+    // FIXME: This shoud be completely indented.  It is not yet to
+    // avoid gratuitous conflicts when merging into the master branch.
+    try
+      {

     YYCDEBUG << "Starting parse" << std::endl;
 
 ]m4_ifdef([b4_initial_action], [
     YYCDEBUG << "Starting parse" << std::endl;
 
 ]m4_ifdef([b4_initial_action], [


@@ -722,7 +722,7 @@ b4_dollar_popdef])[]dnl
         YYCDEBUG << "Reading a token: ";
         try
           {
         YYCDEBUG << "Reading a token: ";
         try
           {

-]b4_lex_symbol_if(
+]b4_token_ctor_if(

 [            yyla = b4_function_call([yylex], [symbol_type],
                                      m4_ifdef([b4_lex_param], b4_lex_param));],
 [            yyla.type = yytranslate_ (b4_function_call([yylex], [int],
 [            yyla = b4_function_call([yylex], [symbol_type],
                                      m4_ifdef([b4_lex_param], b4_lex_param));],
 [            yyla.type = yytranslate_ (b4_function_call([yylex], [int],


@@ -955,7 +955,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
     /* Do not reclaim the symbols of the rule which action triggered
        this YYABORT or YYACCEPT.  */
     yypop_ (yylen);
     /* Do not reclaim the symbols of the rule which action triggered
        this YYABORT or YYACCEPT.  */
     yypop_ (yylen);

-    while (yystack_.size () != 1)
+    while (1 < yystack_.size ())

       {
         yy_destroy_ ("Cleanup: popping", yystack_[0]);
         yypop_ ();
       {
         yy_destroy_ ("Cleanup: popping", yystack_[0]);
         yypop_ ();


@@ -963,6 +963,23 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
 
     return yyresult;
   }
 
     return yyresult;
   }

+    catch (...)
+      {
+        YYCDEBUG << "Exception caught: cleaning lookahead and stack"
+                 << std::endl;
+        // Do not try to display the values of the reclaimed symbols,
+        // as their printer might throw an exception.
+        if (!yyempty)
+          yy_destroy_ (YY_NULL, yyla);
+
+        while (1 < yystack_.size ())
+          {
+            yy_destroy_ (YY_NULL, yystack_[0]);
+            yypop_ ();
+          }
+        throw;
+      }
+  }

 
   void
   ]b4_parser_class_name[::error (const syntax_error& yyexc)
 
   void
   ]b4_parser_class_name[::error (const syntax_error& yyexc)


@@ -1117,8 +1134,10 @@ b4_error_verbose_if([state_type yystate, int yytoken],
   }
 #endif // ]b4_api_PREFIX[DEBUG
 
   }
 #endif // ]b4_api_PREFIX[DEBUG
 

-]b4_lex_symbol_if([], [b4_yytranslate_define])[
+]b4_token_ctor_if([], [b4_yytranslate_define])[

 ]b4_namespace_close[
 ]b4_epilogue[]dnl
 ]b4_namespace_close[
 ]b4_epilogue[]dnl

-m4_divert_pop(0)
+b4_output_end()
+
+

 m4_popdef([b4_copyright_years])dnl
 m4_popdef([b4_copyright_years])dnl