* data/glr.c (YYSTACKEXPANDABLE): Don't define if already defined.

[bison.git] / data / glr.c

diff --git a/data/glr.c b/data/glr.c
index 0bb05835e47a78805d6d81e1b477105af9fd44e9..f9835adabdfc147a303668e298afb8fc2e404671 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -1,8 +1,7 @@
 m4_divert(-1)                                                       -*- C -*-
 m4_divert(-1)                                                       -*- C -*-

-m4_include([c.m4])

 
 # GLR skeleton for Bison
 
 # GLR skeleton for Bison

-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005 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


@@ -16,8 +15,8 @@ m4_include([c.m4])
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301  USA

 
 
 ## ---------------- ##
 
 
 ## ---------------- ##


@@ -28,9 +27,6 @@ m4_include([c.m4])
 m4_define_default([b4_stack_depth_max], [10000])
 m4_define_default([b4_stack_depth_init],  [200])
 
 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])
-

 
 
 ## ------------------------ ##
 
 
 ## ------------------------ ##


@@ -64,7 +60,7 @@ m4_ifset([b4_parse_param], [b4_c_args(b4_parse_param), ])])
 
 # b4_lyyerror_args
 # ----------------
 
 # b4_lyyerror_args
 # ----------------

-# Same as above, but on the lookahead, hence yyllocp instead of yylocp.
+# Same as above, but on the look-ahead, 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), ])])
 m4_define([b4_lyyerror_args],
 [b4_pure_if([b4_location_if([yyllocp, ])])dnl
 m4_ifset([b4_parse_param], [b4_c_args(b4_parse_param), ])])


@@ -86,14 +82,14 @@ m4_define([b4_pure_formals],
 
 # b4_lpure_args
 # -------------
 
 # b4_lpure_args
 # -------------

-# Same as above, but on the lookahead, hence yyllocp instead of yylocp.
+# Same as above, but on the look-ahead, hence yyllocp instead of yylocp.

 m4_define([b4_lpure_args],
 [b4_pure_if([b4_location_if([, yyllocp])])[]b4_user_args])
 
 
 # b4_lpure_formals
 # ----------------
 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.
+# Same as above, but on the look-ahead, hence yyllocp instead of yylocp.

 m4_define([b4_lpure_formals],
 [b4_pure_if([b4_location_if([YYLTYPE *yyllocp])])[]b4_user_formals])
 
 m4_define([b4_lpure_formals],
 [b4_pure_if([b4_location_if([YYLTYPE *yyllocp])])[]b4_user_formals])
 


@@ -107,7 +103,7 @@ m4_define([b4_lpure_formals],
 # --------------------
 # Expansion of $<TYPE>$.
 m4_define([b4_lhs_value],
 # --------------------
 # Expansion of $<TYPE>$.
 m4_define([b4_lhs_value],

-[(*yyvalp)[]m4_ifval([$1], [.$1])])
+[((*yyvalp)[]m4_ifval([$1], [.$1]))])

 
 
 # b4_rhs_value(RULE-LENGTH, NUM, [TYPE])
 
 
 # b4_rhs_value(RULE-LENGTH, NUM, [TYPE])


@@ -115,7 +111,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])])
+[(((yyGLRStackItem const *)yyvsp)@{YYFILL (m4_eval([$2 - $1]))@}.yystate.yysemantics.yysval[]m4_ifval([$3], [.$3]))])

 
 
 
 
 
 


@@ -135,28 +131,20 @@ 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])
-
+[(((yyGLRStackItem const *)yyvsp)@{YYFILL (m4_eval([$2 - $1]))@}.yystate.yyloc)])

 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 m4_divert(0)dnl
 @output @output_parser_name@
 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 m4_divert(0)dnl
 @output @output_parser_name@

