Fix glr.cc and lalr1.cc's use of YYDEBUG so that there's zero

[bison.git] / data / yacc.c

diff --git a/data/yacc.c b/data/yacc.c
index 893c86a8c0d71e445eda9cecee32847b7b3f7bb8..74a014f131a900895fbfd41dc4fc4dcfec9486c3 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -41,15 +41,15 @@ m4_define_default([b4_stack_depth_init],  [200])
 # Expand IF-TRUE, if %pure-parser and %parse-param, IF-FALSE otherwise.
 m4_define([b4_yacc_pure_if],
 [b4_pure_if([m4_ifset([b4_parse_param],
 # Expand IF-TRUE, if %pure-parser and %parse-param, IF-FALSE otherwise.
 m4_define([b4_yacc_pure_if],
 [b4_pure_if([m4_ifset([b4_parse_param],

-                      [$1], [$2])],
-            [$2])])
+                     [$1], [$2])],
+           [$2])])

 
 
 # b4_yyerror_args
 # ---------------
 # Arguments passed to yyerror: user args plus yylloc.
 m4_define([b4_yyerror_args],
 
 
 # b4_yyerror_args
 # ---------------
 # Arguments passed to yyerror: user args plus yylloc.
 m4_define([b4_yyerror_args],

-[b4_yacc_pure_if([b4_location_if([&yylloc, ])])dnl
+[b4_yacc_pure_if([b4_locations_if([&yylloc, ])])dnl

 m4_ifset([b4_parse_param], [b4_c_args(b4_parse_param), ])])
 
 
 m4_ifset([b4_parse_param], [b4_c_args(b4_parse_param), ])])
 
 


@@ -59,7 +59,7 @@ m4_ifset([b4_parse_param], [b4_c_args(b4_parse_param), ])])
 # b4_lex_param arrives quoted twice, but we want to keep only one level.
 m4_define([b4_lex_param],
 m4_dquote(b4_pure_if([[[[YYSTYPE *]], [[&yylval]]][]dnl
 # b4_lex_param arrives quoted twice, but we want to keep only one level.
 m4_define([b4_lex_param],
 m4_dquote(b4_pure_if([[[[YYSTYPE *]], [[&yylval]]][]dnl

-b4_location_if([, [[YYLTYPE *], [&yylloc]]])m4_ifdef([b4_lex_param], [, ])])dnl
+b4_locations_if([, [[YYLTYPE *], [&yylloc]]])m4_ifdef([b4_lex_param], [, ])])dnl

 m4_ifdef([b4_lex_param], b4_lex_param)))
 
 
 m4_ifdef([b4_lex_param], b4_lex_param)))
 
 


@@ -71,18 +71,19 @@ m4_ifdef([b4_lex_param], b4_lex_param)))
 # b4_int_type(MIN, MAX)
 # ---------------------
 # Return the smallest int type able to handle numbers ranging from
 # b4_int_type(MIN, MAX)
 # ---------------------
 # Return the smallest int type able to handle numbers ranging from

-# MIN to MAX (included).  We overwrite the version from c.m4 which relies
-# on "signed char" which is not portable to old K&R compilers.
+# MIN to MAX (included).  Overwrite the version from c.m4, which
+# uses only C89 types, so that the user can override the shorter
+# types, and so that pre-C89 compilers are handled correctly.

 m4_define([b4_int_type],
 m4_define([b4_int_type],

-[m4_if(b4_ints_in($@,      [0],   [255]), [1], [unsigned char],
-       b4_ints_in($@,   [-128],   [127]), [1], [yysigned_char],
+[m4_if(b4_ints_in($@,      [0],   [255]), [1], [yytype_uint8],
+       b4_ints_in($@,   [-128],   [127]), [1], [yytype_int8],

 
 

-       b4_ints_in($@,      [0], [65535]), [1], [unsigned short int],
-       b4_ints_in($@, [-32768], [32767]), [1], [short int],
+       b4_ints_in($@,      [0], [65535]), [1], [yytype_uint16],
+       b4_ints_in($@, [-32768], [32767]), [1], [yytype_int16],

 
        m4_eval([0 <= $1]),                [1], [unsigned int],
 
 
        m4_eval([0 <= $1]),                [1], [unsigned int],
 

-                                              [int])])
+                                              [int])])

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


