(Web2c Actions): signed char -> yysigned_char.

[bison.git] / data / glr.c

diff --git a/data/glr.c b/data/glr.c
index 6612ce5724c5632f94c313935c3981acf522e021..3c69ac826075110d532d1158dfd9db4ebfb195fe 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -1,21 +1,23 @@
-m4_divert(-1)                                                       -*- YYC -*-
+m4_divert(-1)                                                       -*- C -*-
+m4_include([c.m4])

 
 

-# b4_sint_type(MAX)
-# -----------------
-# Return the smallest signed int type able to handle the number MAX.
-m4_define([b4_sint_type],
-[m4_if(m4_eval([$1 <= 127]),        [1], [signed char],
-       m4_eval([$1 <= 32767]),      [1], [signed short],
-       [signed int])])
+# GLR skeleton for Bison
+# Copyright (C) 2002 Free Software Foundation, Inc.

 
 

-# b4_uint_type(MAX)
-# -----------------
-# Return the smallest unsigned int type able to handle the number MAX.
-m4_define([b4_uint_type],
-[m4_if(m4_eval([$1 <= 255]),        [1], [unsigned char],
-       m4_eval([$1 <= 65535]),      [1], [unsigned short],
-       [unsigned int])])
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.

 
 

+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# 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

 
 # b4_lhs_value([TYPE])
 # --------------------
 
 # b4_lhs_value([TYPE])
 # --------------------


@@ -99,82 +101,19 @@ m4_define_default([b4_header_guard],
                                 [[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]], [_])])
 
 
                                 [[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]], [_])])
 
 

-## ------------------------- ##
-## Assigning token numbers.  ##
-## ------------------------- ##
-
-# b4_token_define(TOKEN-NAME, TOKEN-NUMBER)
-# -----------------------------------------
-# Output the definition of this token as #define.
-m4_define([b4_token_define],
-[#define $1 $2
-])
-
-
-# b4_token_enum(TOKEN-NAME, TOKEN-NUMBER)
-# ---------------------------------------
-# Output the definition of this token as an enum.
-m4_define([b4_token_enum],
-[$1 = $2])
-
-
-# b4_token_defines(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)
-# -------------------------------------------------------
-# Output the definition of the tokens (if there are) as enums and #define.
-m4_define([b4_token_defines],
-[m4_if([$@], [[]], [],
-[/* Tokens.  */
-#ifndef YYTOKENTYPE
-# if defined (__STDC__) || defined (__cplusplus)
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-m4_map_sep([     b4_token_enum], [,
-],
-           [$@])
-   };
-# endif
-  /* POSIX requires `int' for tokens in interfaces.  */
-# define YYTOKENTYPE int
-#endif /* !YYTOKENTYPE */
-m4_map([b4_token_define], [$@])
-])
-])
-
-

 m4_divert(0)dnl
 #output "b4_output_parser_name"
 m4_divert(0)dnl
 #output "b4_output_parser_name"