-b4_copyright([Skeleton parser for GLR parsing with Bison], [2002])
+b4_copyright([Skeleton parser for GLR parsing with Bison],
+  [2002, 2003, 2004, 2005])

 [
 /* This is the parser code for GLR (Generalized LR) parser. */
 
 [
 /* This is the parser code for GLR (Generalized LR) parser. */
 

-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <setjmp.h>
-

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

-[/* If NAME_PREFIX is specified substitute the variables and functions
-   names.  */
+[/* Substitute the variable and function names.  */

 #define yyparse b4_prefix[]parse
 #define yylex   b4_prefix[]lex
 #define yyerror b4_prefix[]error
 #define yyparse b4_prefix[]parse
 #define yylex   b4_prefix[]lex
 #define yyerror b4_prefix[]error


@@ -164,7 +152,7 @@ m4_if(b4_prefix[], [yy], [],
 #define yychar  b4_prefix[]char
 #define yydebug b4_prefix[]debug
 #define yynerrs b4_prefix[]nerrs
 #define yychar  b4_prefix[]char
 #define yydebug b4_prefix[]debug
 #define yynerrs b4_prefix[]nerrs

-b4_location_if([#define yylloc b4_prefix[]lloc])])
+#define yylloc b4_prefix[]lloc])

 
 b4_token_defines(b4_tokens)
 
 
 b4_token_defines(b4_tokens)
 


@@ -184,48 +172,71 @@ b4_pre_prologue[
 # define YYERROR_VERBOSE ]b4_error_verbose[
 #endif
 
 # define YYERROR_VERBOSE ]b4_error_verbose[
 #endif
 

-#ifndef YYSTYPE
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)

 ]m4_ifdef([b4_stype],
 [b4_syncline([b4_stype_line], [b4_filename])
 ]m4_ifdef([b4_stype],
 [b4_syncline([b4_stype_line], [b4_filename])

-typedef union b4_stype yystype;
-/* Line __line__ of __file__.  */
+typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])b4_stype YYSTYPE;
+/* Line __line__ of glr.c.  */

 b4_syncline([@oline@], [@ofile@])],
 b4_syncline([@oline@], [@ofile@])],

-[typedef int yystype;])[
-# define YYSTYPE yystype
+[typedef int YYSTYPE;])[
+# define YYSTYPE_IS_DECLARED 1

 # define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
 

-#ifndef YYLTYPE
-typedef struct yyltype
+#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED)
+typedef struct YYLTYPE

 {
 {

+]b4_location_if([

   int first_line;
   int first_column;
   int last_line;
   int last_column;
   int first_line;
   int first_column;
   int last_line;
   int last_column;

-} yyltype;
-# define YYLTYPE ]b4_location_type[
+],[
+  char yydummy;
+])[
+} YYLTYPE;
+# define YYLTYPE_IS_DECLARED 1

 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
 # 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 $$ and $@@ to zeroed-out
-   values.  Since the default value of these quantities is undefined,
-   this behavior is technically correct. */
+/* Default (constant) value used for initialization for null
+   right-hand sides.  Unlike the standard yacc.c template,
+   here we set the default value of $$ to a zeroed-out value.
+   Since the default value is undefined, this behavior is
+   technically correct. */

 static YYSTYPE yyval_default;
 static YYSTYPE yyval_default;

-static YYLTYPE yyloc_default;

 
 /* Copy the second part of user declarations.  */
 ]b4_post_prologue[
 
 
 /* Copy the second part of user declarations.  */
 ]b4_post_prologue[
 

-]/* Line __line__ of __file__.  */
+]/* Line __line__ of glr.c.  */

 b4_syncline([@oline@], [@ofile@])
 [
 b4_syncline([@oline@], [@ofile@])
 [

-#if ! defined (__cplusplus)
-   typedef char bool;
-#  define yytrue 1
-#  define yyfalse 0
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <setjmp.h>
+
+#ifndef YYFREE
+# define YYFREE free
+#endif
+#ifndef YYMALLOC
+# define YYMALLOC malloc
+#endif
+#ifndef YYREALLOC
+# define YYREALLOC realloc
+#endif
+
+#define YYSIZEMAX ((size_t) -1)
+
+#ifdef __cplusplus
+   typedef bool yybool;
+#else
+   typedef unsigned char yybool;

 #endif
 #endif

+#define yytrue 1
+#define yyfalse 0

 
 /*-----------------.
 | GCC extensions.  |
 
 /*-----------------.
 | GCC extensions.  |


@@ -236,9 +247,20 @@ b4_syncline([@oline@], [@ofile@])
 # if !defined (__GNUC__) || __GNUC__ < 2 || \
 (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */
 # if !defined (__GNUC__) || __GNUC__ < 2 || \
 (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */

+# else
+]b4_location_if([#  define YYOPTIONAL_LOC(Name) Name],[
+#  if defined (__cplusplus)
+#   define YYOPTIONAL_LOC(Name) /* empty */
+#  else
+#   define YYOPTIONAL_LOC(Name) Name ATTRIBUTE_UNUSED
+#  endif])[

 # endif
 #endif
 
 # endif
 #endif
 

+#ifndef YYASSERT
+# define YYASSERT(condition) ((void) ((condition) || (abort (), 0)))
+#endif
+

 #ifndef ATTRIBUTE_UNUSED
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
 #ifndef ATTRIBUTE_UNUSED
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif


@@ -258,14 +280,17 @@ b4_syncline([@oline@], [@ofile@])
 #define YYNSTATES  ]b4_states_number[
 /* YYMAXRHS -- Maximum number of symbols on right-hand side of rule. */
 #define YYMAXRHS ]b4_r2_max[
 #define YYNSTATES  ]b4_states_number[
 /* YYMAXRHS -- Maximum number of symbols on right-hand side of rule. */
 #define YYMAXRHS ]b4_r2_max[

+/* YYMAXLEFT -- Maximum number of symbols to the left of a handle
+   accessed by $0, $-1, etc., in any rule. */
+#define YYMAXLEFT ]b4_max_left_semantic_context[

 
 /* YYTRANSLATE(X) -- Bison symbol number corresponding to X.  */
 #define YYUNDEFTOK  ]b4_undef_token_number[
 #define YYMAXUTOK   ]b4_user_token_number_max[
 
 
 /* YYTRANSLATE(X) -- Bison symbol number corresponding to X.  */
 #define YYUNDEFTOK  ]b4_undef_token_number[
 #define YYMAXUTOK   ]b4_user_token_number_max[
 

-#define YYTRANSLATE(YYX)                                               \
+#define YYTRANSLATE(YYX)                                               \

   ((YYX <= 0) ? YYEOF :                                                        \
   ((YYX <= 0) ? YYEOF :                                                        \

-   (unsigned)(YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+   (unsigned int) (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[] =


@@ -301,8 +326,6 @@ static const char *const yytname[] =
 {
   ]b4_tname[
 };
 {
   ]b4_tname[
 };

-
-#define yytname_size ((int) (sizeof (yytname) / sizeof (yytname[0])))

 #endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 #endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */


@@ -360,7 +383,7 @@ 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
    number is the opposite.  If zero, do what YYDEFACT says.
 /* 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.

-   If YYTABLE_NINF, parse error.  */
+   If YYTABLE_NINF, syntax error.  */

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


@@ -379,9 +402,9 @@ static const ]b4_int_type_for([b4_conflict_list_heads])[ 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
 /* 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 pointers onto yyconfl are taken, which type is "short int *".

 dnl We probably ought to introduce a type for confl.
 dnl We probably ought to introduce a type for confl.

-[static const short yyconfl[] =
+[static const short int yyconfl[] =

 {
   ]b4_conflicting_rules[
 };
 {
   ]b4_conflicting_rules[
 };


@@ -405,18 +428,50 @@ static const ]b4_int_type_for([b4_stos])[ yystos[] =
 /* Error token number */
 #define YYTERROR 1
 
 /* Error token number */
 #define YYTERROR 1
 

-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
-
-#define YYRHSLOC(yyRhs,YYK) (yyRhs[YYK].yystate.yyloc)
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */

 
 

+]b4_location_if([[
+#define YYRHSLOC(Rhs, K) ((Rhs)[K].yystate.yyloc)
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+    do                                                                 \
+      if (N)                                                           \
+       {                                                               \
+         (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
+         (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
+         (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
+         (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
+       }                                                               \
+      else                                                             \
+       {                                                               \
+         (Current).first_line   = (Current).last_line   =              \
+           YYRHSLOC (Rhs, 0).last_line;                                \
+         (Current).first_column = (Current).last_column =              \
+           YYRHSLOC (Rhs, 0).last_column;                              \
+       }                                                               \
+    while (0)
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+# define YY_LOCATION_PRINT(File, Loc)                  \
+    fprintf (File, "%d.%d-%d.%d",                      \
+             (Loc).first_line, (Loc).first_column,     \
+             (Loc).last_line,  (Loc).last_column)
+#endif
+]],[

 #ifndef YYLLOC_DEFAULT
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(yyCurrent, yyRhs, YYN)                 \
-  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;
+# define YYLLOC_DEFAULT(Current, Rhs, N) ((void) 0)

 #endif
 #endif

+])[
+
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+

 
 /* YYLEX -- calling `yylex' with the right arguments.  */
 #define YYLEX ]b4_c_function_call([yylex], [int], b4_lex_param)[
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
 #define YYLEX ]b4_c_function_call([yylex], [int], b4_lex_param)[


@@ -440,7 +495,7 @@ static const int YYEMPTY = -2;
 typedef enum { yyok, yyaccept, yyabort, yyerr } YYRESULTTAG;
 
 #define YYCHK(YYE)                                                          \
 typedef enum { yyok, yyaccept, yyabort, yyerr } YYRESULTTAG;
 
 #define YYCHK(YYE)                                                          \

-   do { YYRESULTTAG yyflag = YYE; if (yyflag != yyok) return yyflag; }              \
+   do { YYRESULTTAG yyflag = YYE; if (yyflag != yyok) return yyflag; }      \

    while (0)
 
 #if YYDEBUG
    while (0)
 
 #if YYDEBUG


@@ -457,20 +512,13 @@ do {                                              \
 
 ]b4_yysymprint_generate([b4_c_ansi_function_def])[
 
 
 ]b4_yysymprint_generate([b4_c_ansi_function_def])[
 

-# define YYDSYMPRINT(Args)                     \
-do {                                           \
-  if (yydebug)                                 \
-    yysymprint Args;                           \
-} while (0)
-
-# define YYDSYMPRINTF(Title, Token, Value, Location)           \
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)         \

 do {                                                           \
   if (yydebug)                                                 \
     {                                                          \
       YYFPRINTF (stderr, "%s ", Title);                                \
 do {                                                           \
   if (yydebug)                                                 \
     {                                                          \
       YYFPRINTF (stderr, "%s ", Title);                                \

-      yysymprint (stderr,                                      \
-                  Token, Value]b4_location_if([, Location])[); \
-      YYFPRINTF (stderr, "\n");                                        \
+      yysymprint (stderr,                                      \
+                  Type, Value]b4_location_if([, Location])[);  \

     }                                                          \
 } while (0)
 
     }                                                          \
 } while (0)
 


@@ -480,10 +528,8 @@ int yydebug;
 
 #else /* !YYDEBUG */
 
 
 #else /* !YYDEBUG */
 

-  /* Avoid empty `if' bodies.  */
-# define YYDPRINTF(Args)   {}
-# define YYDSYMPRINT(Args) {}
-# define YYDSYMPRINTF(Title, Token, Value, Location) {}
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)

 
 #endif /* !YYDEBUG */
 
 
 #endif /* !YYDEBUG */
 


@@ -499,28 +545,51 @@ int yydebug;
    SIZE_MAX < YYMAXDEPTH * sizeof (GLRStackItem)
    evaluated with infinite-precision integer arithmetic.  */
 
    SIZE_MAX < YYMAXDEPTH * sizeof (GLRStackItem)
    evaluated with infinite-precision integer arithmetic.  */
 

-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-

 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH ]b4_stack_depth_max[
 #endif
 
 /* Minimum number of free items on the stack allowed after an
    allocation.  This is to allow allocation and initialization
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH ]b4_stack_depth_max[
 #endif
 
 /* Minimum number of free items on the stack allowed after an
    allocation.  This is to allow allocation and initialization

-   to be completed by functions that call expandGLRStack before the
+   to be completed by functions that call yyexpandGLRStack before the

    stack is expanded, thus insuring that all necessary pointers get
    properly redirected to new data. */
 #define YYHEADROOM 2
 
    stack is expanded, thus insuring that all necessary pointers get
    properly redirected to new data. */
 #define YYHEADROOM 2
 

-#if ! defined (YYSTACKEXPANDABLE) \
-    && (! defined (__cplusplus) || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))
-#define YYSTACKEXPANDABLE 1
-#else
-#define YYSTACKEXPANDABLE 0
+#ifndef YYSTACKEXPANDABLE
+# if (! defined (__cplusplus) \
+      || (]b4_location_if([[defined (YYLTYPE_IS_TRIVIAL) && YYLTYPE_IS_TRIVIAL \
+         && ]])[defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL))
+#  define YYSTACKEXPANDABLE 1
+# else
+#  define YYSTACKEXPANDABLE 0
+# endif

 #endif
 
 #endif
 

+#if YYERROR_VERBOSE
+
+# ifndef yystpcpy
+#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+#endif /* !YYERROR_VERBOSE */
+

 /** State numbers, as in LALR(1) machine */
 typedef int yyStateNum;
 
 /** State numbers, as in LALR(1) machine */
 typedef int yyStateNum;
 


@@ -528,10 +597,10 @@ typedef int yyStateNum;
 typedef int yyRuleNum;
 
 /** Grammar symbol */
 typedef int yyRuleNum;
 
 /** Grammar symbol */

-typedef short yySymbol;
+typedef short int yySymbol;

 
 /** Item references, as in LALR(1) machine */
 
 /** Item references, as in LALR(1) machine */

-typedef short yyItemNum;
+typedef short int yyItemNum;

 
 typedef struct yyGLRState yyGLRState;
 typedef struct yySemanticOption yySemanticOption;
 
 typedef struct yyGLRState yyGLRState;
 typedef struct yySemanticOption yySemanticOption;


@@ -540,15 +609,26 @@ typedef struct yyGLRStack yyGLRStack;
 typedef struct yyGLRStateSet yyGLRStateSet;
 
 struct yyGLRState {
 typedef struct yyGLRStateSet yyGLRStateSet;
 
 struct yyGLRState {

-  bool yyisState;
-  bool yyresolved;
+  /** Type tag: always true. */
+  yybool yyisState;
+  /** Type tag for yysemantics. If true, yysval applies, otherwise
+   *  yyfirstVal applies. */
+  yybool yyresolved;
+  /** Number of corresponding LALR(1) machine state. */

   yyStateNum yylrState;
   yyStateNum yylrState;

+  /** Preceding state in this stack */

   yyGLRState* yypred;
   yyGLRState* yypred;

+  /** Source position of the first token produced by my symbol */

   size_t yyposn;
   union {
   size_t yyposn;
   union {

+    /** First in a chain of alternative reductions producing the
+     *  non-terminal corresponding to this state, threaded through
+     *  yynext. */

     yySemanticOption* yyfirstVal;
     yySemanticOption* yyfirstVal;

+    /** Semantic value for this state. */

     YYSTYPE yysval;
   } yysemantics;
     YYSTYPE yysval;
   } yysemantics;

+  /** Source location for this state. */

   YYLTYPE yyloc;
 };
 
   YYLTYPE yyloc;
 };
 


@@ -558,12 +638,19 @@ struct yyGLRStateSet {
 };
 
 struct yySemanticOption {
 };
 
 struct yySemanticOption {

-  bool yyisState;
+  /** Type tag: always false. */
+  yybool yyisState;
+  /** Rule number for this reduction */

   yyRuleNum yyrule;
   yyRuleNum yyrule;

+  /** The last RHS state in the list of states to be reduced. */

   yyGLRState* yystate;
   yyGLRState* yystate;

+  /** Next sibling in chain of options. To facilitate merging,
+   *  options are chained in decreasing order by address. */

   yySemanticOption* yynext;
 };
 
   yySemanticOption* yynext;
 };
 

+/** Type of the items in the GLR stack. The yyisState field
+ *  indicates which item of the union is valid. */

 union yyGLRStackItem {
   yyGLRState yystate;
   yySemanticOption yyoption;
 union yyGLRStackItem {
   yyGLRState yystate;
   yySemanticOption yyoption;


@@ -572,6 +659,8 @@ union yyGLRStackItem {
 struct yyGLRStack {
   int yyerrflag;
   int yyerrState;
 struct yyGLRStack {
   int yyerrflag;
   int yyerrState;

+]b4_location_if([[  /* To compute the location of the error token.  */
+  yyGLRStackItem yyerror_range[3];]])[

 ]b4_pure_if(
 [
   int yyerrcnt;
 ]b4_pure_if(
 [
   int yyerrcnt;


@@ -581,41 +670,78 @@ struct yyGLRStack {
   jmp_buf yyexception_buffer;
   yyGLRStackItem* yyitems;
   yyGLRStackItem* yynextFree;
   jmp_buf yyexception_buffer;
   yyGLRStackItem* yyitems;
   yyGLRStackItem* yynextFree;

-  int yyspaceLeft;
+  size_t yyspaceLeft;

   yyGLRState* yysplitPoint;
   yyGLRState* yylastDeleted;
   yyGLRStateSet yytops;
 };
 
   yyGLRState* yysplitPoint;
   yyGLRState* yylastDeleted;
   yyGLRStateSet yytops;
 };
 

-static void yyinitGLRStack (yyGLRStack* yystack, size_t yysize);

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

-static void yyfreeGLRStack (yyGLRStack* yystack);

 
 static void
 
 static void

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

 {
 {

-  if (yyformat != NULL)
-    {
-      char yymsg[256];
-      va_list yyap;
-      va_start (yyap, yyformat);
-      yystack->yyerrflag = 1;
-      vsprintf (yymsg, yyformat, yyap);
-      yyerror (]b4_yyerror_args[yymsg);
-    }
+  yystack->yyerrflag = 1;
+  if (yymsg != NULL)
+    yyerror (]b4_yyerror_args[yymsg);

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

+static void
+yyStackOverflow (yyGLRStack* yystack]b4_pure_formals[)
+{
+  yyFail (yystack]b4_pure_args[, "parser stack overflow");
+}
+

 #if YYDEBUG || YYERROR_VERBOSE
 #if YYDEBUG || YYERROR_VERBOSE

-/** A printable representation of TOKEN.  Valid until next call to
- *  tokenName. */
+/** A printable representation of TOKEN.  */

 static inline const char*
 yytokenName (yySymbol yytoken)
 {
 static inline const char*
 yytokenName (yySymbol yytoken)
 {

+  if (yytoken == YYEMPTY)
+    return "";
+

   return yytname[yytoken];
 }
 #endif
 
   return yytname[yytoken];
 }
 #endif
 

+/** Fill in YYVSP[YYLOW1 .. YYLOW0-1] from the chain of states starting
+ *  at YYVSP[YYLOW0].yystate.yypred.  Leaves YYVSP[YYLOW1].yystate.yypred
+ *  containing the pointer to the next state in the chain. Assumes
+ *  YYLOW1 < YYLOW0.  */
+static void yyfillin (yyGLRStackItem *, int, int) ATTRIBUTE_UNUSED;
+static void
+yyfillin (yyGLRStackItem *yyvsp, int yylow0, int yylow1)
+{
+  yyGLRState* s;
+  int i;
+  s = yyvsp[yylow0].yystate.yypred;
+  for (i = yylow0-1; i >= yylow1; i -= 1)
+    {
+      YYASSERT (s->yyresolved);
+      yyvsp[i].yystate.yyresolved = yytrue;
+      yyvsp[i].yystate.yysemantics.yysval = s->yysemantics.yysval;
+      yyvsp[i].yystate.yyloc = s->yyloc;
+      s = yyvsp[i].yystate.yypred = s->yypred;
+    }
+}
+
+/* Do nothing if YYNORMAL or if *YYLOW <= YYLOW1.  Otherwise, fill in
+   YYVSP[YYLOW1 .. *YYLOW-1] as in yyfillin and set *YYLOW = YYLOW1.
+   For convenience, always return YYLOW1.  */
+static inline int yyfill (yyGLRStackItem *, int *, int, yybool)
+     ATTRIBUTE_UNUSED;
+static inline int
+yyfill (yyGLRStackItem *yyvsp, int *yylow, int yylow1, yybool yynormal)
+{
+  if (!yynormal && yylow1 < *yylow)
+    {
+      yyfillin (yyvsp, *yylow, yylow1);
+      *yylow = yylow1;
+    }
+  return yylow1;
+}
+

 /** 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


@@ -623,22 +749,14 @@ yytokenName (yySymbol yytoken)
  *  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* YYOPTIONAL_LOC (yylocp),
+             yyGLRStack* yystack

               ]b4_user_formals[)
 {
               ]b4_user_formals[)
 {

-  /* Avoid `unused' warnings in there are no $n. */
-  (void) yystack;
+  yybool yynormal ATTRIBUTE_UNUSED = (yystack->yysplitPoint == NULL);
+  int yylow;

 
 

-  if (yyrhslen == 0)
-    {
-      *yyvalp = yyval_default;
-      *yylocp = yyloc_default;
-    }
-  else
-    {
-      *yyvalp = yyvsp[1-yyrhslen].yystate.yysemantics.yysval;
-      *yylocp = yyvsp[1-yyrhslen].yystate.yyloc;
-    }

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


@@ -646,25 +764,33 @@ yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp,
 # undef YYABORT
 # define YYABORT return yyabort
 # undef YYERROR
 # undef YYABORT
 # define YYABORT return yyabort
 # undef YYERROR

-# define YYERROR return yyerr
+# define YYERROR return yyerrok, yyerr

 # undef YYRECOVERING
 # define YYRECOVERING (yystack->yyerrState != 0)
 # undef yyclearin
 # define yyclearin (yychar = *(yystack->yytokenp) = YYEMPTY)
 # undef YYRECOVERING
 # define YYRECOVERING (yystack->yyerrState != 0)
 # undef yyclearin
 # define yyclearin (yychar = *(yystack->yytokenp) = YYEMPTY)

+# undef YYFILL
+# define YYFILL(N) yyfill (yyvsp, &yylow, N, yynormal)

 # undef YYBACKUP
 # define YYBACKUP(Token, Value)                                                     \
 # undef YYBACKUP
 # define YYBACKUP(Token, Value)                                                     \

-  do {                                                                      \
-    yyerror (]b4_yyerror_args["syntax error: cannot back up");              \
-    YYERROR;                                                                \
-  } while (0)
+  return yyerror (]b4_yyerror_args["syntax error: cannot back up"),         \
+        yyerrok, yyerr

 
 

-]
-   switch (yyn)
-     {
-       b4_actions
-     }
+  yylow = 1;
+  if (yyrhslen == 0)
+    *yyvalp = yyval_default;
+  else
+    *yyvalp = yyvsp[YYFILL (1-yyrhslen)].yystate.yysemantics.yysval;
+  YYLLOC_DEFAULT (*yylocp, yyvsp - yyrhslen, yyrhslen);
+]b4_location_if([[  yystack->yyerror_range[1].yystate.yyloc = *yylocp;
+]])
+  switch (yyn)
+    {
+      b4_actions
+      default: break;
+    }

 
 

-   return yyok;
+  return yyok;

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


@@ -672,15 +798,14 @@ yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp,
 # undef YYBACKUP
 # undef yyclearin
 # undef YYRECOVERING
 # undef YYBACKUP
 # undef yyclearin
 # undef YYRECOVERING

-/* Line __line__ of __file__.  */
+/* Line __line__ of glr.c.  */

 b4_syncline([@oline@], [@ofile@])
 }
 \f
 
 b4_syncline([@oline@], [@ofile@])
 }
 \f
 

-static YYSTYPE
+static void

 yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1)
 {
 yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1)
 {

-  YYSTYPE yyval = *yy0;

   /* `Use' the arguments.  */
   (void) yy0;
   (void) yy1;
   /* `Use' the arguments.  */
   (void) yy0;
   (void) yy1;


@@ -688,8 +813,8 @@ yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1)
   switch (yyn)
     {
       b4_mergers
   switch (yyn)
     {
       b4_mergers

+      default: break;

     }
     }

-  return yyval;

 }
 [
                              /* Bison grammar-table manipulation.  */
 }
 [
                              /* Bison grammar-table manipulation.  */


@@ -717,7 +842,7 @@ yylhsNonterm (yyRuleNum yyrule)
 
 /** True iff LR state STATE has only a default reduction (regardless
  *  of token). */
 
 /** True iff LR state STATE has only a default reduction (regardless
  *  of token). */

-static inline bool
+static inline yybool

 yyisDefaultedState (yyStateNum yystate)
 {
   return yyis_pact_ninf (yypact[yystate]);
 yyisDefaultedState (yyStateNum yystate)
 {
   return yyis_pact_ninf (yypact[yystate]);


@@ -730,10 +855,10 @@ yydefaultAction (yyStateNum yystate)
   return yydefact[yystate];
 }
 
   return yydefact[yystate];
 }
 

-#define yyis_table_ninf(yyindex) \
+#define yyis_table_ninf(yytable_value) \

   ]m4_if(m4_eval(b4_table_ninf < b4_table_min), 1,
         0,
   ]m4_if(m4_eval(b4_table_ninf < b4_table_min), 1,
         0,

-        ((yyindex) == YYTABLE_NINF))[
+        ((yytable_value) == YYTABLE_NINF))[

 
 /** Set *YYACTION to the action to take in YYSTATE on seeing YYTOKEN.
  *  Result R means
 
 /** Set *YYACTION to the action to take in YYSTATE on seeing YYTOKEN.
  *  Result R means


@@ -745,7 +870,7 @@ yydefaultAction (yyStateNum yystate)
  */
 static inline void
 yygetLRActions (yyStateNum yystate, int yytoken,
  */
 static inline void
 yygetLRActions (yyStateNum yystate, int yytoken,

-               int* yyaction, const short** yyconflicts)
+               int* yyaction, const short int** yyconflicts)

 {
   int yyindex = yypact[yystate] + yytoken;
   if (yyindex < 0 || YYLAST < yyindex || yycheck[yyindex] != yytoken)
 {
   int yyindex = yypact[yystate] + yytoken;
   if (yyindex < 0 || YYLAST < yyindex || yycheck[yyindex] != yytoken)


@@ -753,7 +878,7 @@ yygetLRActions (yyStateNum yystate, int yytoken,
       *yyaction = -yydefact[yystate];
       *yyconflicts = yyconfl;
     }
       *yyaction = -yydefact[yystate];
       *yyconflicts = yyconfl;
     }

-  else if (! yyis_table_ninf (yyindex))
+  else if (! yyis_table_ninf (yytable[yyindex]))

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


@@ -776,13 +901,13 @@ yyLRgotoState (yyStateNum yystate, yySymbol yylhs)
     return yydefgoto[yylhs - YYNTOKENS];
 }
 
     return yydefgoto[yylhs - YYNTOKENS];
 }
 

-static inline bool
+static inline yybool

 yyisShiftAction (int yyaction)
 {
   return 0 < yyaction;
 }
 
 yyisShiftAction (int yyaction)
 {
   return 0 < yyaction;
 }
 

-static inline bool
+static inline yybool

 yyisErrorAction (int yyaction)
 {
   return yyaction == 0;
 yyisErrorAction (int yyaction)
 {
   return yyaction == 0;


@@ -790,14 +915,6 @@ yyisErrorAction (int yyaction)
 
                                /* GLRStates */
 
 
                                /* GLRStates */
 

-/** True iff the semantic value of the edge leading to STATE is
- *  resolved. */
-static inline bool
-yyhasResolvedValue (yyGLRState* yystate)
-{
-  return yystate->yyresolved;
-}
-

 static void
 yyaddDeferredAction (yyGLRStack* yystack, yyGLRState* yystate,
                     yyGLRState* rhs, yyRuleNum yyrule]b4_pure_formals[)
 static void
 yyaddDeferredAction (yyGLRStack* yystack, yyGLRState* yystate,
                     yyGLRState* rhs, yyRuleNum yyrule]b4_pure_formals[)


@@ -818,23 +935,26 @@ yyaddDeferredAction (yyGLRStack* yystack, yyGLRState* yystate,
                                /* GLRStacks */
 
 /** Initialize SET to a singleton set containing an empty stack. */
                                /* GLRStacks */
 
 /** Initialize SET to a singleton set containing an empty stack. */

-static void
+static yybool

 yyinitStateSet (yyGLRStateSet* yyset)
 {
   yyset->yysize = 1;
   yyset->yycapacity = 16;
 yyinitStateSet (yyGLRStateSet* yyset)
 {
   yyset->yysize = 1;
   yyset->yycapacity = 16;

-  yyset->yystates = (yyGLRState**) malloc (16 * sizeof (yyset->yystates[0]));
+  yyset->yystates = (yyGLRState**) YYMALLOC (16 * sizeof yyset->yystates[0]);
+  if (! yyset->yystates)
+    return yyfalse;

   yyset->yystates[0] = NULL;
   yyset->yystates[0] = NULL;

+  return yytrue;

 }
 
 static void yyfreeStateSet (yyGLRStateSet* yyset)
 {
 }
 
 static void yyfreeStateSet (yyGLRStateSet* yyset)
 {

-  free (yyset->yystates);
+  YYFREE (yyset->yystates);

 }
 
 /** Initialize STACK to a single empty stack, with total maximum
  *  capacity for all stacks of SIZE. */
 }
 
 /** Initialize STACK to a single empty stack, with total maximum
  *  capacity for all stacks of SIZE. */

-static void
+static yybool

 yyinitGLRStack (yyGLRStack* yystack, size_t yysize)
 {
   yystack->yyerrflag = 0;
 yyinitGLRStack (yyGLRStack* yystack, size_t yysize)
 {
   yystack->yyerrflag = 0;


@@ -842,10 +962,10 @@ yyinitGLRStack (yyGLRStack* yystack, size_t yysize)
   yynerrs = 0;
   yystack->yyspaceLeft = yysize;
   yystack->yynextFree = yystack->yyitems =
   yynerrs = 0;
   yystack->yyspaceLeft = yysize;
   yystack->yynextFree = yystack->yyitems =

-    (yyGLRStackItem*) malloc (yysize * sizeof (yystack->yynextFree[0]));
+    (yyGLRStackItem*) YYMALLOC (yysize * sizeof yystack->yynextFree[0]);

   yystack->yysplitPoint = NULL;
   yystack->yylastDeleted = NULL;
   yystack->yysplitPoint = NULL;
   yystack->yylastDeleted = NULL;

-  yyinitStateSet (&yystack->yytops);
+  return yyinitStateSet (&yystack->yytops) && yystack->yyitems;

 }
 
 #define YYRELOC(YYFROMITEMS,YYTOITEMS,YYX,YYTYPE) \
 }
 
 #define YYRELOC(YYFROMITEMS,YYTOITEMS,YYX,YYTYPE) \


@@ -860,24 +980,25 @@ static void
 yyexpandGLRStack (yyGLRStack* yystack]b4_pure_formals[)
 {
 #if YYSTACKEXPANDABLE
 yyexpandGLRStack (yyGLRStack* yystack]b4_pure_formals[)
 {
 #if YYSTACKEXPANDABLE

-  yyGLRStack yynewStack;
+  yyGLRStackItem* yynewItems;

   yyGLRStackItem* yyp0, *yyp1;
   size_t yysize, yynewSize;
   size_t yyn;
   yysize = yystack->yynextFree - yystack->yyitems;
   if (YYMAXDEPTH <= yysize)
   yyGLRStackItem* yyp0, *yyp1;
   size_t yysize, yynewSize;
   size_t yyn;
   yysize = yystack->yynextFree - yystack->yyitems;
   if (YYMAXDEPTH <= yysize)

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

   yynewSize = 2*yysize;
   if (YYMAXDEPTH < yynewSize)
     yynewSize = YYMAXDEPTH;
   yynewSize = 2*yysize;
   if (YYMAXDEPTH < yynewSize)
     yynewSize = YYMAXDEPTH;

-  yyinitGLRStack (&yynewStack, yynewSize);
-  for (yyp0 = yystack->yyitems, yyp1 = yynewStack.yyitems, yyn = yysize;
+  yynewItems = (yyGLRStackItem*) YYMALLOC (yynewSize * sizeof yynewItems[0]);
+  if (! yynewItems)
+    yyStackOverflow (yystack]b4_pure_args[);
+  for (yyp0 = yystack->yyitems, yyp1 = yynewItems, yyn = yysize;

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

-      if (*(bool*) yyp0)
+      if (*(yybool *) yyp0)

        {
          yyGLRState* yys0 = &yyp0->yystate;
          yyGLRState* yys1 = &yyp1->yystate;
        {
          yyGLRState* yys0 = &yyp0->yystate;
          yyGLRState* yys1 = &yyp1->yystate;


@@ -899,30 +1020,29 @@ yyexpandGLRStack (yyGLRStack* yystack]b4_pure_formals[)
        }
     }
   if (yystack->yysplitPoint != NULL)
        }
     }
   if (yystack->yysplitPoint != NULL)

-    yystack->yysplitPoint = YYRELOC (yystack->yyitems, yynewStack.yyitems,
+    yystack->yysplitPoint = YYRELOC (yystack->yyitems, yynewItems,

                                 yystack->yysplitPoint, yystate);
 
   for (yyn = 0; yyn < yystack->yytops.yysize; yyn += 1)
     if (yystack->yytops.yystates[yyn] != NULL)
       yystack->yytops.yystates[yyn] =
                                 yystack->yysplitPoint, yystate);
 
   for (yyn = 0; yyn < yystack->yytops.yysize; yyn += 1)
     if (yystack->yytops.yystates[yyn] != NULL)
       yystack->yytops.yystates[yyn] =

-       YYRELOC (yystack->yyitems, yynewStack.yyitems,
+       YYRELOC (yystack->yyitems, yynewItems,

                 yystack->yytops.yystates[yyn], yystate);
                 yystack->yytops.yystates[yyn], yystate);

-  free (yystack->yyitems);
-  yystack->yyitems = yynewStack.yyitems;
-  yystack->yynextFree = yynewStack.yynextFree + yysize;
-  yystack->yyspaceLeft = yynewStack.yyspaceLeft - yysize;
+  YYFREE (yystack->yyitems);
+  yystack->yyitems = yynewItems;
+  yystack->yynextFree = yynewItems + yysize;
+  yystack->yyspaceLeft = yynewSize - yysize;

 
 #else
 
 
 #else
 

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

 #endif
 }
 
 static void
 yyfreeGLRStack (yyGLRStack* yystack)
 {
 #endif
 }
 
 static void
 yyfreeGLRStack (yyGLRStack* yystack)
 {

-  free (yystack->yyitems);
+  YYFREE (yystack->yyitems);

   yyfreeStateSet (&yystack->yytops);
 }
 
   yyfreeStateSet (&yystack->yytops);
 }
 


@@ -938,7 +1058,7 @@ yyupdateSplit (yyGLRStack* yystack, yyGLRState* yys)
 
 /** Invalidate stack #K in STACK. */
 static inline void
 
 /** Invalidate stack #K in STACK. */
 static inline void

-yymarkStackDeleted (yyGLRStack* yystack, int yyk)
+yymarkStackDeleted (yyGLRStack* yystack, size_t yyk)

 {
   if (yystack->yytops.yystates[yyk] != NULL)
     yystack->yylastDeleted = yystack->yytops.yystates[yyk];
 {
   if (yystack->yytops.yystates[yyk] != NULL)
     yystack->yylastDeleted = yystack->yytops.yystates[yyk];


@@ -969,14 +1089,19 @@ yyremoveDeletes (yyGLRStack* yystack)
       if (yystack->yytops.yystates[yyi] == NULL)
        {
          if (yyi == yyj)
       if (yystack->yytops.yystates[yyi] == NULL)
        {
          if (yyi == yyj)

-           YYDPRINTF ((stderr, "Removing dead stacks.\n"));
+           {
+             YYDPRINTF ((stderr, "Removing dead stacks.\n"));
+           }

          yystack->yytops.yysize -= 1;
        }
       else
        {
          yystack->yytops.yystates[yyj] = yystack->yytops.yystates[yyi];
          if (yyj != yyi)
          yystack->yytops.yysize -= 1;
        }
       else
        {
          yystack->yytops.yystates[yyj] = yystack->yytops.yystates[yyi];
          if (yyj != yyi)

-           YYDPRINTF ((stderr, "Rename stack %d -> %d.\n", yyi, yyj));
+           {
+             YYDPRINTF ((stderr, "Rename stack %lu -> %lu.\n",
+                         (unsigned long int) yyi, (unsigned long int) yyj));
+           }

          yyj += 1;
        }
       yyi += 1;
          yyj += 1;
        }
       yyi += 1;


@@ -986,7 +1111,8 @@ yyremoveDeletes (yyGLRStack* yystack)
 /** Shift to a new state on stack #K of STACK, corresponding to LR state
  * LRSTATE, at input position POSN, with (resolved) semantic value SVAL. */
 static inline void
 /** Shift to a new state on stack #K of STACK, corresponding to LR state
  * LRSTATE, at input position POSN, with (resolved) semantic value SVAL. */
 static inline void

-yyglrShift (yyGLRStack* yystack, int yyk, yyStateNum yylrState, size_t yyposn,
+yyglrShift (yyGLRStack* yystack, size_t yyk, yyStateNum yylrState,
+           size_t yyposn,

            YYSTYPE yysval, YYLTYPE* yylocp]b4_user_formals[)
 {
   yyGLRStackItem* yynewItem;
            YYSTYPE yysval, YYLTYPE* yylocp]b4_user_formals[)
 {
   yyGLRStackItem* yynewItem;


@@ -1006,11 +1132,11 @@ yyglrShift (yyGLRStack* yystack, int yyk, yyStateNum yylrState, size_t yyposn,
     yyexpandGLRStack (yystack]b4_pure_args[);
 }
 
     yyexpandGLRStack (yystack]b4_pure_args[);
 }
 

-/** Shift to a new state on stack #K of STACK, to a new state
- *  corresponding to LR state LRSTATE, at input position POSN, with
- * the (unresolved) semantic value of RHS under the action for RULE. */
+/** Shift stack #K of YYSTACK, to a new state corresponding to LR
+ *  state YYLRSTATE, at input position YYPOSN, with the (unresolved)
+ *  semantic value of YYRHS under the action for YYRULE. */

 static inline void
 static inline void

-yyglrShiftDefer (yyGLRStack* yystack, int yyk, yyStateNum yylrState,
+yyglrShiftDefer (yyGLRStack* yystack, size_t yyk, yyStateNum yylrState,

                 size_t yyposn, yyGLRState* rhs, yyRuleNum yyrule]b4_pure_formals[)
 {
   yyGLRStackItem* yynewItem;
                 size_t yyposn, yyGLRState* rhs, yyRuleNum yyrule]b4_pure_formals[)
 {
   yyGLRStackItem* yynewItem;


@@ -1035,8 +1161,8 @@ yyglrShiftDefer (yyGLRStack* yystack, int yyk, yyStateNum yylrState,
  *  and *LOCP to the computed location (if any).  Return value is as
  *  for userAction. */
 static inline YYRESULTTAG
  *  and *LOCP to the computed location (if any).  Return value is as
  *  for userAction. */
 static inline YYRESULTTAG

-yydoAction (yyGLRStack* yystack, int yyk, yyRuleNum yyrule,
-           YYSTYPE* yyvalp, YYLTYPE* yylocp]b4_user_formals[)
+yydoAction (yyGLRStack* yystack, size_t yyk, yyRuleNum yyrule,
+           YYSTYPE* yyvalp, YYLTYPE* yylocp]b4_user_formals[)

 {
   int yynrhs = yyrhsLength (yyrule);
 
 {
   int yynrhs = yyrhsLength (yyrule);
 


@@ -1044,20 +1170,10 @@ yydoAction (yyGLRStack* yystack, int yyk, yyRuleNum yyrule,
     {
       /* Standard special case: single stack. */
       yyGLRStackItem* rhs = (yyGLRStackItem*) yystack->yytops.yystates[yyk];
     {
       /* Standard special case: single stack. */
       yyGLRStackItem* rhs = (yyGLRStackItem*) yystack->yytops.yystates[yyk];

-      assert (yyk == 0);
+      YYASSERT (yyk == 0);

       yystack->yynextFree -= yynrhs;
       yystack->yyspaceLeft += yynrhs;
       yystack->yytops.yystates[0] = & yystack->yynextFree[-1].yystate;
       yystack->yynextFree -= yynrhs;
       yystack->yyspaceLeft += yynrhs;
       yystack->yytops.yystates[0] = & yystack->yynextFree[-1].yystate;

-      if (yynrhs == 0)
-       {
-         *yyvalp = yyval_default;
-         *yylocp = yyloc_default;
-       }
-      else
-       {
-         *yyvalp = rhs[1-yynrhs].yystate.yysemantics.yysval;
-         *yylocp = rhs[1-yynrhs].yystate.yyloc;
-       }

       return yyuserAction (yyrule, yynrhs, rhs,
                           yyvalp, yylocp, yystack]b4_user_args[);
     }
       return yyuserAction (yyrule, yynrhs, rhs,
                           yyvalp, yylocp, yystack]b4_user_args[);
     }


@@ -1065,28 +1181,17 @@ yydoAction (yyGLRStack* yystack, int yyk, yyRuleNum yyrule,
     {
       int yyi;
       yyGLRState* yys;
     {
       int yyi;
       yyGLRState* yys;

-      yyGLRStackItem yyrhsVals[YYMAXRHS];
-      for (yyi = yynrhs-1, yys = yystack->yytops.yystates[yyk]; 0 <= yyi;
-          yyi -= 1, yys = yys->yypred)
+      yyGLRStackItem yyrhsVals[YYMAXRHS + YYMAXLEFT + 1];
+      yys = yyrhsVals[YYMAXRHS + YYMAXLEFT].yystate.yypred
+       = yystack->yytops.yystates[yyk];
+      for (yyi = 0; yyi < yynrhs; yyi += 1)

        {
        {

-         assert (yys->yypred != NULL);
-         yyrhsVals[yyi].yystate.yyresolved = yytrue;
-         yyrhsVals[yyi].yystate.yysemantics.yysval = yys->yysemantics.yysval;
-         yyrhsVals[yyi].yystate.yyloc = yys->yyloc;
+         yys = yys->yypred;
+         YYASSERT (yys);

        }
       yyupdateSplit (yystack, yys);
       yystack->yytops.yystates[yyk] = yys;
        }
       yyupdateSplit (yystack, yys);
       yystack->yytops.yystates[yyk] = yys;

-      if (yynrhs == 0)
-       {
-         *yyvalp = yyval_default;
-         *yylocp = yyloc_default;
-       }
-      else
-       {
-         *yyvalp = yyrhsVals[0].yystate.yysemantics.yysval;
-         *yylocp = yyrhsVals[0].yystate.yyloc;
-       }
-      return yyuserAction (yyrule, yynrhs, yyrhsVals + (yynrhs-1),
+      return yyuserAction (yyrule, yynrhs, yyrhsVals + YYMAXRHS + YYMAXLEFT - 1,

                           yyvalp, yylocp, yystack]b4_user_args[);
     }
 }
                           yyvalp, yylocp, yystack]b4_user_args[);
     }
 }


@@ -1108,8 +1213,9 @@ static inline void
 yy_reduce_print (size_t yyk, yyRuleNum yyrule)
 {
   int yyi;
 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]));
+  YYFPRINTF (stderr, "Reducing stack %lu by rule %d (line %lu), ",
+            (unsigned long int) yyk, yyrule - 1,
+            (unsigned long int) yyrline[yyrule]);

   /* Print the symbols being reduced, and their result.  */
   for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
     YYFPRINTF (stderr, "%s ", yytokenName (yyrhs[yyi]));
   /* Print the symbols being reduced, and their result.  */
   for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
     YYFPRINTF (stderr, "%s ", yytokenName (yyrhs[yyi]));


@@ -1130,7 +1236,7 @@ yy_reduce_print (size_t 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]b4_pure_formals[)
+             yybool yyforceEval]b4_pure_formals[)

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


@@ -1145,8 +1251,6 @@ yyglrReduce (yyGLRStack* yystack, size_t yyk, yyRuleNum yyrule,
                  yyLRgotoState (yystack->yytops.yystates[yyk]->yylrState,
                                 yylhsNonterm (yyrule)),
                  yyposn, yysval, &yyloc]b4_user_args[);
                  yyLRgotoState (yystack->yytops.yystates[yyk]->yylrState,
                                 yylhsNonterm (yyrule)),
                  yyposn, yysval, &yyloc]b4_user_args[);

-      YYDPRINTF ((stderr, "Stack %d entering state %d\n",
-                 yyk, yystack->yytops.yystates[yyk]->yylrState));

     }
   else
     {
     }
   else
     {


@@ -1159,14 +1263,13 @@ yyglrReduce (yyGLRStack* yystack, size_t yyk, yyRuleNum yyrule,
           0 < yyn; yyn -= 1)
        {
          yys = yys->yypred;
           0 < yyn; yyn -= 1)
        {
          yys = yys->yypred;

-         assert (yys != NULL);
+         YYASSERT (yys);

        }
       yyupdateSplit (yystack, yys);
       yynewLRState = yyLRgotoState (yys->yylrState, yylhsNonterm (yyrule));
       YYDPRINTF ((stderr,
        }
       yyupdateSplit (yystack, yys);
       yynewLRState = yyLRgotoState (yys->yylrState, yylhsNonterm (yyrule));
       YYDPRINTF ((stderr,

-                 "Reduced stack %d by rule #%d; action deferred. "
-                 "Now in state %d.\n",
-                 yyk, yyrule-1, yynewLRState));
+                 "Reduced stack %lu by rule #%d; action deferred. Now in state %d.\n",
+                 (unsigned long int) yyk, yyrule - 1, yynewLRState));

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


@@ -1178,8 +1281,9 @@ yyglrReduce (yyGLRStack* yystack, size_t yyk, yyRuleNum yyrule,
                  {
                    yyaddDeferredAction (yystack, yyp, yys0, yyrule]b4_pure_args[);
                    yymarkStackDeleted (yystack, yyk);
                  {
                    yyaddDeferredAction (yystack, yyp, yys0, yyrule]b4_pure_args[);
                    yymarkStackDeleted (yystack, yyk);

-                   YYDPRINTF ((stderr, "Merging stack %d into stack %d.\n",
-                               yyk, yyi));
+                   YYDPRINTF ((stderr, "Merging stack %lu into stack %lu.\n",
+                               (unsigned long int) yyk,
+                               (unsigned long int) yyi));

                    return yyok;
                  }
                yyp = yyp->yypred;
                    return yyok;
                  }
                yyp = yyp->yypred;


@@ -1191,21 +1295,25 @@ yyglrReduce (yyGLRStack* yystack, size_t yyk, yyRuleNum yyrule,
   return yyok;
 }
 
   return yyok;
 }
 

-static int
-yysplitStack (yyGLRStack* yystack, int yyk)
+static size_t
+yysplitStack (yyGLRStack* yystack, size_t yyk]b4_pure_formals[)

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

-      assert (yyk == 0);
+      YYASSERT (yyk == 0);

       yystack->yysplitPoint = yystack->yytops.yystates[yyk];
     }
   if (yystack->yytops.yysize >= yystack->yytops.yycapacity)
     {
       yystack->yysplitPoint = yystack->yytops.yystates[yyk];
     }
   if (yystack->yytops.yysize >= yystack->yytops.yycapacity)
     {

-      yystack->yytops.yycapacity *= 2;
-      yystack->yytops.yystates =
-       (yyGLRState**) realloc (yystack->yytops.yystates,
-                               yystack->yytops.yycapacity
-                               * sizeof (yyGLRState*));
+      yyGLRState** yynewStates;
+      if (! ((yystack->yytops.yycapacity
+             <= (YYSIZEMAX / (2 * sizeof yynewStates[0])))
+            && (yynewStates =
+                (yyGLRState**) YYREALLOC (yystack->yytops.yystates,
+                                          ((yystack->yytops.yycapacity *= 2)
+                                           * sizeof yynewStates[0])))))
+       yyStackOverflow (yystack]b4_pure_args[);
+      yystack->yytops.yystates = yynewStates;

     }
   yystack->yytops.yystates[yystack->yytops.yysize]
     = yystack->yytops.yystates[yyk];
     }
   yystack->yytops.yystates[yystack->yytops.yysize]
     = yystack->yytops.yystates[yyk];


@@ -1216,7 +1324,7 @@ yysplitStack (yyGLRStack* yystack, int yyk)
 /** True iff Y0 and Y1 represent identical options at the top level.
  *  That is, they represent the same rule applied to RHS symbols
  *  that produce the same terminal symbols. */
 /** True iff Y0 and Y1 represent identical options at the top level.
  *  That is, they represent the same rule applied to RHS symbols
  *  that produce the same terminal symbols. */

-static bool
+static yybool

 yyidenticalOptions (yySemanticOption* yyy0, yySemanticOption* yyy1)
 {
   if (yyy0->yyrule == yyy1->yyrule)
 yyidenticalOptions (yySemanticOption* yyy0, yySemanticOption* yyy1)
 {
   if (yyy0->yyrule == yyy1->yyrule)


@@ -1235,9 +1343,8 @@ yyidenticalOptions (yySemanticOption* yyy0, yySemanticOption* yyy1)
     return yyfalse;
 }
 
     return yyfalse;
 }
 

-/** Assuming identicalOptions (Y0,Y1), (destructively) merge the
- *  alternative semantic values for the RHS-symbols of Y1 into the
- *  corresponding semantic value sets of the symbols of Y0. */
+/** Assuming identicalOptions (Y0,Y1), destructively merge the
+ *  alternative semantic values for the RHS-symbols of Y1 and Y0. */

 static void
 yymergeOptionSets (yySemanticOption* yyy0, yySemanticOption* yyy1)
 {
 static void
 yymergeOptionSets (yySemanticOption* yyy0, yySemanticOption* yyy1)
 {


@@ -1247,16 +1354,46 @@ yymergeOptionSets (yySemanticOption* yyy0, yySemanticOption* yyy1)
        yyn = yyrhsLength (yyy0->yyrule);
        yyn > 0;
        yys0 = yys0->yypred, yys1 = yys1->yypred, yyn -= 1)
        yyn = yyrhsLength (yyy0->yyrule);
        yyn > 0;
        yys0 = yys0->yypred, yys1 = yys1->yypred, yyn -= 1)

-    if (yys0 == yys1)
-      break;
-    else if (! yys0->yyresolved && ! yys1->yyresolved)
-      {
-       yySemanticOption* yyz;
-       for (yyz = yys0->yysemantics.yyfirstVal; yyz->yynext != NULL;
-            yyz = yyz->yynext)
-         ;
-       yyz->yynext = yys1->yysemantics.yyfirstVal;
-      }
+    {
+      if (yys0 == yys1)
+       break;
+      else if (yys0->yyresolved)
+       {
+         yys1->yyresolved = yytrue;
+         yys1->yysemantics.yysval = yys0->yysemantics.yysval;
+       }
+      else if (yys1->yyresolved)
+       {
+         yys0->yyresolved = yytrue;
+         yys0->yysemantics.yysval = yys1->yysemantics.yysval;
+       }
+      else
+       {
+         yySemanticOption** yyz0p;
+         yySemanticOption* yyz1;
+         yyz0p = &yys0->yysemantics.yyfirstVal;
+         yyz1 = yys1->yysemantics.yyfirstVal;
+         while (yytrue)
+           {
+             if (yyz1 == *yyz0p || yyz1 == NULL)
+               break;
+             else if (*yyz0p == NULL)
+               {
+                 *yyz0p = yyz1;
+                 break;
+               }
+             else if (*yyz0p < yyz1)
+               {
+                 yySemanticOption* yyz = *yyz0p;
+                 *yyz0p = yyz1;
+                 yyz1 = yyz1->yynext;
+                 (*yyz0p)->yynext = yyz;
+               }
+             yyz0p = &(*yyz0p)->yynext;
+           }
+         yys1->yysemantics.yyfirstVal = yys0->yysemantics.yyfirstVal;
+       }
+    }

 }
 
 /** Y0 and Y1 represent two possible actions to take in a given
 }
 
 /** Y0 and Y1 represent two possible actions to take in a given


@@ -1294,7 +1431,7 @@ yyresolveStates (yyGLRState* yys, int yyn, yyGLRStack* yystack]b4_user_formals[)
   YYRESULTTAG yyflag;
   if (0 < yyn)
     {
   YYRESULTTAG yyflag;
   if (0 < yyn)
     {

-      assert (yys->yypred != NULL);
+      YYASSERT (yys->yypred);

       yyflag = yyresolveStates (yys->yypred, yyn-1, yystack]b4_user_args[);
       if (yyflag != yyok)
        return yyflag;
       yyflag = yyresolveStates (yys->yypred, yyn-1, yystack]b4_user_args[);
       if (yyflag != yyok)
        return yyflag;


@@ -1315,21 +1452,14 @@ static YYRESULTTAG
 yyresolveAction (yySemanticOption* yyopt, yyGLRStack* yystack,
                 YYSTYPE* yyvalp, YYLTYPE* yylocp]b4_user_formals[)
 {
 yyresolveAction (yySemanticOption* yyopt, yyGLRStack* yystack,
                 YYSTYPE* yyvalp, YYLTYPE* yylocp]b4_user_formals[)
 {

-  yyGLRStackItem yyrhsVals[YYMAXRHS];
-  int yynrhs, yyi;
-  yyGLRState* yys;
+  yyGLRStackItem yyrhsVals[YYMAXRHS + YYMAXLEFT + 1];
+  int yynrhs;

 
   yynrhs = yyrhsLength (yyopt->yyrule);
   YYCHK (yyresolveStates (yyopt->yystate, yynrhs, yystack]b4_user_args[));
 
   yynrhs = yyrhsLength (yyopt->yyrule);
   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);
-      yyrhsVals[yyi].yystate.yyresolved = yytrue;
-      yyrhsVals[yyi].yystate.yysemantics.yysval = yys->yysemantics.yysval;
-      yyrhsVals[yyi].yystate.yyloc = yys->yyloc;
-    }
-  return yyuserAction (yyopt->yyrule, yynrhs, yyrhsVals + (yynrhs-1),
+  yyrhsVals[YYMAXRHS + YYMAXLEFT].yystate.yypred = yyopt->yystate;
+  return yyuserAction (yyopt->yyrule, yynrhs,
+                      yyrhsVals + YYMAXRHS + YYMAXLEFT - 1,

                       yyvalp, yylocp, yystack]b4_user_args[);
 }
 
                       yyvalp, yylocp, yystack]b4_user_args[);
 }
 


@@ -1358,9 +1488,10 @@ yyreportTree (yySemanticOption* yyx, int yyindent)
               yyindent, "", yytokenName (yylhsNonterm (yyx->yyrule)),
               yyx->yyrule);
   else
               yyindent, "", yytokenName (yylhsNonterm (yyx->yyrule)),
               yyx->yyrule);
   else

-    YYFPRINTF (stderr, "%*s%s -> <Rule %d, tokens %d .. %d>\n",
+    YYFPRINTF (stderr, "%*s%s -> <Rule %d, tokens %lu .. %lu>\n",

               yyindent, "", yytokenName (yylhsNonterm (yyx->yyrule)),
               yyindent, "", yytokenName (yylhsNonterm (yyx->yyrule)),

-              yyx->yyrule, yys->yyposn+1, yyx->yystate->yyposn);
+              yyx->yyrule, (unsigned long int) (yys->yyposn + 1),
+              (unsigned long int) yyx->yystate->yyposn);

   for (yyi = 1; yyi <= yynrhs; yyi += 1)
     {
       if (yystates[yyi]->yyresolved)
   for (yyi = 1; yyi <= yynrhs; yyi += 1)
     {
       if (yystates[yyi]->yyresolved)


@@ -1369,9 +1500,10 @@ yyreportTree (yySemanticOption* yyx, int yyindent)
            YYFPRINTF (stderr, "%*s%s <empty>\n", yyindent+2, "",
                       yytokenName (yyrhs[yyprhs[yyx->yyrule]+yyi-1]));
          else
            YYFPRINTF (stderr, "%*s%s <empty>\n", yyindent+2, "",
                       yytokenName (yyrhs[yyprhs[yyx->yyrule]+yyi-1]));
          else

-           YYFPRINTF (stderr, "%*s%s <tokens %d .. %d>\n", yyindent+2, "",
+           YYFPRINTF (stderr, "%*s%s <tokens %lu .. %lu>\n", yyindent+2, "",

                       yytokenName (yyrhs[yyprhs[yyx->yyrule]+yyi-1]),
                       yytokenName (yyrhs[yyprhs[yyx->yyrule]+yyi-1]),

-                      yystates[yyi-1]->yyposn+1, yystates[yyi]->yyposn);
+                      (unsigned long int) (yystates[yyi - 1]->yyposn + 1),
+                      (unsigned long int) yystates[yyi]->yyposn);

        }
       else
        yyreportTree (yystates[yyi]->yysemantics.yyfirstVal, yyindent+2);
        }
       else
        yyreportTree (yystates[yyi]->yysemantics.yyfirstVal, yyindent+2);


@@ -1407,10 +1539,10 @@ yyresolveValue (yySemanticOption* yyoptionList, yyGLRStack* yystack,
 {
   yySemanticOption* yybest;
   yySemanticOption* yyp;
 {
   yySemanticOption* yybest;
   yySemanticOption* yyp;

-  int yymerge;
+  yybool yymerge;

 
   yybest = yyoptionList;
 
   yybest = yyoptionList;

-  yymerge = 0;
+  yymerge = yyfalse;

   for (yyp = yyoptionList->yynext; yyp != NULL; yyp = yyp->yynext)
     {
       if (yyidenticalOptions (yybest, yyp))
   for (yyp = yyoptionList->yynext; yyp != NULL; yyp = yyp->yynext)
     {
       if (yyidenticalOptions (yybest, yyp))


@@ -1422,13 +1554,13 @@ yyresolveValue (yySemanticOption* yyoptionList, yyGLRStack* yystack,
            yyreportAmbiguity (yybest, yyp, yystack]b4_pure_args[);
            break;
          case 1:
            yyreportAmbiguity (yybest, yyp, yystack]b4_pure_args[);
            break;
          case 1:

-           yymerge = 1;
+           yymerge = yytrue;

            break;
          case 2:
            break;
          case 3:
            yybest = yyp;
            break;
          case 2:
            break;
          case 3:
            yybest = yyp;

-           yymerge = 0;
+           yymerge = yyfalse;

            break;
          }
     }
            break;
          }
     }


@@ -1444,7 +1576,7 @@ yyresolveValue (yySemanticOption* yyoptionList, yyGLRStack* yystack,
              YYSTYPE yyval1;
              YYLTYPE yydummy;
              YYCHK (yyresolveAction (yyp, yystack, &yyval1, &yydummy]b4_user_args[));
              YYSTYPE yyval1;
              YYLTYPE yydummy;
              YYCHK (yyresolveAction (yyp, yystack, &yyval1, &yydummy]b4_user_args[));

-             *yyvalp = yyuserMerge (yymerger[yyp->yyrule], yyvalp, &yyval1);
+             yyuserMerge (yymerger[yyp->yyrule], yyvalp, &yyval1);

            }
        }
       return yyok;
            }
        }
       return yyok;


@@ -1464,7 +1596,7 @@ yyresolveStack (yyGLRStack* yystack]b4_user_formals[)
       for (yyn = 0, yys = yystack->yytops.yystates[0];
           yys != yystack->yysplitPoint;
           yys = yys->yypred, yyn += 1)
       for (yyn = 0, yys = yystack->yytops.yystates[0];
           yys != yystack->yysplitPoint;
           yys = yys->yypred, yyn += 1)

-       ;
+       continue;

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


@@ -1502,26 +1634,30 @@ yycompressStack (yyGLRStack* yystack)
 }
 
 static YYRESULTTAG
 }
 
 static YYRESULTTAG

-yyprocessOneStack (yyGLRStack* yystack, int yyk,
+yyprocessOneStack (yyGLRStack* yystack, size_t yyk,

                   size_t yyposn, YYSTYPE* yylvalp, YYLTYPE* yyllocp
                   size_t yyposn, YYSTYPE* yylvalp, YYLTYPE* yyllocp

-                 ]b4_user_formals[)
+                 ]b4_pure_formals[)

 {
   int yyaction;
 {
   int yyaction;

-  const short* yyconflicts;
+  const short int* yyconflicts;

   yyRuleNum yyrule;
   yySymbol* const yytokenp = yystack->yytokenp;
 
   while (yystack->yytops.yystates[yyk] != NULL)
     {
       yyStateNum yystate = yystack->yytops.yystates[yyk]->yylrState;
   yyRuleNum yyrule;
   yySymbol* const yytokenp = yystack->yytokenp;
 
   while (yystack->yytops.yystates[yyk] != NULL)
     {
       yyStateNum yystate = yystack->yytops.yystates[yyk]->yylrState;

+      YYDPRINTF ((stderr, "Stack %lu Entering state %d\n",
+                 (unsigned long int) yyk, yystate));
+
+      YYASSERT (yystate != YYFINAL);

 
 

-      assert (yystate != YYFINAL);

       if (yyisDefaultedState (yystate))
        {
          yyrule = yydefaultAction (yystate);
          if (yyrule == 0)
            {
       if (yyisDefaultedState (yystate))
        {
          yyrule = yydefaultAction (yystate);
          if (yyrule == 0)
            {

-             YYDPRINTF ((stderr, "Stack %d dies.\n", yyk));
+             YYDPRINTF ((stderr, "Stack %lu dies.\n",
+                         (unsigned long int) yyk));

              yymarkStackDeleted (yystack, yyk);
              return yyok;
            }
              yymarkStackDeleted (yystack, yyk);
              return yyok;
            }


@@ -1534,35 +1670,38 @@ yyprocessOneStack (yyGLRStack* yystack, int yyk,
              YYDPRINTF ((stderr, "Reading a token: "));
              yychar = YYLEX;
              *yytokenp = YYTRANSLATE (yychar);
              YYDPRINTF ((stderr, "Reading a token: "));
              yychar = YYLEX;
              *yytokenp = YYTRANSLATE (yychar);

-             YYDSYMPRINTF ("Next token is", *yytokenp, yylvalp, yyllocp);
+             YY_SYMBOL_PRINT ("Next token is", *yytokenp, yylvalp, yyllocp);
+             YYDPRINTF ((stderr, "\n"));

            }
          yygetLRActions (yystate, *yytokenp, &yyaction, &yyconflicts);
 
          while (*yyconflicts != 0)
            {
            }
          yygetLRActions (yystate, *yytokenp, &yyaction, &yyconflicts);
 
          while (*yyconflicts != 0)
            {

-             int yynewStack = yysplitStack (yystack, yyk);
-             YYDPRINTF ((stderr, "Splitting off stack %d from %d.\n",
-                         yynewStack, yyk));
+             size_t yynewStack = yysplitStack (yystack, yyk]b4_pure_args[);
+             YYDPRINTF ((stderr, "Splitting off stack %lu from %lu.\n",
+                         (unsigned long int) yynewStack,
+                         (unsigned long int) yyk));

              YYCHK (yyglrReduce (yystack, yynewStack,
                                  *yyconflicts, yyfalse]b4_lpure_args[));
              YYCHK (yyprocessOneStack (yystack, yynewStack, yyposn,
              YYCHK (yyglrReduce (yystack, yynewStack,
                                  *yyconflicts, yyfalse]b4_lpure_args[));
              YYCHK (yyprocessOneStack (yystack, yynewStack, yyposn,

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

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

-             YYDPRINTF ((stderr, "Shifting token %s on stack %d, ",
-                         yytokenName (*yytokenp), yyk));
+             YYDPRINTF ((stderr, "On stack %lu, ", (unsigned long int) yyk));
+             YY_SYMBOL_PRINT ("shifting", *yytokenp, yylvalp, yyllocp);

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

-             YYDPRINTF ((stderr, "which is now in state #%d\n",
+             YYDPRINTF ((stderr, ", now in state #%d\n",

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

-             YYDPRINTF ((stderr, "Stack %d dies.\n", yyk));
+             YYDPRINTF ((stderr, "Stack %lu dies.\n",
+                         (unsigned long int) yyk));

              yymarkStackDeleted (yystack, yyk);
              break;
            }
              yymarkStackDeleted (yystack, yyk);
              break;
            }


@@ -1574,8 +1713,8 @@ yyprocessOneStack (yyGLRStack* yystack, int yyk,
 }
 
 static void
 }
 
 static void

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

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


@@ -1585,78 +1724,124 @@ yyreportParseError (yyGLRStack* yystack,
     {
 #if YYERROR_VERBOSE
       yySymbol* const yytokenp = yystack->yytokenp;
     {
 #if YYERROR_VERBOSE
       yySymbol* const yytokenp = yystack->yytokenp;

-      int yyn, yyx, yycount;
-      size_t yysize;
-      const char* yyprefix;
-      char* yyp;
-      char* yymsg;
+      int yyn;

       yyn = yypact[yystack->yytops.yystates[0]->yylrState];
       if (YYPACT_NINF < yyn && yyn < YYLAST)
        {
       yyn = yypact[yystack->yytops.yystates[0]->yylrState];
       if (YYPACT_NINF < yyn && yyn < YYLAST)
        {

-         yycount = 0;
+         size_t yysize0 = strlen (yytokenName (*yytokenp));
+         size_t yysize = yysize0;
+         size_t yysize1;
+         yybool yysize_overflow = yyfalse;
+         char* yymsg = NULL;
+         enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+         char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+         int yyx;
+         char *yyfmt;
+         char const *yyf;
+         static char const yyunexpected[] = "syntax error, unexpected %s";
+         static char const yyexpecting[] = ", expecting %s";
+         static char const yyor[] = " or %s";
+         char yyformat[sizeof yyunexpected
+                       + sizeof yyexpecting - 1
+                       + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+                          * (sizeof yyor - 1))];
+         char const *yyprefix = yyexpecting;
+

          /* Start YYX at -YYN if negative to avoid negative indexes in
             YYCHECK.  */
          /* Start YYX at -YYN if negative to avoid negative indexes in
             YYCHECK.  */

-         yysize = sizeof ("parse error, unexpected ")
-           + strlen (yytokenName (*yytokenp));
-         yyprefix = ", expecting ";
-         for (yyx = yyn < 0 ? -yyn : 0; yyx < yytname_size && yycount <= 5;
-              yyx += 1)
+         int yyxbegin = yyn < 0 ? -yyn : 0;
+
+         /* Stay within bounds of both yycheck and yytname.  */
+         int yychecklim = YYLAST - yyn;
+         int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+         int yycount = 1;
+
+         yyarg[0] = yytokenName (*yytokenp);
+         yyfmt = yystpcpy (yyformat, yyunexpected);
+
+         for (yyx = yyxbegin; yyx < yyxend; ++yyx)

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

-             yysize += strlen (yytokenName (yyx)) + strlen (yyprefix),
-               yycount += 1, yyprefix = " or ";
-         yymsg = yyp = (char*) malloc (yysize);
-         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 (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+             {
+               if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)

                  {
                  {

-                   sprintf (yyp, "%s%s", yyprefix, yytokenName (yyx));
-                   yyp += strlen (yyp);
-                   yyprefix = " or ";
+                   yycount = 1;
+                   yysize = yysize0;
+                   yyformat[sizeof yyunexpected - 1] = '\0';
+                   break;

                  }
                  }

+               yyarg[yycount++] = yytokenName (yyx);
+               yysize1 = yysize + strlen (yytokenName (yyx));
+               yysize_overflow |= yysize1 < yysize;
+               yysize = yysize1;
+               yyfmt = yystpcpy (yyfmt, yyprefix);
+               yyprefix = yyor;
+             }
+
+         yyf = yyformat;
+         yysize1 = yysize + (yyfmt - yyformat);
+         yysize_overflow |= yysize1 < yysize;
+         yysize = yysize1;
+
+         if (!yysize_overflow)
+           yymsg = (char *) YYMALLOC (yysize);
+
+         if (yymsg)
+           {
+             char *yyp = yymsg;
+             int yyi = 0;
+             while ((*yyp = *yyf))
+               {
+                 if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+                   {
+                     yyp = yystpcpy (yyp, yyarg[yyi++]);
+                     yyf += 2;
+                   }
+                 else
+                   {
+                     yyp++;
+                     yyf++;
+                   }
+               }
+             yyerror (]b4_lyyerror_args[yymsg);
+             YYFREE (yymsg);

            }
            }

-         yyerror (]b4_lyyerror_args[yymsg);
-         free (yymsg);
+         else
+           yyerror (]b4_lyyerror_args["syntax error; also virtual memory exhausted");

        }
       else
        }
       else

-#endif
-       yyerror (]b4_lyyerror_args["parse error");
+#endif /* YYERROR_VERBOSE */
+       yyerror (]b4_lyyerror_args["syntax error");

       yynerrs += 1;
     }
 }
 
 /* Recover from a syntax error on YYSTACK, assuming that YYTOKENP,
    YYLVALP, and YYLLOCP point to the syntactic category, semantic
       yynerrs += 1;
     }
 }
 
 /* Recover from a syntax error on YYSTACK, assuming that YYTOKENP,
    YYLVALP, and YYLLOCP point to the syntactic category, semantic

-   value, and location of the lookahead.  */
+   value, and location of the look-ahead.  */

 static void
 static void

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

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

-  if (yystack->yyerrState == 0)
-    yystack->yyerrState = 3;
-  else if (yystack->yyerrState == 3)
+  if (yystack->yyerrState == 3)

     /* We just shifted the error token and (perhaps) took some
        reductions.  Skip tokens until we can proceed.  */
     while (yytrue)
       {
        if (*yytokenp == YYEOF)
          {
     /* We just shifted the error token and (perhaps) took some
        reductions.  Skip tokens until we can proceed.  */
     while (yytrue)
       {
        if (*yytokenp == YYEOF)
          {

-           /* Now pop stack until we find a state that shifts the
-              error token.  */
+           /* Now pop stack until empty and fail. */

            while (yystack->yytops.yystates[0] != NULL)
              {
                yyGLRState *yys = yystack->yytops.yystates[0];
            while (yystack->yytops.yystates[0] != NULL)
              {
                yyGLRState *yys = yystack->yytops.yystates[0];

-               YYDSYMPRINTF ("Error: popping",
-                             yystos[yys->yylrState],
-                             &yys->yysemantics.yysval, &yys->yyloc);
-               yydestruct (yystos[yys->yylrState],
+]b4_location_if([[             yystack->yyerror_range[1].yystate.yyloc = yys->yyloc;]])[
+               yydestruct ("Error: popping",
+                            yystos[yys->yylrState],

                            &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
                yystack->yytops.yystates[0] = yys->yypred;
                yystack->yynextFree -= 1;
                            &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
                yystack->yytops.yystates[0] = yys->yypred;
                yystack->yynextFree -= 1;


@@ -1665,18 +1850,25 @@ yyrecoverParseError (yyGLRStack* yystack,
            yyFail (yystack][]b4_lpure_args[, NULL);
          }
        if (*yytokenp != YYEMPTY)
            yyFail (yystack][]b4_lpure_args[, NULL);
          }
        if (*yytokenp != YYEMPTY)

-         {
-           YYDSYMPRINTF ("Error: discarding", *yytokenp, yylvalp, yyllocp);
-           yydestruct (*yytokenp, yylvalp]b4_location_if([, yyllocp])[);
+         {]b4_location_if([[
+           /* We throw away the lookahead, but the error range
+              of the shifted error token must take it into account. */
+           yyGLRState *yys = yystack->yytops.yystates[0];
+           yyGLRStackItem yyerror_range[3];
+           yyerror_range[1].yystate.yyloc = yys->yyloc;
+           yyerror_range[2].yystate.yyloc = *yyllocp;
+           YYLLOC_DEFAULT (yys->yyloc, yyerror_range, 2);]])[
+           yydestruct ("Error: discarding",
+                       *yytokenp, yylvalp]b4_location_if([, yyllocp])[);

          }
        YYDPRINTF ((stderr, "Reading a token: "));
        yychar = YYLEX;
        *yytokenp = YYTRANSLATE (yychar);
          }
        YYDPRINTF ((stderr, "Reading a token: "));
        yychar = YYLEX;
        *yytokenp = YYTRANSLATE (yychar);

-       YYDSYMPRINTF ("Next token is", *yytokenp, yylvalp, yyllocp);
+       YY_SYMBOL_PRINT ("Next token is", *yytokenp, yylvalp, yyllocp);
+       YYDPRINTF ((stderr, "\n"));

        yyj = yypact[yystack->yytops.yystates[0]->yylrState];
        if (yyis_pact_ninf (yyj))
        yyj = yypact[yystack->yytops.yystates[0]->yylrState];
        if (yyis_pact_ninf (yyj))

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

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


@@ -1699,6 +1891,7 @@ yyrecoverParseError (yyGLRStack* yystack,
   yycompressStack (yystack);
 
   /* Now pop stack until we find a state that shifts the error token. */
   yycompressStack (yystack);
 
   /* Now pop stack until we find a state that shifts the error token. */

+  yystack->yyerrState = 3;

   while (yystack->yytops.yystates[0] != NULL)
     {
       yyGLRState *yys = yystack->yytops.yystates[0];
   while (yystack->yytops.yystates[0] != NULL)
     {
       yyGLRState *yys = yystack->yytops.yystates[0];


@@ -1709,19 +1902,23 @@ yyrecoverParseError (yyGLRStack* yystack,
          if (0 <= yyj && yyj <= YYLAST && yycheck[yyj] == YYTERROR
              && yyisShiftAction (yytable[yyj]))
            {
          if (0 <= yyj && yyj <= YYLAST && yycheck[yyj] == YYTERROR
              && yyisShiftAction (yytable[yyj]))
            {

-             YYDPRINTF ((stderr, "Shifting error token, "));
+             /* Shift the error token having adjusted its location.  */
+             YYLTYPE yyerrloc;]b4_location_if([[
+             yystack->yyerror_range[2].yystate.yyloc = *yyllocp;
+             YYLLOC_DEFAULT (yyerrloc, yystack->yyerror_range, 2);]])[
+             YY_SYMBOL_PRINT ("Shifting", yystos[yytable[yyj]],
+                              yylvalp, &yyerrloc);
+             YYDPRINTF ((stderr, "\n"));

              yyglrShift (yystack, 0, yytable[yyj],
              yyglrShift (yystack, 0, yytable[yyj],

-                         yys->yyposn, *yylvalp, yyllocp]b4_user_args[);
-             YYDPRINTF ((stderr, "Entering state %d\n",
-                         yystack->yytops.yystates[0]->yylrState));
+                         yys->yyposn, *yylvalp, &yyerrloc]b4_user_args[);
+             yys = yystack->yytops.yystates[0];

              break;
            }
        }
              break;
            }
        }

-      YYDSYMPRINTF ("Error: popping",
-                   yystos[yys->yylrState],
-                   &yys->yysemantics.yysval, &yys->yyloc);
-      yydestruct (yystos[yys->yylrState],
-                 &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
+]b4_location_if([[      yystack->yyerror_range[1].yystate.yyloc = yys->yyloc;]])[
+      yydestruct ("Error: popping",
+                 yystos[yys->yylrState],
+                 &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);

       yystack->yytops.yystates[0] = yys->yypred;
       yystack->yynextFree -= 1;
       yystack->yyspaceLeft += 1;
       yystack->yytops.yystates[0] = yys->yypred;
       yystack->yynextFree -= 1;
       yystack->yyspaceLeft += 1;


@@ -1767,16 +1964,35 @@ yyrecoverParseError (yyGLRStack* yystack,
   YYSTYPE* const yylvalp = &yylval;
   YYLTYPE* const yyllocp = &yylloc;
 
   YYSTYPE* const yylvalp = &yylval;
   YYLTYPE* const yyllocp = &yylloc;
 

-  yyinitGLRStack (&yystack, YYINITDEPTH);
-  yystack.yytokenp = &yytoken;
-

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

+  yytoken = YYEMPTY;
+

   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]b4_user_args[);
-  yytoken = YYEMPTY;
+  if (! yyinitGLRStack (&yystack, YYINITDEPTH))
+    goto yyDone;
+  yystack.yytokenp = &yytoken;
+
+  yylval = yyval_default;
+]b4_location_if([
+#if YYLTYPE_IS_TRIVIAL
+  yylloc.first_line   = yylloc.last_line   = 1;
+  yylloc.first_column = yylloc.last_column = 0;
+#endif
+])
+m4_ifdef([b4_initial_action], [
+m4_pushdef([b4_at_dollar],     [yylloc])dnl
+m4_pushdef([b4_dollar_dollar], [yylval])dnl
+  /* User initialization code. */
+  b4_initial_action
+m4_popdef([b4_dollar_dollar])dnl
+m4_popdef([b4_at_dollar])dnl
+/* Line __line__ of glr.c.  */
+b4_syncline([@oline@], [@ofile@])])dnl
+[
+  yyglrShift (&yystack, 0, 0, 0, yylval, &yylloc]b4_user_args[);

   yyposn = 0;
 
   while (yytrue)
   yyposn = 0;
 
   while (yytrue)


@@ -1784,15 +2000,15 @@ yyrecoverParseError (yyGLRStack* yystack,
       /* For efficiency, we have two loops, 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)
        {
          yyRuleNum yyrule;
          int yyaction;
       /* Standard mode */
       while (yytrue)
        {
          yyRuleNum yyrule;
          int yyaction;

-         const short* yyconflicts;
+         const short int* yyconflicts;

 
          yyStateNum yystate = yystack.yytops.yystates[0]->yylrState;
 
          yyStateNum yystate = yystack.yytops.yystates[0]->yylrState;

+          YYDPRINTF ((stderr, "Entering state %d\n", yystate));

          if (yystate == YYFINAL)
            goto yyDone;
          if (yyisDefaultedState (yystate))
          if (yystate == YYFINAL)
            goto yyDone;
          if (yyisDefaultedState (yystate))


@@ -1800,7 +2016,8 @@ yyrecoverParseError (yyGLRStack* yystack,
              yyrule = yydefaultAction (yystate);
              if (yyrule == 0)
                {
              yyrule = yydefaultAction (yystate);
              if (yyrule == 0)
                {

-                 yyreportParseError (&yystack, yylvalp, yyllocp]b4_user_args[);
+]b4_location_if([[               yystack.yyerror_range[1].yystate.yyloc = *yyllocp;]])[
+                 yyreportSyntaxError (&yystack, yylvalp, yyllocp]b4_user_args[);

                  goto yyuser_error;
                }
              YYCHK1 (yyglrReduce (&yystack, 0, yyrule, yytrue]b4_lpure_args[));
                  goto yyuser_error;
                }
              YYCHK1 (yyglrReduce (&yystack, 0, yyrule, yytrue]b4_lpure_args[));


@@ -1812,15 +2029,16 @@ yyrecoverParseError (yyGLRStack* yystack,
                  YYDPRINTF ((stderr, "Reading a token: "));
                  yychar = YYLEX;
                  yytoken = YYTRANSLATE (yychar);
                  YYDPRINTF ((stderr, "Reading a token: "));
                  yychar = YYLEX;
                  yytoken = YYTRANSLATE (yychar);

-                  YYDSYMPRINTF ("Next token is", yytoken, yylvalp, yyllocp);
+                  YY_SYMBOL_PRINT ("Next token is", yytoken, yylvalp, yyllocp);
+                  YYDPRINTF ((stderr, "\n"));

                }
              yygetLRActions (yystate, yytoken, &yyaction, &yyconflicts);
              if (*yyconflicts != 0)
                break;
              if (yyisShiftAction (yyaction))
                {
                }
              yygetLRActions (yystate, yytoken, &yyaction, &yyconflicts);
              if (*yyconflicts != 0)
                break;
              if (yyisShiftAction (yyaction))
                {

-                 YYDPRINTF ((stderr, "Shifting token %s, ",
-                             yytokenName (yytoken)));
+                 YY_SYMBOL_PRINT ("Shifting", yytoken, yylvalp, yyllocp);
+                 YYDPRINTF ((stderr, "\n"));

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


@@ -1828,12 +2046,11 @@ yyrecoverParseError (yyGLRStack* yystack,
                              yylval, yyllocp]b4_user_args[);
                  if (0 < yystack.yyerrState)
                    yystack.yyerrState -= 1;
                              yylval, yyllocp]b4_user_args[);
                  if (0 < yystack.yyerrState)
                    yystack.yyerrState -= 1;

-                 YYDPRINTF ((stderr, "Entering state %d\n",
-                             yystack.yytops.yystates[0]->yylrState));

                }
              else if (yyisErrorAction (yyaction))
                {
                }
              else if (yyisErrorAction (yyaction))
                {

-                 yyreportParseError (&yystack, yylvalp, yyllocp]b4_user_args[);
+]b4_location_if([[               yystack.yyerror_range[1].yystate.yyloc = *yyllocp;]])[
+                 yyreportSyntaxError (&yystack, yylvalp, yyllocp]b4_user_args[);

                  goto yyuser_error;
                }
              else
                  goto yyuser_error;
                }
              else


@@ -1843,11 +2060,11 @@ yyrecoverParseError (yyGLRStack* yystack,
 
       while (yytrue)
        {
 
       while (yytrue)
        {

-         int yys;
-         int yyn = yystack.yytops.yysize;
+         size_t yys;
+         size_t yyn = yystack.yytops.yysize;

          for (yys = 0; yys < yyn; yys += 1)
            YYCHK1 (yyprocessOneStack (&yystack, yys, yyposn,
          for (yys = 0; yys < yyn; yys += 1)
            YYCHK1 (yyprocessOneStack (&yystack, yys, yyposn,

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

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


@@ -1855,10 +2072,11 @@ yyrecoverParseError (yyGLRStack* yystack,
            {
              yyundeleteLastStack (&yystack);
              if (yystack.yytops.yysize == 0)
            {
              yyundeleteLastStack (&yystack);
              if (yystack.yytops.yysize == 0)

-               yyFail (&yystack][]b4_lpure_args[, "parse error");
+               yyFail (&yystack][]b4_lpure_args[, "syntax error");

              YYCHK1 (yyresolveStack (&yystack]b4_user_args[));
              YYDPRINTF ((stderr, "Returning to deterministic operation.\n"));
              YYCHK1 (yyresolveStack (&yystack]b4_user_args[));
              YYDPRINTF ((stderr, "Returning to deterministic operation.\n"));

-             yyreportParseError (&yystack, yylvalp, yyllocp]b4_user_args[);
+]b4_location_if([[           yystack.yyerror_range[1].yystate.yyloc = *yyllocp;]])[
+             yyreportSyntaxError (&yystack, yylvalp, yyllocp]b4_user_args[);

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


@@ -1871,18 +2089,22 @@ yyrecoverParseError (yyGLRStack* yystack,
        }
       continue;
     yyuser_error:
        }
       continue;
     yyuser_error:

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

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

-  ;
+  /* On YYABORT, free the lookahead. */
+  if (yystack.yyerrflag == 1 && yytoken != YYEMPTY)
+    yydestruct ("Error: discarding lookahead",
+                yytoken, yylvalp]b4_location_if([, yyllocp])[);

 
   yyfreeGLRStack (&yystack);
   return yystack.yyerrflag;
 }
 
 /* DEBUGGING ONLY */
 
   yyfreeGLRStack (&yystack);
   return yystack.yyerrflag;
 }
 
 /* DEBUGGING ONLY */

-static void yypstack (yyGLRStack* yystack, int yyk) ATTRIBUTE_UNUSED;
+#ifdef YYDEBUG
+static void yypstack (yyGLRStack* yystack, size_t yyk) ATTRIBUTE_UNUSED;

 static void yypdumpstack (yyGLRStack* yystack) ATTRIBUTE_UNUSED;
 
 static void
 static void yypdumpstack (yyGLRStack* yystack) ATTRIBUTE_UNUSED;
 
 static void


@@ -1893,7 +2115,7 @@ yy_yypstack (yyGLRState* yys)
       yy_yypstack (yys->yypred);
       fprintf (stderr, " -> ");
     }
       yy_yypstack (yys->yypred);
       fprintf (stderr, " -> ");
     }

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

 }
 
 static void
 }
 
 static void


@@ -1907,12 +2129,12 @@ yypstates (yyGLRState* yyst)
 }
 
 static void
 }
 
 static void

-yypstack (yyGLRStack* yystack, int yyk)
+yypstack (yyGLRStack* yystack, size_t yyk)

 {
   yypstates (yystack->yytops.yystates[yyk]);
 }
 
 {
   yypstates (yystack->yytops.yystates[yyk]);
 }
 

-#define YYINDEX(YYX)                                                        \
+#define YYINDEX(YYX)                                                        \

     ((YYX) == NULL ? -1 : (yyGLRStackItem*) (YYX) - yystack->yyitems)
 
 
     ((YYX) == NULL ? -1 : (yyGLRStackItem*) (YYX) - yystack->yyitems)
 
 


@@ -1923,68 +2145,74 @@ 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, "%3lu. ", (unsigned long) (yyp - yystack->yyitems));
-      if (*(bool*) yyp)
+      fprintf (stderr, "%3lu. ", (unsigned long int) (yyp - yystack->yyitems));
+      if (*(yybool *) yyp)

        {
          fprintf (stderr, "Res: %d, LR State: %d, posn: %lu, pred: %ld",
                   yyp->yystate.yyresolved, yyp->yystate.yylrState,
        {
          fprintf (stderr, "Res: %d, LR State: %d, posn: %lu, pred: %ld",
                   yyp->yystate.yyresolved, yyp->yystate.yylrState,

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

          if (! yyp->yystate.yyresolved)
            fprintf (stderr, ", firstVal: %ld",
          if (! yyp->yystate.yyresolved)
            fprintf (stderr, ", firstVal: %ld",

-                    (long) YYINDEX (yyp->yystate.yysemantics.yyfirstVal));
+                    (long int) YYINDEX (yyp->yystate.yysemantics.yyfirstVal));

        }
       else
        {
          fprintf (stderr, "Option. rule: %d, state: %ld, next: %ld",
                   yyp->yyoption.yyrule,
        }
       else
        {
          fprintf (stderr, "Option. rule: %d, state: %ld, next: %ld",
                   yyp->yyoption.yyrule,

-                  (long) YYINDEX (yyp->yyoption.yystate),
-                  (long) YYINDEX (yyp->yyoption.yynext));
+                  (long int) YYINDEX (yyp->yyoption.yystate),
+                  (long int) 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, "%lu: %ld; ", (unsigned long) yyi,
-            (long) YYINDEX (yystack->yytops.yystates[yyi]));
+    fprintf (stderr, "%lu: %ld; ", (unsigned long int) yyi,
+            (long int) YYINDEX (yystack->yytops.yystates[yyi]));

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

+#endif

 ]
 
 b4_epilogue
 m4_if(b4_defines_flag, 0, [],
 [@output @output_header_name@
 ]
 
 b4_epilogue
 m4_if(b4_defines_flag, 0, [],
 [@output @output_header_name@

-b4_copyright([Skeleton parser for GLR parsing with Bison], [2002])
+b4_copyright([Skeleton parser for GLR parsing with Bison],
+  [2002, 2003, 2004, 2005])

 
 b4_token_defines(b4_tokens)
 
 
 b4_token_defines(b4_tokens)
 

-#ifndef YYSTYPE
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)

 m4_ifdef([b4_stype],
 [b4_syncline([b4_stype_line], [b4_filename])
 m4_ifdef([b4_stype],
 [b4_syncline([b4_stype_line], [b4_filename])

-typedef union b4_stype yystype;
-/* Line __line__ of __file__.  */
+typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])b4_stype YYSTYPE;
+/* Line __line__ of glr.c.  */

 b4_syncline([@oline@], [@ofile@])],
 b4_syncline([@oline@], [@ofile@])],

-[typedef int yystype;])
-# define YYSTYPE yystype
+[typedef int YYSTYPE;])
+# define YYSTYPE_IS_DECLARED 1

 # define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 b4_pure_if([],
 [extern YYSTYPE b4_prefix[]lval;])
 
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 b4_pure_if([],
 [extern YYSTYPE b4_prefix[]lval;])
 

-b4_location_if(
-[#ifndef YYLTYPE
-typedef struct yyltype
+#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED)
+typedef struct YYLTYPE

 {
 {

+b4_location_if([

   int first_line;
   int first_column;
   int last_line;
   int last_column;
   int first_line;
   int first_column;
   int last_line;
   int last_column;

-} yyltype;
-# define YYLTYPE yyltype
+],[
+  char yydummy;
+])
+} YYLTYPE;
+# define YYLTYPE_IS_DECLARED 1
+# define YYLTYPE_IS_TRIVIAL 1

 #endif
 
 #endif
 

-m4_if(b4_pure, [0],
+b4_location_if([b4_pure_if([],

 [extern YYLTYPE b4_prefix[]lloc;])
 ])
 ])
 [extern YYLTYPE b4_prefix[]lloc;])
 ])
 ])