@@ -134,14 +135,9 @@ m4_define([b4_rhs_location],
 m4_changecom()
 m4_divert(0)dnl
 @output @output_parser_name@
 m4_changecom()
 m4_divert(0)dnl
 @output @output_parser_name@

-b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
+b4_copyright([Skeleton implementation for Bison's Yacc-like parsers in C],dnl '

   [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])[
 
   [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])[
 

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

 /* C LALR(1) parser skeleton written by Richard Stallman, by
    simplifying the original so-called "semantic" parser.  */
 
 /* C LALR(1) parser skeleton written by Richard Stallman, by
    simplifying the original so-called "semantic" parser.  */
 


@@ -153,7 +149,7 @@ b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
    USER NAME SPACE" below.  */
 
 ]b4_identification
    USER NAME SPACE" below.  */
 
 ]b4_identification

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

 [/* Substitute the variable and function names.  */
 #define yyparse b4_prefix[]parse
 #define yylex   b4_prefix[]lex
 [/* Substitute the variable and function names.  */
 #define yyparse b4_prefix[]parse
 #define yylex   b4_prefix[]lex


@@ -162,16 +158,14 @@ 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])])[
-
-]b4_token_enums_defines(b4_tokens)[
+b4_locations_if([#define yylloc b4_prefix[]lloc])])[

 
 /* Copy the first part of user declarations.  */
 ]b4_pre_prologue[
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Copy the first part of user declarations.  */
 ]b4_pre_prologue[
 
 /* Enabling traces.  */
 #ifndef YYDEBUG

-# define YYDEBUG ]b4_debug[
+# define YYDEBUG ]b4_debug_flag[

 #endif
 
 /* Enabling verbose error messages.  */
 #endif
 
 /* Enabling verbose error messages.  */


@@ -179,7 +173,7 @@ b4_location_if([#define yylloc b4_prefix[]lloc])])[
 # undef YYERROR_VERBOSE
 # define YYERROR_VERBOSE 1
 #else
 # undef YYERROR_VERBOSE
 # define YYERROR_VERBOSE 1
 #else

-# define YYERROR_VERBOSE ]b4_error_verbose[
+# define YYERROR_VERBOSE ]b4_error_verbose_flag[

 #endif
 
 /* Enabling the token table.  */
 #endif
 
 /* Enabling the token table.  */


@@ -187,19 +181,26 @@ b4_location_if([#define yylloc b4_prefix[]lloc])])[
 # define YYTOKEN_TABLE ]b4_token_table[
 #endif
 
 # define YYTOKEN_TABLE ]b4_token_table[
 #endif
 

-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+]m4_ifdef([b4_start_header],
+[[/* Copy the %start-header blocks.  */
+]b4_start_header])[]dnl
+
+b4_token_enums_defines(b4_tokens)[
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED

 ]m4_ifdef([b4_stype],
 ]m4_ifdef([b4_stype],

-[b4_syncline([b4_stype_line], [b4_file_name])
-typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])b4_stype YYSTYPE;
-/* Line __line__ of yacc.c.  */
-b4_syncline([@oline@], [@ofile@])],
-[typedef int YYSTYPE;])[
+[[typedef union ]b4_union_name[
+]b4_user_stype[
+       YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1]],
+[m4_if(b4_tag_seen_flag, 0,
+[[typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1]])])[

 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

-# define YYSTYPE_IS_TRIVIAL 1

 #endif
 
 #endif
 

-]b4_location_if([#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED)
+]b4_locations_if([#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED

 typedef struct YYLTYPE
 {
   int first_line;
 typedef struct YYLTYPE
 {
   int first_line;


@@ -210,34 +211,51 @@ typedef struct YYLTYPE
 # define yyltype YYLTYPE /* obsolescent; will be withdrawn */
 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1
 # define yyltype YYLTYPE /* obsolescent; will be withdrawn */
 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1

+#endif])
+
+m4_ifdef([b4_end_header],
+[[/* Copy the %end-header blocks.  */
+]b4_end_header])[]dnl
+
+[/* Copy the second part of user declarations.  */
+]b4_user_post_prologue[
+
+#ifdef short
+# undef short

 #endif
 #endif

-])[
-
-/* Copy the second part of user declarations.  */
-]b4_post_prologue
-
-/* Line __line__ of yacc.c.  */
-b4_syncline([@oline@], [@ofile@])[
-
-/* Define YYMODERN_C if this compiler supports C89 or better.  If
-   __STDC__ is defined, the compiler is modern.  IBM xlc 7.0 when run
-   as 'cc' doesn't define __STDC__ (or __STDC_VERSION__) for pedantic
-   reasons, but it defines __C99__FUNC__ so check that as well.
-   Consider a C++ compiler to be modern if it defines __cplusplus.  */
-#ifndef YYMODERN_C
-# if defined (__STDC__) || defined (__C99__FUNC__) || defined (__cplusplus)
-#  define YYMODERN_C 1
-# else
-#  define YYMODERN_C 0
-# endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif ]b4_c_modern[
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;

 #endif
 
 #ifndef YYSIZE_T
 #endif
 
 #ifndef YYSIZE_T

-# if defined (__SIZE_TYPE__)
+# ifdef __SIZE_TYPE__

 #  define YYSIZE_T __SIZE_TYPE__
 #  define YYSIZE_T __SIZE_TYPE__

-# elif defined (size_t)
+# elif defined size_t

 #  define YYSIZE_T size_t
 #  define YYSIZE_T size_t

-# elif ! defined (YYSIZE_T) && YYMODERN_C
+# elif ! defined YYSIZE_T && ]b4_c_modern[

 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else


@@ -260,7 +278,7 @@ b4_syncline([@oline@], [@ofile@])[
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */

-#ifndef lint
+#if ! defined lint || defined __GNUC__

 # define YYUSE(e) ((void) (e))
 #else
 # define YYUSE(e) /* empty */
 # define YYUSE(e) ((void) (e))
 #else
 # define YYUSE(e) /* empty */


@@ -270,13 +288,13 @@ b4_syncline([@oline@], [@ofile@])[
 #ifndef lint
 # define YYID(n) (n)
 #else
 #ifndef lint
 # define YYID(n) (n)
 #else

-]b4_c_function_def([YYID], [static int], [[int i], [i]])[
+]b4_c_function_def([YYID], [static int], [[int yyi], [yyi]])[

 {
 {

-  return i;
+  return yyi;

 }
 #endif
 
 }
 #endif
 

-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+#if ! defined yyoverflow || YYERROR_VERBOSE

 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 


@@ -284,16 +302,16 @@ b4_syncline([@oline@], [@ofile@])[
 #  if YYSTACK_USE_ALLOCA
 #   ifdef __GNUC__
 #    define YYSTACK_ALLOC __builtin_alloca
 #  if YYSTACK_USE_ALLOCA
 #   ifdef __GNUC__
 #    define YYSTACK_ALLOC __builtin_alloca

-#   elif defined (__BUILTIN_VA_ARG_INCR)
+#   elif defined __BUILTIN_VA_ARG_INCR

 #    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
 #    include <alloca.h> /* INFRINGES ON USER NAME SPACE */

-#   elif defined (_AIX)
+#   elif defined _AIX

 #    define YYSTACK_ALLOC __alloca
 #    define YYSTACK_ALLOC __alloca

-#   elif defined (_MSC_VER)
+#   elif defined _MSC_VER

 #    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
 #    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca

-#    if ! defined (_ALLOCA_H) && ! defined (_STDLIB_H) && YYMODERN_C
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && ]b4_c_modern[

 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #     ifndef _STDLIB_H
 #      define _STDLIB_H 1
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #     ifndef _STDLIB_H
 #      define _STDLIB_H 1


@@ -319,39 +337,41 @@ b4_syncline([@oline@], [@ofile@])[
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif

-#  ifdef __cplusplus
-extern "C" {
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+            && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif

 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc

-#   if ! defined (malloc) && ! defined (_STDLIB_H) && YYMODERN_C
+#   if ! defined malloc && ! defined _STDLIB_H && ]b4_c_modern[

 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free

-#   if ! defined (free) && ! defined (_STDLIB_H)  && YYMODERN_C
+#   if ! defined free && ! defined _STDLIB_H && ]b4_c_modern[

 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif

-#  ifdef __cplusplus
-}
-#  endif

 # endif
 # endif

-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */

 
 
 
 

-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-        || (]b4_location_if([[defined (YYLTYPE_IS_TRIVIAL) && YYLTYPE_IS_TRIVIAL \
-             && ]])[defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+        || (]b4_locations_if([[defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
+            && ]])[defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))

 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {

-  short int yyss;
+  yytype_int16 yyss;

   YYSTYPE yyvs;
   YYSTYPE yyvs;

-  ]b4_location_if([  YYLTYPE yyls;
+  ]b4_locations_if([  YYLTYPE yyls;

 ])dnl
 [};
 
 ])dnl
 [};
 


@@ -360,18 +380,18 @@ union yyalloc
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */

-]b4_location_if(
+]b4_locations_if(

 [# define YYSTACK_BYTES(N) \
 [# define YYSTACK_BYTES(N) \

-     ((N) * (sizeof (short int) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \

       + 2 * YYSTACK_GAP_MAXIMUM)],
 [# define YYSTACK_BYTES(N) \
       + 2 * YYSTACK_GAP_MAXIMUM)],
 [# define YYSTACK_BYTES(N) \

-     ((N) * (sizeof (short int) + sizeof (YYSTYPE))                    \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \

       + YYSTACK_GAP_MAXIMUM)])[
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
       + YYSTACK_GAP_MAXIMUM)])[
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY

-#  if defined (__GNUC__) && 1 < __GNUC__
+#  if defined __GNUC__ && 1 < __GNUC__

 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else


@@ -404,12 +424,6 @@ union yyalloc
 
 #endif
 
 
 #endif
 

-#if YYMODERN_C
-   typedef signed char yysigned_char;
-#else
-   typedef short int yysigned_char;
-#endif
-

 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  ]b4_final_state_number[
 /* YYLAST -- Last index in YYTABLE.  */
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  ]b4_final_state_number[
 /* YYLAST -- Last index in YYTABLE.  */


@@ -612,8 +626,8 @@ while (YYID (0))
 # if YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)                 \
      fprintf (File, "%d.%d-%d.%d",                     \
 # if YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)                 \
      fprintf (File, "%d.%d-%d.%d",                     \

-              (Loc).first_line, (Loc).first_column,    \
-              (Loc).last_line,  (Loc).last_column)
+             (Loc).first_line, (Loc).first_column,     \
+             (Loc).last_line,  (Loc).last_column)

 # else
 #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 # endif
 # else
 #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 # endif


@@ -623,7 +637,7 @@ while (YYID (0))
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM

-# define YYLEX yylex (]b4_pure_if([&yylval[]b4_location_if([, &yylloc]), ])[YYLEX_PARAM)
+# define YYLEX yylex (]b4_pure_if([&yylval[]b4_locations_if([, &yylloc]), ])[YYLEX_PARAM)

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


@@ -648,7 +662,7 @@ do {                                                                          \
     {                                                                    \
       YYFPRINTF (stderr, "%s ", Title);                                          \
       yy_symbol_print (stderr,                                           \
     {                                                                    \
       YYFPRINTF (stderr, "%s ", Title);                                          \
       yy_symbol_print (stderr,                                           \

-                  Type, Value]b4_location_if([, Location])[]b4_user_args[); \
+                 Type, Value]b4_locations_if([, Location])[]b4_user_args[); \

       YYFPRINTF (stderr, "\n");                                                  \
     }                                                                    \
 } while (YYID (0))
       YYFPRINTF (stderr, "\n");                                                  \
     }                                                                    \
 } while (YYID (0))


@@ -661,12 +675,15 @@ do {                                                                        \
 `------------------------------------------------------------------*/
 
 ]b4_c_function_def([yy_stack_print], [static void],
 `------------------------------------------------------------------*/
 
 ]b4_c_function_def([yy_stack_print], [static void],

-                   [[short int *bottom], [bottom]],
-                   [[short int *top],    [top]])[
+                  [[yytype_int16 *yybottom], [yybottom]],
+                  [[yytype_int16 *yytop],    [yytop]])[

 {
   YYFPRINTF (stderr, "Stack now");
 {
   YYFPRINTF (stderr, "Stack now");

-  for (; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }

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


@@ -682,24 +699,24 @@ do {                                                              \
 `------------------------------------------------*/
 
 ]b4_c_function_def([yy_reduce_print], [static void],
 `------------------------------------------------*/
 
 ]b4_c_function_def([yy_reduce_print], [static void],

-                   [[YYSTYPE *yyvsp], [yyvsp]],
-    b4_location_if([[[YYLTYPE *yylsp], [yylsp]],])
-                  [[int yyrule], [yyrule]]m4_ifset([b4_parse_param], [,])
-                   b4_parse_param)[
+                  [[YYSTYPE *yyvsp], [yyvsp]],
+    b4_locations_if([[[YYLTYPE *yylsp], [yylsp]],
+                  ])[[int yyrule], [yyrule]]m4_ifset([b4_parse_param], [,
+                  ])b4_parse_param)[

 {
   int yynrhs = yyr2[yyrule];
   int yyi;
   unsigned long int yylno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
 {
   int yynrhs = yyr2[yyrule];
   int yyi;
   unsigned long int yylno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",

-             yyrule - 1, yylno);
+            yyrule - 1, yylno);

   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],

-                       &]b4_rhs_value(yynrhs, yyi + 1)[
-                       ]b4_location_if([, &]b4_rhs_location(yynrhs, yyi + 1))[]dnl
-                      b4_user_args[);
+                      &]b4_rhs_value(yynrhs, yyi + 1)[
+                      ]b4_locations_if([, &]b4_rhs_location(yynrhs, yyi + 1))[]dnl
+                      b4_user_args[);

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


@@ -707,7 +724,7 @@ do {                                                                \
 # define YY_REDUCE_PRINT(Rule)         \
 do {                                   \
   if (yydebug)                         \
 # define YY_REDUCE_PRINT(Rule)         \
 do {                                   \
   if (yydebug)                         \

-    yy_reduce_print (yyvsp, ]b4_location_if([yylsp, ])[Rule]b4_user_args[); \
+    yy_reduce_print (yyvsp, ]b4_locations_if([yylsp, ])[Rule]b4_user_args[); \

 } while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
 } while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that


@@ -742,17 +759,12 @@ int yydebug;
 #if YYERROR_VERBOSE
 
 # ifndef yystrlen
 #if YYERROR_VERBOSE
 
 # ifndef yystrlen

-#  if defined (__GLIBC__) && defined (_STRING_H)
+#  if defined __GLIBC__ && defined _STRING_H

 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */

-static YYSIZE_T
-#   if YYMODERN_C
-yystrlen (const char *yystr)
-#   else
-yystrlen (yystr)
-     const char *yystr;
-#   endif
+]b4_c_function_def([yystrlen], [static YYSIZE_T],
+   [[const char *yystr], [yystr]])[

 {
   YYSIZE_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)
 {
   YYSIZE_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)


@@ -763,19 +775,13 @@ yystrlen (yystr)
 # endif
 
 # ifndef yystpcpy
 # endif
 
 # ifndef yystpcpy

-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#  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.  */
 #   define yystpcpy stpcpy
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */

-static char *
-#   if YYMODERN_C
-yystpcpy (char *yydest, const char *yysrc)
-#   else
-yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
+]b4_c_function_def([yystpcpy], [static char *],
+   [[char *yydest], [yydest]], [[const char *yysrc], [yysrc]])[

 {
   char *yyd = yydest;
   const char *yys = yysrc;
 {
   char *yyd = yydest;
   const char *yys = yysrc;


@@ -801,7 +807,7 @@ yytnamerr (char *yyres, const char *yystr)
 {
   if (*yystr == '"')
     {
 {
   if (*yystr == '"')
     {

-      size_t yyn = 0;
+      YYSIZE_T yyn = 0;

       char const *yyp = yystr;
 
       for (;;)
       char const *yyp = yystr;
 
       for (;;)


@@ -848,7 +854,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
 {
   int yyn = yypact[yystate];
 
 {
   int yyn = yypact[yystate];
 

-  if (! (YYPACT_NINF < yyn && yyn < YYLAST))
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))

     return 0;
   else
     {
     return 0;
   else
     {


@@ -863,7 +869,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
 
 # if 0
       /* This is so xgettext sees the translatable formats that are
 
 # if 0
       /* This is so xgettext sees the translatable formats that are

-         constructed on the fly.  */
+        constructed on the fly.  */

       YY_("syntax error, unexpected %s");
       YY_("syntax error, unexpected %s, expecting %s");
       YY_("syntax error, unexpected %s, expecting %s or %s");
       YY_("syntax error, unexpected %s");
       YY_("syntax error, unexpected %s, expecting %s");
       YY_("syntax error, unexpected %s, expecting %s or %s");


@@ -876,17 +882,17 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
       static char const yyexpecting[] = ", expecting %s";
       static char const yyor[] = " or %s";
       char yyformat[sizeof yyunexpected
       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))];
+                   + 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
       char const *yyprefix = yyexpecting;
 
       /* Start YYX at -YYN if negative to avoid negative indexes in

-         YYCHECK.  */
+        YYCHECK.  */

       int yyxbegin = yyn < 0 ? -yyn : 0;
 
       /* Stay within bounds of both yycheck and yytname.  */
       int yyxbegin = yyn < 0 ? -yyn : 0;
 
       /* Stay within bounds of both yycheck and yytname.  */

-      int yychecklim = YYLAST - yyn;
+      int yychecklim = YYLAST - yyn + 1;

       int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
       int yycount = 1;
 
       int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
       int yycount = 1;
 


@@ -894,22 +900,22 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
       yyfmt = yystpcpy (yyformat, yyunexpected);
 
       for (yyx = yyxbegin; yyx < yyxend; ++yyx)
       yyfmt = yystpcpy (yyformat, yyunexpected);
 
       for (yyx = yyxbegin; yyx < yyxend; ++yyx)

-        if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-          {
-            if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-              {
-                yycount = 1;
-                yysize = yysize0;
-                yyformat[sizeof yyunexpected - 1] = '\0';
-                break;
-              }
-            yyarg[yycount++] = yytname[yyx];
-            yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-            yysize_overflow |= (yysize1 < yysize);
-            yysize = yysize1;
-            yyfmt = yystpcpy (yyfmt, yyprefix);
-            yyprefix = yyor;
-          }
+       if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+         {
+           if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+             {
+               yycount = 1;
+               yysize = yysize0;
+               yyformat[sizeof yyunexpected - 1] = '\0';
+               break;
+             }
+           yyarg[yycount++] = yytname[yyx];
+           yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+           yysize_overflow |= (yysize1 < yysize);
+           yysize = yysize1;
+           yyfmt = yystpcpy (yyfmt, yyprefix);
+           yyprefix = yyor;
+         }

 
       yyf = YY_(yyformat);
       yysize1 = yysize + yystrlen (yyf);
 
       yyf = YY_(yyformat);
       yysize1 = yysize + yystrlen (yyf);


@@ -921,25 +927,25 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
 
       if (yyresult)
        {
 
       if (yyresult)
        {

-          /* Avoid sprintf, as that infringes on the user's name space.
-             Don't have undefined behavior even if the translation
-             produced a string with the wrong number of "%s"s.  */
-          char *yyp = yyresult;
-          int yyi = 0;
-          while ((*yyp = *yyf) != '\0')
-            {
-              if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-                {
-                  yyp += yytnamerr (yyp, yyarg[yyi++]);
-                  yyf += 2;
-                }
-              else
-                {
-                  yyp++;
-                  yyf++;
-                }
-            }
-        }
+         /* Avoid sprintf, as that infringes on the user's name space.
+            Don't have undefined behavior even if the translation
+            produced a string with the wrong number of "%s"s.  */
+         char *yyp = yyresult;
+         int yyi = 0;
+         while ((*yyp = *yyf) != '\0')
+           {
+             if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+               {
+                 yyp += yytnamerr (yyp, yyarg[yyi++]);
+                 yyf += 2;
+               }
+             else
+               {
+                 yyp++;
+                 yyf++;
+               }
+           }
+       }

       return yysize;
     }
 }
       return yysize;
     }
 }


@@ -952,11 +958,8 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
 /* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
 /* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM

-# if YYMODERN_C
-int yyparse (void *YYPARSE_PARAM);
-# else
-int yyparse ();
-# endif
+]b4_c_function_decl([yyparse], [int],
+   [[void *YYPARSE_PARAM], [YYPARSE_PARAM]])[

 #else /* ! YYPARSE_PARAM */
 ]b4_c_function_decl([yyparse], [int], b4_parse_param)[
 #endif /* ! YYPARSE_PARAM */
 #else /* ! YYPARSE_PARAM */
 ]b4_c_function_decl([yyparse], [int], b4_parse_param)[
 #endif /* ! YYPARSE_PARAM */


@@ -968,21 +971,21 @@ int yyparse ();
 # Declare the variables that are global, or local to YYPARSE if
 # pure-parser.
 m4_define([b4_declare_parser_variables],
 # Declare the variables that are global, or local to YYPARSE if
 # pure-parser.
 m4_define([b4_declare_parser_variables],

-[/* The look-ahead symbol.  */
+[/* The lookahead symbol.  */

 int yychar;
 
 int yychar;
 

-/* The semantic value of the look-ahead symbol.  */
+/* The semantic value of the lookahead symbol.  */

 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */

-int yynerrs;b4_location_if([
-/* Location data for the look-ahead symbol.  */
+int yynerrs;b4_locations_if([
+/* Location data for the lookahead symbol.  */

 YYLTYPE yylloc;])
 ])
 m4_divert_pop([KILL])dnl# ====================== End of M4 code.
 
 b4_pure_if([],
 YYLTYPE yylloc;])
 ])
 m4_divert_pop([KILL])dnl# ====================== End of M4 code.
 
 b4_pure_if([],

-           [b4_declare_parser_variables])
+          [b4_declare_parser_variables])

 
 
 /*----------.
 
 
 /*----------.


@@ -990,12 +993,7 @@ b4_pure_if([],
 `----------*/
 
 #ifdef YYPARSE_PARAM
 `----------*/
 
 #ifdef YYPARSE_PARAM

-# if YYMODERN_C
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
-  void *YYPARSE_PARAM;
-# endif
+b4_c_function_def([yyparse], [int], [[void *YYPARSE_PARAM], [YYPARSE_PARAM]])

 #else /* ! YYPARSE_PARAM */
 b4_c_function_def([yyparse], [int], b4_parse_param)
 #endif
 #else /* ! YYPARSE_PARAM */
 b4_c_function_def([yyparse], [int], b4_parse_param)
 #endif


@@ -1006,7 +1004,7 @@ b4_c_function_def([yyparse], [int], b4_parse_param)
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;

-  /* Look-ahead token as an internal (translated) token number.  */
+  /* Lookahead token as an internal (translated) token number.  */

   int yytoken = 0;
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   int yytoken = 0;
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */


@@ -1024,16 +1022,16 @@ b4_c_function_def([yyparse], [int], b4_parse_param)
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
      to reallocate them elsewhere.  */
 
   /* The state stack.  */

-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  short int *yyssp;
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;

 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
   YYSTYPE *yyvsp;
 
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
   YYSTYPE *yyvsp;
 

-]b4_location_if(
+]b4_locations_if(

 [[  /* The location stack.  */
   YYLTYPE yylsa[YYINITDEPTH];
   YYLTYPE *yyls = yylsa;
 [[  /* The location stack.  */
   YYLTYPE yylsa[YYINITDEPTH];
   YYLTYPE *yyls = yylsa;


@@ -1041,14 +1039,14 @@ b4_c_function_def([yyparse], [int], b4_parse_param)
   /* The locations where the error started and ended.  */
   YYLTYPE yyerror_range[2];]])[
 
   /* The locations where the error started and ended.  */
   YYLTYPE yyerror_range[2];]])[
 

-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N)]b4_location_if([, yylsp -= (N)])[)
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N)]b4_locations_if([, yylsp -= (N)])[)

 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;

-]b4_location_if([  YYLTYPE yyloc;])[
+]b4_locations_if([  YYLTYPE yyloc;])[

 
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
 
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */


@@ -1068,23 +1066,20 @@ b4_c_function_def([yyparse], [int], b4_parse_param)
 
   yyssp = yyss;
   yyvsp = yyvs;
 
   yyssp = yyss;
   yyvsp = yyvs;

-]b4_location_if([[  yylsp = yyls;
+]b4_locations_if([[  yylsp = yyls;

 #if YYLTYPE_IS_TRIVIAL
   /* Initialize the default location before parsing starts.  */
 #if YYLTYPE_IS_TRIVIAL
   /* Initialize the default location before parsing starts.  */

-  yylloc.first_line   = yylloc.last_line   = 1;
-  yylloc.first_column = yylloc.last_column = 0;
+  yylloc.first_line   = yylloc.last_line   = ]b4_location_initial_line[;
+  yylloc.first_column = yylloc.last_column = ]b4_location_initial_column[;

 #endif
 ]])
 m4_ifdef([b4_initial_action], [
 m4_pushdef([b4_at_dollar],     [m4_define([b4_at_dollar_used])yylloc])dnl
 m4_pushdef([b4_dollar_dollar], [m4_define([b4_dollar_dollar_used])yylval])dnl
   /* User initialization code.  */
 #endif
 ]])
 m4_ifdef([b4_initial_action], [
 m4_pushdef([b4_at_dollar],     [m4_define([b4_at_dollar_used])yylloc])dnl
 m4_pushdef([b4_dollar_dollar], [m4_define([b4_dollar_dollar_used])yylval])dnl
   /* User initialization code.  */

-b4_initial_action
+  b4_user_initial_action

 m4_popdef([b4_dollar_dollar])dnl
 m4_popdef([b4_dollar_dollar])dnl

-m4_popdef([b4_at_dollar])dnl
-/* Line __line__ of yacc.c.  */
-b4_syncline([@oline@], [@ofile@])
-])dnl
+m4_popdef([b4_at_dollar])])dnl

 m4_ifdef([b4_dollar_dollar_used],[[  yyvsp[0] = yylval;
 ]])dnl
 m4_ifdef([b4_at_dollar_used], [[  yylsp[0] = yylloc;
 m4_ifdef([b4_dollar_dollar_used],[[  yyvsp[0] = yylval;
 ]])dnl
 m4_ifdef([b4_at_dollar_used], [[  yylsp[0] = yylloc;


@@ -1113,8 +1108,8 @@ m4_ifdef([b4_at_dollar_used], [[  yylsp[0] = yylloc;
           these so that the &'s don't force the real ones into
           memory.  */
        YYSTYPE *yyvs1 = yyvs;
           these so that the &'s don't force the real ones into
           memory.  */
        YYSTYPE *yyvs1 = yyvs;

-       short int *yyss1 = yyss;
-]b4_location_if([      YYLTYPE *yyls1 = yyls;])[
+       yytype_int16 *yyss1 = yyss;
+]b4_locations_if([     YYLTYPE *yyls1 = yyls;])[

 
        /* Each stack pointer address is followed by the size of the
           data in use in that stack, in bytes.  This used to be a
 
        /* Each stack pointer address is followed by the size of the
           data in use in that stack, in bytes.  This used to be a


@@ -1123,9 +1118,9 @@ m4_ifdef([b4_at_dollar_used], [[  yylsp[0] = yylloc;
        yyoverflow (YY_("memory exhausted"),
                    &yyss1, yysize * sizeof (*yyssp),
                    &yyvs1, yysize * sizeof (*yyvsp),
        yyoverflow (YY_("memory exhausted"),
                    &yyss1, yysize * sizeof (*yyssp),
                    &yyvs1, yysize * sizeof (*yyvsp),

-]b4_location_if([                  &yyls1, yysize * sizeof (*yylsp),])[
+]b4_locations_if([                 &yyls1, yysize * sizeof (*yylsp),])[

                    &yystacksize);
                    &yystacksize);

-]b4_location_if([      yyls = yyls1;])[
+]b4_locations_if([     yyls = yyls1;])[

        yyss = yyss1;
        yyvs = yyvs1;
       }
        yyss = yyss1;
        yyvs = yyvs1;
       }


@@ -1141,14 +1136,14 @@ m4_ifdef([b4_at_dollar_used], [[  yylsp[0] = yylloc;
        yystacksize = YYMAXDEPTH;
 
       {
        yystacksize = YYMAXDEPTH;
 
       {

-       short int *yyss1 = yyss;
+       yytype_int16 *yyss1 = yyss;

        union yyalloc *yyptr =
          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
        if (! yyptr)
          goto yyexhaustedlab;
        YYSTACK_RELOCATE (yyss);
        YYSTACK_RELOCATE (yyvs);
        union yyalloc *yyptr =
          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
        if (! yyptr)
          goto yyexhaustedlab;
        YYSTACK_RELOCATE (yyss);
        YYSTACK_RELOCATE (yyvs);

-]b4_location_if([      YYSTACK_RELOCATE (yyls);])[
+]b4_locations_if([     YYSTACK_RELOCATE (yyls);])[

 #  undef YYSTACK_RELOCATE
        if (yyss1 != yyssa)
          YYSTACK_FREE (yyss1);
 #  undef YYSTACK_RELOCATE
        if (yyss1 != yyssa)
          YYSTACK_FREE (yyss1);


@@ -1158,7 +1153,7 @@ m4_ifdef([b4_at_dollar_used], [[  yylsp[0] = yylloc;
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;

-]b4_location_if([      yylsp = yyls + yysize - 1;])[
+]b4_locations_if([      yylsp = yyls + yysize - 1;])[

 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
                  (unsigned long int) yystacksize));
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
                  (unsigned long int) yystacksize));


@@ -1169,6 +1164,9 @@ m4_ifdef([b4_at_dollar_used], [[  yylsp[0] = yylloc;
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 

+  if (yystate == YYFINAL)
+    YYACCEPT;
+

   goto yybackup;
 
 /*-----------.
   goto yybackup;
 
 /*-----------.


@@ -1177,16 +1175,16 @@ m4_ifdef([b4_at_dollar_used], [[  yylsp[0] = yylloc;
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a

-     look-ahead token if we need one and don't already have one.  */
+     lookahead token if we need one and don't already have one.  */

 
 

-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */

   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 

-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */

 
 

-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */

   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));


@@ -1218,24 +1216,20 @@ yybackup:
       goto yyreduce;
     }
 
       goto yyreduce;
     }
 

-  if (yyn == YYFINAL)
-    YYACCEPT;
-

   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 

-  /* Shift the look-ahead token.  */
+  /* Shift the lookahead token.  */

   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 

-  /* Discard the shifted token unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;

 
   yystate = yyn;
   *++yyvsp = yylval;
 
   yystate = yyn;
   *++yyvsp = yylval;

-]b4_location_if([  *++yylsp = yylloc;])[
+]b4_locations_if([  *++yylsp = yylloc;])[

   goto yynewstate;
 
 
   goto yynewstate;
 
 


@@ -1266,15 +1260,13 @@ yyreduce:
      GCC warning that YYVAL may be used uninitialized.  */
   yyval = yyvsp[1-yylen];
 
      GCC warning that YYVAL may be used uninitialized.  */
   yyval = yyvsp[1-yylen];
 

-]b4_location_if(
+]b4_locations_if(

 [[  /* Default location.  */
 [[  /* Default location.  */

-  YYLLOC_DEFAULT (yyloc, yylsp - yylen, yylen);]])[
+  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);]])[

   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {

-      ]b4_actions
-/* Line __line__ of yacc.c.  */
-b4_syncline([@oline@], [@ofile@])[
+      ]b4_user_actions[

       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);


@@ -1284,7 +1276,7 @@ b4_syncline([@oline@], [@ofile@])[
   YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
   YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;

-]b4_location_if([  *++yylsp = yyloc;])[
+]b4_locations_if([  *++yylsp = yyloc;])[

 
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
 
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule


@@ -1346,28 +1338,28 @@ yyerrlab:
 #endif
     }
 
 #endif
     }
 

-]b4_location_if([[  yyerror_range[0] = yylloc;]])[
+]b4_locations_if([[  yyerror_range[0] = yylloc;]])[

 
   if (yyerrstatus == 3)
     {
 
   if (yyerrstatus == 3)
     {

-      /* If just tried and failed to reuse look-ahead token after an
+      /* If just tried and failed to reuse lookahead token after an

         error, discard it.  */
 
       if (yychar <= YYEOF)
         error, discard it.  */
 
       if (yychar <= YYEOF)

-        {
+       {

          /* Return failure if at end of input.  */
          if (yychar == YYEOF)
            YYABORT;
          /* Return failure if at end of input.  */
          if (yychar == YYEOF)
            YYABORT;

-        }
+       }

       else
        {
          yydestruct ("Error: discarding",
       else
        {
          yydestruct ("Error: discarding",

-                      yytoken, &yylval]b4_location_if([, &yylloc])[]b4_user_args[);
+                     yytoken, &yylval]b4_locations_if([, &yylloc])[]b4_user_args[);

          yychar = YYEMPTY;
        }
     }
 
          yychar = YYEMPTY;
        }
     }
 

-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error

      token.  */
   goto yyerrlab1;
 
      token.  */
   goto yyerrlab1;
 


@@ -1383,7 +1375,7 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 

-]b4_location_if([[  yyerror_range[0] = yylsp[1-yylen];
+]b4_locations_if([[  yyerror_range[0] = yylsp[1-yylen];

 ]])[  /* Do not reclaim the symbols of the rule which action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
 ]])[  /* Do not reclaim the symbols of the rule which action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);


@@ -1417,23 +1409,20 @@ yyerrlab1:
       if (yyssp == yyss)
        YYABORT;
 
       if (yyssp == yyss)
        YYABORT;
 

-]b4_location_if([[      yyerror_range[0] = *yylsp;]])[
+]b4_locations_if([[      yyerror_range[0] = *yylsp;]])[

       yydestruct ("Error: popping",
       yydestruct ("Error: popping",

-                  yystos[yystate], yyvsp]b4_location_if([, yylsp])[]b4_user_args[);
+                 yystos[yystate], yyvsp]b4_locations_if([, yylsp])[]b4_user_args[);

       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 

-  if (yyn == YYFINAL)
-    YYACCEPT;
-

   *++yyvsp = yylval;
   *++yyvsp = yylval;

-]b4_location_if([[
+]b4_locations_if([[

   yyerror_range[1] = yylloc;
   /* Using YYLLOC is tempting, but would change the location of
   yyerror_range[1] = yylloc;
   /* Using YYLLOC is tempting, but would change the location of

-     the look-ahead.  YYLOC is available though.  */
-  YYLLOC_DEFAULT (yyloc, yyerror_range - 1, 2);
+     the lookahead.  YYLOC is available though.  */
+  YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);

   *++yylsp = yyloc;]])[
 
   /* Shift the error token.  */
   *++yylsp = yyloc;]])[
 
   /* Shift the error token.  */


@@ -1468,9 +1457,9 @@ yyexhaustedlab:
 #endif
 
 yyreturn:
 #endif
 
 yyreturn:

-  if (yychar != YYEOF && yychar != YYEMPTY)
+  if (yychar != YYEMPTY)

      yydestruct ("Cleanup: discarding lookahead",
      yydestruct ("Cleanup: discarding lookahead",

-                yytoken, &yylval]b4_location_if([, &yylloc])[]b4_user_args[);
+                yytoken, &yylval]b4_locations_if([, &yylloc])[]b4_user_args[);

   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);


@@ -1478,7 +1467,7 @@ yyreturn:
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",

-                 yystos[*yyssp], yyvsp]b4_location_if([, yylsp])[]b4_user_args[);
+                 yystos[*yyssp], yyvsp]b4_locations_if([, yylsp])[]b4_user_args[);

       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow


@@ -1489,40 +1478,41 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif

-  return yyresult;
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);

 ]}
 
 
 b4_epilogue
 ]}
 
 
 b4_epilogue

-m4_if(b4_defines_flag, 0, [],
+b4_defines_if(

 [@output @output_header_name@
 [@output @output_header_name@

-b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
+b4_copyright([Skeleton interface for Bison's Yacc-like parsers in C],dnl '

   [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])
 
   [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])
 

-/* 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.  */
+m4_ifdef([b4_start_header],
+[[/* Copy the %start-header blocks.  */
+]b4_start_header])[]dnl

 
 b4_token_enums_defines(b4_tokens)
 
 
 b4_token_enums_defines(b4_tokens)
 

-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-m4_ifdef([b4_stype],
-[b4_syncline([b4_stype_line], [b4_file_name])
-typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])b4_stype YYSTYPE;
-/* Line __line__ of yacc.c.  */
-b4_syncline([@oline@], [@ofile@])],
-[typedef int YYSTYPE;])
+[#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+]m4_ifdef([b4_stype],
+[[typedef union ]b4_union_name[
+]b4_user_stype[
+       YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1]],
+[m4_if(b4_tag_seen_flag, 0,
+[[typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1]])])[

 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

-# define YYSTYPE_IS_TRIVIAL 1

 #endif
 
 #endif
 

-b4_pure_if([],
+]b4_pure_if([],

 [extern YYSTYPE b4_prefix[]lval;])
 
 [extern YYSTYPE b4_prefix[]lval;])
 

-b4_location_if(
-[#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED)
+b4_locations_if(
+[#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED

 typedef struct YYLTYPE
 {
   int first_line;
 typedef struct YYLTYPE
 {
   int first_line;


@@ -1535,7 +1525,11 @@ typedef struct YYLTYPE
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 

-m4_if(b4_pure, [0],
-[extern YYLTYPE b4_prefix[]lloc;])
-])
-])
+]b4_pure_if([],
+          [extern YYLTYPE b4_prefix[]lloc;])
+)dnl b4_locations_if
+
+m4_ifdef([b4_end_header],
+[[/* Copy the %end-header blocks.  */
+]b4_end_header])[]dnl
+])dnl b4_defines_if