(inline): Remove #define. It's the user's responsibility to #define

[bison.git] / data / glr.c

diff --git a/data/glr.c b/data/glr.c
index c2fab0b8d3e71e3628d9b1e763eee419c9bc8d44..fe99165b78f16da7f105b60cf9008dbfac6b032e 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -19,6 +19,90 @@ m4_include([c.m4])
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 

+
+## ---------------- ##
+## Default values.  ##
+## ---------------- ##
+
+# Stack parameters.
+m4_define_default([b4_stack_depth_max], [10000])
+m4_define_default([b4_stack_depth_init],  [200])
+
+# Location type.
+m4_define_default([b4_location_type], [yyltype])
+
+
+
+## ------------------------ ##
+## Pure/impure interfaces.  ##
+## ------------------------ ##
+
+
+# b4_lex_param
+# ------------
+# Accumule in b4_lex_param all the yylex arguments.
+# Yes, this is quite ugly...
+m4_define([b4_lex_param],
+m4_dquote(b4_pure_if([[[[YYSTYPE *]], [[yylvalp]]][]dnl
+b4_location_if([, [[YYLTYPE *], [yyllocp]]])])dnl
+m4_ifdef([b4_lex_param], [, ]b4_lex_param)))
+
+
+# b4_user_formals
+# ---------------
+m4_define([b4_user_formals],
+[m4_ifset([b4_parse_param], [, b4_c_ansi_formals(b4_parse_param)])])
+
+
+# b4_yyerror_args
+# ---------------
+# Arguments passed to yyerror: user args plus yylloc.
+m4_define([b4_yyerror_args],
+[b4_pure_if([b4_location_if([yylocp, ])])dnl
+m4_ifset([b4_parse_param], [b4_c_args(b4_parse_param), ])])
+
+
+# b4_lyyerror_args
+# ----------------
+# Same as above, but on the lookahead, hence yyllocp instead of yylocp.
+m4_define([b4_lyyerror_args],
+[b4_pure_if([b4_location_if([yyllocp, ])])dnl
+m4_ifset([b4_parse_param], [b4_c_args(b4_parse_param), ])])
+
+
+# b4_pure_args
+# ------------
+# Arguments needed by yyerror: user args plus yylloc.
+m4_define([b4_pure_args],
+[b4_pure_if([b4_location_if([, yylocp])])[]b4_user_args])
+
+
+# b4_pure_formals
+# ---------------
+# Arguments passed to yyerror: user formals plus yyllocp.
+m4_define([b4_pure_formals],
+[b4_pure_if([b4_location_if([, YYLTYPE *yylocp])])[]b4_user_formals])
+
+
+# b4_lpure_args
+# -------------
+# Same as above, but on the lookahead, hence yyllocp instead of yylocp.
+m4_define([b4_lpure_args],
+[b4_pure_if([b4_location_if([, yyllocp])])[]b4_user_args])
+
+
+# b4_lpure_formals
+# ----------------
+# Same as above, but on the lookahead, hence yyllocp instead of yylocp.
+m4_define([b4_lpure_formals],
+[b4_pure_if([b4_location_if([YYLTYPE *yyllocp])])[]b4_user_formals])
+
+
+## ----------------- ##
+## Semantic Values.  ##
+## ----------------- ##
+
+

 # b4_lhs_value([TYPE])
 # --------------------
 # Expansion of $<TYPE>$.
 # b4_lhs_value([TYPE])
 # --------------------
 # Expansion of $<TYPE>$.