-[/* Skeleton parser for GLR parsing with Bison,
-   Copyright (C) 2002 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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   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.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
+b4_copyright([Skeleton parser for GLR parsing with Bison], [2002])
+[

 /* This is the parser code for GLR (Generalized LR) parser. */
 
 /* FIXME: minimize these */
 /* This is the parser code for GLR (Generalized LR) parser. */
 
 /* FIXME: minimize these */

-#include <stdlib.h>
+#include <assert.h>

 #include <setjmp.h>
 #include <setjmp.h>

-#include <stdio.h>

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

-#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>

 
 /* Identify Bison output.  */
 #define YYBISON        1
 
 /* Identify Bison output.  */
 #define YYBISON        1


@@ -197,10 +136,10 @@ m4_divert(0)dnl
 #define yynerrs b4_prefix[]nerrs
 b4_location_if([#define yylloc b4_prefix[]lloc])])
 
 #define yynerrs b4_prefix[]nerrs
 b4_location_if([#define yylloc b4_prefix[]lloc])])
 

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

 
 

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

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


@@ -230,17 +169,17 @@ typedef union b4_stype yystype;
 typedef struct yyltype
 {
 ]b4_location_if([
 typedef struct yyltype
 {
 ]b4_location_if([

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

 } yyltype;
 # define YYLTYPE ]b4_ltype[
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
 /* Default (constant) values used for initialization for null
 } yyltype;
 # define YYLTYPE ]b4_ltype[
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
 /* Default (constant) values used for initialization for null

-   right-hand sides.  Unlike the standard bison.simple template, 
+   right-hand sides.  Unlike the standard bison.simple template,

    here we set the default values of the $$ and $@ to zeroed-out
    values.  Since the default value of these quantities is undefined,
    this behavior is technically correct. */
    here we set the default values of the $$ and $@ to zeroed-out
    values.  Since the default value of these quantities is undefined,
    this behavior is technically correct. */


@@ -259,23 +198,38 @@ static YYLTYPE yyloc_default;
 #  define yyfalse 0
 #endif
 
 #  define yyfalse 0
 #endif
 

-#if ! defined (yy__GNUC__)
-#  define inline 
+/*-----------------.
+| GCC extensions.  |
+`-----------------*/
+
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if !defined (__GNUC__) || __GNUC__ < 2 || \
+(__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+#  define __attribute__(Spec) /* empty */
+# endif
+#endif
+
+#ifndef ATTRIBUTE_UNUSED
+# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#endif
+
+#if ! defined (__GNUC__)
+# define inline

 #endif
 
 /* YYFINAL -- State number of the termination state. */
 #endif
 
 /* YYFINAL -- State number of the termination state. */

-#define YYFINAL  ]b4_final[
-#define YYFLAG  ]b4_flag[
+#define YYFINAL  ]b4_final_state_number[

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

-#define YYNTOKENS  ]b4_ntokens[
+#define YYNTOKENS  ]b4_tokens_number[

 /* YYNNTS -- Number of nonterminals. */
 /* YYNNTS -- Number of nonterminals. */

-#define YYNNTS  ]b4_nnts[
+#define YYNNTS  ]b4_nterms_number[

 /* YYNRULES -- Number of rules. */
 /* YYNRULES -- Number of rules. */

-#define YYNRULES  ]b4_nrules[
+#define YYNRULES  ]b4_rules_number[

 /* YYNRULES -- Number of states. */
 /* YYNRULES -- Number of states. */

-#define YYNSTATES  ]b4_nstates[
+#define YYNSTATES  ]b4_states_number[

 /* YYMAXRHS -- Maximum number of symbols on right-hand side of rule. */
 #define YYMAXRHS ]b4_r2_max[
 
 /* YYMAXRHS -- Maximum number of symbols on right-hand side of rule. */
 #define YYMAXRHS ]b4_r2_max[
 


@@ -287,7 +241,7 @@ static YYLTYPE yyloc_default;
   ((unsigned)(YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
   ((unsigned)(YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */

-static const ]b4_uint_type(b4_translate_max)[ yytranslate[] =
+static const ]b4_int_type_for([b4_translate])[ yytranslate[] =

 {
   ]b4_translate[
 };
 {
   ]b4_translate[
 };


@@ -295,19 +249,19 @@ static const ]b4_uint_type(b4_translate_max)[ yytranslate[] =
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */

-static const ]b4_uint_type(b4_prhs_max)[ yyprhs[] =
+static const ]b4_int_type_for([b4_prhs])[ yyprhs[] =

 {
   ]b4_prhs[
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 {
   ]b4_prhs[
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */

-static const ]b4_sint_type(b4_rhs_max)[ yyrhs[] =
+static const ]b4_int_type_for([b4_rhs])[ yyrhs[] =

 {
   ]b4_rhs[
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 {
   ]b4_rhs[
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */

-static const ]b4_uint_type(b4_rline_max)[ yyrline[] =
+static const ]b4_int_type_for([b4_rline])[ yyrline[] =

 {
   ]b4_rline[
 };
 {
   ]b4_rline[
 };


@@ -321,29 +275,29 @@ static const char *const yytname[] =
   ]b4_tname[
 };
 
   ]b4_tname[
 };
 

-#define yytname_size (sizeof (yytname) / sizeof (yytname[0]))
+#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.  */

-static const ]b4_uint_type(b4_r1_max)[ yyr1[] =
+static const ]b4_int_type_for([b4_r1])[ yyr1[] =

 {
   ]b4_r1[
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 {
   ]b4_r1[
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */

-static const ]b4_uint_type(b4_r2_max)[ yyr2[] =
+static const ]b4_int_type_for([b4_r2])[ yyr2[] =

 {
   ]b4_r2[
 };
 
 /* YYDPREC[RULE-NUM] -- Dynamic precedence of rule #RULE-NUM (0 if none). */
 {
   ]b4_r2[
 };
 
 /* YYDPREC[RULE-NUM] -- Dynamic precedence of rule #RULE-NUM (0 if none). */

-static const short yydprec[] =
+static const ]b4_int_type_for([b4_dprec])[ yydprec[] =

 {
   ]b4_dprec[
 };
 
 /* YYMERGER[RULE-NUM] -- Index of merging function for rule #RULE-NUM. */
 {
   ]b4_dprec[
 };
 
 /* YYMERGER[RULE-NUM] -- Index of merging function for rule #RULE-NUM. */

-static const short yymerger[] =
+static const ]b4_int_type_for([b4_merger])[ yymerger[] =

 {
   ]b4_merger[
 };
 {
   ]b4_merger[
 };


@@ -351,55 +305,61 @@ static const short yymerger[] =
 /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
    doesn't specify something else to do.  Zero means the default is an
    error.  */
 /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
    doesn't specify something else to do.  Zero means the default is an
    error.  */

-static const short yydefact[] =
+static const ]b4_int_type_for([b4_defact])[ yydefact[] =

 {
   ]b4_defact[
 };
 
 {
   ]b4_defact[
 };
 

-/* YYPGOTO[NTERM-NUM]. */
-static const short yydefgoto[] =
+/* YYPDEFGOTO[NTERM-NUM]. */
+static const ]b4_int_type_for([b4_defgoto])[ yydefgoto[] =

 {
   ]b4_defgoto[
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 {
   ]b4_defgoto[
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */

-static const short yypact[] =
+#define YYPACT_NINF ]b4_pact_ninf[
+static const ]b4_int_type_for([b4_pact])[ yypact[] =

 {
   ]b4_pact[
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 {
   ]b4_pact[
 };
 
 /* YYPGOTO[NTERM-NUM].  */

-static const short yypgoto[] =
+static const ]b4_int_type_for([b4_pgoto])[ yypgoto[] =

 {
   ]b4_pgoto[
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
 {
   ]b4_pgoto[
 };
 
 /* 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.  */
-static const short yytable[] =
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, parse error.  */
+#define YYTABLE_NINF ]b4_table_ninf[
+static const ]b4_int_type_for([b4_table])[ yytable[] =

 {
   ]b4_table[
 };
 
 {
   ]b4_table[
 };
 

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

 {
   ]b4_conflict_list_heads[
 };
 
 {
   ]b4_conflict_list_heads[
 };
 

-/* YYCONFL[I] -- lists of conflicting rule numbers, each terminated 
-   by 0, pointed into by YYCONFLP. */
-static const short yyconfl[] =
+/* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by
+   0, pointed into by YYCONFLP.  */
+]dnl Do not use b4_int_type_for here, since there are places where
+dnl pointers onto yyconfl are taken, which type is "short *".
+dnl We probably ought to introduce a type for confl.
+[static const short yyconfl[] =

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

-static const short yycheck[] =
+static const ]b4_int_type_for([b4_check])[ yycheck[] =

 {
   ]b4_check[
 };
 {
   ]b4_check[
 };


@@ -435,11 +395,11 @@ int yyparse (void);
 #define YYRHSLOC(yyRhs,YYK) (yyRhs[YYK].yystate.yyloc)
 
 #ifndef YYLLOC_DEFAULT
 #define YYRHSLOC(yyRhs,YYK) (yyRhs[YYK].yystate.yyloc)
 
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(yyCurrent, yyRhs, YYN)           \
-  yyCurrent.yyfirst_line   = YYRHSLOC(yyRhs,1).yyfirst_line;      \
-  yyCurrent.yyfirst_column = YYRHSLOC(yyRhs,1).yyfirst_column;    \
-  yyCurrent.yylast_line    = YYRHSLOC(yyRhs,YYN).yylast_line;       \
-  yyCurrent.yylast_column  = YYRHSLOC(yyRhs,YYN).yylast_column;
+# 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;

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


@@ -490,7 +450,8 @@ do {                                                \
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */

-# define YYDPRINTF(Args)
+  /* Avoid empty `if' bodies.  */
+# define YYDPRINTF(Args)  {}

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


@@ -502,7 +463,7 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if

-   SIZE_MAX < YYMAXDEPTH * sizeof (GLRStackItem) 
+   SIZE_MAX < YYMAXDEPTH * sizeof (GLRStackItem)

    evaluated with infinite-precision integer arithmetic.  */
 
 #if YYMAXDEPTH == 0
    evaluated with infinite-precision integer arithmetic.  */
 
 #if YYMAXDEPTH == 0


@@ -514,9 +475,9 @@ int yydebug;
 #endif
 
 /* Minimum number of free items on the stack allowed after an
 #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 
-   stack is expanded, thus insuring that all necessary pointers get 
+   allocation.  This is to allow allocation and initialization
+   to be completed by functions that call expandGLRStack before the
+   stack is expanded, thus insuring that all necessary pointers get

    properly redirected to new data. */
 #define YYHEADROOM 2
 
    properly redirected to new data. */
 #define YYHEADROOM 2
 


@@ -546,7 +507,7 @@ typedef struct yyGLRStack yyGLRStack;
 typedef struct yyGLRStateSet yyGLRStateSet;
 
 struct yyGLRState {
 typedef struct yyGLRStateSet yyGLRStateSet;
 
 struct yyGLRState {

-  bool yyisState;      
+  bool yyisState;

   bool yyresolved;
   yyStateNum yylrState;
   yyGLRState* yypred;
   bool yyresolved;
   yyStateNum yylrState;
   yyGLRState* yypred;


@@ -598,7 +559,7 @@ static void yyexpandGLRStack (yyGLRStack* yystack);
 static void yyfreeGLRStack (yyGLRStack* yystack);
 
 static void
 static void yyfreeGLRStack (yyGLRStack* yystack);
 
 static void

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

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


@@ -615,8 +576,8 @@ yyFail (yyGLRStack* yystack, const char* yyformat, ...)
 #if YYDEBUG || YYERROR_VERBOSE
 /** A printable representation of TOKEN.  Valid until next call to
  *  tokenName. */
 #if YYDEBUG || YYERROR_VERBOSE
 /** A printable representation of TOKEN.  Valid until next call to
  *  tokenName. */

-static inline const char* 
-yytokenName (yySymbol yytoken) 
+static inline const char*
+yytokenName (yySymbol yytoken)

 {
   return yytname[yytoken];
 }
 {
   return yytname[yytoken];
 }


@@ -628,15 +589,18 @@ yytokenName (yySymbol yytoken)
  *  (@$). Returns yyok for normal return, yyaccept for YYACCEPT,
  *  yyerr for YYERROR, yyabort for YYABORT. */
 static YYRESULTTAG
  *  (@$). Returns yyok for normal return, yyaccept for YYACCEPT,
  *  yyerr for YYERROR, yyabort for YYABORT. */
 static YYRESULTTAG

-yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp, 
+yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp,

              YYSTYPE* yyvalp, YYLTYPE* yylocp, yyGLRStack* yystack)
 {
              YYSTYPE* yyvalp, YYLTYPE* yylocp, yyGLRStack* yystack)
 {

-  if (yyrhslen == 0) 
+  /* Avoid `unused' warnings in there are no $n. */
+  (void) yystack;
+
+  if (yyrhslen == 0)

     {
       *yyvalp = yyval_default;
       *yylocp = yyloc_default;
     }
     {
       *yyvalp = yyval_default;
       *yylocp = yyloc_default;
     }

-  else 
+  else

     {
       *yyvalp = yyvsp[1-yyrhslen].yystate.yysemantics.yysval;
       *yylocp = yyvsp[1-yyrhslen].yystate.yyloc;
     {
       *yyvalp = yyvsp[1-yyrhslen].yystate.yysemantics.yysval;
       *yylocp = yyvsp[1-yyrhslen].yystate.yyloc;


@@ -663,7 +627,7 @@ yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp,
   } while (0)
 
 ]
   } while (0)
 
 ]

-   switch (yyn) 
+   switch (yyn)

      {
        b4_actions
      }
      {
        b4_actions
      }


@@ -686,7 +650,11 @@ static YYSTYPE
 yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1)
 {
   YYSTYPE yyval = *yy0;
 yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1)
 {
   YYSTYPE yyval = *yy0;

-  switch (yyn) 
+  /* `Use' the arguments. */
+  (void) yy0;
+  (void) yy1;
+
+  switch (yyn)

     {
       b4_mergers
     }
     {
       b4_mergers
     }


@@ -697,14 +665,14 @@ yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1)
 
 /** Number of symbols composing the right hand side of rule #RULE. */
 static inline int
 
 /** Number of symbols composing the right hand side of rule #RULE. */
 static inline int

-yyrhsLength (yyRuleNum yyrule) 
+yyrhsLength (yyRuleNum yyrule)

 {
   return yyr2[yyrule];
 }
 
 /** Left-hand-side symbol for rule #RULE. */
 static inline yySymbol
 {
   return yyr2[yyrule];
 }
 
 /** Left-hand-side symbol for rule #RULE. */
 static inline yySymbol

-yylhsNonterm (yyRuleNum yyrule) 
+yylhsNonterm (yyRuleNum yyrule)

 {
   return yyr1[yyrule];
 }
 {
   return yyr1[yyrule];
 }


@@ -714,9 +682,9 @@ yylhsNonterm (yyRuleNum yyrule)
 static inline bool
 yyisDefaultedState (yyStateNum yystate)
 {
 static inline bool
 yyisDefaultedState (yyStateNum yystate)
 {

-  return yypact[yystate] == YYFLAG;
+  return yypact[yystate] == YYPACT_NINF;

 }
 }

-  
+

 /** The default reduction for STATE, assuming it has one. */
 static inline yyRuleNum
 yydefaultAction (yyStateNum yystate)
 /** The default reduction for STATE, assuming it has one. */
 static inline yyRuleNum
 yydefaultAction (yyStateNum yystate)


@@ -724,29 +692,34 @@ yydefaultAction (yyStateNum yystate)
   return yydefact[yystate];
 }
 
   return yydefact[yystate];
 }
 

-/** Set *ACTION to the action to take in STATE on seeing TOKEN.  
+/** Set *YYACTION to the action to take in YYSTATE on seeing YYTOKEN.

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

- *    R > 0:  Shift to state R. 
- *  Set *CONFLICTS to a pointer into yyconfl to 0-terminated list of 
+ *    R > 0:  Shift to state R.
+ *  Set *CONFLICTS to a pointer into yyconfl to 0-terminated list of

  *  conflicting reductions.
  */
 static inline void
  *  conflicting reductions.
  */
 static inline void

-yygetLRActions (yyStateNum yystate, int yytoken, 
+yygetLRActions (yyStateNum yystate, int yytoken,

                int* yyaction, const short** yyconflicts)
 {
   int yyindex = yypact[yystate] + yytoken;
                int* yyaction, const short** yyconflicts)
 {
   int yyindex = yypact[yystate] + yytoken;

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

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

-  else 
+  else if (yytable[yyindex] != YYTABLE_NINF)

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

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

 }
 
 static inline yyStateNum
 }
 
 static inline yyStateNum


@@ -754,22 +727,22 @@ yyLRgotoState (yyStateNum yystate, yySymbol yylhs)
 {
   int yyr;
   yyr = yypgoto[yylhs - YYNTOKENS] + yystate;
 {
   int yyr;
   yyr = yypgoto[yylhs - YYNTOKENS] + yystate;

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

     return yytable[yyr];
   else
     return yydefgoto[yylhs - YYNTOKENS];
 }
 
 static inline bool
     return yytable[yyr];
   else
     return yydefgoto[yylhs - YYNTOKENS];
 }
 
 static inline bool

-yyisShiftAction (int yyaction) 
+yyisShiftAction (int yyaction)

 {
   return yyaction > 0;
 }
 
 static inline bool
 {
   return yyaction > 0;
 }
 
 static inline bool

-yyisErrorAction (int yyaction) 
+yyisErrorAction (int yyaction)

 {
 {

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

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


@@ -777,21 +750,22 @@ yyisErrorAction (int yyaction)
 /** True iff the semantic value of the edge leading to STATE is
  *  resolved. */
 static inline bool
 /** True iff the semantic value of the edge leading to STATE is
  *  resolved. */
 static inline bool

-yyhasResolvedValue (yyGLRState* yystate) 
+yyhasResolvedValue (yyGLRState* yystate)

 {
   return yystate->yyresolved;
 }
 
 {
   return yystate->yyresolved;
 }
 

-void yyaddDeferredAction (yyGLRStack* yystack, yyGLRState* yystate, 
-                         yyGLRState* yyrhs, yyRuleNum yyrule)
+static void
+yyaddDeferredAction (yyGLRStack* yystack, yyGLRState* yystate,
+                    yyGLRState* rhs, yyRuleNum yyrule)

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

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

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


@@ -810,7 +784,7 @@ yyinitStateSet (yyGLRStateSet* yyset)
   yyset->yystates[0] = NULL;
 }
 
   yyset->yystates[0] = NULL;
 }
 

-static void yyfreeStateSet (yyGLRStateSet* yyset) 
+static void yyfreeStateSet (yyGLRStateSet* yyset)

 {
   free (yyset->yystates);
 }
 {
   free (yyset->yystates);
 }


@@ -824,7 +798,7 @@ yyinitGLRStack (yyGLRStack* yystack, size_t yysize)
   yystack->yyerrState = 0;
   yynerrs = 0;
   yystack->yyspaceLeft = yysize;
   yystack->yyerrState = 0;
   yynerrs = 0;
   yystack->yyspaceLeft = yysize;

-  yystack->yynextFree = yystack->yyitems = 
+  yystack->yynextFree = yystack->yyitems =

     (yyGLRStackItem*) malloc (yysize * sizeof (yystack->yynextFree[0]));
   yystack->yysplitPoint = NULL;
   yystack->yylastDeleted = NULL;
     (yyGLRStackItem*) malloc (yysize * sizeof (yystack->yynextFree[0]));
   yystack->yysplitPoint = NULL;
   yystack->yylastDeleted = NULL;


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

-yyexpandGLRStack (yyGLRStack* yystack) 
+yyexpandGLRStack (yyGLRStack* yystack)

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


@@ -854,23 +828,23 @@ yyexpandGLRStack (yyGLRStack* yystack)
   if (yynewSize > YYMAXDEPTH)
     yynewSize = YYMAXDEPTH;
   yyinitGLRStack (&yynewStack, yynewSize);
   if (yynewSize > YYMAXDEPTH)
     yynewSize = YYMAXDEPTH;
   yyinitGLRStack (&yynewStack, yynewSize);

-  for (yyp0 = yystack->yyitems, yyp1 = yynewStack.yyitems, yyn = yysize; 
+  for (yyp0 = yystack->yyitems, yyp1 = yynewStack.yyitems, yyn = yysize;

        yyn > 0;
        yyn > 0;

-       yyn -= 1, yyp0 += 1, yyp1 += 1) 
+       yyn -= 1, yyp0 += 1, yyp1 += 1)

     {
       *yyp1 = *yyp0;
     {
       *yyp1 = *yyp0;

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

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

-         if (yys0->yypred != NULL) 
-           yys1->yypred = 
+         if (yys0->yypred != NULL)
+           yys1->yypred =

              YYRELOC (yyp0, yyp1, yys0->yypred, yystate);
          if (! yys0->yyresolved && yys0->yysemantics.yyfirstVal != NULL)
              YYRELOC (yyp0, yyp1, yys0->yypred, yystate);
          if (! yys0->yyresolved && yys0->yysemantics.yyfirstVal != NULL)

-           yys1->yysemantics.yyfirstVal = 
+           yys1->yysemantics.yyfirstVal =

              YYRELOC(yyp0, yyp1, yys0->yysemantics.yyfirstVal, yyoption);
        }
              YYRELOC(yyp0, yyp1, yys0->yysemantics.yyfirstVal, yyoption);
        }

-      else 
+      else

        {
          yySemanticOption* yyv0 = &yyp0->yyoption;
          yySemanticOption* yyv1 = &yyp1->yyoption;
        {
          yySemanticOption* yyv0 = &yyp0->yyoption;
          yySemanticOption* yyv1 = &yyp1->yyoption;


@@ -881,13 +855,13 @@ yyexpandGLRStack (yyGLRStack* yystack)
        }
     }
   if (yystack->yysplitPoint != NULL)
        }
     }
   if (yystack->yysplitPoint != NULL)

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

                                 yystack->yysplitPoint, yystate);
                                 yystack->yysplitPoint, yystate);

-  
-  for (yyn = 0; yyn < yystack->yytops.yysize; yyn += 1) 
+
+  for (yyn = 0; yyn < yystack->yytops.yysize; yyn += 1)

     if (yystack->yytops.yystates[yyn] != NULL)
     if (yystack->yytops.yystates[yyn] != NULL)

-      yystack->yytops.yystates[yyn] = 
-       YYRELOC (yystack->yyitems, yynewStack.yyitems, 
+      yystack->yytops.yystates[yyn] =
+       YYRELOC (yystack->yyitems, yynewStack.yyitems,

                 yystack->yytops.yystates[yyn], yystate);
   free (yystack->yyitems);
   yystack->yyitems = yynewStack.yyitems;
                 yystack->yytops.yystates[yyn], yystate);
   free (yystack->yyitems);
   yystack->yyitems = yynewStack.yyitems;


@@ -895,39 +869,39 @@ yyexpandGLRStack (yyGLRStack* yystack)
   yystack->yyspaceLeft = yynewStack.yyspaceLeft - yysize;
 
 #else
   yystack->yyspaceLeft = yynewStack.yyspaceLeft - yysize;
 
 #else

-  
+

   yyFail (yystack, "parsing stack overflow (%d items)", yysize);
 
   yyFail (yystack, "parsing stack overflow (%d items)", yysize);
 

-#endif  
+#endif

 }
 
 static void
 }
 
 static void

-yyfreeGLRStack (yyGLRStack* yystack) 
+yyfreeGLRStack (yyGLRStack* yystack)

 {
   free (yystack->yyitems);
   yyfreeStateSet (&yystack->yytops);
 }
 
 /** Assuming that S is a GLRState somewhere on STACK, update the
 {
   free (yystack->yyitems);
   yyfreeStateSet (&yystack->yytops);
 }
 
 /** Assuming that S is a GLRState somewhere on STACK, update the

- *  splitpoint of STACK, if needed, so that it is at least as deep as 
+ *  splitpoint of STACK, if needed, so that it is at least as deep as

  *  S. */
 static inline void
  *  S. */
 static inline void

-yyupdateSplit (yyGLRStack* yystack, yyGLRState* yys) 
+yyupdateSplit (yyGLRStack* yystack, yyGLRState* yys)

 {
 {

-  if (yystack->yysplitPoint != NULL && yystack->yysplitPoint > yys) 
+  if (yystack->yysplitPoint != NULL && yystack->yysplitPoint > yys)

     yystack->yysplitPoint = yys;
 }
 
 /** Invalidate stack #K in STACK. */
 static inline void
     yystack->yysplitPoint = yys;
 }
 
 /** Invalidate stack #K in STACK. */
 static inline void

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

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

-/** Undelete the last stack that was marked as deleted.  Can only be 
+/** Undelete the last stack that was marked as deleted.  Can only be

     done once after a deletion, and only when all other stacks have
     been deleted. */
 static void
     done once after a deletion, and only when all other stacks have
     been deleted. */
 static void


@@ -935,7 +909,7 @@ yyundeleteLastStack (yyGLRStack* yystack)
 {
   if (yystack->yylastDeleted == NULL || yystack->yytops.yysize != 0)
     return;
 {
   if (yystack->yylastDeleted == NULL || yystack->yytops.yysize != 0)
     return;

-  yystack->yytops.yystates[0] = yystack->yylastDeleted;        
+  yystack->yytops.yystates[0] = yystack->yylastDeleted;

   yystack->yytops.yysize = 1;
   YYDPRINTF ((stderr, "Restoring last deleted stack as stack #0.\n"));
   yystack->yylastDeleted = NULL;
   yystack->yytops.yysize = 1;
   YYDPRINTF ((stderr, "Restoring last deleted stack as stack #0.\n"));
   yystack->yylastDeleted = NULL;


@@ -944,17 +918,17 @@ yyundeleteLastStack (yyGLRStack* yystack)
 static inline void
 yyremoveDeletes (yyGLRStack* yystack)
 {
 static inline void
 yyremoveDeletes (yyGLRStack* yystack)
 {

-  int yyi, yyj;
+  size_t yyi, yyj;

   yyi = yyj = 0;
   yyi = yyj = 0;

-  while (yyj < yystack->yytops.yysize) 
+  while (yyj < yystack->yytops.yysize)

     {
       if (yystack->yytops.yystates[yyi] == NULL)
        {
     {
       if (yystack->yytops.yystates[yyi] == NULL)
        {

-         if (YYDEBUG && yyi == yyj) 
+         if (yyi == yyj)

            YYDPRINTF ((stderr, "Removing dead stacks.\n"));
          yystack->yytops.yysize -= 1;
        }
            YYDPRINTF ((stderr, "Removing dead stacks.\n"));
          yystack->yytops.yysize -= 1;
        }

-      else 
+      else

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


@@ -965,11 +939,11 @@ yyremoveDeletes (yyGLRStack* yystack)
     }
 }
 
     }
 }
 

-/** Shift to a new state on stack #K of STACK, corresponding to LR state 
+/** 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
  * LRSTATE, at input position POSN, with (resolved) semantic value SVAL. */
 static inline void

-yyglrShift (yyGLRStack* yystack, int yyk, yyStateNum yylrState, size_t yyposn, 
-           YYSTYPE yysval, YYLTYPE* yylocp) 
+yyglrShift (yyGLRStack* yystack, int yyk, yyStateNum yylrState, size_t yyposn,
+           YYSTYPE yysval, YYLTYPE* yylocp)

 {
   yyGLRStackItem* yynewItem;
 
 {
   yyGLRStackItem* yynewItem;
 


@@ -992,8 +966,8 @@ yyglrShift (yyGLRStack* yystack, int yyk, yyStateNum yylrState, size_t yyposn,
  *  corresponding to LR state LRSTATE, at input position POSN, with
  * the (unresolved) semantic value of RHS under the action for RULE. */
 static inline void
  *  corresponding to LR state LRSTATE, at input position POSN, with
  * the (unresolved) semantic value of RHS under the action for RULE. */
 static inline void

-yyglrShiftDefer (yyGLRStack* yystack, int yyk, yyStateNum yylrState, 
-                size_t yyposn, yyGLRState* yyrhs, yyRuleNum yyrule)
+yyglrShiftDefer (yyGLRStack* yystack, int yyk, yyStateNum yylrState,
+                size_t yyposn, yyGLRState* rhs, yyRuleNum yyrule)

 {
   yyGLRStackItem* yynewItem;
 
 {
   yyGLRStackItem* yynewItem;
 


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

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

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

- *  #K of STACK, and perform the appropriate semantic action on their 
- *  semantic values.  Assumes that all ambiguities in semantic values 
+ *  #K of STACK, and perform the appropriate semantic action on their
+ *  semantic values.  Assumes that all ambiguities in semantic values

  *  have been previously resolved. Set *VALP to the resulting value,
  *  and *LOCP to the computed location (if any).  Return value is as
  *  for userAction. */
  *  have been previously resolved. Set *VALP to the resulting value,
  *  and *LOCP to the computed location (if any).  Return value is as
  *  for userAction. */


@@ -1022,33 +996,33 @@ yydoAction (yyGLRStack* yystack, int yyk, yyRuleNum yyrule,
 {
   int yynrhs = yyrhsLength (yyrule);
 
 {
   int yynrhs = yyrhsLength (yyrule);
 

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

     {
       /* Standard special case: single stack. */
     {
       /* Standard special case: single stack. */

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

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

-      if (yynrhs == 0) 
+      if (yynrhs == 0)

        {
          *yyvalp = yyval_default;
          *yylocp = yyloc_default;
        }
        {
          *yyvalp = yyval_default;
          *yylocp = yyloc_default;
        }

-      else 
+      else

        {
        {

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

        }
        }

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

     }
     }

-  else 
+  else

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

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

        {
          assert (yys->yypred != NULL);
          yyrhsVals[yyi].yystate.yyresolved = yytrue;
        {
          assert (yys->yypred != NULL);
          yyrhsVals[yyi].yystate.yyresolved = yytrue;


@@ -1057,76 +1031,90 @@ yydoAction (yyGLRStack* yystack, int yyk, yyRuleNum yyrule,
        }
       yyupdateSplit (yystack, yys);
       yystack->yytops.yystates[yyk] = yys;
        }
       yyupdateSplit (yystack, yys);
       yystack->yytops.yystates[yyk] = yys;

-      if (yynrhs == 0) 
+      if (yynrhs == 0)

        {
          *yyvalp = yyval_default;
          *yylocp = yyloc_default;
        }
        {
          *yyvalp = yyval_default;
          *yylocp = yyloc_default;
        }

-      else 
+      else

        {
          *yyvalp = yyrhsVals[0].yystate.yysemantics.yysval;
          *yylocp = yyrhsVals[0].yystate.yyloc;
        }
        {
          *yyvalp = yyrhsVals[0].yystate.yysemantics.yysval;
          *yylocp = yyrhsVals[0].yystate.yyloc;
        }

-      return yyuserAction (yyrule, yynrhs, yyrhsVals + (yynrhs-1), 
+      return yyuserAction (yyrule, yynrhs, yyrhsVals + (yynrhs-1),

                           yyvalp, yylocp, yystack);
     }
 }
 
 /** Pop items off stack #K of STACK according to grammar rule RULE,
  *  and push back on the resulting nonterminal symbol.  Perform the
                           yyvalp, yylocp, yystack);
     }
 }
 
 /** Pop items off stack #K of STACK according to grammar rule RULE,
  *  and push back on the resulting nonterminal symbol.  Perform the

- *  semantic action associated with RULE and store its value with the 
+ *  semantic action associated with RULE and store its value with the

  *  newly pushed state, if FORCEEVAL or if STACK is currently
  *  unambiguous.  Otherwise, store the deferred semantic action with
  *  the new state.  If the new state would have an identical input
  *  position, LR state, and predecessor to an existing state on the stack,
  *  newly pushed state, if FORCEEVAL or if STACK is currently
  *  unambiguous.  Otherwise, store the deferred semantic action with
  *  the new state.  If the new state would have an identical input
  *  position, LR state, and predecessor to an existing state on the stack,

- *  it is identified with that existing state, eliminating stack #K from 
- *  the STACK. In this case, the (necessarily deferred) semantic value is 
- *  added to the options for the existing state's semantic value. 
+ *  it is identified with that existing state, eliminating stack #K from
+ *  the STACK. In this case, the (necessarily deferred) semantic value is
+ *  added to the options for the existing state's semantic value.

  */
 static inline YYRESULTTAG
  */
 static inline YYRESULTTAG

-yyglrReduce (yyGLRStack* yystack, int yyk, yyRuleNum yyrule, bool yyforceEval)
+yyglrReduce (yyGLRStack* yystack, size_t yyk, yyRuleNum yyrule,
+             bool yyforceEval)

 {
 {

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

 
 

-  if (yyforceEval || yystack->yysplitPoint == NULL) 
+  if (yyforceEval || yystack->yysplitPoint == NULL)

     {
       YYSTYPE yysval;
       YYLTYPE yyloc;
     {
       YYSTYPE yysval;
       YYLTYPE yyloc;

-    
+
+#if YYDEBUG
+      if (yydebug)
+       {
+         int yyi;
+         YYDPRINTF ((stderr, "Reducing stack %d by rule %d (line %d),",
+                     yyk, yyrule - 1, yyrline[yyrule]));
+         /* Print the symbols being reduced, and their result.  */
+         for (yyi = yyprhs[yyrule]; yyrhs[yyi] >= 0; yyi++)
+           YYFPRINTF (stderr, "%s ", yytokenName (yyrhs[yyi]));
+         YYFPRINTF (stderr, " -> %s\n", yytokenName (yyr1[yyrule]));
+       }
+#endif

       YYCHK (yydoAction (yystack, yyk, yyrule, &yysval, &yyloc));
       YYCHK (yydoAction (yystack, yyk, yyrule, &yysval, &yyloc));

-      yyglrShift (yystack, yyk, 
-                 yyLRgotoState (yystack->yytops.yystates[yyk]->yylrState, 
+      yyglrShift (yystack, yyk,
+                 yyLRgotoState (yystack->yytops.yystates[yyk]->yylrState,

                                 yylhsNonterm (yyrule)),
                yyposn, yysval, &yyloc);
                                 yylhsNonterm (yyrule)),
                yyposn, yysval, &yyloc);

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

     }
     }

-  else 
+  else

     {
     {

-      int yyi, yyn;
+      size_t yyi;
+      int yyn;

       yyGLRState* yys, *yys0 = yystack->yytops.yystates[yyk];
       yyStateNum yynewLRState;
 
       yyGLRState* yys, *yys0 = yystack->yytops.yystates[yyk];
       yyStateNum yynewLRState;
 

-      for (yys = yystack->yytops.yystates[yyk], yyn = yyrhsLength (yyrule); 
-          yyn > 0; yyn -= 1) 
+      for (yys = yystack->yytops.yystates[yyk], yyn = yyrhsLength (yyrule);
+          yyn > 0; yyn -= 1)

        {
          yys = yys->yypred;
          assert (yys != NULL);
        }
       yyupdateSplit (yystack, yys);
       yynewLRState = yyLRgotoState (yys->yylrState, yylhsNonterm (yyrule));
        {
          yys = yys->yypred;
          assert (yys != NULL);
        }
       yyupdateSplit (yystack, yys);
       yynewLRState = yyLRgotoState (yys->yylrState, yylhsNonterm (yyrule));

-      YYDPRINTF ((stderr, 
+      YYDPRINTF ((stderr,

                  "Reduced stack %d by rule #%d; action deferred. "
                  "Now in state %d.\n",
                  yyk, yyrule-1, yynewLRState));
       for (yyi = 0; yyi < yystack->yytops.yysize; yyi += 1)
                  "Reduced stack %d by rule #%d; action deferred. "
                  "Now in state %d.\n",
                  yyk, yyrule-1, yynewLRState));
       for (yyi = 0; yyi < yystack->yytops.yysize; yyi += 1)

-       if (yyi != yyk && yystack->yytops.yystates[yyi] != NULL) 
+       if (yyi != yyk && yystack->yytops.yystates[yyi] != NULL)

          {
            yyGLRState* yyp, *yysplit = yystack->yysplitPoint;
            yyp = yystack->yytops.yystates[yyi];
          {
            yyGLRState* yyp, *yysplit = yystack->yysplitPoint;
            yyp = yystack->yytops.yystates[yyi];

-           while (yyp != yys && yyp != yysplit && yyp->yyposn >= yyposn) 
+           while (yyp != yys && yyp != yysplit && yyp->yyposn >= yyposn)

              {
              {

-               if (yyp->yylrState == yynewLRState && yyp->yypred == yys) 
+               if (yyp->yylrState == yynewLRState && yyp->yypred == yys)

                  {
                    yyaddDeferredAction (yystack, yyp, yys0, yyrule);
                    yymarkStackDeleted (yystack, yyk);
                  {
                    yyaddDeferredAction (yystack, yyp, yys0, yyrule);
                    yymarkStackDeleted (yystack, yyk);


@@ -1139,27 +1127,27 @@ yyglrReduce (yyGLRStack* yystack, int yyk, yyRuleNum yyrule, bool yyforceEval)
          }
       yystack->yytops.yystates[yyk] = yys;
       yyglrShiftDefer (yystack, yyk, yynewLRState, yyposn, yys0, yyrule);
          }
       yystack->yytops.yystates[yyk] = yys;
       yyglrShiftDefer (yystack, yyk, yynewLRState, yyposn, yys0, yyrule);

-    }    
+    }

   return 0;
 }
 
 static int
 yysplitStack (yyGLRStack* yystack, int yyk)
 {
   return 0;
 }
 
 static int
 yysplitStack (yyGLRStack* yystack, int yyk)
 {

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

     {
       assert (yyk == 0);
       yystack->yysplitPoint = yystack->yytops.yystates[yyk];
     }
     {
       assert (yyk == 0);
       yystack->yysplitPoint = yystack->yytops.yystates[yyk];
     }

-  if (yystack->yytops.yysize >= yystack->yytops.yycapacity) 
+  if (yystack->yytops.yysize >= yystack->yytops.yycapacity)

     {
       yystack->yytops.yycapacity *= 2;
     {
       yystack->yytops.yycapacity *= 2;

-      yystack->yytops.yystates = 
-       (yyGLRState**) realloc (yystack->yytops.yystates, 
-                               yystack->yytops.yycapacity 
+      yystack->yytops.yystates =
+       (yyGLRState**) realloc (yystack->yytops.yystates,
+                               yystack->yytops.yycapacity

                                * sizeof (yyGLRState*));
     }
                                * sizeof (yyGLRState*));
     }

-  yystack->yytops.yystates[yystack->yytops.yysize] 
+  yystack->yytops.yystates[yystack->yytops.yysize]

     = yystack->yytops.yystates[yyk];
   yystack->yytops.yysize += 1;
   return yystack->yytops.yysize-1;
     = yystack->yytops.yystates[yyk];
   yystack->yytops.yysize += 1;
   return yystack->yytops.yysize-1;


@@ -1171,11 +1159,11 @@ yysplitStack (yyGLRStack* yystack, int yyk)
 static bool
 yyidenticalOptions (yySemanticOption* yyy0, yySemanticOption* yyy1)
 {
 static bool
 yyidenticalOptions (yySemanticOption* yyy0, yySemanticOption* yyy1)
 {

-  if (yyy0->yyrule == yyy1->yyrule) 
+  if (yyy0->yyrule == yyy1->yyrule)

     {
       yyGLRState *yys0, *yys1;
       int yyn;
     {
       yyGLRState *yys0, *yys1;
       int yyn;

-      for (yys0 = yyy0->yystate, yys1 = yyy1->yystate, 
+      for (yys0 = yyy0->yystate, yys1 = yyy1->yystate,

           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)


@@ -1188,23 +1176,23 @@ yyidenticalOptions (yySemanticOption* yyy0, yySemanticOption* yyy1)
 }
 
 /** Assuming identicalOptions (Y0,Y1), (destructively) merge the
 }
 
 /** Assuming identicalOptions (Y0,Y1), (destructively) merge the

- *  alternative semantic values for the RHS-symbols of Y1 into the 
+ *  alternative semantic values for the RHS-symbols of Y1 into the

  *  corresponding semantic value sets of the symbols of Y0. */
 static void
 yymergeOptionSets (yySemanticOption* yyy0, yySemanticOption* yyy1)
 {
   yyGLRState *yys0, *yys1;
   int yyn;
  *  corresponding semantic value sets of the symbols of Y0. */
 static void
 yymergeOptionSets (yySemanticOption* yyy0, yySemanticOption* yyy1)
 {
   yyGLRState *yys0, *yys1;
   int yyn;

-  for (yys0 = yyy0->yystate, yys1 = yyy1->yystate, 
+  for (yys0 = yyy0->yystate, yys1 = yyy1->yystate,

        yyn = yyrhsLength (yyy0->yyrule);
        yyn > 0;
        yys0 = yys0->yypred, yys1 = yys1->yypred, yyn -= 1)
     if (yys0 == yys1)
       break;
        yyn = yyrhsLength (yyy0->yyrule);
        yyn > 0;
        yys0 = yys0->yypred, yys1 = yys1->yypred, yyn -= 1)
     if (yys0 == yys1)
       break;

-    else if (! yys0->yyresolved && ! yys1->yyresolved) 
+    else if (! yys0->yyresolved && ! yys1->yyresolved)

       {
        yySemanticOption* yyz;
       {
        yySemanticOption* yyz;

-       for (yyz = yys0->yysemantics.yyfirstVal; yyz->yynext != NULL; 
+       for (yyz = yys0->yysemantics.yyfirstVal; yyz->yynext != NULL;

             yyz = yyz->yynext)
          ;
        yyz->yynext = yys1->yysemantics.yyfirstVal;
             yyz = yyz->yynext)
          ;
        yyz->yynext = yys1->yysemantics.yyfirstVal;


@@ -1215,42 +1203,42 @@ yymergeOptionSets (yySemanticOption* yyy0, yySemanticOption* yyy1)
  *  parsing state; return 0 if no combination is possible,
  *  1 if user-mergeable, 2 if Y0 is preferred, 3 if Y1 is preferred. */
 static int
  *  parsing state; return 0 if no combination is possible,
  *  1 if user-mergeable, 2 if Y0 is preferred, 3 if Y1 is preferred. */
 static int

-yypreference (yySemanticOption* yyy0, yySemanticOption* yyy1)
+yypreference (yySemanticOption* y0, yySemanticOption* y1)

 {
 {

-  yyRuleNum yyr0 = yyy0->yyrule, yyr1 = yyy1->yyrule;
-  int yyp0 = yydprec[yyr0], yyp1 = yydprec[yyr1];
+  yyRuleNum r0 = y0->yyrule, r1 = y1->yyrule;
+  int p0 = yydprec[r0], p1 = yydprec[r1];

 
 

-  if (yyp0 == yyp1) 
+  if (p0 == p1)

     {
     {

-      if (yymerger[yyr0] == 0 || yymerger[yyr0] != yymerger[yyr1])
+      if (yymerger[r0] == 0 || yymerger[r0] != yymerger[r1])

        return 0;
       else
        return 1;
     }
        return 0;
       else
        return 1;
     }

-  if (yyp0 == 0 || yyp1 == 0)
+  if (p0 == 0 || p1 == 0)

     return 0;
     return 0;

-  if (yyp0 < yyp1)
+  if (p0 < p1)

     return 3;
     return 3;

-  if (yyp0 > yyp1)
+  if (p0 > p1)

     return 2;
   return 0;
 }
 
     return 2;
   return 0;
 }
 

-static YYRESULTTAG yyresolveValue (yySemanticOption* yyoptionList, 
-                                  yyGLRStack* yystack, YYSTYPE* yyvalp, 
+static YYRESULTTAG yyresolveValue (yySemanticOption* yyoptionList,
+                                  yyGLRStack* yystack, YYSTYPE* yyvalp,

                                   YYLTYPE* yylocp);
 
 static YYRESULTTAG
 yyresolveStates (yyGLRState* yys, int yyn, yyGLRStack* yystack)
 {
   YYRESULTTAG yyflag;
                                   YYLTYPE* yylocp);
 
 static YYRESULTTAG
 yyresolveStates (yyGLRState* yys, int yyn, yyGLRStack* yystack)
 {
   YYRESULTTAG yyflag;

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

     {
       assert (yys->yypred != NULL);
       yyflag = yyresolveStates (yys->yypred, yyn-1, yystack);
       if (yyflag != yyok)
        return yyflag;
     {
       assert (yys->yypred != NULL);
       yyflag = yyresolveStates (yys->yypred, yyn-1, yystack);
       if (yyflag != yyok)
        return yyflag;

-      if (! yys->yyresolved) 
+      if (! yys->yyresolved)

        {
          yyflag = yyresolveValue (yys->yysemantics.yyfirstVal, yystack,
                               &yys->yysemantics.yysval, &yys->yyloc);
        {
          yyflag = yyresolveValue (yys->yysemantics.yyfirstVal, yystack,
                               &yys->yysemantics.yysval, &yys->yyloc);


@@ -1263,7 +1251,7 @@ yyresolveStates (yyGLRState* yys, int yyn, yyGLRStack* yystack)
 }
 
 static YYRESULTTAG
 }
 
 static YYRESULTTAG

-yyresolveAction (yySemanticOption* yyopt, yyGLRStack* yystack, 
+yyresolveAction (yySemanticOption* yyopt, yyGLRStack* yystack,

                 YYSTYPE* yyvalp, YYLTYPE* yylocp)
 {
   yyGLRStackItem yyrhsVals[YYMAXRHS];
                 YYSTYPE* yyvalp, YYLTYPE* yylocp)
 {
   yyGLRStackItem yyrhsVals[YYMAXRHS];


@@ -1272,22 +1260,23 @@ yyresolveAction (yySemanticOption* yyopt, yyGLRStack* yystack,
 
   yynrhs = yyrhsLength (yyopt->yyrule);
   YYCHK (yyresolveStates (yyopt->yystate, yynrhs, yystack));
 
   yynrhs = yyrhsLength (yyopt->yyrule);
   YYCHK (yyresolveStates (yyopt->yystate, yynrhs, yystack));

-  for (yyi = yynrhs-1, yys = yyopt->yystate; yyi >= 0; 
+  for (yyi = yynrhs-1, yys = yyopt->yystate; yyi >= 0;

        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;
        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), 
+    }
+  return yyuserAction (yyopt->yyrule, yynrhs, yyrhsVals + (yynrhs-1),

                       yyvalp, yylocp, yystack);
 }
 
 #if YYDEBUG
                       yyvalp, yylocp, yystack);
 }
 
 #if YYDEBUG

-static yyGLRState YYLEFTMOST_STATE = { 0, NULL, -1, 0, { NULL } };
+/* FIXME: How can we initialize the lloc bit?  */
+static yyGLRState YYLEFTMOST_STATE = { 0, 0, -1, NULL, 0, { NULL } };

 
 

-static void yyreportTree (yySemanticOption* yyx, int yyindent) 
+static void yyreportTree (yySemanticOption* yyx, int yyindent)

 {
   int yynrhs = yyrhsLength (yyx->yyrule);
   int yyi;
 {
   int yynrhs = yyrhsLength (yyx->yyrule);
   int yyi;


@@ -1303,15 +1292,15 @@ static void yyreportTree (yySemanticOption* yyx, int yyindent)
 
   if (yys->yyposn+1 > yyx->yystate->yyposn)
     YYFPRINTF (stderr, "%*s%s -> <Rule %d, empty>\n",
 
   if (yys->yyposn+1 > yyx->yystate->yyposn)
     YYFPRINTF (stderr, "%*s%s -> <Rule %d, empty>\n",

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

               yyx->yyrule);
   else
               yyx->yyrule);
   else

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

               yyindent, "", yytokenName (yylhsNonterm (yyx->yyrule)),
               yyx->yyrule, yys->yyposn+1, yyx->yystate->yyposn);
               yyindent, "", yytokenName (yylhsNonterm (yyx->yyrule)),
               yyx->yyrule, yys->yyposn+1, yyx->yystate->yyposn);

-  for (yyi = 1; yyi <= yynrhs; yyi += 1) 
+  for (yyi = 1; yyi <= yynrhs; yyi += 1)

     {
     {

-      if (yystates[yyi]->yyresolved) 
+      if (yystates[yyi]->yyresolved)

        {
          if (yystates[yyi-1]->yyposn+1 > yystates[yyi]->yyposn)
            YYFPRINTF (stderr, "%*s%s <empty>\n", yyindent+2, "",
        {
          if (yystates[yyi-1]->yyposn+1 > yystates[yyi]->yyposn)
            YYFPRINTF (stderr, "%*s%s <empty>\n", yyindent+2, "",


@@ -1321,16 +1310,20 @@ static void yyreportTree (yySemanticOption* yyx, int yyindent)
                       yytokenName (yyrhs[yyprhs[yyx->yyrule]+yyi-1]),
                       yystates[yyi-1]->yyposn+1, yystates[yyi]->yyposn);
        }
                       yytokenName (yyrhs[yyprhs[yyx->yyrule]+yyi-1]),
                       yystates[yyi-1]->yyposn+1, yystates[yyi]->yyposn);
        }

-      else 
+      else

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

-#endif    
+#endif

 
 static void
 yyreportAmbiguity (yySemanticOption* yyx0, yySemanticOption* yyx1,
                   yyGLRStack* yystack)
 {
 
 static void
 yyreportAmbiguity (yySemanticOption* yyx0, yySemanticOption* yyx1,
                   yyGLRStack* yystack)
 {

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

 #if YYDEBUG
   YYFPRINTF (stderr, "Ambiguity detected.\n");
   YYFPRINTF (stderr, "Option 1,\n");
 #if YYDEBUG
   YYFPRINTF (stderr, "Ambiguity detected.\n");
   YYFPRINTF (stderr, "Option 1,\n");


@@ -1346,21 +1339,21 @@ yyreportAmbiguity (yySemanticOption* yyx0, yySemanticOption* yyx1,
 /** Resolve the ambiguity represented by OPTIONLIST, perform the indicated
  *  actions, and return the result. */
 static YYRESULTTAG
 /** Resolve the ambiguity represented by OPTIONLIST, perform the indicated
  *  actions, and return the result. */
 static YYRESULTTAG

-yyresolveValue (yySemanticOption* yyoptionList, yyGLRStack* yystack, 
-               YYSTYPE* yyvalp, YYLTYPE* yylocp) 
+yyresolveValue (yySemanticOption* yyoptionList, yyGLRStack* yystack,
+               YYSTYPE* yyvalp, YYLTYPE* yylocp)

 {
   yySemanticOption* yybest;
   yySemanticOption* yyp;
   int yymerge;
 
 {
   yySemanticOption* yybest;
   yySemanticOption* yyp;
   int yymerge;
 

-  yybest = yyoptionList; 
+  yybest = yyoptionList;

   yymerge = 0;
   yymerge = 0;

-  for (yyp = yyoptionList->yynext; yyp != NULL; yyp = yyp->yynext) 
+  for (yyp = yyoptionList->yynext; yyp != NULL; yyp = yyp->yynext)

     {
       if (yyidenticalOptions (yybest, yyp))
        yymergeOptionSets (yybest, yyp);
       else
     {
       if (yyidenticalOptions (yybest, yyp))
        yymergeOptionSets (yybest, yyp);
       else

-       switch (yypreference (yybest, yyp)) 
+       switch (yypreference (yybest, yyp))

          {
          case 0:
            yyreportAmbiguity (yybest, yyp, yystack);
          {
          case 0:
            yyreportAmbiguity (yybest, yyp, yystack);


@@ -1377,13 +1370,13 @@ yyresolveValue (yySemanticOption* yyoptionList, yyGLRStack* yystack,
          }
     }
 
          }
     }
 

-  if (yymerge) 
+  if (yymerge)

     {
       int yyprec = yydprec[yybest->yyrule];
       YYCHK (yyresolveAction (yybest, yystack, yyvalp, yylocp));
     {
       int yyprec = yydprec[yybest->yyrule];
       YYCHK (yyresolveAction (yybest, yystack, yyvalp, yylocp));

-      for (yyp = yybest->yynext; yyp != NULL; yyp = yyp->yynext) 
+      for (yyp = yybest->yynext; yyp != NULL; yyp = yyp->yynext)

        {
        {

-         if (yyprec == yydprec[yyp->yyrule]) 
+         if (yyprec == yydprec[yyp->yyrule])

            {
              YYSTYPE yyval1;
              YYLTYPE yydummy;
            {
              YYSTYPE yyval1;
              YYLTYPE yydummy;


@@ -1398,15 +1391,15 @@ yyresolveValue (yySemanticOption* yyoptionList, yyGLRStack* yystack,
 }
 
 static YYRESULTTAG
 }
 
 static YYRESULTTAG

-yyresolveStack (yyGLRStack* yystack) 
+yyresolveStack (yyGLRStack* yystack)

 {
 {

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

     {
       yyGLRState* yys;
       int yyn;
 
     {
       yyGLRState* yys;
       int yyn;
 

-      for (yyn = 0, yys = yystack->yytops.yystates[0]; 
-          yys != yystack->yysplitPoint; 
+      for (yyn = 0, yys = yystack->yytops.yystates[0];
+          yys != yystack->yysplitPoint;

           yys = yys->yypred, yyn += 1)
        ;
       YYCHK (yyresolveStates (yystack->yytops.yystates[0], yyn, yystack));
           yys = yys->yypred, yyn += 1)
        ;
       YYCHK (yyresolveStates (yystack->yytops.yystates[0], yyn, yystack));


@@ -1415,26 +1408,26 @@ yyresolveStack (yyGLRStack* yystack)
 }
 
 static void
 }
 
 static void

-yycompressStack (yyGLRStack* yystack) 
+yycompressStack (yyGLRStack* yystack)

 {
   yyGLRState* yyp, *yyq, *yyr;
 
   if (yystack->yytops.yysize != 1 || yystack->yysplitPoint == NULL)
     return;
 
 {
   yyGLRState* yyp, *yyq, *yyr;
 
   if (yystack->yytops.yysize != 1 || yystack->yysplitPoint == NULL)
     return;
 

-  for (yyp = yystack->yytops.yystates[0], yyq = yyp->yypred, yyr = NULL; 
-       yyp != yystack->yysplitPoint; 
+  for (yyp = yystack->yytops.yystates[0], yyq = yyp->yypred, yyr = NULL;
+       yyp != yystack->yysplitPoint;

        yyr = yyp, yyp = yyq, yyq = yyp->yypred)
     yyp->yypred = yyr;
        yyr = yyp, yyp = yyq, yyq = yyp->yypred)
     yyp->yypred = yyr;

-  
+

   yystack->yyspaceLeft += yystack->yynextFree - yystack->yyitems;
   yystack->yynextFree = ((yyGLRStackItem*) yystack->yysplitPoint) + 1;
   yystack->yyspaceLeft -= yystack->yynextFree - yystack->yyitems;
   yystack->yysplitPoint = NULL;
   yystack->yylastDeleted = NULL;
   yystack->yyspaceLeft += yystack->yynextFree - yystack->yyitems;
   yystack->yynextFree = ((yyGLRStackItem*) yystack->yysplitPoint) + 1;
   yystack->yyspaceLeft -= yystack->yynextFree - yystack->yyitems;
   yystack->yysplitPoint = NULL;
   yystack->yylastDeleted = NULL;

-  
-  while (yyr != NULL) 
-    {  
+
+  while (yyr != NULL)
+    {

       yystack->yynextFree->yystate = *yyr;
       yyr = yyr->yypred;
       yystack->yynextFree->yystate.yypred = & yystack->yynextFree[-1].yystate;
       yystack->yynextFree->yystate = *yyr;
       yyr = yyr->yypred;
       yystack->yynextFree->yystate.yypred = & yystack->yynextFree[-1].yystate;


@@ -1445,7 +1438,7 @@ yycompressStack (yyGLRStack* yystack)
 }
 
 static YYRESULTTAG
 }
 
 static YYRESULTTAG

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

                   size_t yyposn, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
 {
   int yyaction;
                   size_t yyposn, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
 {
   int yyaction;


@@ -1453,15 +1446,15 @@ yyprocessOneStack (yyGLRStack* yystack, int yyk,
   yyRuleNum yyrule;
   yySymbol* const yytokenp = yystack->yytokenp;
 
   yyRuleNum yyrule;
   yySymbol* const yytokenp = yystack->yytokenp;
 

-  while (yystack->yytops.yystates[yyk] != NULL) 
+  while (yystack->yytops.yystates[yyk] != NULL)

     {
       yyStateNum yystate = yystack->yytops.yystates[yyk]->yylrState;
 
       assert (yystate != YYFINAL);
     {
       yyStateNum yystate = yystack->yytops.yystates[yyk]->yylrState;
 
       assert (yystate != YYFINAL);

-      if (yyisDefaultedState (yystate)) 
+      if (yyisDefaultedState (yystate))

        {
          yyrule = yydefaultAction (yystate);
        {
          yyrule = yydefaultAction (yystate);

-         if (yyrule == 0) 
+         if (yyrule == 0)

            {
              YYDPRINTF ((stderr, "Stack %d dies.\n", yyk));
              yymarkStackDeleted (yystack, yyk);
            {
              YYDPRINTF ((stderr, "Stack %d dies.\n", yyk));
              yymarkStackDeleted (yystack, yyk);


@@ -1469,37 +1462,39 @@ yyprocessOneStack (yyGLRStack* yystack, int yyk,
            }
          YYCHK (yyglrReduce (yystack, yyk, yyrule, yyfalse));
        }
            }
          YYCHK (yyglrReduce (yystack, yyk, yyrule, yyfalse));
        }

-      else 
+      else

        {
        {

-         if (*yytokenp == YYEMPTY) 
+         if (*yytokenp == YYEMPTY)

            {
            {

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

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

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

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

-         while (*yyconflicts != 0) 
+         while (*yyconflicts != 0)

            {
              int yynewStack = yysplitStack (yystack, yyk);
              YYDPRINTF ((stderr, "Splitting off stack %d from %d.\n",
                          yynewStack, yyk));
              YYCHK (yyglrReduce (yystack, yynewStack, *yyconflicts, yyfalse));
            {
              int yynewStack = yysplitStack (yystack, yyk);
              YYDPRINTF ((stderr, "Splitting off stack %d from %d.\n",
                          yynewStack, yyk));
              YYCHK (yyglrReduce (yystack, yynewStack, *yyconflicts, yyfalse));

-             YYCHK (yyprocessOneStack (yystack, yynewStack, yyposn, 
+             YYCHK (yyprocessOneStack (yystack, yynewStack, yyposn,

                                        yylvalp, yyllocp));
              yyconflicts += 1;
            }
                                        yylvalp, yyllocp));
              yyconflicts += 1;
            }

-      
-         if (yyisShiftAction (yyaction)) 
+
+         if (yyisShiftAction (yyaction))

            {
            {

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

                          yytokenName (*yytokenp), yyk));
              yyglrShift (yystack, yyk, yyaction, yyposn+1, *yylvalp, yyllocp);
                          yytokenName (*yytokenp), yyk));
              yyglrShift (yystack, yyk, yyaction, yyposn+1, *yylvalp, yyllocp);

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

                          yystack->yytops.yystates[yyk]->yylrState));
              break;
            }
                          yystack->yytops.yystates[yyk]->yylrState));
              break;
            }

-         else if (yyisErrorAction (yyaction)) 
+         else if (yyisErrorAction (yyaction))

            {
              YYDPRINTF ((stderr, "Stack %d dies.\n", yyk));
              yymarkStackDeleted (yystack, yyk);
            {
              YYDPRINTF ((stderr, "Stack %d dies.\n", yyk));
              yymarkStackDeleted (yystack, yyk);


@@ -1515,37 +1510,41 @@ yyprocessOneStack (yyGLRStack* yystack, int yyk,
 static void
 yyreportParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
 {
 static void
 yyreportParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
 {

-  yySymbol* const yytokenp = yystack->yytokenp;
+  /* `Unused' warnings. */
+  (void) yylvalp;
+  (void) yyllocp;

 
   if (yystack->yyerrState == 0)
     {
 
   if (yystack->yyerrState == 0)
     {

-#if YYERROR_VERBOSE  
-      int yyn, yyx, yycount, yysize;
-      char* yyprefix;
+#if YYERROR_VERBOSE
+      yySymbol* const yytokenp = yystack->yytokenp;
+      int yyn, yyx, yycount;
+      size_t yysize;
+      const char* yyprefix;

       char* yyp;
       char* yymsg;
       yyn = yypact[yystack->yytops.yystates[0]->yylrState];
       char* yyp;
       char* yymsg;
       yyn = yypact[yystack->yytops.yystates[0]->yylrState];

-      if (yyn > YYFLAG && yyn < YYLAST)
+      if (YYPACT_NINF < yyn && yyn < YYLAST)

        {
          yycount = 0;
          /* Start YYX at -YYN if negative to avoid negative indexes in
             YYCHECK.  */
        {
          yycount = 0;
          /* Start YYX at -YYN if negative to avoid negative indexes in
             YYCHECK.  */

-         yysize = sizeof ("parse error, unexpected ") 
+         yysize = sizeof ("parse error, unexpected ")

            + strlen (yytokenName (*yytokenp));
          yyprefix = ", expecting ";
            + strlen (yytokenName (*yytokenp));
          yyprefix = ", expecting ";

-         for (yyx = yyn < 0 ? -yyn : 0; yyx < yytname_size && yycount <= 5; 
+         for (yyx = yyn < 0 ? -yyn : 0; yyx < yytname_size && yycount <= 5;

               yyx += 1)
               yyx += 1)

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

              yysize += strlen (yytokenName (yyx)) + strlen (yyprefix),
                yycount += 1, yyprefix = " or ";
          yymsg = yyp = (char*) malloc (yysize);
              yysize += strlen (yytokenName (yyx)) + strlen (yyprefix),
                yycount += 1, yyprefix = " or ";
          yymsg = yyp = (char*) malloc (yysize);

-         yyp += sprintf (yyp, "parse error, unexpected %s", 
+         yyp += sprintf (yyp, "parse error, unexpected %s",

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

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

                  {
                    yyp += sprintf (yyp, "%s%s", yyprefix, yytokenName (yyx));
                    yyprefix = " or ";
                  {
                    yyp += sprintf (yyp, "%s%s", yyprefix, yytokenName (yyx));
                    yyprefix = " or ";


@@ -1561,50 +1560,47 @@ yyreportParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
     }
 }
 
     }
 }
 

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

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

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

 yyrecoverParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
 {
   yySymbol* const yytokenp = yystack->yytokenp;
 yyrecoverParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
 {
   yySymbol* const yytokenp = yystack->yytokenp;

-  int yyk, yyj;
+  size_t yyk;
+  int yyj;

 
 

-  if (yystack->yyerrState == 0) 
+  if (yystack->yyerrState == 0)

     yystack->yyerrState = 3;
     yystack->yyerrState = 3;

-  else if (yystack->yyerrState == 3) 
-    {
-      /* We just shifted the error token and (perhaps) took some
-        reductions. Skip tokens until we can proceed. */
-      do {
+  else 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)
          yyFail (yystack, NULL);
        if (*yytokenp != YYEMPTY)
        if (*yytokenp == YYEOF)
          yyFail (yystack, NULL);
        if (*yytokenp != YYEMPTY)

-         YYDPRINTF ((stderr, "Discarding token %s\n", 
+         YYDPRINTF ((stderr, "Discarding token %s\n",

                      yytokenName (*yytokenp)));
                      yytokenName (*yytokenp)));

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

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

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

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

-       if (yyj == YYFLAG)
-         /* Something's not right; we shouldn't be here */
+       if (yyj == YYPACT_NINF)
+         /* Something's not right; we shouldn't be here.  */

          yyFail (yystack, NULL);
        yyj += *yytokenp;
          yyFail (yystack, NULL);
        yyj += *yytokenp;

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

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

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

          return;
          return;

-      } while (yytrue);
-    }
-      
-  /* Reduce to one stack */
+      }
+
+  /* Reduce to one stack.  */

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


@@ -1616,13 +1612,13 @@ yyrecoverParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
   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. */

-  while (yystack->yytops.yystates[0] != NULL) 
+  while (yystack->yytops.yystates[0] != NULL)

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

-      if (yyj != YYFLAG + YYTERROR && yyj >= 0 && yyj <= YYLAST && 
+      if (yyj != YYPACT_NINF + YYTERROR && yyj >= 0 && yyj <= YYLAST &&

          yycheck[yyj] == YYTERROR && yyisShiftAction (yytable[yyj]))
        {
          yycheck[yyj] == YYTERROR && yyisShiftAction (yytable[yyj]))
        {

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

                      yystack->yytops.yystates[0]->yyposn, *yylvalp, yyllocp);
          break;
        }
                      yystack->yytops.yystates[0]->yyposn, *yylvalp, yyllocp);
          break;
        }


@@ -1632,8 +1628,8 @@ yyrecoverParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
     }
   if (yystack->yytops.yystates[0] == NULL)
     yyFail (yystack, NULL);
     }
   if (yystack->yytops.yystates[0] == NULL)
     yyFail (yystack, NULL);

-}    
-  
+}
+

 #define YYCHK1(YYE)                                                         \
   do {                                                                      \
     switch (YYE) {                                                          \
 #define YYCHK1(YYE)                                                         \
   do {                                                                      \
     switch (YYE) {                                                          \


@@ -1648,10 +1644,10 @@ yyrecoverParseError (yyGLRStack* yystack, YYSTYPE* yylvalp, YYLTYPE* yyllocp)
     case yyerr:                                                                     \
       goto yyuser_error;                                                    \
     }                                                                       \
     case yyerr:                                                                     \
       goto yyuser_error;                                                    \
     }                                                                       \

-  } while (0) 
+  } while (0)

 
 int
 
 int

-yyparse (YYPARSE_PARAM_ARG) 
+yyparse (YYPARSE_PARAM_ARG)

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


@@ -1666,10 +1662,12 @@ yyparse (YYPARSE_PARAM_ARG)
 
   YYSTYPE* const yylvalp = &yylval;
   YYLTYPE* const yyllocp = &yylloc;
 
   YYSTYPE* const yylvalp = &yylval;
   YYLTYPE* const yyllocp = &yylloc;

-  
+

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

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

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


@@ -1677,14 +1675,14 @@ yyparse (YYPARSE_PARAM_ARG)
   yytoken = YYEMPTY;
   yyposn = 0;
 
   yytoken = YYEMPTY;
   yyposn = 0;
 

-  while (yytrue) 
+  while (yytrue)

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

-       
+

       /* Standard mode */
       /* Standard mode */

-      while (yytrue) 
+      while (yytrue)

        {
          yyRuleNum yyrule;
          int yyaction;
        {
          yyRuleNum yyrule;
          int yyaction;


@@ -1693,31 +1691,32 @@ yyparse (YYPARSE_PARAM_ARG)
          yyStateNum yystate = yystack.yytops.yystates[0]->yylrState;
          if (yystate == YYFINAL)
            goto yyDone;
          yyStateNum yystate = yystack.yytops.yystates[0]->yylrState;
          if (yystate == YYFINAL)
            goto yyDone;

-         if (yyisDefaultedState (yystate)) 
+         if (yyisDefaultedState (yystate))

            {
              yyrule = yydefaultAction (yystate);
            {
              yyrule = yydefaultAction (yystate);

-             if (yyrule == 0) 
+             if (yyrule == 0)

                {
                  yyreportParseError (&yystack, yylvalp, yyllocp);
                  goto yyuser_error;
                }
              YYCHK1 (yyglrReduce (&yystack, 0, yyrule, yytrue));
            }
                {
                  yyreportParseError (&yystack, yylvalp, yyllocp);
                  goto yyuser_error;
                }
              YYCHK1 (yyglrReduce (&yystack, 0, yyrule, yytrue));
            }

-         else 
+         else

            {
            {

-             if (yytoken == YYEMPTY) 
+             if (yytoken == YYEMPTY)

                {
                {

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

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

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

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

-             if (yyisShiftAction (yyaction)) 
+             if (yyisShiftAction (yyaction))

                {
                {

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

                              yytokenName (yytoken)));
                  if (yytoken != YYEOF)
                    yytoken = YYEMPTY;
                              yytokenName (yytoken)));
                  if (yytoken != YYEOF)
                    yytoken = YYEMPTY;


@@ -1725,7 +1724,7 @@ yyparse (YYPARSE_PARAM_ARG)
                  yyglrShift (&yystack, 0, yyaction, yyposn, yylval, yyllocp);
                  if (yystack.yyerrState > 0)
                    yystack.yyerrState -= 1;
                  yyglrShift (&yystack, 0, yyaction, yyposn, yylval, yyllocp);
                  if (yystack.yyerrState > 0)
                    yystack.yyerrState -= 1;

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

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


@@ -1738,7 +1737,7 @@ yyparse (YYPARSE_PARAM_ARG)
            }
        }
 
            }
        }
 

-      while (yytrue) 
+      while (yytrue)

        {
          int yys;
          int yyn = yystack.yytops.yysize;
        {
          int yys;
          int yyn = yystack.yytops.yysize;


@@ -1758,7 +1757,7 @@ yyparse (YYPARSE_PARAM_ARG)
              yyreportParseError (&yystack, yylvalp, yyllocp);
              goto yyuser_error;
            }
              yyreportParseError (&yystack, yylvalp, yyllocp);
              goto yyuser_error;
            }

-         else if (yystack.yytops.yysize == 1) 
+         else if (yystack.yytops.yysize == 1)

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


@@ -1779,30 +1778,32 @@ yyparse (YYPARSE_PARAM_ARG)
 }
 
 /* DEBUGGING ONLY */
 }
 
 /* DEBUGGING ONLY */

+static void yypstack (yyGLRStack* yystack, int yyk) ATTRIBUTE_UNUSED;
+static void yypdumpstack (yyGLRStack* yystack) ATTRIBUTE_UNUSED;

 
 

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

 {
 {

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

     {
     {

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

     }
     }

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

 
 

-  if (yyst == NULL) 
+static void
+yypstates (yyGLRState* yyst)
+{
+  if (yyst == NULL)

     fprintf (stderr, "<null>");
     fprintf (stderr, "<null>");

-  else 
+  else

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

-void
-yypstack (yyGLRStack* yystack, int yyk) 
+static void
+yypstack (yyGLRStack* yystack, int yyk)

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


@@ -1811,35 +1812,37 @@ yypstack (yyGLRStack* yystack, int yyk)
     ((YYX) == NULL ? -1 : (yyGLRStackItem*) (YYX) - yystack->yyitems)
 
 
     ((YYX) == NULL ? -1 : (yyGLRStackItem*) (YYX) - yystack->yyitems)
 
 

-void
-yypdumpstack (yyGLRStack* yystack) 
+static void
+yypdumpstack (yyGLRStack* yystack)

 {
   yyGLRStackItem* yyp;
 {
   yyGLRStackItem* yyp;

-  int yyi;
-  for (yyp = yystack->yyitems; yyp < yystack->yynextFree; yyp += 1) 
+  size_t yyi;
+  for (yyp = yystack->yyitems; yyp < yystack->yynextFree; yyp += 1)

     {
     {

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

        {
        {

-         fprintf (stderr, "Res: %d, LR State: %d, posn: %d, pred: %d",
-                  yyp->yystate.yyresolved, yyp->yystate.yylrState, 
-                  yyp->yystate.yyposn,
-                  YYINDEX(yyp->yystate.yypred));
-         if (! yyp->yystate.yyresolved) 
-           fprintf (stderr, ", firstVal: %d", 
-                    YYINDEX (yyp->yystate.yysemantics.yyfirstVal));
+         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));
+         if (! yyp->yystate.yyresolved)
+           fprintf (stderr, ", firstVal: %ld",
+                    (long) YYINDEX (yyp->yystate.yysemantics.yyfirstVal));

        }
        }

-      else  
+      else

        {
        {

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

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

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

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


@@ -1848,6 +1851,7 @@ yypdumpstack (yyGLRStack* yystack)
 b4_epilogue
 m4_if(b4_defines_flag, 0, [],
 [#output "b4_output_header_name"
 b4_epilogue
 m4_if(b4_defines_flag, 0, [],
 [#output "b4_output_header_name"

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

 #ifndef b4_header_guard
 # define b4_header_guard
 
 #ifndef b4_header_guard
 # define b4_header_guard
 


@@ -1870,10 +1874,10 @@ b4_location_if(
 [#ifndef YYLTYPE
 typedef struct yyltype
 {
 [#ifndef YYLTYPE
 typedef struct yyltype
 {

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

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