@@ -31,7 +115,7 @@ m4_define([b4_lhs_value],
 # Expansion of $<TYPE>NUM, where the current rule has RULE-LENGTH
 # symbols on RHS.
 m4_define([b4_rhs_value],
 # Expansion of $<TYPE>NUM, where the current rule has RULE-LENGTH
 # symbols on RHS.
 m4_define([b4_rhs_value],

-[yyvsp@<:@m4_eval([$2 - $1])@:>@.yystate.yysemantics.yysval[]m4_ifval([$3], [.$3])])
+[yyvsp@{m4_eval([$2 - $1])@}.yystate.yysemantics.yysval[]m4_ifval([$3], [.$3])])

 
 
 
 
 
 


@@ -39,15 +123,6 @@ m4_define([b4_rhs_value],
 ## Locations.  ##
 ## ----------- ##
 
 ## Locations.  ##
 ## ----------- ##
 

-# b4_location_if(IF-TRUE, IF-FALSE)
-# ---------------------------------
-# Expand IF-TRUE, if locations are used, IF-FALSE otherwise.
-m4_define([b4_location_if],
-[m4_if(b4_locations_flag, [1],
-       [$1],
-       [$2])])
-
-

 # b4_lhs_location()
 # -----------------
 # Expansion of @$.
 # b4_lhs_location()
 # -----------------
 # Expansion of @$.


@@ -60,70 +135,26 @@ m4_define([b4_lhs_location],
 # Expansion of @NUM, where the current rule has RULE-LENGTH symbols
 # on RHS.
 m4_define([b4_rhs_location],
 # Expansion of @NUM, where the current rule has RULE-LENGTH symbols
 # on RHS.
 m4_define([b4_rhs_location],

-[yyvsp@<:@m4_eval([$2 - $1])@:>@.yystate.yyloc])
-
-
-
-## -------------- ##
-## %pure-parser.  ##
-## -------------- ##
-
-# b4_pure_if(IF-TRUE, IF-FALSE)
-# -----------------------------
-# Expand IF-TRUE, if %pure-parser, IF-FALSE otherwise.
-m4_define([b4_pure_if],
-[m4_if(b4_pure, [1],
-       [$1],
-       [$2])])
-
-
-## ------------------- ##
-## Output file names.  ##
-## ------------------- ##
-
-m4_define_default([b4_input_suffix], [.y])
-
-m4_define_default([b4_output_parser_suffix],
-[m4_translit(b4_input_suffix, [yY], [cC])])
-
-m4_define_default([b4_output_parser_name],
-[b4_output_prefix[]b4_output_infix[]b4_output_parser_suffix[]])
-
-
-m4_define_default([b4_output_header_suffix],
-[m4_translit(b4_input_suffix, [yY], [hH])])
-
-m4_define_default([b4_output_header_name],
-[b4_output_prefix[]b4_output_infix[]b4_output_header_suffix[]])
-
-m4_define_default([b4_header_guard],
-                  [m4_bpatsubst(m4_toupper([BISON_]b4_output_header_name),
-                                [[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]], [_])])
+[yyvsp@{m4_eval([$2 - $1])@}.yystate.yyloc])

 
 
 
 

+# We do want M4 expansion after # for CPP macros.
+m4_changecom()

 m4_divert(0)dnl
 m4_divert(0)dnl

-#output "b4_output_parser_name"
+@output @output_parser_name@

 b4_copyright([Skeleton parser for GLR parsing with Bison], [2002])
 [
 /* This is the parser code for GLR (Generalized LR) parser. */
 
 b4_copyright([Skeleton parser for GLR parsing with Bison], [2002])
 [
 /* This is the parser code for GLR (Generalized LR) parser. */
 

-/* FIXME: minimize these */
-#include <stdlib.h>
-#include <setjmp.h>
+#include <assert.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>
+#include <string.h>

 #include <stdarg.h>
 #include <stdarg.h>

-#include <assert.h>
-
-/* Identify Bison output.  */
-#define YYBISON        1
-
-/* Pure parsers.  */
-#define YYPURE ]b4_pure[
-
-/* Using locations.  */
-#define YYLSP_NEEDED ]b4_locations_flag[
+#include <setjmp.h>

 
 

-]m4_if(b4_prefix[], [yy], [],
+]b4_identification
+m4_if(b4_prefix[], [yy], [],

 [/* If NAME_PREFIX is specified substitute the variables and functions
    names.  */
 #define yyparse b4_prefix[]parse
 [/* If NAME_PREFIX is specified substitute the variables and functions
    names.  */
 #define yyparse b4_prefix[]parse


@@ -135,10 +166,10 @@ b4_copyright([Skeleton parser for GLR parsing with Bison], [2002])
 #define yynerrs b4_prefix[]nerrs
 b4_location_if([#define yylloc b4_prefix[]lloc])])
 
 #define yynerrs b4_prefix[]nerrs
 b4_location_if([#define yylloc b4_prefix[]lloc])])
 

-/* Copy the first part of user declarations.  */
-b4_pre_prologue
+b4_token_defines(b4_tokens)

 
 

-b4_token_defines(b4_tokens)[
+/* Copy the first part of user declarations.  */
+b4_pre_prologue[

 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG


@@ -155,10 +186,10 @@ b4_token_defines(b4_tokens)[
 
 #ifndef YYSTYPE
 ]m4_ifdef([b4_stype],
 
 #ifndef YYSTYPE
 ]m4_ifdef([b4_stype],

-[#line b4_stype_line "b4_filename"
+[b4_syncline([b4_stype_line], [b4_filename])

 typedef union b4_stype yystype;
 /* Line __line__ of __file__.  */
 typedef union b4_stype yystype;
 /* Line __line__ of __file__.  */

-#line __oline__ "__ofile__"],
+b4_syncline([@oline@], [@ofile@])],

 [typedef int yystype;])[
 # define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
 [typedef int yystype;])[
 # define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1


@@ -167,19 +198,18 @@ typedef union b4_stype yystype;
 #ifndef YYLTYPE
 typedef struct yyltype
 {
 #ifndef YYLTYPE
 typedef struct yyltype
 {

-]b4_location_if([
-  int yyfirst_line;
-  int yyfirst_column;
-  int yylast_line;
-  int yylast_column;])[
+  int first_line;
+  int first_column;
+  int last_line;
+  int last_column;

 } yyltype;
 } yyltype;

-# define YYLTYPE ]b4_ltype[
+# define YYLTYPE ]b4_location_type[

 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
 /* Default (constant) values used for initialization for null
    right-hand sides.  Unlike the standard bison.simple template,
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
 /* Default (constant) values used for initialization for null
    right-hand sides.  Unlike the standard bison.simple template,

-   here we set the default values of the $$ and $@ to zeroed-out
+   here we set the default values of $$ and $@@ to zeroed-out

    values.  Since the default value of these quantities is undefined,
    this behavior is technically correct. */
 static YYSTYPE yyval_default;
    values.  Since the default value of these quantities is undefined,
    this behavior is technically correct. */
 static YYSTYPE yyval_default;


@@ -189,7 +219,7 @@ static YYLTYPE yyloc_default;
 ]b4_post_prologue[
 
 ]/* Line __line__ of __file__.  */
 ]b4_post_prologue[
 
 ]/* Line __line__ of __file__.  */

-#line __oline__ "__ofile__"
+b4_syncline([@oline@], [@ofile@])

 [
 #if ! defined (__cplusplus)
    typedef char bool;
 [
 #if ! defined (__cplusplus)
    typedef char bool;


@@ -213,13 +243,9 @@ static YYLTYPE yyloc_default;
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
 
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
 

-#if ! defined (__GNUC__)
-# define inline
-#endif
-

 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  ]b4_final_state_number[
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  ]b4_final_state_number[

-#define YYFLAG  ]b4_flag[
+/* YYLAST -- Last index in YYTABLE.  */

 #define YYLAST   ]b4_last[
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYLAST   ]b4_last[
 
 /* YYNTOKENS -- Number of terminals. */


@@ -237,8 +263,9 @@ static YYLTYPE yyloc_default;
 #define YYUNDEFTOK  ]b4_undef_token_number[
 #define YYMAXUTOK   ]b4_user_token_number_max[
 
 #define YYUNDEFTOK  ]b4_undef_token_number[
 #define YYMAXUTOK   ]b4_user_token_number_max[
 

-#define YYTRANSLATE(YYX) \
-  ((unsigned)(YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+#define YYTRANSLATE(YYX)                                               \
+  ((YYX <= 0) ? YYEOF :                                                        \
+   (unsigned)(YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)

 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
 static const ]b4_int_type_for([b4_translate])[ yytranslate[] =
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
 static const ]b4_int_type_for([b4_translate])[ yytranslate[] =


@@ -332,24 +359,25 @@ static const ]b4_int_type_for([b4_pgoto])[ yypgoto[] =
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which

-   number is the opposite.  If zero, do what YYDEFACT says.  */
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, parse error.  */

 #define YYTABLE_NINF ]b4_table_ninf[
 static const ]b4_int_type_for([b4_table])[ yytable[] =
 {
   ]b4_table[
 };
 
 #define YYTABLE_NINF ]b4_table_ninf[
 static const ]b4_int_type_for([b4_table])[ yytable[] =
 {
   ]b4_table[
 };
 

-/* YYCONFLP[YYPACT[STATE-NUM]] -- pointer into yyconfl of start of list
-   of conflicting reductions corresponding to action entry for state
-   STATE-NUM in yytable.  0 means no conflicts.  The list in yyconfl
-   is terminated by a rule number of 0. */
+/* YYCONFLP[YYPACT[STATE-NUM]] -- Pointer into YYCONFL of start of
+   list of conflicting reductions corresponding to action entry for
+   state STATE-NUM in yytable.  0 means no conflicts.  The list in
+   yyconfl is terminated by a rule number of 0.  */

 static const ]b4_int_type_for([b4_conflict_list_heads])[ yyconflp[] =
 {
   ]b4_conflict_list_heads[
 };
 
 static const ]b4_int_type_for([b4_conflict_list_heads])[ yyconflp[] =
 {
   ]b4_conflict_list_heads[
 };
 

-/* YYCONFL[I] -- lists of conflicting rule numbers, each terminated
-   by 0, pointed into by YYCONFLP. */
+/* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by
+   0, pointed into by YYCONFLP.  */

 ]dnl Do not use b4_int_type_for here, since there are places where
 dnl pointers onto yyconfl are taken, which type is "short *".
 dnl We probably ought to introduce a type for confl.
 ]dnl Do not use b4_int_type_for here, since there are places where
 dnl pointers onto yyconfl are taken, which type is "short *".
 dnl We probably ought to introduce a type for confl.


@@ -363,27 +391,16 @@ static const ]b4_int_type_for([b4_check])[ yycheck[] =
   ]b4_check[
 };
 
   ]b4_check[
 };
 

+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const ]b4_int_type_for([b4_stos])[ yystos[] =
+{
+  ]b4_stos[
+};
+

 \f
 \f

-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
-
-#ifdef YYPARSE_PARAM
-#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#else /* !YYPARSE_PARAM */
-# define YYPARSE_PARAM_ARG void
-#endif /* !YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-# ifdef YYPARSE_PARAM
-int yyparse (void *);
-# else
-int yyparse (void);
-# endif
-#endif
+/* Prevent warning if -Wmissing-prototypes.  */
+]b4_c_ansi_function_decl([yyparse], [int], b4_parse_param)[

 
 /* Error token number */
 #define YYTERROR 1
 
 /* Error token number */
 #define YYTERROR 1


@@ -395,25 +412,17 @@ int yyparse (void);
 
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(yyCurrent, yyRhs, YYN)                 \
 
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(yyCurrent, yyRhs, YYN)                 \

-  yyCurrent.yyfirst_line   = YYRHSLOC(yyRhs,1).yyfirst_line;   \
-  yyCurrent.yyfirst_column = YYRHSLOC(yyRhs,1).yyfirst_column; \
-  yyCurrent.yylast_line    = YYRHSLOC(yyRhs,YYN).yylast_line;  \
-  yyCurrent.yylast_column  = YYRHSLOC(yyRhs,YYN).yylast_column;
+  yyCurrent.first_line   = YYRHSLOC(yyRhs,1).first_line;       \
+  yyCurrent.first_column = YYRHSLOC(yyRhs,1).first_column;     \
+  yyCurrent.last_line    = YYRHSLOC(yyRhs,YYN).last_line;      \
+  yyCurrent.last_column  = YYRHSLOC(yyRhs,YYN).last_column;

 #endif
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
 #endif
 
 /* YYLEX -- calling `yylex' with the right arguments.  */

+#define YYLEX ]b4_c_function_call([yylex], [int], b4_lex_param)[

 
 ]b4_pure_if(
 [
 
 ]b4_pure_if(
 [

-#ifdef YYLEX_PARAM
-# define YYLEX yylex (yylvalp, b4_location_if([yyllocp, ])YYLEX_PARAM)
-#else
-# define YYLEX yylex (yylvalp[]b4_location_if([, yyllocp]))
-#endif],
-[#define YYLEX  yylex ()])
-
-b4_pure_if(
-[

 #undef yynerrs
 #define yynerrs (yystack->yyerrcnt)
 #undef yychar
 #undef yynerrs
 #define yynerrs (yystack->yyerrcnt)
 #undef yychar


@@ -445,17 +454,30 @@ do {                                              \
   if (yydebug)                                 \
     YYFPRINTF Args;                            \
 } while (0)
   if (yydebug)                                 \
     YYFPRINTF Args;                            \
 } while (0)

+
+]b4_yysymprint_generate([b4_c_ansi_function_def])[
+
+# define YYDSYMPRINT(Args)                     \
+do {                                           \
+  if (yydebug)                                 \
+    yysymprint Args;                           \
+} while (0)
+

 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;

+

 #else /* !YYDEBUG */
 #else /* !YYDEBUG */

+

   /* Avoid empty `if' bodies.  */
   /* Avoid empty `if' bodies.  */

-# define YYDPRINTF(Args)  {}
+# define YYDPRINTF(Args)   {}
+# define YYDSYMPRINT(Args) {}
+

 #endif /* !YYDEBUG */
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef        YYINITDEPTH
 #endif /* !YYDEBUG */
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef        YYINITDEPTH

-# define YYINITDEPTH ]b4_initdepth[
+# define YYINITDEPTH ]b4_stack_depth_init[

 #endif
 
 /* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
 #endif
 
 /* YYMAXDEPTH -- maximum size the stacks can grow to (effective only


@@ -470,7 +492,7 @@ int yydebug;
 #endif
 
 #ifndef YYMAXDEPTH
 #endif
 
 #ifndef YYMAXDEPTH

-# define YYMAXDEPTH ]b4_maxdepth[
+# define YYMAXDEPTH ]b4_stack_depth_max[

 #endif
 
 /* Minimum number of free items on the stack allowed after an
 #endif
 
 /* Minimum number of free items on the stack allowed after an


@@ -554,11 +576,11 @@ struct yyGLRStack {
 };
 
 static void yyinitGLRStack (yyGLRStack* yystack, size_t yysize);
 };
 
 static void yyinitGLRStack (yyGLRStack* yystack, size_t yysize);

-static void yyexpandGLRStack (yyGLRStack* yystack);
+static void yyexpandGLRStack (yyGLRStack* yystack]b4_pure_formals[);

 static void yyfreeGLRStack (yyGLRStack* yystack);
 
 static void
 static void yyfreeGLRStack (yyGLRStack* yystack);
 
 static void

-yyFail (yyGLRStack* yystack, const char* yyformat, ...)
+yyFail (yyGLRStack* yystack]b4_pure_formals[, const char* yyformat, ...)

 {
   if (yyformat != NULL)
     {
 {
   if (yyformat != NULL)
     {


@@ -567,7 +589,7 @@ yyFail (yyGLRStack* yystack, const char* yyformat, ...)
       va_start (yyap, yyformat);
       yystack->yyerrflag = 1;
       vsprintf (yymsg, yyformat, yyap);
       va_start (yyap, yyformat);
       yystack->yyerrflag = 1;
       vsprintf (yymsg, yyformat, yyap);

-      yyerror (yymsg);
+      yyerror (]b4_yyerror_args[yymsg);

     }
   longjmp (yystack->yyexception_buffer, 1);
 }
     }
   longjmp (yystack->yyexception_buffer, 1);
 }


@@ -585,11 +607,12 @@ yytokenName (yySymbol yytoken)
 /** Perform user action for rule number YYN, with RHS length YYRHSLEN,
  *  and top stack item YYVSP.  YYLVALP points to place to put semantic
  *  value ($$), and yylocp points to place for location information
 /** Perform user action for rule number YYN, with RHS length YYRHSLEN,
  *  and top stack item YYVSP.  YYLVALP points to place to put semantic
  *  value ($$), and yylocp points to place for location information

- *  (@$). Returns yyok for normal return, yyaccept for YYACCEPT,
+ *  (@@$). Returns yyok for normal return, yyaccept for YYACCEPT,

  *  yyerr for YYERROR, yyabort for YYABORT. */
 static YYRESULTTAG
 yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp,
  *  yyerr for YYERROR, yyabort for YYABORT. */
 static YYRESULTTAG
 yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp,

-             YYSTYPE* yyvalp, YYLTYPE* yylocp, yyGLRStack* yystack)
+             YYSTYPE* yyvalp, YYLTYPE* yylocp, yyGLRStack* yystack
+              ]b4_user_formals[)

 {
   /* Avoid `unused' warnings in there are no $n. */
   (void) yystack;
 {
   /* Avoid `unused' warnings in there are no $n. */
   (void) yystack;


@@ -604,8 +627,6 @@ yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp,
       *yyvalp = yyvsp[1-yyrhslen].yystate.yysemantics.yysval;
       *yylocp = yyvsp[1-yyrhslen].yystate.yyloc;
     }
       *yyvalp = yyvsp[1-yyrhslen].yystate.yysemantics.yysval;
       *yylocp = yyvsp[1-yyrhslen].yystate.yyloc;
     }

-# undef yyval
-# define yyval (*yyvalp)

 # undef yyerrok
 # define yyerrok (yystack->yyerrState = 0)
 # undef YYACCEPT
 # undef yyerrok
 # define yyerrok (yystack->yyerrState = 0)
 # undef YYACCEPT


@@ -621,7 +642,7 @@ yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp,
 # undef YYBACKUP
 # define YYBACKUP(Token, Value)                                                     \
   do {                                                                      \
 # undef YYBACKUP
 # define YYBACKUP(Token, Value)                                                     \
   do {                                                                      \

-    yyerror ("syntax error: cannot back up");                               \
+    yyerror (]b4_yyerror_args["syntax error: cannot back up");              \

     YYERROR;                                                                \
   } while (0)
 
     YYERROR;                                                                \
   } while (0)
 


@@ -632,7 +653,6 @@ yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp,
      }
 
    return yyok;
      }
 
    return yyok;

-# undef yyval

 # undef yyerrok
 # undef YYABORT
 # undef YYACCEPT
 # undef yyerrok
 # undef YYABORT
 # undef YYACCEPT


@@ -641,7 +661,7 @@ yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp,
 # undef yyclearin
 # undef YYRECOVERING
 /* Line __line__ of __file__.  */
 # undef yyclearin
 # undef YYRECOVERING
 /* Line __line__ of __file__.  */

-#line __oline__ "__ofile__"
+b4_syncline([@oline@], [@ofile@])

 }
 \f
 
 }
 \f
 


@@ -649,7 +669,7 @@ static YYSTYPE
 yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1)
 {
   YYSTYPE yyval = *yy0;
 yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1)
 {
   YYSTYPE yyval = *yy0;

-  /* `Use' the arguments. */
+  /* `Use' the arguments.  */

   (void) yy0;
   (void) yy1;
 
   (void) yy0;
   (void) yy1;
 


@@ -660,7 +680,9 @@ yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1)
   return yyval;
 }
 [
   return yyval;
 }
 [

-                               /* Bison grammar-table manipulation */
+                             /* Bison grammar-table manipulation.  */
+
+]b4_yydestruct_generate([b4_c_ansi_function_def])[

 
 /** Number of symbols composing the right hand side of rule #RULE. */
 static inline int
 
 /** Number of symbols composing the right hand side of rule #RULE. */
 static inline int


@@ -676,12 +698,17 @@ yylhsNonterm (yyRuleNum yyrule)
   return yyr1[yyrule];
 }
 
   return yyr1[yyrule];
 }
 

+#define yyis_pact_ninf(yystate) \
+  ]m4_if(m4_eval(b4_pact_ninf < b4_pact_min), 1,
+        0,
+        ((yystate) == YYPACT_NINF))[
+

 /** True iff LR state STATE has only a default reduction (regardless
  *  of token). */
 static inline bool
 yyisDefaultedState (yyStateNum yystate)
 {
 /** True iff LR state STATE has only a default reduction (regardless
  *  of token). */
 static inline bool
 yyisDefaultedState (yyStateNum yystate)
 {

-  return yypact[yystate] == YYPACT_NINF;
+  return yyis_pact_ninf (yypact[yystate]);

 }
 
 /** The default reduction for STATE, assuming it has one. */
 }
 
 /** The default reduction for STATE, assuming it has one. */


@@ -691,7 +718,12 @@ yydefaultAction (yyStateNum yystate)
   return yydefact[yystate];
 }
 
   return yydefact[yystate];
 }
 

-/** Set *ACTION to the action to take in STATE on seeing TOKEN.
+#define yyis_table_ninf(yyindex) \
+  ]m4_if(m4_eval(b4_table_ninf < b4_table_min), 1,
+        0,
+        ((yyindex) == YYTABLE_NINF))[
+
+/** Set *YYACTION to the action to take in YYSTATE on seeing YYTOKEN.

  *  Result R means
  *    R < 0:  Reduce on rule -R.
  *    R = 0:  Error.
  *  Result R means
  *    R < 0:  Reduce on rule -R.
  *    R = 0:  Error.


@@ -704,16 +736,21 @@ yygetLRActions (yyStateNum yystate, int yytoken,
                int* yyaction, const short** yyconflicts)
 {
   int yyindex = yypact[yystate] + yytoken;
                int* yyaction, const short** yyconflicts)
 {
   int yyindex = yypact[yystate] + yytoken;

-  if (yyindex < 0 || yyindex > YYLAST || yycheck[yyindex] != yytoken)
+  if (yyindex < 0 || YYLAST < yyindex || yycheck[yyindex] != yytoken)

     {
       *yyaction = -yydefact[yystate];
       *yyconflicts = yyconfl;
     }
     {
       *yyaction = -yydefact[yystate];
       *yyconflicts = yyconfl;
     }

-  else
+  else if (! yyis_table_ninf (yyindex))

     {
       *yyaction = yytable[yyindex];
       *yyconflicts = yyconfl + yyconflp[yyindex];
     }
     {
       *yyaction = yytable[yyindex];
       *yyconflicts = yyconfl + yyconflp[yyindex];
     }

+  else
+    {
+      *yyaction = 0;
+      *yyconflicts = yyconfl + yyconflp[yyindex];
+    }

 }
 
 static inline yyStateNum
 }
 
 static inline yyStateNum


@@ -721,7 +758,7 @@ yyLRgotoState (yyStateNum yystate, yySymbol yylhs)
 {
   int yyr;
   yyr = yypgoto[yylhs - YYNTOKENS] + yystate;
 {
   int yyr;
   yyr = yypgoto[yylhs - YYNTOKENS] + yystate;

-  if (yyr >= 0 && yyr <= YYLAST && yycheck[yyr] == yystate)
+  if (0 <= yyr && yyr <= YYLAST && yycheck[yyr] == yystate)

     return yytable[yyr];
   else
     return yydefgoto[yylhs - YYNTOKENS];
     return yytable[yyr];
   else
     return yydefgoto[yylhs - YYNTOKENS];


@@ -730,13 +767,13 @@ yyLRgotoState (yyStateNum yystate, yySymbol yylhs)
 static inline bool
 yyisShiftAction (int yyaction)
 {
 static inline bool
 yyisShiftAction (int yyaction)
 {

-  return yyaction > 0;
+  return 0 < yyaction;

 }
 
 static inline bool
 yyisErrorAction (int yyaction)
 {
 }
 
 static inline bool
 yyisErrorAction (int yyaction)
 {

-  return yyaction == 0 || yyaction == YYPACT_NINF;
+  return yyaction == 0;

 }
 
                                /* GLRStates */
 }
 
                                /* GLRStates */


@@ -751,19 +788,19 @@ yyhasResolvedValue (yyGLRState* yystate)
 
 static void
 yyaddDeferredAction (yyGLRStack* yystack, yyGLRState* yystate,
 
 static void
 yyaddDeferredAction (yyGLRStack* yystack, yyGLRState* yystate,

-                    yyGLRState* yyrhs, yyRuleNum yyrule)
+                    yyGLRState* rhs, yyRuleNum yyrule]b4_pure_formals[)

 {
   yySemanticOption* yynewItem;
   yynewItem = &yystack->yynextFree->yyoption;
   yystack->yyspaceLeft -= 1;
   yystack->yynextFree += 1;
   yynewItem->yyisState = yyfalse;
 {
   yySemanticOption* yynewItem;
   yynewItem = &yystack->yynextFree->yyoption;
   yystack->yyspaceLeft -= 1;
   yystack->yynextFree += 1;
   yynewItem->yyisState = yyfalse;

-  yynewItem->yystate = yyrhs;
+  yynewItem->yystate = rhs;

   yynewItem->yyrule = yyrule;
   yynewItem->yynext = yystate->yysemantics.yyfirstVal;
   yystate->yysemantics.yyfirstVal = yynewItem;
   if (yystack->yyspaceLeft < YYHEADROOM)
   yynewItem->yyrule = yyrule;
   yynewItem->yynext = yystate->yysemantics.yyfirstVal;
   yystate->yysemantics.yyfirstVal = yynewItem;
   if (yystack->yyspaceLeft < YYHEADROOM)

-    yyexpandGLRStack (yystack);
+    yyexpandGLRStack (yystack]b4_pure_args[);

 }
 
                                /* GLRStacks */
 }
 
                                /* GLRStacks */


@@ -808,7 +845,7 @@ yyinitGLRStack (yyGLRStack* yystack, size_t yysize)
     allocation, so that we can avoid having external pointers exist
     across an allocation. */
 static void
     allocation, so that we can avoid having external pointers exist
     across an allocation. */
 static void

-yyexpandGLRStack (yyGLRStack* yystack)
+yyexpandGLRStack (yyGLRStack* yystack]b4_pure_formals[)

 {
 #if YYSTACKEXPANDABLE
   yyGLRStack yynewStack;
 {
 #if YYSTACKEXPANDABLE
   yyGLRStack yynewStack;


@@ -816,14 +853,15 @@ yyexpandGLRStack (yyGLRStack* yystack)
   size_t yysize, yynewSize;
   size_t yyn;
   yysize = yystack->yynextFree - yystack->yyitems;
   size_t yysize, yynewSize;
   size_t yyn;
   yysize = yystack->yynextFree - yystack->yyitems;

-  if (yysize >= YYMAXDEPTH)
-    yyFail (yystack, "parsing stack overflow (%d items)", yysize);
+  if (YYMAXDEPTH <= yysize)
+    yyFail (yystack][]b4_pure_args[,
+           "parsing stack overflow (%d items)", yysize);

   yynewSize = 2*yysize;
   yynewSize = 2*yysize;

-  if (yynewSize > YYMAXDEPTH)
+  if (YYMAXDEPTH < yynewSize)

     yynewSize = YYMAXDEPTH;
   yyinitGLRStack (&yynewStack, yynewSize);
   for (yyp0 = yystack->yyitems, yyp1 = yynewStack.yyitems, yyn = yysize;
     yynewSize = YYMAXDEPTH;
   yyinitGLRStack (&yynewStack, yynewSize);
   for (yyp0 = yystack->yyitems, yyp1 = yynewStack.yyitems, yyn = yysize;

-       yyn > 0;
+       0 < yyn;

        yyn -= 1, yyp0 += 1, yyp1 += 1)
     {
       *yyp1 = *yyp0;
        yyn -= 1, yyp0 += 1, yyp1 += 1)
     {
       *yyp1 = *yyp0;


@@ -864,8 +902,8 @@ yyexpandGLRStack (yyGLRStack* yystack)
 
 #else
 
 
 #else
 

-  yyFail (yystack, "parsing stack overflow (%d items)", yysize);
-
+  yyFail (yystack][]b4_lpure_args[,
+          "parsing stack overflow (%d items)", yysize);

 #endif
 }
 
 #endif
 }
 


@@ -937,7 +975,7 @@ yyremoveDeletes (yyGLRStack* yystack)
  * LRSTATE, at input position POSN, with (resolved) semantic value SVAL. */
 static inline void
 yyglrShift (yyGLRStack* yystack, int yyk, yyStateNum yylrState, size_t yyposn,
  * LRSTATE, at input position POSN, with (resolved) semantic value SVAL. */
 static inline void
 yyglrShift (yyGLRStack* yystack, int yyk, yyStateNum yylrState, size_t yyposn,

-           YYSTYPE yysval, YYLTYPE* yylocp)
+           YYSTYPE yysval, YYLTYPE* yylocp]b4_user_formals[)

 {
   yyGLRStackItem* yynewItem;
 
 {
   yyGLRStackItem* yynewItem;
 


@@ -953,7 +991,7 @@ yyglrShift (yyGLRStack* yystack, int yyk, yyStateNum yylrState, size_t yyposn,
   yynewItem->yystate.yysemantics.yysval = yysval;
   yynewItem->yystate.yyloc = *yylocp;
   if (yystack->yyspaceLeft < YYHEADROOM)
   yynewItem->yystate.yysemantics.yysval = yysval;
   yynewItem->yystate.yyloc = *yylocp;
   if (yystack->yyspaceLeft < YYHEADROOM)

-    yyexpandGLRStack (yystack);
+    yyexpandGLRStack (yystack]b4_pure_args[);

 }
 
 /** Shift to a new state on stack #K of STACK, to a new state
 }
 
 /** Shift to a new state on stack #K of STACK, to a new state


@@ -961,7 +999,7 @@ yyglrShift (yyGLRStack* yystack, int yyk, yyStateNum yylrState, size_t yyposn,
  * the (unresolved) semantic value of RHS under the action for RULE. */
 static inline void
 yyglrShiftDefer (yyGLRStack* yystack, int yyk, yyStateNum yylrState,
  * the (unresolved) semantic value of RHS under the action for RULE. */
 static inline void
 yyglrShiftDefer (yyGLRStack* yystack, int yyk, yyStateNum yylrState,

-                size_t yyposn, yyGLRState* yyrhs, yyRuleNum yyrule)
+                size_t yyposn, yyGLRState* rhs, yyRuleNum yyrule]b4_pure_formals[)

 {
   yyGLRStackItem* yynewItem;
 
 {
   yyGLRStackItem* yynewItem;
 


@@ -975,7 +1013,7 @@ yyglrShiftDefer (yyGLRStack* yystack, int yyk, yyStateNum yylrState,
   yystack->yytops.yystates[yyk] = &yynewItem->yystate;
   yystack->yynextFree += 1;
   yystack->yyspaceLeft -= 1;
   yystack->yytops.yystates[yyk] = &yynewItem->yystate;
   yystack->yynextFree += 1;
   yystack->yyspaceLeft -= 1;

-  yyaddDeferredAction (yystack, &yynewItem->yystate, yyrhs, yyrule);
+  yyaddDeferredAction (yystack, &yynewItem->yystate, rhs, yyrule]b4_pure_args[);

 }
 
 /** Pop the symbols consumed by reduction #RULE from the top of stack
 }
 
 /** Pop the symbols consumed by reduction #RULE from the top of stack


@@ -986,14 +1024,14 @@ yyglrShiftDefer (yyGLRStack* yystack, int yyk, yyStateNum yylrState,
  *  for userAction. */
 static inline int
 yydoAction (yyGLRStack* yystack, int yyk, yyRuleNum yyrule,
  *  for userAction. */
 static inline int
 yydoAction (yyGLRStack* yystack, int yyk, yyRuleNum yyrule,

-           YYSTYPE* yyvalp, YYLTYPE* yylocp)
+           YYSTYPE* yyvalp, YYLTYPE* yylocp]b4_user_formals[)

 {
   int yynrhs = yyrhsLength (yyrule);
 
   if (yystack->yysplitPoint == NULL)
     {
       /* Standard special case: single stack. */
 {
   int yynrhs = yyrhsLength (yyrule);
 
   if (yystack->yysplitPoint == NULL)
     {
       /* Standard special case: single stack. */

-      yyGLRStackItem* yyrhs = (yyGLRStackItem*) yystack->yytops.yystates[yyk];
+      yyGLRStackItem* rhs = (yyGLRStackItem*) yystack->yytops.yystates[yyk];

       assert (yyk == 0);
       yystack->yynextFree -= yynrhs;
       yystack->yyspaceLeft += yynrhs;
       assert (yyk == 0);
       yystack->yynextFree -= yynrhs;
       yystack->yyspaceLeft += yynrhs;


@@ -1005,17 +1043,18 @@ yydoAction (yyGLRStack* yystack, int yyk, yyRuleNum yyrule,
        }
       else
        {
        }
       else
        {

-         *yyvalp = yyrhs[1-yynrhs].yystate.yysemantics.yysval;
-         *yylocp = yyrhs[1-yynrhs].yystate.yyloc;
+         *yyvalp = rhs[1-yynrhs].yystate.yysemantics.yysval;
+         *yylocp = rhs[1-yynrhs].yystate.yyloc;

        }
        }

-      return yyuserAction (yyrule, yynrhs, yyrhs, yyvalp, yylocp, yystack);
+      return yyuserAction (yyrule, yynrhs, rhs,
+                          yyvalp, yylocp, yystack]b4_user_args[);

     }
   else
     {
       int yyi;
       yyGLRState* yys;
       yyGLRStackItem yyrhsVals[YYMAXRHS];
     }
   else
     {
       int yyi;
       yyGLRState* yys;
       yyGLRStackItem yyrhsVals[YYMAXRHS];

-      for (yyi = yynrhs-1, yys = yystack->yytops.yystates[yyk]; yyi >= 0;
+      for (yyi = yynrhs-1, yys = yystack->yytops.yystates[yyk]; 0 <= yyi;

           yyi -= 1, yys = yys->yypred)
        {
          assert (yys->yypred != NULL);
           yyi -= 1, yys = yys->yypred)
        {
          assert (yys->yypred != NULL);


@@ -1036,10 +1075,36 @@ yydoAction (yyGLRStack* yystack, int yyk, yyRuleNum yyrule,
          *yylocp = yyrhsVals[0].yystate.yyloc;
        }
       return yyuserAction (yyrule, yynrhs, yyrhsVals + (yynrhs-1),
          *yylocp = yyrhsVals[0].yystate.yyloc;
        }
       return yyuserAction (yyrule, yynrhs, yyrhsVals + (yynrhs-1),

-                          yyvalp, yylocp, yystack);
+                          yyvalp, yylocp, yystack]b4_user_args[);

     }
 }
 
     }
 }
 

+#if !YYDEBUG
+# define YY_REDUCE_PRINT(K, Rule)
+#else
+# define YY_REDUCE_PRINT(K, Rule)      \
+do {                                   \
+  if (yydebug)                         \
+    yy_reduce_print (K, Rule);         \
+} while (0)
+
+/*----------------------------------------------------------.
+| Report that the RULE is going to be reduced on stack #K.  |
+`----------------------------------------------------------*/
+
+static inline void
+yy_reduce_print (size_t yyk, yyRuleNum yyrule)
+{
+  int yyi;
+  YYDPRINTF ((stderr, "Reducing stack %d by rule %d (line %d),",
+             yyk, yyrule - 1, yyrline[yyrule]));
+  /* Print the symbols being reduced, and their result.  */
+  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
+    YYFPRINTF (stderr, "%s ", yytokenName (yyrhs[yyi]));
+  YYFPRINTF (stderr, " -> %s\n", yytokenName (yyr1[yyrule]));
+}
+#endif
+

 /** Pop items off stack #K of STACK according to grammar rule RULE,
  *  and push back on the resulting nonterminal symbol.  Perform the
  *  semantic action associated with RULE and store its value with the
 /** Pop items off stack #K of STACK according to grammar rule RULE,
  *  and push back on the resulting nonterminal symbol.  Perform the
  *  semantic action associated with RULE and store its value with the


@@ -1053,7 +1118,7 @@ yydoAction (yyGLRStack* yystack, int yyk, yyRuleNum yyrule,
  */
 static inline YYRESULTTAG
 yyglrReduce (yyGLRStack* yystack, size_t yyk, yyRuleNum yyrule,
  */
 static inline YYRESULTTAG
 yyglrReduce (yyGLRStack* yystack, size_t yyk, yyRuleNum yyrule,

-             bool yyforceEval)
+             bool yyforceEval]b4_pure_formals[)

 {
   size_t yyposn = yystack->yytops.yystates[yyk]->yyposn;
 
 {
   size_t yyposn = yystack->yytops.yystates[yyk]->yyposn;
 


@@ -1062,13 +1127,14 @@ yyglrReduce (yyGLRStack* yystack, size_t yyk, yyRuleNum yyrule,
       YYSTYPE yysval;
       YYLTYPE yyloc;
 
       YYSTYPE yysval;
       YYLTYPE yyloc;
 

-      YYCHK (yydoAction (yystack, yyk, yyrule, &yysval, &yyloc));
+      YY_REDUCE_PRINT (yyk, yyrule);
+      YYCHK (yydoAction (yystack, yyk, yyrule, &yysval, &yyloc]b4_user_args[));

       yyglrShift (yystack, yyk,
                  yyLRgotoState (yystack->yytops.yystates[yyk]->yylrState,
                                 yylhsNonterm (yyrule)),
       yyglrShift (yystack, yyk,
                  yyLRgotoState (yystack->yytops.yystates[yyk]->yylrState,
                                 yylhsNonterm (yyrule)),

-               yyposn, yysval, &yyloc);
-      YYDPRINTF ((stderr, "Reduced stack %d by rule #%d. Now in state %d.\n",
-                 yyk, yyrule-1, yystack->yytops.yystates[yyk]->yylrState));
+                 yyposn, yysval, &yyloc]b4_user_args[);
+      YYDPRINTF ((stderr, "Stack %d entering state %d\n",
+                 yyk, yystack->yytops.yystates[yyk]->yylrState));

     }
   else
     {
     }
   else
     {


@@ -1078,7 +1144,7 @@ yyglrReduce (yyGLRStack* yystack, size_t yyk, yyRuleNum yyrule,
       yyStateNum yynewLRState;
 
       for (yys = yystack->yytops.yystates[yyk], yyn = yyrhsLength (yyrule);
       yyStateNum yynewLRState;
 
       for (yys = yystack->yytops.yystates[yyk], yyn = yyrhsLength (yyrule);

-          yyn > 0; yyn -= 1)
+          0 < yyn; yyn -= 1)

        {
          yys = yys->yypred;
          assert (yys != NULL);
        {
          yys = yys->yypred;
          assert (yys != NULL);


@@ -1098,7 +1164,7 @@ yyglrReduce (yyGLRStack* yystack, size_t yyk, yyRuleNum yyrule,
              {
                if (yyp->yylrState == yynewLRState && yyp->yypred == yys)
                  {
              {
                if (yyp->yylrState == yynewLRState && yyp->yypred == yys)
                  {

-                   yyaddDeferredAction (yystack, yyp, yys0, yyrule);
+                   yyaddDeferredAction (yystack, yyp, yys0, yyrule]b4_pure_args[);

                    yymarkStackDeleted (yystack, yyk);
                    YYDPRINTF ((stderr, "Merging stack %d into stack %d.\n",
                                yyk, yyi));
                    yymarkStackDeleted (yystack, yyk);
                    YYDPRINTF ((stderr, "Merging stack %d into stack %d.\n",
                                yyk, yyi));


@@ -1108,7 +1174,7 @@ yyglrReduce (yyGLRStack* yystack, size_t yyk, yyRuleNum yyrule,
              }
          }
       yystack->yytops.yystates[yyk] = yys;
              }
          }
       yystack->yytops.yystates[yyk] = yys;

-      yyglrShiftDefer (yystack, yyk, yynewLRState, yyposn, yys0, yyrule);
+      yyglrShiftDefer (yystack, yyk, yynewLRState, yyposn, yys0, yyrule]b4_pure_args[);

     }
   return 0;
 }
     }
   return 0;
 }


@@ -1201,29 +1267,30 @@ yypreference (yySemanticOption* y0, yySemanticOption* y1)
     return 0;
   if (p0 < p1)
     return 3;
     return 0;
   if (p0 < p1)
     return 3;

-  if (p0 > p1)
+  if (p1 < p0)

     return 2;
   return 0;
 }
 
 static YYRESULTTAG yyresolveValue (yySemanticOption* yyoptionList,
                                   yyGLRStack* yystack, YYSTYPE* yyvalp,
     return 2;
   return 0;
 }
 
 static YYRESULTTAG yyresolveValue (yySemanticOption* yyoptionList,
                                   yyGLRStack* yystack, YYSTYPE* yyvalp,

-                                  YYLTYPE* yylocp);
+                                  YYLTYPE* yylocp]b4_user_formals[);

 
 static YYRESULTTAG
 
 static YYRESULTTAG

-yyresolveStates (yyGLRState* yys, int yyn, yyGLRStack* yystack)
+yyresolveStates (yyGLRState* yys, int yyn, yyGLRStack* yystack]b4_user_formals[)

 {
   YYRESULTTAG yyflag;
 {
   YYRESULTTAG yyflag;

-  if (yyn > 0)
+  if (0 < yyn)

     {
       assert (yys->yypred != NULL);
     {
       assert (yys->yypred != NULL);

-      yyflag = yyresolveStates (yys->yypred, yyn-1, yystack);
+      yyflag = yyresolveStates (yys->yypred, yyn-1, yystack]b4_user_args[);

       if (yyflag != yyok)
        return yyflag;
       if (! yys->yyresolved)
        {
          yyflag = yyresolveValue (yys->yysemantics.yyfirstVal, yystack,
       if (yyflag != yyok)
        return yyflag;
       if (! yys->yyresolved)
        {
          yyflag = yyresolveValue (yys->yysemantics.yyfirstVal, yystack,

-                              &yys->yysemantics.yysval, &yys->yyloc);
+                                  &yys->yysemantics.yysval, &yys->yyloc
+                                 ]b4_user_args[);

          if (yyflag != yyok)
            return yyflag;
          yys->yyresolved = yytrue;
          if (yyflag != yyok)
            return yyflag;
          yys->yyresolved = yytrue;


@@ -1234,15 +1301,15 @@ yyresolveStates (yyGLRState* yys, int yyn, yyGLRStack* yystack)
 
 static YYRESULTTAG
 yyresolveAction (yySemanticOption* yyopt, yyGLRStack* yystack,
 
 static YYRESULTTAG
 yyresolveAction (yySemanticOption* yyopt, yyGLRStack* yystack,

-                YYSTYPE* yyvalp, YYLTYPE* yylocp)
+                YYSTYPE* yyvalp, YYLTYPE* yylocp]b4_user_formals[)

 {
   yyGLRStackItem yyrhsVals[YYMAXRHS];
   int yynrhs, yyi;
   yyGLRState* yys;
 
   yynrhs = yyrhsLength (yyopt->yyrule);
 {
   yyGLRStackItem yyrhsVals[YYMAXRHS];
   int yynrhs, yyi;
   yyGLRState* yys;
 
   yynrhs = yyrhsLength (yyopt->yyrule);

-  YYCHK (yyresolveStates (yyopt->yystate, yynrhs, yystack));
-  for (yyi = yynrhs-1, yys = yyopt->yystate; yyi >= 0;
+  YYCHK (yyresolveStates (yyopt->yystate, yynrhs, yystack]b4_user_args[));
+  for (yyi = yynrhs-1, yys = yyopt->yystate; 0 <= yyi;

        yyi -= 1, yys = yys->yypred)
     {
       assert (yys->yypred != NULL);
        yyi -= 1, yys = yys->yypred)
     {
       assert (yys->yypred != NULL);


@@ -1251,27 +1318,30 @@ yyresolveAction (yySemanticOption* yyopt, yyGLRStack* yystack,
       yyrhsVals[yyi].yystate.yyloc = yys->yyloc;
     }
   return yyuserAction (yyopt->yyrule, yynrhs, yyrhsVals + (yynrhs-1),
       yyrhsVals[yyi].yystate.yyloc = yys->yyloc;
     }
   return yyuserAction (yyopt->yyrule, yynrhs, yyrhsVals + (yynrhs-1),

-                      yyvalp, yylocp, yystack);
+                      yyvalp, yylocp, yystack]b4_user_args[);

 }
 
 #if YYDEBUG
 }
 
 #if YYDEBUG

-static yyGLRState YYLEFTMOST_STATE = { 0, NULL, -1, 0, { NULL } };
-
-static void yyreportTree (yySemanticOption* yyx, int yyindent)
+static void
+yyreportTree (yySemanticOption* yyx, int yyindent)

 {
   int yynrhs = yyrhsLength (yyx->yyrule);
   int yyi;
   yyGLRState* yys;
   yyGLRState* yystates[YYMAXRHS];
 {
   int yynrhs = yyrhsLength (yyx->yyrule);
   int yyi;
   yyGLRState* yys;
   yyGLRState* yystates[YYMAXRHS];

+  yyGLRState yyleftmost_state;

 
 

-  for (yyi = yynrhs, yys = yyx->yystate; yyi > 0; yyi -= 1, yys = yys->yypred)
+  for (yyi = yynrhs, yys = yyx->yystate; 0 < yyi; yyi -= 1, yys = yys->yypred)

     yystates[yyi] = yys;
   if (yys == NULL)
     yystates[yyi] = yys;
   if (yys == NULL)

-    yystates[0] = &YYLEFTMOST_STATE;
+    {
+      yyleftmost_state.yyposn = 0;
+      yystates[0] = &yyleftmost_state;
+    }

   else
     yystates[0] = yys;
 
   else
     yystates[0] = yys;
 

-  if (yys->yyposn+1 > yyx->yystate->yyposn)
+  if (yyx->yystate->yyposn < yys->yyposn + 1)

     YYFPRINTF (stderr, "%*s%s -> <Rule %d, empty>\n",
               yyindent, "", yytokenName (yylhsNonterm (yyx->yyrule)),
               yyx->yyrule);
     YYFPRINTF (stderr, "%*s%s -> <Rule %d, empty>\n",
               yyindent, "", yytokenName (yylhsNonterm (yyx->yyrule)),
               yyx->yyrule);


@@ -1299,7 +1369,7 @@ static void yyreportTree (yySemanticOption* yyx, int yyindent)
 
 static void
 yyreportAmbiguity (yySemanticOption* yyx0, yySemanticOption* yyx1,
 
 static void
 yyreportAmbiguity (yySemanticOption* yyx0, yySemanticOption* yyx1,

-                  yyGLRStack* yystack)
+                  yyGLRStack* yystack]b4_pure_formals[)

 {
   /* `Unused' warnings.  */
   (void) yyx0;
 {
   /* `Unused' warnings.  */
   (void) yyx0;


@@ -1313,7 +1383,7 @@ yyreportAmbiguity (yySemanticOption* yyx0, yySemanticOption* yyx1,
   yyreportTree (yyx1, 2);
   YYFPRINTF (stderr, "\n");
 #endif
   yyreportTree (yyx1, 2);
   YYFPRINTF (stderr, "\n");
 #endif

-  yyFail (yystack, "ambiguity detected");
+  yyFail (yystack][]b4_pure_args[, "ambiguity detected");

 }
 
 
 }
 
 


@@ -1321,7 +1391,7 @@ yyreportAmbiguity (yySemanticOption* yyx0, yySemanticOption* yyx1,
  *  actions, and return the result. */
 static YYRESULTTAG
 yyresolveValue (yySemanticOption* yyoptionList, yyGLRStack* yystack,
  *  actions, and return the result. */
 static YYRESULTTAG
 yyresolveValue (yySemanticOption* yyoptionList, yyGLRStack* yystack,

-               YYSTYPE* yyvalp, YYLTYPE* yylocp)
+               YYSTYPE* yyvalp, YYLTYPE* yylocp]b4_user_formals[)

 {
   yySemanticOption* yybest;
   yySemanticOption* yyp;
 {
   yySemanticOption* yybest;
   yySemanticOption* yyp;


@@ -1337,7 +1407,7 @@ yyresolveValue (yySemanticOption* yyoptionList, yyGLRStack* yystack,
        switch (yypreference (yybest, yyp))
          {
          case 0:
        switch (yypreference (yybest, yyp))
          {
          case 0:

-           yyreportAmbiguity (yybest, yyp, yystack);
+           yyreportAmbiguity (yybest, yyp, yystack]b4_pure_args[);

            break;
          case 1:
            yymerge = 1;
            break;
          case 1:
            yymerge = 1;


@@ -1354,25 +1424,25 @@ yyresolveValue (yySemanticOption* yyoptionList, yyGLRStack* yystack,
   if (yymerge)
     {
       int yyprec = yydprec[yybest->yyrule];
   if (yymerge)
     {
       int yyprec = yydprec[yybest->yyrule];

-      YYCHK (yyresolveAction (yybest, yystack, yyvalp, yylocp));
+      YYCHK (yyresolveAction (yybest, yystack, yyvalp, yylocp]b4_user_args[));

       for (yyp = yybest->yynext; yyp != NULL; yyp = yyp->yynext)
        {
          if (yyprec == yydprec[yyp->yyrule])
            {
              YYSTYPE yyval1;
              YYLTYPE yydummy;
       for (yyp = yybest->yynext; yyp != NULL; yyp = yyp->yynext)
        {
          if (yyprec == yydprec[yyp->yyrule])
            {
              YYSTYPE yyval1;
              YYLTYPE yydummy;

-             YYCHK (yyresolveAction (yyp, yystack, &yyval1, &yydummy));
+             YYCHK (yyresolveAction (yyp, yystack, &yyval1, &yydummy]b4_user_args[));

              *yyvalp = yyuserMerge (yymerger[yyp->yyrule], yyvalp, &yyval1);
            }
        }
       return yyok;
     }
   else
              *yyvalp = yyuserMerge (yymerger[yyp->yyrule], yyvalp, &yyval1);
            }
        }
       return yyok;
     }
   else

-    return yyresolveAction (yybest, yystack, yyvalp, yylocp);
+    return yyresolveAction (yybest, yystack, yyvalp, yylocp]b4_user_args[);

 }
 
 static YYRESULTTAG
 }
 
 static YYRESULTTAG

-yyresolveStack (yyGLRStack* yystack)
+yyresolveStack (yyGLRStack* yystack]b4_user_formals[)

 {
   if (yystack->yysplitPoint != NULL)
     {
 {
   if (yystack->yysplitPoint != NULL)
     {


@@ -1383,7 +1453,8 @@ yyresolveStack (yyGLRStack* yystack)
           yys != yystack->yysplitPoint;
           yys = yys->yypred, yyn += 1)
        ;
           yys != yystack->yysplitPoint;
           yys = yys->yypred, yyn += 1)
        ;

-      YYCHK (yyresolveStates (yystack->yytops.yystates[0], yyn, yystack));
+      YYCHK (yyresolveStates (yystack->yytops.yystates[0], yyn, yystack
+                            ]b4_user_args[));

     }
   return yyok;
 }
     }
   return yyok;
 }


@@ -1420,7 +1491,8 @@ yycompressStack (yyGLRStack* yystack)
 
 static YYRESULTTAG
 yyprocessOneStack (yyGLRStack* yystack, int yyk,
 
 static YYRESULTTAG
 yyprocessOneStack (yyGLRStack* yystack, int yyk,

-                  size_t yyposn, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
+                  size_t yyposn, YYSTYPE* yylvalp, YYLTYPE* yyllocp
+                 ]b4_user_formals[)

 {
   int yyaction;
   const short* yyconflicts;
 {
   int yyaction;
   const short* yyconflicts;


@@ -1441,15 +1513,17 @@ yyprocessOneStack (yyGLRStack* yystack, int yyk,
              yymarkStackDeleted (yystack, yyk);
              return yyok;
            }
              yymarkStackDeleted (yystack, yyk);
              return yyok;
            }

-         YYCHK (yyglrReduce (yystack, yyk, yyrule, yyfalse));
+         YYCHK (yyglrReduce (yystack, yyk, yyrule, yyfalse]b4_lpure_args[));

        }
       else
        {
          if (*yytokenp == YYEMPTY)
            {
        }
       else
        {
          if (*yytokenp == YYEMPTY)
            {

+             YYDPRINTF ((stderr, "Reading a token: "));

              yychar = YYLEX;
              yychar = YYLEX;

-             *yytokenp = YYTRANSLATE(yychar);
-             YYDPRINTF ((stderr, "Read token %s\n", yytokenName (*yytokenp)));
+             *yytokenp = YYTRANSLATE (yychar);
+             YYDPRINTF ((stderr, "Next token is %s\n",
+                         yytokenName (*yytokenp)));

            }
          yygetLRActions (yystate, *yytokenp, &yyaction, &yyconflicts);
 
            }
          yygetLRActions (yystate, *yytokenp, &yyaction, &yyconflicts);
 


@@ -1458,17 +1532,19 @@ yyprocessOneStack (yyGLRStack* yystack, int yyk,
              int yynewStack = yysplitStack (yystack, yyk);
              YYDPRINTF ((stderr, "Splitting off stack %d from %d.\n",
                          yynewStack, yyk));
              int yynewStack = yysplitStack (yystack, yyk);
              YYDPRINTF ((stderr, "Splitting off stack %d from %d.\n",
                          yynewStack, yyk));

-             YYCHK (yyglrReduce (yystack, yynewStack, *yyconflicts, yyfalse));
+             YYCHK (yyglrReduce (yystack, yynewStack,
+                                 *yyconflicts, yyfalse]b4_lpure_args[));

              YYCHK (yyprocessOneStack (yystack, yynewStack, yyposn,
              YYCHK (yyprocessOneStack (yystack, yynewStack, yyposn,

-                                       yylvalp, yyllocp));
+                                       yylvalp, yyllocp]b4_user_args[));

              yyconflicts += 1;
            }
 
          if (yyisShiftAction (yyaction))
            {
              yyconflicts += 1;
            }
 
          if (yyisShiftAction (yyaction))
            {

-             YYDPRINTF ((stderr, "Shifted token %s on stack %d, ",
+             YYDPRINTF ((stderr, "Shifting token %s on stack %d, ",

                          yytokenName (*yytokenp), yyk));
                          yytokenName (*yytokenp), yyk));

-             yyglrShift (yystack, yyk, yyaction, yyposn+1, *yylvalp, yyllocp);
+             yyglrShift (yystack, yyk, yyaction, yyposn+1,
+                         *yylvalp, yyllocp]b4_user_args[);

              YYDPRINTF ((stderr, "which is now in state #%d\n",
                          yystack->yytops.yystates[yyk]->yylrState));
              break;
              YYDPRINTF ((stderr, "which is now in state #%d\n",
                          yystack->yytops.yystates[yyk]->yylrState));
              break;


@@ -1480,14 +1556,15 @@ yyprocessOneStack (yyGLRStack* yystack, int yyk,
              break;
            }
          else
              break;
            }
          else

-           YYCHK (yyglrReduce (yystack, yyk, -yyaction, yyfalse));
+           YYCHK (yyglrReduce (yystack, yyk, -yyaction, yyfalse]b4_lpure_args[));

        }
     }
   return yyok;
 }
 
 static void
        }
     }
   return yyok;
 }
 
 static void

-yyreportParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
+yyreportParseError (yyGLRStack* yystack,
+                   YYSTYPE* yylvalp, YYLTYPE* yyllocp]b4_user_formals[)

 {
   /* `Unused' warnings. */
   (void) yylvalp;
 {
   /* `Unused' warnings. */
   (void) yylvalp;


@@ -1497,7 +1574,8 @@ yyreportParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
     {
 #if YYERROR_VERBOSE
       yySymbol* const yytokenp = yystack->yytokenp;
     {
 #if YYERROR_VERBOSE
       yySymbol* const yytokenp = yystack->yytokenp;

-      int yyn, yyx, yycount, yysize;
+      int yyn, yyx, yycount;
+      size_t yysize;

       const char* yyprefix;
       char* yyp;
       char* yymsg;
       const char* yyprefix;
       char* yyp;
       char* yymsg;


@@ -1516,37 +1594,35 @@ yyreportParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
              yysize += strlen (yytokenName (yyx)) + strlen (yyprefix),
                yycount += 1, yyprefix = " or ";
          yymsg = yyp = (char*) malloc (yysize);
              yysize += strlen (yytokenName (yyx)) + strlen (yyprefix),
                yycount += 1, yyprefix = " or ";
          yymsg = yyp = (char*) malloc (yysize);

-         yyp += sprintf (yyp, "parse error, unexpected %s",
-                         yytokenName (*yytokenp));
+         sprintf (yyp, "parse error, unexpected %s", yytokenName (*yytokenp));
+         yyp += strlen (yyp);

          if (yycount < 5)
            {
              yyprefix = ", expecting ";
              for (yyx = yyn < 0 ? -yyn : 0; yyx < yytname_size; yyx += 1)
          if (yycount < 5)
            {
              yyprefix = ", expecting ";
              for (yyx = yyn < 0 ? -yyn : 0; yyx < yytname_size; yyx += 1)

-               if (yycheck[yyx + yyn] == yyx)
+               if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)

                  {
                  {

-                   yyp += sprintf (yyp, "%s%s", yyprefix, yytokenName (yyx));
+                   sprintf (yyp, "%s%s", yyprefix, yytokenName (yyx));
+                   yyp += strlen (yyp);

                    yyprefix = " or ";
                  }
            }
                    yyprefix = " or ";
                  }
            }

-         yyerror (yymsg);
+         yyerror (]b4_lyyerror_args[yymsg);

          free (yymsg);
        }
       else
 #endif
          free (yymsg);
        }
       else
 #endif

-       yyerror ("parse error");
+       yyerror (]b4_lyyerror_args["parse error");

       yynerrs += 1;
     }
 }
 
       yynerrs += 1;
     }
 }
 

-/* Recover from a syntax error on STACK, assuming that TOKENP,
+/* Recover from a syntax error on YYSTACK, assuming that YYTOKENP,

    YYLVALP, and YYLLOCP point to the syntactic category, semantic
    YYLVALP, and YYLLOCP point to the syntactic category, semantic

-   value, and location of the lookahead.
-   NOTE: This uses the panic-mode recovery algorithm described in the
-   Bison documentation, which differs from what is in bison.simple.
-   Specifically, this routine performs no reductions before shifting
-   the error token. */
+   value, and location of the lookahead.  */

 static void
 static void

-yyrecoverParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
+yyrecoverParseError (yyGLRStack* yystack,
+                    YYSTYPE* yylvalp, YYLTYPE* yyllocp]b4_user_formals[)

 {
   yySymbol* const yytokenp = yystack->yytokenp;
   size_t yyk;
 {
   yySymbol* const yytokenp = yystack->yytokenp;
   size_t yyk;


@@ -1555,39 +1631,60 @@ yyrecoverParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
   if (yystack->yyerrState == 0)
     yystack->yyerrState = 3;
   else if (yystack->yyerrState == 3)
   if (yystack->yyerrState == 0)
     yystack->yyerrState = 3;
   else if (yystack->yyerrState == 3)

-    {
-      /* We just shifted the error token and (perhaps) took some
-        reductions. Skip tokens until we can proceed. */
-      do {
+    /* We just shifted the error token and (perhaps) took some
+       reductions.  Skip tokens until we can proceed.  */
+    while (yytrue)
+      {

        if (*yytokenp == YYEOF)
        if (*yytokenp == YYEOF)

-         yyFail (yystack, NULL);
+         {
+           /* Now pop stack until we find a state that shifts the
+              error token.  */
+           while (yystack->yytops.yystates[0] != NULL)
+             {
+               yyGLRState *yys = yystack->yytops.yystates[0];
+               YYDPRINTF ((stderr, "Error: popping "));
+               YYDSYMPRINT ((stderr,
+                             yystos[yys->yylrState],
+                             &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[));
+               YYDPRINTF ((stderr, "\n"));
+               yydestruct (yystos[yys->yylrState],
+                           &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
+               yystack->yytops.yystates[0] = yys->yypred;
+               yystack->yynextFree -= 1;
+               yystack->yyspaceLeft += 1;
+             }
+           yyFail (yystack][]b4_lpure_args[, NULL);
+         }

        if (*yytokenp != YYEMPTY)
        if (*yytokenp != YYEMPTY)

-         YYDPRINTF ((stderr, "Discarding token %s\n",
-                     yytokenName (*yytokenp)));
+         {
+           YYDPRINTF ((stderr, "Discarding token %s\n",
+                       yytokenName (*yytokenp)));
+           yydestruct (*yytokenp, yylvalp]b4_location_if([, yyllocp])[);
+         }
+       YYDPRINTF ((stderr, "Reading a token: "));

        yychar = YYLEX;
        *yytokenp = YYTRANSLATE (yychar);
        yychar = YYLEX;
        *yytokenp = YYTRANSLATE (yychar);

-       YYDPRINTF ((stderr, "Read token %s\n", yytokenName (*yytokenp)));
+       YYDPRINTF ((stderr, "Next token is %s\n", yytokenName (*yytokenp)));

        yyj = yypact[yystack->yytops.yystates[0]->yylrState];
        yyj = yypact[yystack->yytops.yystates[0]->yylrState];

-       if (yyj == YYPACT_NINF)
-         /* Something's not right; we shouldn't be here */
-         yyFail (yystack, NULL);
+       if (yyis_pact_ninf (yyj))
+         /* Something's not right; we shouldn't be here.  */
+         yyFail (yystack][]b4_lpure_args[, NULL);

        yyj += *yytokenp;
        yyj += *yytokenp;

-       if (yyj < 0 || yyj > YYLAST || yycheck[yyj] != *yytokenp)
+       if (yyj < 0 || YYLAST < yyj || yycheck[yyj] != *yytokenp)

          {
            if (yydefact[yystack->yytops.yystates[0]->yylrState] != 0)
              return;
          }
          {
            if (yydefact[yystack->yytops.yystates[0]->yylrState] != 0)
              return;
          }

-       else if (yytable[yyj] != 0 && yytable[yyj] != YYTABLE_NINF)
+       else if (yytable[yyj] != 0 && ! yyis_table_ninf (yytable[yyj]))

          return;
          return;

-      } while (yytrue);
-    }
+      }

 
 

-  /* Reduce to one stack */
+  /* Reduce to one stack.  */

   for (yyk = 0; yyk < yystack->yytops.yysize; yyk += 1)
     if (yystack->yytops.yystates[yyk] != NULL)
       break;
   if (yyk >= yystack->yytops.yysize)
   for (yyk = 0; yyk < yystack->yytops.yysize; yyk += 1)
     if (yystack->yytops.yystates[yyk] != NULL)
       break;
   if (yyk >= yystack->yytops.yysize)

-    yyFail (yystack, NULL);
+    yyFail (yystack][]b4_lpure_args[, NULL);

   for (yyk += 1; yyk < yystack->yytops.yysize; yyk += 1)
     yymarkStackDeleted (yystack, yyk);
   yyremoveDeletes (yystack);
   for (yyk += 1; yyk < yystack->yytops.yysize; yyk += 1)
     yymarkStackDeleted (yystack, yyk);
   yyremoveDeletes (yystack);


@@ -1596,20 +1693,33 @@ yyrecoverParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
   /* Now pop stack until we find a state that shifts the error token. */
   while (yystack->yytops.yystates[0] != NULL)
     {
   /* Now pop stack until we find a state that shifts the error token. */
   while (yystack->yytops.yystates[0] != NULL)
     {

-      yyj = yypact[yystack->yytops.yystates[0]->yylrState] + YYTERROR;
-      if (yyj != YYPACT_NINF + YYTERROR && yyj >= 0 && yyj <= YYLAST &&
-         yycheck[yyj] == YYTERROR && yyisShiftAction (yytable[yyj]))
+      yyGLRState *yys = yystack->yytops.yystates[0];
+      yyj = yypact[yys->yylrState];
+      if (! yyis_pact_ninf (yyj))

        {
        {

-         yyglrShift (yystack, 0, yytable[yyj],
-                     yystack->yytops.yystates[0]->yyposn, *yylvalp, yyllocp);
-         break;
+         yyj += YYTERROR;
+         if (0 <= yyj && yyj <= YYLAST && yycheck[yyj] == YYTERROR
+             && yyisShiftAction (yytable[yyj]))
+           {
+             YYDPRINTF ((stderr, "Shifting error token, "));
+             yyglrShift (yystack, 0, yytable[yyj],
+                         yys->yyposn, *yylvalp, yyllocp]b4_user_args[);
+             break;
+           }

        }
        }

-      yystack->yytops.yystates[0] = yystack->yytops.yystates[0]->yypred;
+      YYDPRINTF ((stderr, "Error: popping "));
+      YYDSYMPRINT ((stderr,
+                   yystos[yys->yylrState],
+                   &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[));
+      YYDPRINTF ((stderr, "\n"));
+      yydestruct (yystos[yys->yylrState],
+                 &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
+      yystack->yytops.yystates[0] = yys->yypred;

       yystack->yynextFree -= 1;
       yystack->yyspaceLeft += 1;
     }
   if (yystack->yytops.yystates[0] == NULL)
       yystack->yynextFree -= 1;
       yystack->yyspaceLeft += 1;
     }
   if (yystack->yytops.yystates[0] == NULL)

-    yyFail (yystack, NULL);
+    yyFail (yystack][]b4_lpure_args[, NULL);

 }
 
 #define YYCHK1(YYE)                                                         \
 }
 
 #define YYCHK1(YYE)                                                         \


@@ -1628,8 +1738,12 @@ yyrecoverParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
     }                                                                       \
   } while (0)
 
     }                                                                       \
   } while (0)
 

-int
-yyparse (YYPARSE_PARAM_ARG)
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+]b4_c_ansi_function_def([yyparse], [int], b4_parse_param)[

 {
   yySymbol yytoken;
   yyGLRStack yystack;
 {
   yySymbol yytoken;
   yyGLRStack yystack;


@@ -1648,18 +1762,20 @@ yyparse (YYPARSE_PARAM_ARG)
   yyinitGLRStack (&yystack, YYINITDEPTH);
   yystack.yytokenp = &yytoken;
 
   yyinitGLRStack (&yystack, YYINITDEPTH);
   yystack.yytokenp = &yytoken;
 

+  YYDPRINTF ((stderr, "Starting parse\n"));
+

   if (setjmp (yystack.yyexception_buffer) != 0)
     goto yyDone;
 
   if (setjmp (yystack.yyexception_buffer) != 0)
     goto yyDone;
 

-  yyglrShift (&yystack, 0, 0, 0, yyval_default, &yyloc_default);
+  yyglrShift (&yystack, 0, 0, 0, yyval_default, &yyloc_default]b4_user_args[);

   yytoken = YYEMPTY;
   yyposn = 0;
 
   while (yytrue)
     {
   yytoken = YYEMPTY;
   yyposn = 0;
 
   while (yytrue)
     {

-      /* For efficiency, we have two loops, of which the first of which
-       * is specialized to deterministic operation (single stack, no
-       * potential ambiguity). */
+      /* For efficiency, we have two loops, the first of which is
+        specialized to deterministic operation (single stack, no
+        potential ambiguity).  */

 
       /* Standard mode */
       while (yytrue)
 
       /* Standard mode */
       while (yytrue)


@@ -1676,18 +1792,19 @@ yyparse (YYPARSE_PARAM_ARG)
              yyrule = yydefaultAction (yystate);
              if (yyrule == 0)
                {
              yyrule = yydefaultAction (yystate);
              if (yyrule == 0)
                {

-                 yyreportParseError (&yystack, yylvalp, yyllocp);
+                 yyreportParseError (&yystack, yylvalp, yyllocp]b4_user_args[);

                  goto yyuser_error;
                }
                  goto yyuser_error;
                }

-             YYCHK1 (yyglrReduce (&yystack, 0, yyrule, yytrue));
+             YYCHK1 (yyglrReduce (&yystack, 0, yyrule, yytrue]b4_lpure_args[));

            }
          else
            {
              if (yytoken == YYEMPTY)
                {
            }
          else
            {
              if (yytoken == YYEMPTY)
                {

+                 YYDPRINTF ((stderr, "Reading a token: "));

                  yychar = YYLEX;
                  yytoken = YYTRANSLATE (yychar);
                  yychar = YYLEX;
                  yytoken = YYTRANSLATE (yychar);

-                 YYDPRINTF ((stderr, "Read token %s\n",
+                 YYDPRINTF ((stderr, "Next token is %s\n",

                              yytokenName (yytoken)));
                }
              yygetLRActions (yystate, yytoken, &yyaction, &yyconflicts);
                              yytokenName (yytoken)));
                }
              yygetLRActions (yystate, yytoken, &yyaction, &yyconflicts);


@@ -1695,24 +1812,25 @@ yyparse (YYPARSE_PARAM_ARG)
                break;
              if (yyisShiftAction (yyaction))
                {
                break;
              if (yyisShiftAction (yyaction))
                {

-                 YYDPRINTF ((stderr, "Shifted token %s. ",
+                 YYDPRINTF ((stderr, "Shifting token %s, ",

                              yytokenName (yytoken)));
                  if (yytoken != YYEOF)
                    yytoken = YYEMPTY;
                  yyposn += 1;
                              yytokenName (yytoken)));
                  if (yytoken != YYEOF)
                    yytoken = YYEMPTY;
                  yyposn += 1;

-                 yyglrShift (&yystack, 0, yyaction, yyposn, yylval, yyllocp);
-                 if (yystack.yyerrState > 0)
+                 yyglrShift (&yystack, 0, yyaction, yyposn,
+                             yylval, yyllocp]b4_user_args[);
+                 if (0 < yystack.yyerrState)

                    yystack.yyerrState -= 1;
                    yystack.yyerrState -= 1;

-                 YYDPRINTF ((stderr, "Now in state #%d\n",
+                 YYDPRINTF ((stderr, "Entering state %d\n",

                              yystack.yytops.yystates[0]->yylrState));
                }
              else if (yyisErrorAction (yyaction))
                {
                              yystack.yytops.yystates[0]->yylrState));
                }
              else if (yyisErrorAction (yyaction))
                {

-                 yyreportParseError (&yystack, yylvalp, yyllocp);
+                 yyreportParseError (&yystack, yylvalp, yyllocp]b4_user_args[);

                  goto yyuser_error;
                }
              else
                  goto yyuser_error;
                }
              else

-               YYCHK1 (yyglrReduce (&yystack, 0, -yyaction, yytrue));
+               YYCHK1 (yyglrReduce (&yystack, 0, -yyaction, yytrue]b4_lpure_args[));

            }
        }
 
            }
        }
 


@@ -1722,7 +1840,7 @@ yyparse (YYPARSE_PARAM_ARG)
          int yyn = yystack.yytops.yysize;
          for (yys = 0; yys < yyn; yys += 1)
            YYCHK1 (yyprocessOneStack (&yystack, yys, yyposn,
          int yyn = yystack.yytops.yysize;
          for (yys = 0; yys < yyn; yys += 1)
            YYCHK1 (yyprocessOneStack (&yystack, yys, yyposn,

-                                      yylvalp, yyllocp));
+                                      yylvalp, yyllocp]b4_user_args[));

          yytoken = YYEMPTY;
          yyposn += 1;
          yyremoveDeletes (&yystack);
          yytoken = YYEMPTY;
          yyposn += 1;
          yyremoveDeletes (&yystack);


@@ -1730,15 +1848,15 @@ yyparse (YYPARSE_PARAM_ARG)
            {
              yyundeleteLastStack (&yystack);
              if (yystack.yytops.yysize == 0)
            {
              yyundeleteLastStack (&yystack);
              if (yystack.yytops.yysize == 0)

-               yyFail (&yystack, "parse error");
-             YYCHK1 (yyresolveStack (&yystack));
+               yyFail (&yystack][]b4_lpure_args[, "parse error");
+             YYCHK1 (yyresolveStack (&yystack]b4_user_args[));

              YYDPRINTF ((stderr, "Returning to deterministic operation.\n"));
              YYDPRINTF ((stderr, "Returning to deterministic operation.\n"));

-             yyreportParseError (&yystack, yylvalp, yyllocp);
+             yyreportParseError (&yystack, yylvalp, yyllocp]b4_user_args[);

              goto yyuser_error;
            }
          else if (yystack.yytops.yysize == 1)
            {
              goto yyuser_error;
            }
          else if (yystack.yytops.yysize == 1)
            {

-             YYCHK1 (yyresolveStack (&yystack));
+             YYCHK1 (yyresolveStack (&yystack]b4_user_args[));

              YYDPRINTF ((stderr, "Returning to deterministic operation.\n"));
              yycompressStack (&yystack);
              break;
              YYDPRINTF ((stderr, "Returning to deterministic operation.\n"));
              yycompressStack (&yystack);
              break;


@@ -1746,7 +1864,7 @@ yyparse (YYPARSE_PARAM_ARG)
        }
       continue;
     yyuser_error:
        }
       continue;
     yyuser_error:

-      yyrecoverParseError (&yystack, yylvalp, yyllocp);
+      yyrecoverParseError (&yystack, yylvalp, yyllocp]b4_user_args[);

       yyposn = yystack.yytops.yystates[0]->yyposn;
     }
  yyDone:
       yyposn = yystack.yytops.yystates[0]->yyposn;
     }
  yyDone:


@@ -1761,20 +1879,19 @@ static void yypstack (yyGLRStack* yystack, int yyk) ATTRIBUTE_UNUSED;
 static void yypdumpstack (yyGLRStack* yystack) ATTRIBUTE_UNUSED;
 
 static void
 static void yypdumpstack (yyGLRStack* yystack) ATTRIBUTE_UNUSED;
 
 static void

-yypstates (yyGLRState* yyst)
+yy_yypstack (yyGLRState* yys)

 {
 {

-  static void
-  yy_yypstack (yyGLRState* yys)
+  if (yys->yypred)

     {
     {

-      if (yys->yypred == NULL)
-       fprintf (stderr, "%d@%d", yys->yylrState, yys->yyposn);
-      else
-       {
-         yy_yypstack (yys->yypred);
-         fprintf (stderr, " -> %d@%d", yys->yylrState, yys->yyposn);
-       }
+      yy_yypstack (yys->yypred);
+      fprintf (stderr, " -> ");

     }
     }

+  fprintf (stderr, "%d@@%lu", yys->yylrState, (unsigned long) yys->yyposn);
+}

 
 

+static void
+yypstates (yyGLRState* yyst)
+{

   if (yyst == NULL)
     fprintf (stderr, "<null>");
   else
   if (yyst == NULL)
     fprintf (stderr, "<null>");
   else


@@ -1799,50 +1916,50 @@ yypdumpstack (yyGLRStack* yystack)
   size_t yyi;
   for (yyp = yystack->yyitems; yyp < yystack->yynextFree; yyp += 1)
     {
   size_t yyi;
   for (yyp = yystack->yyitems; yyp < yystack->yynextFree; yyp += 1)
     {

-      fprintf (stderr, "%3d. ", yyp - yystack->yyitems);
+      fprintf (stderr, "%3lu. ", (unsigned long) (yyp - yystack->yyitems));

       if (*(bool*) yyp)
        {
       if (*(bool*) yyp)
        {

-         fprintf (stderr, "Res: %d, LR State: %d, posn: %d, pred: %d",
+         fprintf (stderr, "Res: %d, LR State: %d, posn: %lu, pred: %ld",

                   yyp->yystate.yyresolved, yyp->yystate.yylrState,
                   yyp->yystate.yyresolved, yyp->yystate.yylrState,

-                  yyp->yystate.yyposn,
-                  YYINDEX(yyp->yystate.yypred));
+                  (unsigned long) yyp->yystate.yyposn,
+                  (long) YYINDEX (yyp->yystate.yypred));

          if (! yyp->yystate.yyresolved)
          if (! yyp->yystate.yyresolved)

-           fprintf (stderr, ", firstVal: %d",
-                    YYINDEX (yyp->yystate.yysemantics.yyfirstVal));
+           fprintf (stderr, ", firstVal: %ld",
+                    (long) YYINDEX (yyp->yystate.yysemantics.yyfirstVal));

        }
       else
        {
        }
       else
        {

-         fprintf (stderr, "Option. rule: %d, state: %d, next: %d",
-                  yyp->yyoption.yyrule, YYINDEX (yyp->yyoption.yystate),
-                  YYINDEX (yyp->yyoption.yynext));
+         fprintf (stderr, "Option. rule: %d, state: %ld, next: %ld",
+                  yyp->yyoption.yyrule,
+                  (long) YYINDEX (yyp->yyoption.yystate),
+                  (long) YYINDEX (yyp->yyoption.yynext));

        }
       fprintf (stderr, "\n");
     }
   fprintf (stderr, "Tops:");
   for (yyi = 0; yyi < yystack->yytops.yysize; yyi += 1)
        }
       fprintf (stderr, "\n");
     }
   fprintf (stderr, "Tops:");
   for (yyi = 0; yyi < yystack->yytops.yysize; yyi += 1)

-    fprintf (stderr, "%d: %d; ", yyi, YYINDEX (yystack->yytops.yystates[yyi]));
+    fprintf (stderr, "%lu: %ld; ", (unsigned long) yyi,
+            (long) YYINDEX (yystack->yytops.yystates[yyi]));

   fprintf (stderr, "\n");
 }
   fprintf (stderr, "\n");
 }

-

 ]
 
 b4_epilogue
 m4_if(b4_defines_flag, 0, [],
 ]
 
 b4_epilogue
 m4_if(b4_defines_flag, 0, [],

-[#output "b4_output_header_name"
+[@output @output_header_name@

 b4_copyright([Skeleton parser for GLR parsing with Bison], [2002])
 b4_copyright([Skeleton parser for GLR parsing with Bison], [2002])

-#ifndef b4_header_guard
-# define b4_header_guard

 
 b4_token_defines(b4_tokens)
 
 #ifndef YYSTYPE
 m4_ifdef([b4_stype],
 
 b4_token_defines(b4_tokens)
 
 #ifndef YYSTYPE
 m4_ifdef([b4_stype],

-[#line b4_stype_line "b4_filename"
+[b4_syncline([b4_stype_line], [b4_filename])

 typedef union b4_stype yystype;
 /* Line __line__ of __file__.  */
 typedef union b4_stype yystype;
 /* Line __line__ of __file__.  */

-#line __oline__ "__ofile__"],
+b4_syncline([@oline@], [@ofile@])],

 [typedef int yystype;])
 # define YYSTYPE yystype
 [typedef int yystype;])
 # define YYSTYPE yystype

+# define YYSTYPE_IS_TRIVIAL 1

 #endif
 
 b4_pure_if([],
 #endif
 
 b4_pure_if([],


@@ -1852,10 +1969,10 @@ b4_location_if(
 [#ifndef YYLTYPE
 typedef struct yyltype
 {
 [#ifndef YYLTYPE
 typedef struct yyltype
 {

-  int yyfirst_line;
-  int yyfirst_column;
-  int yylast_line;
-  int yylast_column;
+  int first_line;
+  int first_column;
+  int last_line;
+  int last_column;

 } yyltype;
 # define YYLTYPE yyltype
 #endif
 } yyltype;
 # define YYLTYPE yyltype
 #endif


@@ -1863,5 +1980,4 @@ typedef struct yyltype
 m4_if(b4_pure, [0],
 [extern YYLTYPE b4_prefix[]lloc;])
 ])
 m4_if(b4_pure, [0],
 [extern YYLTYPE b4_prefix[]lloc;])
 ])

-#endif /* not b4_header_guard */

 ])
 ])