gawk-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-3972-gc2f3679


From: Arnold Robbins
Subject: [SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-3972-gc2f3679
Date: Thu, 14 May 2020 13:43:40 -0400 (EDT)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-5.1-stable has been updated
       via  c2f36795bec8103c8f144f64fb5b6854072de5b5 (commit)
      from  4f53898eb87421a13d10b2dec9ebae432a31cf6f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=c2f36795bec8103c8f144f64fb5b6854072de5b5

commit c2f36795bec8103c8f144f64fb5b6854072de5b5
Author: Arnold D. Robbins <address@hidden>
Date:   Thu May 14 20:43:23 2020 +0300

    Move to Bison 3.6.

diff --git a/ChangeLog b/ChangeLog
index d23a679..7d807b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-14         Arnold D. Robbins     <address@hidden>
+
+       * awkgram.c, command.c: Rebuild with Bison 3.6.
+       * NEWS: Updated.
+
 2020-05-06         Arnold D. Robbins     <address@hidden>
 
        Add lint check for string + string. It's not concatenation
diff --git a/NEWS b/NEWS
index 65f9c96..8ff7613 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,11 @@
    are permitted in any medium without royalty provided the copyright
    notice and this notice are preserved.
 
+Changes from 5.0.1 to 5.0.2
+---------------------------
+
+1. Infrastructure upgrades: Bison 3.6.
+
 Changes from 5.0.1 to 5.1.0
 ---------------------------
 
diff --git a/awkgram.c b/awkgram.c
index 0aa364a..a92964e 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.5.4.  */
+/* A Bison parser, made by GNU Bison 3.6.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
@@ -34,6 +34,10 @@
 /* C LALR(1) parser skeleton written by Richard Stallman, by
    simplifying the original so-called "semantic" parser.  */
 
+/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
+   especially those whose name start with YY_ or yy_.  They are
+   private implementation details that can be changed or removed.  */
+
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
    variables, as they might otherwise be expanded by user macros.
@@ -41,14 +45,11 @@
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 
-/* Undocumented macros, especially those whose name start with YY_,
-   are private implementation details.  Do not rely on them.  */
-
 /* Identify Bison output.  */
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.5.4"
+#define YYBISON_VERSION "3.6"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -231,7 +232,7 @@ extern double fmod(double x, double y);
 
 #define YYSTYPE INSTRUCTION *
 
-#line 235 "awkgram.c"
+#line 236 "awkgram.c"
 
 # ifndef YY_CAST
 #  ifdef __cplusplus
@@ -254,14 +255,6 @@ extern double fmod(double x, double y);
 #  endif
 # endif
 
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
 
 /* Debug traces.  */
 #ifndef YYDEBUG
@@ -271,67 +264,75 @@ extern double fmod(double x, double y);
 extern int yydebug;
 #endif
 
-/* Token type.  */
+/* Token kinds.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
   enum yytokentype
   {
-    FUNC_CALL = 258,
-    NAME = 259,
-    REGEXP = 260,
-    FILENAME = 261,
-    YNUMBER = 262,
-    YSTRING = 263,
-    TYPED_REGEXP = 264,
-    RELOP = 265,
-    IO_OUT = 266,
-    IO_IN = 267,
-    ASSIGNOP = 268,
-    ASSIGN = 269,
-    MATCHOP = 270,
-    CONCAT_OP = 271,
-    SUBSCRIPT = 272,
-    LEX_BEGIN = 273,
-    LEX_END = 274,
-    LEX_IF = 275,
-    LEX_ELSE = 276,
-    LEX_RETURN = 277,
-    LEX_DELETE = 278,
-    LEX_SWITCH = 279,
-    LEX_CASE = 280,
-    LEX_DEFAULT = 281,
-    LEX_WHILE = 282,
-    LEX_DO = 283,
-    LEX_FOR = 284,
-    LEX_BREAK = 285,
-    LEX_CONTINUE = 286,
-    LEX_PRINT = 287,
-    LEX_PRINTF = 288,
-    LEX_NEXT = 289,
-    LEX_EXIT = 290,
-    LEX_FUNCTION = 291,
-    LEX_BEGINFILE = 292,
-    LEX_ENDFILE = 293,
-    LEX_GETLINE = 294,
-    LEX_NEXTFILE = 295,
-    LEX_IN = 296,
-    LEX_AND = 297,
-    LEX_OR = 298,
-    INCREMENT = 299,
-    DECREMENT = 300,
-    LEX_BUILTIN = 301,
-    LEX_LENGTH = 302,
-    LEX_EOF = 303,
-    LEX_INCLUDE = 304,
-    LEX_EVAL = 305,
-    LEX_LOAD = 306,
-    LEX_NAMESPACE = 307,
-    NEWLINE = 308,
-    SLASH_BEFORE_EQUAL = 309,
-    UNARY = 310
+    YYEMPTY = -2,
+    YYEOF = 0,                     /* "end of file"  */
+    YYerror = 256,                 /* error  */
+    YYUNDEF = 257,                 /* "invalid token"  */
+    FUNC_CALL = 258,               /* FUNC_CALL  */
+    NAME = 259,                    /* NAME  */
+    REGEXP = 260,                  /* REGEXP  */
+    FILENAME = 261,                /* FILENAME  */
+    YNUMBER = 262,                 /* YNUMBER  */
+    YSTRING = 263,                 /* YSTRING  */
+    TYPED_REGEXP = 264,            /* TYPED_REGEXP  */
+    RELOP = 265,                   /* RELOP  */
+    IO_OUT = 266,                  /* IO_OUT  */
+    IO_IN = 267,                   /* IO_IN  */
+    ASSIGNOP = 268,                /* ASSIGNOP  */
+    ASSIGN = 269,                  /* ASSIGN  */
+    MATCHOP = 270,                 /* MATCHOP  */
+    CONCAT_OP = 271,               /* CONCAT_OP  */
+    SUBSCRIPT = 272,               /* SUBSCRIPT  */
+    LEX_BEGIN = 273,               /* LEX_BEGIN  */
+    LEX_END = 274,                 /* LEX_END  */
+    LEX_IF = 275,                  /* LEX_IF  */
+    LEX_ELSE = 276,                /* LEX_ELSE  */
+    LEX_RETURN = 277,              /* LEX_RETURN  */
+    LEX_DELETE = 278,              /* LEX_DELETE  */
+    LEX_SWITCH = 279,              /* LEX_SWITCH  */
+    LEX_CASE = 280,                /* LEX_CASE  */
+    LEX_DEFAULT = 281,             /* LEX_DEFAULT  */
+    LEX_WHILE = 282,               /* LEX_WHILE  */
+    LEX_DO = 283,                  /* LEX_DO  */
+    LEX_FOR = 284,                 /* LEX_FOR  */
+    LEX_BREAK = 285,               /* LEX_BREAK  */
+    LEX_CONTINUE = 286,            /* LEX_CONTINUE  */
+    LEX_PRINT = 287,               /* LEX_PRINT  */
+    LEX_PRINTF = 288,              /* LEX_PRINTF  */
+    LEX_NEXT = 289,                /* LEX_NEXT  */
+    LEX_EXIT = 290,                /* LEX_EXIT  */
+    LEX_FUNCTION = 291,            /* LEX_FUNCTION  */
+    LEX_BEGINFILE = 292,           /* LEX_BEGINFILE  */
+    LEX_ENDFILE = 293,             /* LEX_ENDFILE  */
+    LEX_GETLINE = 294,             /* LEX_GETLINE  */
+    LEX_NEXTFILE = 295,            /* LEX_NEXTFILE  */
+    LEX_IN = 296,                  /* LEX_IN  */
+    LEX_AND = 297,                 /* LEX_AND  */
+    LEX_OR = 298,                  /* LEX_OR  */
+    INCREMENT = 299,               /* INCREMENT  */
+    DECREMENT = 300,               /* DECREMENT  */
+    LEX_BUILTIN = 301,             /* LEX_BUILTIN  */
+    LEX_LENGTH = 302,              /* LEX_LENGTH  */
+    LEX_EOF = 303,                 /* LEX_EOF  */
+    LEX_INCLUDE = 304,             /* LEX_INCLUDE  */
+    LEX_EVAL = 305,                /* LEX_EVAL  */
+    LEX_LOAD = 306,                /* LEX_LOAD  */
+    LEX_NAMESPACE = 307,           /* LEX_NAMESPACE  */
+    NEWLINE = 308,                 /* NEWLINE  */
+    SLASH_BEFORE_EQUAL = 309,      /* SLASH_BEFORE_EQUAL  */
+    UNARY = 310                    /* UNARY  */
   };
+  typedef enum yytokentype yytoken_kind_t;
 #endif
-/* Tokens.  */
+/* Token kinds.  */
+#define YYEOF 0
+#define YYerror 256
+#define YYUNDEF 257
 #define FUNC_CALL 258
 #define NAME 259
 #define REGEXP 260
@@ -399,6 +400,161 @@ extern YYSTYPE yylval;
 int yyparse (void);
 
 
+/* Symbol kind.  */
+enum yysymbol_kind_t
+{
+  YYSYMBOL_YYEMPTY = -2,
+  YYSYMBOL_YYEOF = 0,                      /* "end of file"  */
+  YYSYMBOL_YYerror = 1,                    /* error  */
+  YYSYMBOL_YYUNDEF = 2,                    /* "invalid token"  */
+  YYSYMBOL_FUNC_CALL = 3,                  /* FUNC_CALL  */
+  YYSYMBOL_NAME = 4,                       /* NAME  */
+  YYSYMBOL_REGEXP = 5,                     /* REGEXP  */
+  YYSYMBOL_FILENAME = 6,                   /* FILENAME  */
+  YYSYMBOL_YNUMBER = 7,                    /* YNUMBER  */
+  YYSYMBOL_YSTRING = 8,                    /* YSTRING  */
+  YYSYMBOL_TYPED_REGEXP = 9,               /* TYPED_REGEXP  */
+  YYSYMBOL_RELOP = 10,                     /* RELOP  */
+  YYSYMBOL_IO_OUT = 11,                    /* IO_OUT  */
+  YYSYMBOL_IO_IN = 12,                     /* IO_IN  */
+  YYSYMBOL_ASSIGNOP = 13,                  /* ASSIGNOP  */
+  YYSYMBOL_ASSIGN = 14,                    /* ASSIGN  */
+  YYSYMBOL_MATCHOP = 15,                   /* MATCHOP  */
+  YYSYMBOL_CONCAT_OP = 16,                 /* CONCAT_OP  */
+  YYSYMBOL_SUBSCRIPT = 17,                 /* SUBSCRIPT  */
+  YYSYMBOL_LEX_BEGIN = 18,                 /* LEX_BEGIN  */
+  YYSYMBOL_LEX_END = 19,                   /* LEX_END  */
+  YYSYMBOL_LEX_IF = 20,                    /* LEX_IF  */
+  YYSYMBOL_LEX_ELSE = 21,                  /* LEX_ELSE  */
+  YYSYMBOL_LEX_RETURN = 22,                /* LEX_RETURN  */
+  YYSYMBOL_LEX_DELETE = 23,                /* LEX_DELETE  */
+  YYSYMBOL_LEX_SWITCH = 24,                /* LEX_SWITCH  */
+  YYSYMBOL_LEX_CASE = 25,                  /* LEX_CASE  */
+  YYSYMBOL_LEX_DEFAULT = 26,               /* LEX_DEFAULT  */
+  YYSYMBOL_LEX_WHILE = 27,                 /* LEX_WHILE  */
+  YYSYMBOL_LEX_DO = 28,                    /* LEX_DO  */
+  YYSYMBOL_LEX_FOR = 29,                   /* LEX_FOR  */
+  YYSYMBOL_LEX_BREAK = 30,                 /* LEX_BREAK  */
+  YYSYMBOL_LEX_CONTINUE = 31,              /* LEX_CONTINUE  */
+  YYSYMBOL_LEX_PRINT = 32,                 /* LEX_PRINT  */
+  YYSYMBOL_LEX_PRINTF = 33,                /* LEX_PRINTF  */
+  YYSYMBOL_LEX_NEXT = 34,                  /* LEX_NEXT  */
+  YYSYMBOL_LEX_EXIT = 35,                  /* LEX_EXIT  */
+  YYSYMBOL_LEX_FUNCTION = 36,              /* LEX_FUNCTION  */
+  YYSYMBOL_LEX_BEGINFILE = 37,             /* LEX_BEGINFILE  */
+  YYSYMBOL_LEX_ENDFILE = 38,               /* LEX_ENDFILE  */
+  YYSYMBOL_LEX_GETLINE = 39,               /* LEX_GETLINE  */
+  YYSYMBOL_LEX_NEXTFILE = 40,              /* LEX_NEXTFILE  */
+  YYSYMBOL_LEX_IN = 41,                    /* LEX_IN  */
+  YYSYMBOL_LEX_AND = 42,                   /* LEX_AND  */
+  YYSYMBOL_LEX_OR = 43,                    /* LEX_OR  */
+  YYSYMBOL_INCREMENT = 44,                 /* INCREMENT  */
+  YYSYMBOL_DECREMENT = 45,                 /* DECREMENT  */
+  YYSYMBOL_LEX_BUILTIN = 46,               /* LEX_BUILTIN  */
+  YYSYMBOL_LEX_LENGTH = 47,                /* LEX_LENGTH  */
+  YYSYMBOL_LEX_EOF = 48,                   /* LEX_EOF  */
+  YYSYMBOL_LEX_INCLUDE = 49,               /* LEX_INCLUDE  */
+  YYSYMBOL_LEX_EVAL = 50,                  /* LEX_EVAL  */
+  YYSYMBOL_LEX_LOAD = 51,                  /* LEX_LOAD  */
+  YYSYMBOL_LEX_NAMESPACE = 52,             /* LEX_NAMESPACE  */
+  YYSYMBOL_NEWLINE = 53,                   /* NEWLINE  */
+  YYSYMBOL_SLASH_BEFORE_EQUAL = 54,        /* SLASH_BEFORE_EQUAL  */
+  YYSYMBOL_55_ = 55,                       /* '?'  */
+  YYSYMBOL_56_ = 56,                       /* ':'  */
+  YYSYMBOL_57_ = 57,                       /* ','  */
+  YYSYMBOL_58_ = 58,                       /* '<'  */
+  YYSYMBOL_59_ = 59,                       /* '>'  */
+  YYSYMBOL_60_ = 60,                       /* '+'  */
+  YYSYMBOL_61_ = 61,                       /* '-'  */
+  YYSYMBOL_62_ = 62,                       /* '*'  */
+  YYSYMBOL_63_ = 63,                       /* '/'  */
+  YYSYMBOL_64_ = 64,                       /* '%'  */
+  YYSYMBOL_65_ = 65,                       /* '!'  */
+  YYSYMBOL_UNARY = 66,                     /* UNARY  */
+  YYSYMBOL_67_ = 67,                       /* '^'  */
+  YYSYMBOL_68_ = 68,                       /* '$'  */
+  YYSYMBOL_69_ = 69,                       /* '('  */
+  YYSYMBOL_70_ = 70,                       /* ')'  */
+  YYSYMBOL_71_ = 71,                       /* '@'  */
+  YYSYMBOL_72_ = 72,                       /* '['  */
+  YYSYMBOL_73_ = 73,                       /* ']'  */
+  YYSYMBOL_74_ = 74,                       /* '{'  */
+  YYSYMBOL_75_ = 75,                       /* '}'  */
+  YYSYMBOL_76_ = 76,                       /* ';'  */
+  YYSYMBOL_YYACCEPT = 77,                  /* $accept  */
+  YYSYMBOL_program = 78,                   /* program  */
+  YYSYMBOL_rule = 79,                      /* rule  */
+  YYSYMBOL_source = 80,                    /* source  */
+  YYSYMBOL_library = 81,                   /* library  */
+  YYSYMBOL_namespace = 82,                 /* namespace  */
+  YYSYMBOL_pattern = 83,                   /* pattern  */
+  YYSYMBOL_action = 84,                    /* action  */
+  YYSYMBOL_func_name = 85,                 /* func_name  */
+  YYSYMBOL_lex_builtin = 86,               /* lex_builtin  */
+  YYSYMBOL_function_prologue = 87,         /* function_prologue  */
+  YYSYMBOL_88_1 = 88,                      /* $@1  */
+  YYSYMBOL_regexp = 89,                    /* regexp  */
+  YYSYMBOL_90_2 = 90,                      /* $@2  */
+  YYSYMBOL_typed_regexp = 91,              /* typed_regexp  */
+  YYSYMBOL_a_slash = 92,                   /* a_slash  */
+  YYSYMBOL_statements = 93,                /* statements  */
+  YYSYMBOL_statement_term = 94,            /* statement_term  */
+  YYSYMBOL_statement = 95,                 /* statement  */
+  YYSYMBOL_non_compound_stmt = 96,         /* non_compound_stmt  */
+  YYSYMBOL_97_3 = 97,                      /* $@3  */
+  YYSYMBOL_simple_stmt = 98,               /* simple_stmt  */
+  YYSYMBOL_99_4 = 99,                      /* $@4  */
+  YYSYMBOL_100_5 = 100,                    /* $@5  */
+  YYSYMBOL_opt_simple_stmt = 101,          /* opt_simple_stmt  */
+  YYSYMBOL_case_statements = 102,          /* case_statements  */
+  YYSYMBOL_case_statement = 103,           /* case_statement  */
+  YYSYMBOL_case_value = 104,               /* case_value  */
+  YYSYMBOL_print = 105,                    /* print  */
+  YYSYMBOL_print_expression_list = 106,    /* print_expression_list  */
+  YYSYMBOL_output_redir = 107,             /* output_redir  */
+  YYSYMBOL_108_6 = 108,                    /* $@6  */
+  YYSYMBOL_if_statement = 109,             /* if_statement  */
+  YYSYMBOL_nls = 110,                      /* nls  */
+  YYSYMBOL_opt_nls = 111,                  /* opt_nls  */
+  YYSYMBOL_input_redir = 112,              /* input_redir  */
+  YYSYMBOL_opt_param_list = 113,           /* opt_param_list  */
+  YYSYMBOL_param_list = 114,               /* param_list  */
+  YYSYMBOL_opt_exp = 115,                  /* opt_exp  */
+  YYSYMBOL_opt_expression_list = 116,      /* opt_expression_list  */
+  YYSYMBOL_expression_list = 117,          /* expression_list  */
+  YYSYMBOL_opt_fcall_expression_list = 118, /* opt_fcall_expression_list  */
+  YYSYMBOL_fcall_expression_list = 119,    /* fcall_expression_list  */
+  YYSYMBOL_fcall_exp = 120,                /* fcall_exp  */
+  YYSYMBOL_exp = 121,                      /* exp  */
+  YYSYMBOL_assign_operator = 122,          /* assign_operator  */
+  YYSYMBOL_relop_or_less = 123,            /* relop_or_less  */
+  YYSYMBOL_a_relop = 124,                  /* a_relop  */
+  YYSYMBOL_common_exp = 125,               /* common_exp  */
+  YYSYMBOL_simp_exp = 126,                 /* simp_exp  */
+  YYSYMBOL_simp_exp_nc = 127,              /* simp_exp_nc  */
+  YYSYMBOL_non_post_simp_exp = 128,        /* non_post_simp_exp  */
+  YYSYMBOL_func_call = 129,                /* func_call  */
+  YYSYMBOL_direct_func_call = 130,         /* direct_func_call  */
+  YYSYMBOL_opt_variable = 131,             /* opt_variable  */
+  YYSYMBOL_delete_subscript_list = 132,    /* delete_subscript_list  */
+  YYSYMBOL_delete_subscript = 133,         /* delete_subscript  */
+  YYSYMBOL_delete_exp_list = 134,          /* delete_exp_list  */
+  YYSYMBOL_bracketed_exp_list = 135,       /* bracketed_exp_list  */
+  YYSYMBOL_subscript = 136,                /* subscript  */
+  YYSYMBOL_subscript_list = 137,           /* subscript_list  */
+  YYSYMBOL_simple_variable = 138,          /* simple_variable  */
+  YYSYMBOL_variable = 139,                 /* variable  */
+  YYSYMBOL_opt_incdec = 140,               /* opt_incdec  */
+  YYSYMBOL_l_brace = 141,                  /* l_brace  */
+  YYSYMBOL_r_brace = 142,                  /* r_brace  */
+  YYSYMBOL_r_paren = 143,                  /* r_paren  */
+  YYSYMBOL_opt_semi = 144,                 /* opt_semi  */
+  YYSYMBOL_semi = 145,                     /* semi  */
+  YYSYMBOL_colon = 146,                    /* colon  */
+  YYSYMBOL_comma = 147                     /* comma  */
+};
+typedef enum yysymbol_kind_t yysymbol_kind_t;
+
 
 
 
@@ -498,6 +654,7 @@ typedef int yytype_uint16;
 
 #define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X))
 
+
 /* Stored state numbers (used for stacks). */
 typedef yytype_int16 yy_state_t;
 
@@ -516,6 +673,7 @@ typedef int yy_state_fast_t;
 # endif
 #endif
 
+
 #ifndef YY_ATTRIBUTE_PURE
 # if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
 #  define YY_ATTRIBUTE_PURE __attribute__ ((__pure__))
@@ -573,7 +731,7 @@ typedef int yy_state_fast_t;
 
 #define YY_ASSERT(E) ((void) (0 && (E)))
 
-#if ! defined yyoverflow || YYERROR_VERBOSE
+#if !defined yyoverflow
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
@@ -638,8 +796,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 # endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
+#endif /* !defined yyoverflow */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
@@ -715,14 +872,15 @@ union yyalloc
 /* YYNSTATES -- Number of states.  */
 #define YYNSTATES  355
 
-#define YYUNDEFTOK  2
 #define YYMAXUTOK   310
 
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex, with out-of-bounds checking.  */
-#define YYTRANSLATE(YYX)                                                \
-  (0 <= (YYX) && (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+#define YYTRANSLATE(YYX)                                \
+  (0 <= (YYX) && (YYX) <= YYMAXUTOK                     \
+   ? YY_CAST (yysymbol_kind_t, yytranslate[YYX])        \
+   : YYSYMBOL_YYUNDEF)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex.  */
@@ -790,26 +948,33 @@ static const yytype_int16 yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
+/** Accessing symbol of state STATE.  */
+#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State])
+
+#if YYDEBUG || 0
+/* The user-facing name of the symbol whose (internal) number is
+   YYSYMBOL.  No bounds checking.  */
+static const char *yysymbol_name (yysymbol_kind_t yysymbol) 
YY_ATTRIBUTE_UNUSED;
+
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "FUNC_CALL", "NAME", "REGEXP",
-  "FILENAME", "YNUMBER", "YSTRING", "TYPED_REGEXP", "RELOP", "IO_OUT",
-  "IO_IN", "ASSIGNOP", "ASSIGN", "MATCHOP", "CONCAT_OP", "SUBSCRIPT",
-  "LEX_BEGIN", "LEX_END", "LEX_IF", "LEX_ELSE", "LEX_RETURN", "LEX_DELETE",
-  "LEX_SWITCH", "LEX_CASE", "LEX_DEFAULT", "LEX_WHILE", "LEX_DO",
-  "LEX_FOR", "LEX_BREAK", "LEX_CONTINUE", "LEX_PRINT", "LEX_PRINTF",
-  "LEX_NEXT", "LEX_EXIT", "LEX_FUNCTION", "LEX_BEGINFILE", "LEX_ENDFILE",
-  "LEX_GETLINE", "LEX_NEXTFILE", "LEX_IN", "LEX_AND", "LEX_OR",
-  "INCREMENT", "DECREMENT", "LEX_BUILTIN", "LEX_LENGTH", "LEX_EOF",
-  "LEX_INCLUDE", "LEX_EVAL", "LEX_LOAD", "LEX_NAMESPACE", "NEWLINE",
-  "SLASH_BEFORE_EQUAL", "'?'", "':'", "','", "'<'", "'>'", "'+'", "'-'",
-  "'*'", "'/'", "'%'", "'!'", "UNARY", "'^'", "'$'", "'('", "')'", "'@'",
-  "'['", "']'", "'{'", "'}'", "';'", "$accept", "program", "rule",
-  "source", "library", "namespace", "pattern", "action", "func_name",
-  "lex_builtin", "function_prologue", "$@1", "regexp", "$@2",
+  "\"end of file\"", "error", "\"invalid token\"", "FUNC_CALL", "NAME",
+  "REGEXP", "FILENAME", "YNUMBER", "YSTRING", "TYPED_REGEXP", "RELOP",
+  "IO_OUT", "IO_IN", "ASSIGNOP", "ASSIGN", "MATCHOP", "CONCAT_OP",
+  "SUBSCRIPT", "LEX_BEGIN", "LEX_END", "LEX_IF", "LEX_ELSE", "LEX_RETURN",
+  "LEX_DELETE", "LEX_SWITCH", "LEX_CASE", "LEX_DEFAULT", "LEX_WHILE",
+  "LEX_DO", "LEX_FOR", "LEX_BREAK", "LEX_CONTINUE", "LEX_PRINT",
+  "LEX_PRINTF", "LEX_NEXT", "LEX_EXIT", "LEX_FUNCTION", "LEX_BEGINFILE",
+  "LEX_ENDFILE", "LEX_GETLINE", "LEX_NEXTFILE", "LEX_IN", "LEX_AND",
+  "LEX_OR", "INCREMENT", "DECREMENT", "LEX_BUILTIN", "LEX_LENGTH",
+  "LEX_EOF", "LEX_INCLUDE", "LEX_EVAL", "LEX_LOAD", "LEX_NAMESPACE",
+  "NEWLINE", "SLASH_BEFORE_EQUAL", "'?'", "':'", "','", "'<'", "'>'",
+  "'+'", "'-'", "'*'", "'/'", "'%'", "'!'", "UNARY", "'^'", "'$'", "'('",
+  "')'", "'@'", "'['", "']'", "'{'", "'}'", "';'", "$accept", "program",
+  "rule", "source", "library", "namespace", "pattern", "action",
+  "func_name", "lex_builtin", "function_prologue", "$@1", "regexp", "$@2",
   "typed_regexp", "a_slash", "statements", "statement_term", "statement",
   "non_compound_stmt", "$@3", "simple_stmt", "$@4", "$@5",
   "opt_simple_stmt", "case_statements", "case_statement", "case_value",
@@ -824,9 +989,15 @@ static const char *const yytname[] =
   "simple_variable", "variable", "opt_incdec", "l_brace", "r_brace",
   "r_paren", "opt_semi", "semi", "colon", "comma", YY_NULLPTR
 };
+
+static const char *
+yysymbol_name (yysymbol_kind_t yysymbol)
+{
+  return yytname[yysymbol];
+}
 #endif
 
-# ifdef YYPRINT
+#ifdef YYPRINT
 /* YYTOKNUM[NUM] -- (External) token number corresponding to the
    (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_int16 yytoknum[] =
@@ -840,7 +1011,7 @@ static const yytype_int16 yytoknum[] =
       43,    45,    42,    47,    37,    33,   310,    94,    36,    40,
       41,    64,    91,    93,   123,   125,    59
 };
-# endif
+#endif
 
 #define YYPACT_NINF (-283)
 
@@ -1309,10 +1480,10 @@ static const yytype_int8 yyr2[] =
 };
 
 
+enum { YYENOMEM = -2 };
+
 #define yyerrok         (yyerrstatus = 0)
 #define yyclearin       (yychar = YYEMPTY)
-#define YYEMPTY         (-2)
-#define YYEOF           0
 
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
@@ -1338,10 +1509,9 @@ static const yytype_int8 yyr2[] =
       }                                                           \
   while (0)
 
-/* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
-
+/* Backward compatibility with an undocumented macro.
+   Use YYerror or YYUNDEF. */
+#define YYERRCODE YYUNDEF
 
 
 /* Enable debugging if requested.  */
@@ -1359,18 +1529,18 @@ do {                                            \
 } while (0)
 
 /* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
+# ifndef YY_LOCATION_PRINT
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
 do {                                                                      \
   if (yydebug)                                                            \
     {                                                                     \
       YYFPRINTF (stderr, "%s ", Title);                                   \
       yy_symbol_print (stderr,                                            \
-                  Type, Value); \
+                  Kind, Value); \
       YYFPRINTF (stderr, "\n");                                           \
     }                                                                     \
 } while (0)
@@ -1381,18 +1551,19 @@ do {                                                    
                  \
 `-----------------------------------*/
 
 static void
-yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_value_print (FILE *yyo,
+                       yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep)
 {
   FILE *yyoutput = yyo;
   YYUSE (yyoutput);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
+  if (yykind < YYNTOKENS)
+    YYPRINT (yyo, yytoknum[yykind], *yyvaluep);
 # endif
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
+  YYUSE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
@@ -1402,12 +1573,13 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE 
const * const yyvaluep)
 `---------------------------*/
 
 static void
-yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_print (FILE *yyo,
+                 yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep)
 {
   YYFPRINTF (yyo, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
+             yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind));
 
-  yy_symbol_value_print (yyo, yytype, yyvaluep);
+  yy_symbol_value_print (yyo, yykind, yyvaluep);
   YYFPRINTF (yyo, ")");
 }
 
@@ -1440,7 +1612,8 @@ do {                                                      
      \
 `------------------------------------------------*/
 
 static void
-yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp,
+                 int yyrule)
 {
   int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
@@ -1452,9 +1625,8 @@ yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, int 
yyrule)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr,
-                       yystos[+yyssp[yyi + 1 - yynrhs]],
-                       &yyvsp[(yyi + 1) - (yynrhs)]
-                                              );
+                       YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]),
+                       &yyvsp[(yyi + 1) - (yynrhs)]);
       YYFPRINTF (stderr, "\n");
     }
 }
@@ -1469,8 +1641,8 @@ do {                                    \
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YYDPRINTF(Args) ((void) 0)
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -1493,258 +1665,29 @@ int yydebug;
 #endif
 
 
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S)))
-#  else
-/* Return the length of YYSTR.  */
-static YYPTRDIFF_T
-yystrlen (const char *yystr)
-{
-  YYPTRDIFF_T yylen;
-  for (yylen = 0; yystr[yylen]; yylen++)
-    continue;
-  return yylen;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-{
-  char *yyd = yydest;
-  const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
 
-  return yyd - 1;
-}
-#  endif
-# endif
 
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYPTRDIFF_T
-yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-    {
-      YYPTRDIFF_T yyn = 0;
-      char const *yyp = yystr;
 
-      for (;;)
-        switch (*++yyp)
-          {
-          case '\'':
-          case ',':
-            goto do_not_strip_quotes;
-
-          case '\\':
-            if (*++yyp != '\\')
-              goto do_not_strip_quotes;
-            else
-              goto append;
-
-          append:
-          default:
-            if (yyres)
-              yyres[yyn] = *yyp;
-            yyn++;
-            break;
-
-          case '"':
-            if (yyres)
-              yyres[yyn] = '\0';
-            return yyn;
-          }
-    do_not_strip_quotes: ;
-    }
-
-  if (yyres)
-    return yystpcpy (yyres, yystr) - yyres;
-  else
-    return yystrlen (yystr);
-}
-# endif
-
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int
-yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
-                yy_state_t *yyssp, int yytoken)
-{
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = YY_NULLPTR;
-  /* Arguments of yyformat: reported tokens (one for the "unexpected",
-     one per "expected"). */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Actual size of YYARG. */
-  int yycount = 0;
-  /* Cumulated lengths of YYARG.  */
-  YYPTRDIFF_T yysize = 0;
-
-  /* There are many possibilities here to consider:
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[+*yyssp];
-      YYPTRDIFF_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
-      yysize = yysize0;
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                {
-                  YYPTRDIFF_T yysize1
-                    = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
-                  if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
-                    yysize = yysize1;
-                  else
-                    return 2;
-                }
-              }
-        }
-    }
-
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-    default: /* Avoid compiler warnings. */
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or 
%s"));
-# undef YYCASE_
-    }
-
-  {
-    /* Don't count the "%s"s in the final size, but reserve room for
-       the terminator.  */
-    YYPTRDIFF_T yysize1 = yysize + (yystrlen (yyformat) - 2 * yycount) + 1;
-    if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
-      yysize = yysize1;
-    else
-      return 2;
-  }
-
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
-
-  /* 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 = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          ++yyp;
-          ++yyformat;
-        }
-  }
-  return 0;
-}
-#endif /* YYERROR_VERBOSE */
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg,
+            yysymbol_kind_t yykind, YYSTYPE *yyvaluep)
 {
   YYUSE (yyvaluep);
   if (!yymsg)
     yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+  YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp);
 
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
+  YYUSE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
-
-
 /* The lookahead symbol.  */
 int yychar;
 
@@ -1754,6 +1697,8 @@ YYSTYPE yylval;
 int yynerrs;
 
 
+
+
 /*----------.
 | yyparse.  |
 `----------*/
@@ -1772,6 +1717,9 @@ yyparse (void)
        Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
+    /* Their size.  */
+    YYPTRDIFF_T yystacksize;
+
     /* The state stack.  */
     yy_state_t yyssa[YYINITDEPTH];
     yy_state_t *yyss;
@@ -1782,22 +1730,16 @@ yyparse (void)
     YYSTYPE *yyvs;
     YYSTYPE *yyvsp;
 
-    YYPTRDIFF_T yystacksize;
-
   int yyn;
+  /* The return value of yyparse.  */
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
+  yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf;
-#endif
+
 
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
@@ -1805,15 +1747,17 @@ yyparse (void)
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
+  yynerrs = 0;
+  yystate = 0;
+  yyerrstatus = 0;
+
+  yystacksize = YYINITDEPTH;
   yyssp = yyss = yyssa;
   yyvsp = yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
+
 
   YYDPRINTF ((stderr, "Starting parse\n"));
 
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
@@ -1836,6 +1780,7 @@ yysetstate:
   YY_IGNORE_USELESS_CAST_BEGIN
   *yyssp = YY_CAST (yy_state_t, yystate);
   YY_IGNORE_USELESS_CAST_END
+  YY_STACK_PRINT (yyss, yyssp);
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
@@ -1881,7 +1826,7 @@ yysetstate:
           goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-# undef YYSTACK_RELOCATE
+#  undef YYSTACK_RELOCATE
         if (yyss1 != yyssa)
           YYSTACK_FREE (yyss1);
       }
@@ -1920,18 +1865,29 @@ yybackup:
 
   /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either empty, or end-of-input, or a valid lookahead.  */
   if (yychar == YYEMPTY)
     {
-      YYDPRINTF ((stderr, "Reading a token: "));
+      YYDPRINTF ((stderr, "Reading a token\n"));
       yychar = yylex ();
     }
 
   if (yychar <= YYEOF)
     {
-      yychar = yytoken = YYEOF;
+      yychar = YYEOF;
+      yytoken = YYSYMBOL_YYEOF;
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
+  else if (yychar == YYerror)
+    {
+      /* The scanner already issued an error message, process directly
+         to error recovery.  But do not keep the error token as
+         lookahead, it is too special and may lead us to an endless
+         loop in error recovery. */
+      yychar = YYUNDEF;
+      yytoken = YYSYMBOL_YYerror;
+      goto yyerrlab1;
+    }
   else
     {
       yytoken = YYTRANSLATE (yychar);
@@ -2003,7 +1959,7 @@ yyreduce:
   case 2:
 #line 232 "awkgram.y"
           { yyval = NULL; }
-#line 2007 "awkgram.c"
+#line 1963 "awkgram.c"
     break;
 
   case 3:
@@ -2012,7 +1968,7 @@ yyreduce:
                rule = 0;
                yyerrok;
          }
-#line 2016 "awkgram.c"
+#line 1972 "awkgram.c"
     break;
 
   case 4:
@@ -2026,7 +1982,7 @@ yyreduce:
                }
                yyval = yyvsp[-1];
          }
-#line 2030 "awkgram.c"
+#line 1986 "awkgram.c"
     break;
 
   case 5:
@@ -2034,7 +1990,7 @@ yyreduce:
           {
                next_sourcefile();
          }
-#line 2038 "awkgram.c"
+#line 1994 "awkgram.c"
     break;
 
   case 6:
@@ -2047,7 +2003,7 @@ yyreduce:
                 */
                /* yyerrok; */
          }
-#line 2051 "awkgram.c"
+#line 2007 "awkgram.c"
     break;
 
   case 7:
@@ -2059,7 +2015,7 @@ yyreduce:
                        pending_comment = NULL;
                }
          }
-#line 2063 "awkgram.c"
+#line 2019 "awkgram.c"
     break;
 
   case 8:
@@ -2077,7 +2033,7 @@ yyreduce:
                        (void) append_rule(yyvsp[-1], NULL);
                }
          }
-#line 2081 "awkgram.c"
+#line 2037 "awkgram.c"
     break;
 
   case 9:
@@ -2092,7 +2048,7 @@ yyreduce:
                }
                yyerrok;
          }
-#line 2096 "awkgram.c"
+#line 2052 "awkgram.c"
     break;
 
   case 10:
@@ -2106,7 +2062,7 @@ yyreduce:
                }
                yyerrok;
          }
-#line 2110 "awkgram.c"
+#line 2066 "awkgram.c"
     break;
 
   case 11:
@@ -2120,7 +2076,7 @@ yyreduce:
                }
                yyerrok;
          }
-#line 2124 "awkgram.c"
+#line 2080 "awkgram.c"
     break;
 
   case 12:
@@ -2134,7 +2090,7 @@ yyreduce:
 
                yyerrok;
          }
-#line 2138 "awkgram.c"
+#line 2094 "awkgram.c"
     break;
 
   case 13:
@@ -2148,19 +2104,19 @@ yyreduce:
                bcfree(yyvsp[0]);
                yyval = (INSTRUCTION *) srcfile;
          }
-#line 2152 "awkgram.c"
+#line 2108 "awkgram.c"
     break;
 
   case 14:
 #line 341 "awkgram.y"
           { yyval = NULL; }
-#line 2158 "awkgram.c"
+#line 2114 "awkgram.c"
     break;
 
   case 15:
 #line 343 "awkgram.y"
           { yyval = NULL; }
-#line 2164 "awkgram.c"
+#line 2120 "awkgram.c"
     break;
 
   case 16:
@@ -2174,37 +2130,37 @@ yyreduce:
                bcfree(yyvsp[0]);
                yyval = (INSTRUCTION *) srcfile;
          }
-#line 2178 "awkgram.c"
+#line 2134 "awkgram.c"
     break;
 
   case 17:
 #line 358 "awkgram.y"
           { yyval = NULL; }
-#line 2184 "awkgram.c"
+#line 2140 "awkgram.c"
     break;
 
   case 18:
 #line 360 "awkgram.y"
           { yyval = NULL; }
-#line 2190 "awkgram.c"
+#line 2146 "awkgram.c"
     break;
 
   case 19:
 #line 365 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 2196 "awkgram.c"
+#line 2152 "awkgram.c"
     break;
 
   case 20:
 #line 367 "awkgram.y"
           { yyval = NULL; }
-#line 2202 "awkgram.c"
+#line 2158 "awkgram.c"
     break;
 
   case 21:
 #line 369 "awkgram.y"
           { yyval = NULL; }
-#line 2208 "awkgram.c"
+#line 2164 "awkgram.c"
     break;
 
   case 22:
@@ -2213,7 +2169,7 @@ yyreduce:
                rule = Rule;
                yyval = NULL;
          }
-#line 2217 "awkgram.c"
+#line 2173 "awkgram.c"
     break;
 
   case 23:
@@ -2221,7 +2177,7 @@ yyreduce:
           {
                rule = Rule;
          }
-#line 2225 "awkgram.c"
+#line 2181 "awkgram.c"
     break;
 
   case 24:
@@ -2255,7 +2211,7 @@ yyreduce:
                        yyval = list_append(list_merge(yyvsp[-2], yyvsp[0]), 
tp);
                rule = Rule;
          }
-#line 2259 "awkgram.c"
+#line 2215 "awkgram.c"
     break;
 
   case 25:
@@ -2271,7 +2227,7 @@ yyreduce:
                yyvsp[0]->source_file = source;
                yyval = yyvsp[0];
          }
-#line 2275 "awkgram.c"
+#line 2231 "awkgram.c"
     break;
 
   case 26:
@@ -2287,7 +2243,7 @@ yyreduce:
                yyvsp[0]->source_file = source;
                yyval = yyvsp[0];
          }
-#line 2291 "awkgram.c"
+#line 2247 "awkgram.c"
     break;
 
   case 27:
@@ -2297,7 +2253,7 @@ yyreduce:
                yyvsp[0]->source_file = source;
                yyval = yyvsp[0];
          }
-#line 2301 "awkgram.c"
+#line 2257 "awkgram.c"
     break;
 
   case 28:
@@ -2307,7 +2263,7 @@ yyreduce:
                yyvsp[0]->source_file = source;
                yyval = yyvsp[0];
          }
-#line 2311 "awkgram.c"
+#line 2267 "awkgram.c"
     break;
 
   case 29:
@@ -2326,7 +2282,7 @@ yyreduce:
 
                yyval = ip;
          }
-#line 2330 "awkgram.c"
+#line 2286 "awkgram.c"
     break;
 
   case 31:
@@ -2341,7 +2297,7 @@ yyreduce:
                }
                yyval = yyvsp[0];
          }
-#line 2345 "awkgram.c"
+#line 2301 "awkgram.c"
     break;
 
   case 32:
@@ -2351,7 +2307,7 @@ yyreduce:
                                        tokstart);
                YYABORT;
          }
-#line 2355 "awkgram.c"
+#line 2311 "awkgram.c"
     break;
 
   case 33:
@@ -2360,13 +2316,13 @@ yyreduce:
                yyval = yyvsp[0];
                at_seen = false;
          }
-#line 2364 "awkgram.c"
+#line 2320 "awkgram.c"
     break;
 
   case 36:
 #line 501 "awkgram.y"
                                      { want_param_names = FUNC_HEADER; }
-#line 2370 "awkgram.c"
+#line 2326 "awkgram.c"
     break;
 
   case 37:
@@ -2396,13 +2352,13 @@ yyreduce:
                yyval = yyvsp[-6];
                want_param_names = FUNC_BODY;
          }
-#line 2400 "awkgram.c"
+#line 2356 "awkgram.c"
     break;
 
   case 38:
 #line 535 "awkgram.y"
                 { want_regexp = true; }
-#line 2406 "awkgram.c"
+#line 2362 "awkgram.c"
     break;
 
   case 39:
@@ -2435,7 +2391,7 @@ yyreduce:
                  yyval->opcode = Op_match_rec;
                  yyval->memory = n;
                }
-#line 2439 "awkgram.c"
+#line 2395 "awkgram.c"
     break;
 
   case 40:
@@ -2452,19 +2408,19 @@ yyreduce:
                  yyval->opcode = Op_push_re;
                  yyval->memory = make_typed_regex(re, len);
                }
-#line 2456 "awkgram.c"
+#line 2412 "awkgram.c"
     break;
 
   case 41:
 #line 584 "awkgram.y"
           { bcfree(yyvsp[0]); }
-#line 2462 "awkgram.c"
+#line 2418 "awkgram.c"
     break;
 
   case 43:
 #line 590 "awkgram.y"
           { yyval = NULL; }
-#line 2468 "awkgram.c"
+#line 2424 "awkgram.c"
     break;
 
   case 44:
@@ -2488,25 +2444,25 @@ yyreduce:
 
                yyerrok;
          }
-#line 2492 "awkgram.c"
+#line 2448 "awkgram.c"
     break;
 
   case 45:
 #line 612 "awkgram.y"
           {    yyval = NULL; }
-#line 2498 "awkgram.c"
+#line 2454 "awkgram.c"
     break;
 
   case 46:
 #line 616 "awkgram.y"
                         { yyval = yyvsp[0]; }
-#line 2504 "awkgram.c"
+#line 2460 "awkgram.c"
     break;
 
   case 47:
 #line 617 "awkgram.y"
                         { yyval = yyvsp[0]; }
-#line 2510 "awkgram.c"
+#line 2466 "awkgram.c"
     break;
 
   case 48:
@@ -2521,7 +2477,7 @@ yyreduce:
                } else
                        yyval = NULL;
          }
-#line 2525 "awkgram.c"
+#line 2481 "awkgram.c"
     break;
 
   case 49:
@@ -2530,7 +2486,7 @@ yyreduce:
                trailing_comment = yyvsp[0];    // NULL or comment
                yyval = make_braced_statements(yyvsp[-2], yyvsp[-1], yyvsp[0]);
          }
-#line 2534 "awkgram.c"
+#line 2490 "awkgram.c"
     break;
 
   case 50:
@@ -2541,7 +2497,7 @@ yyreduce:
                else
                        yyval = yyvsp[0];
          }
-#line 2545 "awkgram.c"
+#line 2501 "awkgram.c"
     break;
 
   case 51:
@@ -2653,7 +2609,7 @@ yyreduce:
                break_allowed--;
                fix_break_continue(ip, tbreak, NULL);
          }
-#line 2657 "awkgram.c"
+#line 2613 "awkgram.c"
     break;
 
   case 52:
@@ -2708,7 +2664,7 @@ yyreduce:
                continue_allowed--;
                fix_break_continue(ip, tbreak, tcont);
          }
-#line 2712 "awkgram.c"
+#line 2668 "awkgram.c"
     break;
 
   case 53:
@@ -2762,7 +2718,7 @@ yyreduce:
                /* else
                        $1 and $4 are NULLs */
          }
-#line 2766 "awkgram.c"
+#line 2722 "awkgram.c"
     break;
 
   case 54:
@@ -2892,7 +2848,7 @@ regular_loop:
                break_allowed--;
                continue_allowed--;
          }
-#line 2896 "awkgram.c"
+#line 2852 "awkgram.c"
     break;
 
   case 55:
@@ -2918,7 +2874,7 @@ regular_loop:
                break_allowed--;
                continue_allowed--;
          }
-#line 2922 "awkgram.c"
+#line 2878 "awkgram.c"
     break;
 
   case 56:
@@ -2943,7 +2899,7 @@ regular_loop:
                break_allowed--;
                continue_allowed--;
          }
-#line 2947 "awkgram.c"
+#line 2903 "awkgram.c"
     break;
 
   case 57:
@@ -2954,7 +2910,7 @@ regular_loop:
                else
                        yyval = yyvsp[0];
          }
-#line 2958 "awkgram.c"
+#line 2914 "awkgram.c"
     break;
 
   case 58:
@@ -2968,7 +2924,7 @@ regular_loop:
                if (yyvsp[0] != NULL)
                        yyval = list_append(yyval, yyvsp[0]);
          }
-#line 2972 "awkgram.c"
+#line 2928 "awkgram.c"
     break;
 
   case 59:
@@ -2982,7 +2938,7 @@ regular_loop:
                if (yyvsp[0] != NULL)
                        yyval = list_append(yyval, yyvsp[0]);
          }
-#line 2986 "awkgram.c"
+#line 2942 "awkgram.c"
     break;
 
   case 60:
@@ -2997,7 +2953,7 @@ regular_loop:
                if (yyvsp[0] != NULL)
                        yyval = list_append(yyval, yyvsp[0]);
          }
-#line 3001 "awkgram.c"
+#line 2957 "awkgram.c"
     break;
 
   case 61:
@@ -3014,7 +2970,7 @@ regular_loop:
                if (yyvsp[0] != NULL)
                        yyval = list_append(yyval, yyvsp[0]);
          }
-#line 3018 "awkgram.c"
+#line 2974 "awkgram.c"
     break;
 
   case 62:
@@ -3035,7 +2991,7 @@ regular_loop:
                if (yyvsp[0] != NULL)
                        yyval = list_append(yyval, yyvsp[0]);
          }
-#line 3039 "awkgram.c"
+#line 2995 "awkgram.c"
     break;
 
   case 63:
@@ -3044,7 +3000,7 @@ regular_loop:
                if (! in_function)
                        yyerror(_("`return' used outside function context"));
          }
-#line 3048 "awkgram.c"
+#line 3004 "awkgram.c"
     break;
 
   case 64:
@@ -3062,7 +3018,7 @@ regular_loop:
                if (yyvsp[0] != NULL)
                        yyval = list_append(yyval, yyvsp[0]);
          }
-#line 3066 "awkgram.c"
+#line 3022 "awkgram.c"
     break;
 
   case 65:
@@ -3073,13 +3029,13 @@ regular_loop:
                else
                        yyval = yyvsp[-1];
          }
-#line 3077 "awkgram.c"
+#line 3033 "awkgram.c"
     break;
 
   case 66:
 #line 1128 "awkgram.y"
                 { in_print = true; in_parens = 0; }
-#line 3083 "awkgram.c"
+#line 3039 "awkgram.c"
     break;
 
   case 67:
@@ -3184,13 +3140,13 @@ regular_print:
                        }
                }
          }
-#line 3188 "awkgram.c"
+#line 3144 "awkgram.c"
     break;
 
   case 68:
 #line 1230 "awkgram.y"
                           { sub_counter = 0; }
-#line 3194 "awkgram.c"
+#line 3150 "awkgram.c"
     break;
 
   case 69:
@@ -3227,7 +3183,7 @@ regular_print:
                        yyval = list_append(list_append(yyvsp[0], yyvsp[-2]), 
yyvsp[-3]);
                }
          }
-#line 3231 "awkgram.c"
+#line 3187 "awkgram.c"
     break;
 
   case 70:
@@ -3257,7 +3213,7 @@ regular_print:
                                fatal(_("`delete' is not allowed with 
FUNCTAB"));
                }
          }
-#line 3261 "awkgram.c"
+#line 3217 "awkgram.c"
     break;
 
   case 71:
@@ -3265,25 +3221,25 @@ regular_print:
           {
                yyval = optimize_assignment(yyvsp[0]);
          }
-#line 3269 "awkgram.c"
+#line 3225 "awkgram.c"
     break;
 
   case 72:
 #line 1301 "awkgram.y"
           { yyval = NULL; }
-#line 3275 "awkgram.c"
+#line 3231 "awkgram.c"
     break;
 
   case 73:
 #line 1303 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3281 "awkgram.c"
+#line 3237 "awkgram.c"
     break;
 
   case 74:
 #line 1308 "awkgram.y"
           { yyval = NULL; }
-#line 3287 "awkgram.c"
+#line 3243 "awkgram.c"
     break;
 
   case 75:
@@ -3294,13 +3250,13 @@ regular_print:
                else
                        yyval = list_prepend(yyvsp[-1], yyvsp[0]);
          }
-#line 3298 "awkgram.c"
+#line 3254 "awkgram.c"
     break;
 
   case 76:
 #line 1317 "awkgram.y"
           { yyval = NULL; }
-#line 3304 "awkgram.c"
+#line 3260 "awkgram.c"
     break;
 
   case 77:
@@ -3317,7 +3273,7 @@ regular_print:
                bcfree(yyvsp[-2]);
                yyval = yyvsp[-4];
          }
-#line 3321 "awkgram.c"
+#line 3277 "awkgram.c"
     break;
 
   case 78:
@@ -3333,13 +3289,13 @@ regular_print:
                yyvsp[-3]->comment = yyvsp[-1];
                yyval = yyvsp[-3];
          }
-#line 3337 "awkgram.c"
+#line 3293 "awkgram.c"
     break;
 
   case 79:
 #line 1350 "awkgram.y"
           {    yyval = yyvsp[0]; }
-#line 3343 "awkgram.c"
+#line 3299 "awkgram.c"
     break;
 
   case 80:
@@ -3351,7 +3307,7 @@ regular_print:
                bcfree(yyvsp[-1]);
                yyval = yyvsp[0];
          }
-#line 3355 "awkgram.c"
+#line 3311 "awkgram.c"
     break;
 
   case 81:
@@ -3362,13 +3318,13 @@ regular_print:
                add_sign_to_num(n, '+');
                yyval = yyvsp[0];
          }
-#line 3366 "awkgram.c"
+#line 3322 "awkgram.c"
     break;
 
   case 82:
 #line 1367 "awkgram.y"
           {    yyval = yyvsp[0]; }
-#line 3372 "awkgram.c"
+#line 3328 "awkgram.c"
     break;
 
   case 83:
@@ -3380,7 +3336,7 @@ regular_print:
                        yyvsp[0]->opcode = Op_push;
                yyval = yyvsp[0];
          }
-#line 3384 "awkgram.c"
+#line 3340 "awkgram.c"
     break;
 
   case 84:
@@ -3390,19 +3346,19 @@ regular_print:
                yyvsp[0]->opcode = Op_push_re;
                yyval = yyvsp[0];
          }
-#line 3394 "awkgram.c"
+#line 3350 "awkgram.c"
     break;
 
   case 85:
 #line 1386 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3400 "awkgram.c"
+#line 3356 "awkgram.c"
     break;
 
   case 86:
 #line 1388 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3406 "awkgram.c"
+#line 3362 "awkgram.c"
     break;
 
   case 88:
@@ -3410,7 +3366,7 @@ regular_print:
           {
                yyval = yyvsp[-1];
          }
-#line 3414 "awkgram.c"
+#line 3370 "awkgram.c"
     break;
 
   case 89:
@@ -3420,13 +3376,13 @@ regular_print:
                in_parens = 0;
                yyval = NULL;
          }
-#line 3424 "awkgram.c"
+#line 3380 "awkgram.c"
     break;
 
   case 90:
 #line 1410 "awkgram.y"
                  { in_print = false; in_parens = 0; }
-#line 3430 "awkgram.c"
+#line 3386 "awkgram.c"
     break;
 
   case 91:
@@ -3440,7 +3396,7 @@ regular_print:
                        lintwarn(_("concatenation as I/O `>' redirection target 
is ambiguous"));
                yyval = list_prepend(yyvsp[0], yyvsp[-2]);
          }
-#line 3444 "awkgram.c"
+#line 3400 "awkgram.c"
     break;
 
   case 92:
@@ -3451,7 +3407,7 @@ regular_print:
                add_lint(yyvsp[-3], LINT_assign_in_cond);
                yyval = mk_condition(yyvsp[-3], yyvsp[-5], yyvsp[0], NULL, 
NULL);
          }
-#line 3455 "awkgram.c"
+#line 3411 "awkgram.c"
     break;
 
   case 93:
@@ -3464,7 +3420,7 @@ regular_print:
                add_lint(yyvsp[-6], LINT_assign_in_cond);
                yyval = mk_condition(yyvsp[-6], yyvsp[-8], yyvsp[-3], 
yyvsp[-2], yyvsp[0]);
          }
-#line 3468 "awkgram.c"
+#line 3424 "awkgram.c"
     break;
 
   case 94:
@@ -3472,7 +3428,7 @@ regular_print:
           {
                yyval = yyvsp[0];
          }
-#line 3476 "awkgram.c"
+#line 3432 "awkgram.c"
     break;
 
   case 95:
@@ -3494,25 +3450,25 @@ regular_print:
                } else
                        yyval = NULL;
          }
-#line 3498 "awkgram.c"
+#line 3454 "awkgram.c"
     break;
 
   case 96:
 #line 1469 "awkgram.y"
           { yyval = NULL; }
-#line 3504 "awkgram.c"
+#line 3460 "awkgram.c"
     break;
 
   case 97:
 #line 1471 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3510 "awkgram.c"
+#line 3466 "awkgram.c"
     break;
 
   case 98:
 #line 1476 "awkgram.y"
           { yyval = NULL; }
-#line 3516 "awkgram.c"
+#line 3472 "awkgram.c"
     break;
 
   case 99:
@@ -3521,19 +3477,19 @@ regular_print:
                bcfree(yyvsp[-1]);
                yyval = yyvsp[0];
          }
-#line 3525 "awkgram.c"
+#line 3481 "awkgram.c"
     break;
 
   case 100:
 #line 1486 "awkgram.y"
           { yyval = NULL; }
-#line 3531 "awkgram.c"
+#line 3487 "awkgram.c"
     break;
 
   case 101:
 #line 1488 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3537 "awkgram.c"
+#line 3493 "awkgram.c"
     break;
 
   case 102:
@@ -3542,7 +3498,7 @@ regular_print:
                yyvsp[0]->param_count = 0;
                yyval = list_create(yyvsp[0]);
          }
-#line 3546 "awkgram.c"
+#line 3502 "awkgram.c"
     break;
 
   case 103:
@@ -3563,55 +3519,55 @@ regular_print:
                } else
                        yyval = NULL;
          }
-#line 3567 "awkgram.c"
+#line 3523 "awkgram.c"
     break;
 
   case 104:
 #line 1515 "awkgram.y"
           { yyval = NULL; }
-#line 3573 "awkgram.c"
+#line 3529 "awkgram.c"
     break;
 
   case 105:
 #line 1517 "awkgram.y"
           { yyval = yyvsp[-1]; }
-#line 3579 "awkgram.c"
+#line 3535 "awkgram.c"
     break;
 
   case 106:
 #line 1519 "awkgram.y"
           { yyval = yyvsp[-2]; }
-#line 3585 "awkgram.c"
+#line 3541 "awkgram.c"
     break;
 
   case 107:
 #line 1525 "awkgram.y"
           { yyval = NULL; }
-#line 3591 "awkgram.c"
+#line 3547 "awkgram.c"
     break;
 
   case 108:
 #line 1527 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3597 "awkgram.c"
+#line 3553 "awkgram.c"
     break;
 
   case 109:
 #line 1532 "awkgram.y"
           { yyval = NULL; }
-#line 3603 "awkgram.c"
+#line 3559 "awkgram.c"
     break;
 
   case 110:
 #line 1534 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3609 "awkgram.c"
+#line 3565 "awkgram.c"
     break;
 
   case 111:
 #line 1539 "awkgram.y"
           {    yyval = mk_expression_list(NULL, yyvsp[0]); }
-#line 3615 "awkgram.c"
+#line 3571 "awkgram.c"
     break;
 
   case 112:
@@ -3622,13 +3578,13 @@ regular_print:
                yyval = mk_expression_list(yyvsp[-2], yyvsp[0]);
                yyerrok;
          }
-#line 3626 "awkgram.c"
+#line 3582 "awkgram.c"
     break;
 
   case 113:
 #line 1548 "awkgram.y"
           { yyval = NULL; }
-#line 3632 "awkgram.c"
+#line 3588 "awkgram.c"
     break;
 
   case 114:
@@ -3640,7 +3596,7 @@ regular_print:
                 */
                yyval = yyvsp[-1];
          }
-#line 3644 "awkgram.c"
+#line 3600 "awkgram.c"
     break;
 
   case 115:
@@ -3649,7 +3605,7 @@ regular_print:
                /* Ditto */
                yyval = mk_expression_list(yyvsp[-2], yyvsp[0]);
          }
-#line 3653 "awkgram.c"
+#line 3609 "awkgram.c"
     break;
 
   case 116:
@@ -3660,25 +3616,25 @@ regular_print:
                        yyvsp[-2]->lasti->comment = yyvsp[-1];
                yyval = yyvsp[-2];
          }
-#line 3664 "awkgram.c"
+#line 3620 "awkgram.c"
     break;
 
   case 117:
 #line 1573 "awkgram.y"
           { yyval = NULL; }
-#line 3670 "awkgram.c"
+#line 3626 "awkgram.c"
     break;
 
   case 118:
 #line 1575 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3676 "awkgram.c"
+#line 3632 "awkgram.c"
     break;
 
   case 119:
 #line 1580 "awkgram.y"
           {    yyval = mk_expression_list(NULL, yyvsp[0]); }
-#line 3682 "awkgram.c"
+#line 3638 "awkgram.c"
     break;
 
   case 120:
@@ -3689,13 +3645,13 @@ regular_print:
                yyval = mk_expression_list(yyvsp[-2], yyvsp[0]);
                yyerrok;
          }
-#line 3693 "awkgram.c"
+#line 3649 "awkgram.c"
     break;
 
   case 121:
 #line 1589 "awkgram.y"
           { yyval = NULL; }
-#line 3699 "awkgram.c"
+#line 3655 "awkgram.c"
     break;
 
   case 122:
@@ -3707,7 +3663,7 @@ regular_print:
                 */
                yyval = yyvsp[-1];
          }
-#line 3711 "awkgram.c"
+#line 3667 "awkgram.c"
     break;
 
   case 123:
@@ -3716,7 +3672,7 @@ regular_print:
                /* Ditto */
                yyval = mk_expression_list(yyvsp[-2], yyvsp[0]);
          }
-#line 3720 "awkgram.c"
+#line 3676 "awkgram.c"
     break;
 
   case 124:
@@ -3727,19 +3683,19 @@ regular_print:
                        yyvsp[-2]->comment = yyvsp[-1];
                yyval = yyvsp[-2];
          }
-#line 3731 "awkgram.c"
+#line 3687 "awkgram.c"
     break;
 
   case 125:
 #line 1613 "awkgram.y"
               { yyval = yyvsp[0]; }
-#line 3737 "awkgram.c"
+#line 3693 "awkgram.c"
     break;
 
   case 126:
 #line 1614 "awkgram.y"
                        { yyval = list_create(yyvsp[0]); }
-#line 3743 "awkgram.c"
+#line 3699 "awkgram.c"
     break;
 
   case 127:
@@ -3750,7 +3706,7 @@ regular_print:
                                _("regular expression on right of assignment"));
                yyval = mk_assignment(yyvsp[-2], yyvsp[0], yyvsp[-1]);
          }
-#line 3754 "awkgram.c"
+#line 3710 "awkgram.c"
     break;
 
   case 128:
@@ -3758,19 +3714,19 @@ regular_print:
           {
                yyval = mk_assignment(yyvsp[-2], list_create(yyvsp[0]), 
yyvsp[-1]);
          }
-#line 3762 "awkgram.c"
+#line 3718 "awkgram.c"
     break;
 
   case 129:
 #line 1631 "awkgram.y"
           {    yyval = mk_boolean(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3768 "awkgram.c"
+#line 3724 "awkgram.c"
     break;
 
   case 130:
 #line 1633 "awkgram.y"
           {    yyval = mk_boolean(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3774 "awkgram.c"
+#line 3730 "awkgram.c"
     break;
 
   case 131:
@@ -3787,7 +3743,7 @@ regular_print:
                bcfree(yyvsp[0]);
                yyval = list_append(yyvsp[-2], yyvsp[-1]);
          }
-#line 3791 "awkgram.c"
+#line 3747 "awkgram.c"
     break;
 
   case 132:
@@ -3808,7 +3764,7 @@ regular_print:
                        yyval = list_append(list_merge(yyvsp[-2], yyvsp[0]), 
yyvsp[-1]);
                }
          }
-#line 3812 "awkgram.c"
+#line 3768 "awkgram.c"
     break;
 
   case 133:
@@ -3822,7 +3778,7 @@ regular_print:
                yyvsp[-1]->expr_count = 1;
                yyval = list_append(list_merge(yyvsp[-2], yyvsp[0]), yyvsp[-1]);
          }
-#line 3826 "awkgram.c"
+#line 3782 "awkgram.c"
     break;
 
   case 134:
@@ -3833,31 +3789,31 @@ regular_print:
                                _("regular expression on right of comparison"));
                yyval = list_append(list_merge(yyvsp[-2], yyvsp[0]), yyvsp[-1]);
          }
-#line 3837 "awkgram.c"
+#line 3793 "awkgram.c"
     break;
 
   case 135:
 #line 1682 "awkgram.y"
           { yyval = mk_condition(yyvsp[-4], yyvsp[-3], yyvsp[-2], yyvsp[-1], 
yyvsp[0]); }
-#line 3843 "awkgram.c"
+#line 3799 "awkgram.c"
     break;
 
   case 136:
 #line 1684 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3849 "awkgram.c"
+#line 3805 "awkgram.c"
     break;
 
   case 137:
 #line 1689 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3855 "awkgram.c"
+#line 3811 "awkgram.c"
     break;
 
   case 138:
 #line 1691 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3861 "awkgram.c"
+#line 3817 "awkgram.c"
     break;
 
   case 139:
@@ -3866,43 +3822,43 @@ regular_print:
                yyvsp[0]->opcode = Op_assign_quotient;
                yyval = yyvsp[0];
          }
-#line 3870 "awkgram.c"
+#line 3826 "awkgram.c"
     break;
 
   case 140:
 #line 1701 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3876 "awkgram.c"
+#line 3832 "awkgram.c"
     break;
 
   case 141:
 #line 1703 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3882 "awkgram.c"
+#line 3838 "awkgram.c"
     break;
 
   case 142:
 #line 1708 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3888 "awkgram.c"
+#line 3844 "awkgram.c"
     break;
 
   case 143:
 #line 1710 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3894 "awkgram.c"
+#line 3850 "awkgram.c"
     break;
 
   case 144:
 #line 1715 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3900 "awkgram.c"
+#line 3856 "awkgram.c"
     break;
 
   case 145:
 #line 1717 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 3906 "awkgram.c"
+#line 3862 "awkgram.c"
     break;
 
   case 146:
@@ -3960,43 +3916,43 @@ regular_print:
                                max_args = count;
                }
          }
-#line 3964 "awkgram.c"
+#line 3920 "awkgram.c"
     break;
 
   case 148:
 #line 1778 "awkgram.y"
           { yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3970 "awkgram.c"
+#line 3926 "awkgram.c"
     break;
 
   case 149:
 #line 1780 "awkgram.y"
           { yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3976 "awkgram.c"
+#line 3932 "awkgram.c"
     break;
 
   case 150:
 #line 1782 "awkgram.y"
           { yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3982 "awkgram.c"
+#line 3938 "awkgram.c"
     break;
 
   case 151:
 #line 1784 "awkgram.y"
           { yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3988 "awkgram.c"
+#line 3944 "awkgram.c"
     break;
 
   case 152:
 #line 1786 "awkgram.y"
           { yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 3994 "awkgram.c"
+#line 3950 "awkgram.c"
     break;
 
   case 153:
 #line 1788 "awkgram.y"
           { yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 4000 "awkgram.c"
+#line 3956 "awkgram.c"
     break;
 
   case 154:
@@ -4014,7 +3970,7 @@ regular_print:
                                _("non-redirected `getline' undefined inside 
END action"));
                yyval = mk_getline(yyvsp[-2], yyvsp[-1], yyvsp[0], 
redirect_input);
          }
-#line 4018 "awkgram.c"
+#line 3974 "awkgram.c"
     break;
 
   case 155:
@@ -4023,7 +3979,7 @@ regular_print:
                yyvsp[0]->opcode = Op_postincrement;
                yyval = mk_assignment(yyvsp[-1], NULL, yyvsp[0]);
          }
-#line 4027 "awkgram.c"
+#line 3983 "awkgram.c"
     break;
 
   case 156:
@@ -4032,7 +3988,7 @@ regular_print:
                yyvsp[0]->opcode = Op_postdecrement;
                yyval = mk_assignment(yyvsp[-1], NULL, yyvsp[0]);
          }
-#line 4036 "awkgram.c"
+#line 3992 "awkgram.c"
     break;
 
   case 157:
@@ -4057,7 +4013,7 @@ regular_print:
                        yyval = list_append(list_merge(t, yyvsp[0]), yyvsp[-1]);
                }
          }
-#line 4061 "awkgram.c"
+#line 4017 "awkgram.c"
     break;
 
   case 158:
@@ -4066,43 +4022,43 @@ regular_print:
                  yyval = mk_getline(yyvsp[-1], yyvsp[0], yyvsp[-3], 
yyvsp[-2]->redir_type);
                  bcfree(yyvsp[-2]);
                }
-#line 4070 "awkgram.c"
+#line 4026 "awkgram.c"
     break;
 
   case 159:
 #line 1846 "awkgram.y"
           { yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 4076 "awkgram.c"
+#line 4032 "awkgram.c"
     break;
 
   case 160:
 #line 1848 "awkgram.y"
           { yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 4082 "awkgram.c"
+#line 4038 "awkgram.c"
     break;
 
   case 161:
 #line 1850 "awkgram.y"
           { yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 4088 "awkgram.c"
+#line 4044 "awkgram.c"
     break;
 
   case 162:
 #line 1852 "awkgram.y"
           { yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 4094 "awkgram.c"
+#line 4050 "awkgram.c"
     break;
 
   case 163:
 #line 1854 "awkgram.y"
           { yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 4100 "awkgram.c"
+#line 4056 "awkgram.c"
     break;
 
   case 164:
 #line 1856 "awkgram.y"
           { yyval = mk_binary(yyvsp[-2], yyvsp[0], yyvsp[-1]); }
-#line 4106 "awkgram.c"
+#line 4062 "awkgram.c"
     break;
 
   case 165:
@@ -4110,7 +4066,7 @@ regular_print:
           {
                yyval = list_create(yyvsp[0]);
          }
-#line 4114 "awkgram.c"
+#line 4070 "awkgram.c"
     break;
 
   case 166:
@@ -4146,7 +4102,7 @@ regular_print:
                        }
                }
           }
-#line 4150 "awkgram.c"
+#line 4106 "awkgram.c"
     break;
 
   case 167:
@@ -4158,7 +4114,7 @@ regular_print:
                // print "foo" > ("bar" 1)
                yyval = list_append(yyvsp[-1], bcalloc(Op_parens, 1, 
sourceline));
          }
-#line 4162 "awkgram.c"
+#line 4118 "awkgram.c"
     break;
 
   case 168:
@@ -4168,7 +4124,7 @@ regular_print:
                if (yyval == NULL)
                        YYABORT;
          }
-#line 4172 "awkgram.c"
+#line 4128 "awkgram.c"
     break;
 
   case 169:
@@ -4178,7 +4134,7 @@ regular_print:
                if (yyval == NULL)
                        YYABORT;
          }
-#line 4182 "awkgram.c"
+#line 4138 "awkgram.c"
     break;
 
   case 170:
@@ -4195,7 +4151,7 @@ regular_print:
                if (yyval == NULL)
                        YYABORT;
          }
-#line 4199 "awkgram.c"
+#line 4155 "awkgram.c"
     break;
 
   case 173:
@@ -4204,7 +4160,7 @@ regular_print:
                yyvsp[-1]->opcode = Op_preincrement;
                yyval = mk_assignment(yyvsp[0], NULL, yyvsp[-1]);
          }
-#line 4208 "awkgram.c"
+#line 4164 "awkgram.c"
     break;
 
   case 174:
@@ -4213,7 +4169,7 @@ regular_print:
                yyvsp[-1]->opcode = Op_predecrement;
                yyval = mk_assignment(yyvsp[0], NULL, yyvsp[-1]);
          }
-#line 4217 "awkgram.c"
+#line 4173 "awkgram.c"
     break;
 
   case 175:
@@ -4221,7 +4177,7 @@ regular_print:
           {
                yyval = list_create(yyvsp[0]);
          }
-#line 4225 "awkgram.c"
+#line 4181 "awkgram.c"
     break;
 
   case 176:
@@ -4229,7 +4185,7 @@ regular_print:
           {
                yyval = list_create(yyvsp[0]);
          }
-#line 4233 "awkgram.c"
+#line 4189 "awkgram.c"
     break;
 
   case 177:
@@ -4248,7 +4204,7 @@ regular_print:
                        yyval = list_append(yyvsp[0], yyvsp[-1]);
                }
          }
-#line 4252 "awkgram.c"
+#line 4208 "awkgram.c"
     break;
 
   case 178:
@@ -4270,7 +4226,7 @@ regular_print:
                        yyval = list_append(yyvsp[0], yyvsp[-1]);
                }
          }
-#line 4274 "awkgram.c"
+#line 4230 "awkgram.c"
     break;
 
   case 179:
@@ -4279,7 +4235,7 @@ regular_print:
                func_use(yyvsp[0]->lasti->func_name, FUNC_USE);
                yyval = yyvsp[0];
          }
-#line 4283 "awkgram.c"
+#line 4239 "awkgram.c"
     break;
 
   case 180:
@@ -4317,7 +4273,7 @@ regular_print:
                yyval = list_prepend(yyvsp[0], t);
                at_seen = false;
          }
-#line 4321 "awkgram.c"
+#line 4277 "awkgram.c"
     break;
 
   case 181:
@@ -4354,37 +4310,37 @@ regular_print:
                        yyval = list_append(t, yyvsp[-3]);
                }
          }
-#line 4358 "awkgram.c"
+#line 4314 "awkgram.c"
     break;
 
   case 182:
 #line 2064 "awkgram.y"
           { yyval = NULL; }
-#line 4364 "awkgram.c"
+#line 4320 "awkgram.c"
     break;
 
   case 183:
 #line 2066 "awkgram.y"
           { yyval = yyvsp[0]; }
-#line 4370 "awkgram.c"
+#line 4326 "awkgram.c"
     break;
 
   case 184:
 #line 2071 "awkgram.y"
           { yyval = NULL; }
-#line 4376 "awkgram.c"
+#line 4332 "awkgram.c"
     break;
 
   case 185:
 #line 2073 "awkgram.y"
           { yyval = yyvsp[-1]; }
-#line 4382 "awkgram.c"
+#line 4338 "awkgram.c"
     break;
 
   case 186:
 #line 2078 "awkgram.y"
           {    yyval = yyvsp[0]; }
-#line 4388 "awkgram.c"
+#line 4344 "awkgram.c"
     break;
 
   case 187:
@@ -4392,7 +4348,7 @@ regular_print:
           {
                yyval = list_merge(yyvsp[-1], yyvsp[0]);
          }
-#line 4396 "awkgram.c"
+#line 4352 "awkgram.c"
     break;
 
   case 188:
@@ -4410,7 +4366,7 @@ regular_print:
                sub_counter++;  /* count # of dimensions */
                yyval = yyvsp[0];
          }
-#line 4414 "awkgram.c"
+#line 4370 "awkgram.c"
     break;
 
   case 189:
@@ -4428,13 +4384,13 @@ regular_print:
                        yyvsp[0]->sub_count = count_expressions(&t, false);
                yyval = list_append(t, yyvsp[0]);
          }
-#line 4432 "awkgram.c"
+#line 4388 "awkgram.c"
     break;
 
   case 190:
 #line 2121 "awkgram.y"
           {    yyval = yyvsp[0]; }
-#line 4438 "awkgram.c"
+#line 4394 "awkgram.c"
     break;
 
   case 191:
@@ -4442,13 +4398,13 @@ regular_print:
           {
                yyval = list_merge(yyvsp[-1], yyvsp[0]);
          }
-#line 4446 "awkgram.c"
+#line 4402 "awkgram.c"
     break;
 
   case 192:
 #line 2130 "awkgram.y"
           { yyval = yyvsp[-1]; }
-#line 4452 "awkgram.c"
+#line 4408 "awkgram.c"
     break;
 
   case 193:
@@ -4458,7 +4414,7 @@ regular_print:
                yyvsp[0]->memory = variable(yyvsp[0]->source_line, 
yyvsp[0]->lextok, Node_var_new);
                yyval = list_create(yyvsp[0]);
          }
-#line 4462 "awkgram.c"
+#line 4418 "awkgram.c"
     break;
 
   case 194:
@@ -4470,7 +4426,7 @@ regular_print:
                yyvsp[-1]->opcode = Op_push_array;
                yyval = list_prepend(yyvsp[0], yyvsp[-1]);
          }
-#line 4474 "awkgram.c"
+#line 4430 "awkgram.c"
     break;
 
   case 195:
@@ -4486,7 +4442,7 @@ regular_print:
                } else
                        yyval = yyvsp[0];
          }
-#line 4490 "awkgram.c"
+#line 4446 "awkgram.c"
     break;
 
   case 196:
@@ -4496,7 +4452,7 @@ regular_print:
                if (yyvsp[0] != NULL)
                        mk_assignment(yyvsp[-1], NULL, yyvsp[0]);
          }
-#line 4500 "awkgram.c"
+#line 4456 "awkgram.c"
     break;
 
   case 197:
@@ -4504,7 +4460,7 @@ regular_print:
           {
                yyvsp[0]->opcode = Op_postincrement;
          }
-#line 4508 "awkgram.c"
+#line 4464 "awkgram.c"
     break;
 
   case 198:
@@ -4512,59 +4468,59 @@ regular_print:
           {
                yyvsp[0]->opcode = Op_postdecrement;
          }
-#line 4516 "awkgram.c"
+#line 4472 "awkgram.c"
     break;
 
   case 199:
 #line 2181 "awkgram.y"
           { yyval = NULL; }
-#line 4522 "awkgram.c"
+#line 4478 "awkgram.c"
     break;
 
   case 200:
 #line 2185 "awkgram.y"
                       { yyval = yyvsp[0]; }
-#line 4528 "awkgram.c"
+#line 4484 "awkgram.c"
     break;
 
   case 201:
 #line 2189 "awkgram.y"
                         { yyval = yyvsp[0]; yyerrok; }
-#line 4534 "awkgram.c"
+#line 4490 "awkgram.c"
     break;
 
   case 202:
 #line 2193 "awkgram.y"
               { yyerrok; }
-#line 4540 "awkgram.c"
+#line 4496 "awkgram.c"
     break;
 
   case 203:
 #line 2198 "awkgram.y"
           { yyval = NULL; }
-#line 4546 "awkgram.c"
+#line 4502 "awkgram.c"
     break;
 
   case 205:
 #line 2203 "awkgram.y"
                 { yyerrok; }
-#line 4552 "awkgram.c"
+#line 4508 "awkgram.c"
     break;
 
   case 206:
 #line 2207 "awkgram.y"
                 { yyval = yyvsp[0]; yyerrok; }
-#line 4558 "awkgram.c"
+#line 4514 "awkgram.c"
     break;
 
   case 207:
 #line 2211 "awkgram.y"
                         { yyval = yyvsp[0]; yyerrok; }
-#line 4564 "awkgram.c"
+#line 4520 "awkgram.c"
     break;
 
 
-#line 4568 "awkgram.c"
+#line 4524 "awkgram.c"
 
       default: break;
     }
@@ -4579,11 +4535,10 @@ regular_print:
      case of YYERROR or YYBACKUP, subsequent parser actions might lead
      to an incorrect destructor call or verbose syntax error message
      before the lookahead is translated.  */
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+  YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, 
&yyloc);
 
   YYPOPSTACK (yylen);
   yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
 
@@ -4607,50 +4562,14 @@ regular_print:
 yyerrlab:
   /* Make sure we have latest lookahead translation.  See comments at
      user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
+  yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar);
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
-#else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
-      {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = YY_CAST (char *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, 
yymsg_alloc)));
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
-      }
-# undef YYSYNTAX_ERROR
-#endif
     }
 
-
-
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
@@ -4699,13 +4618,14 @@ yyerrorlab:
 yyerrlab1:
   yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
+  // Pop stack until we find a state that shifts the error token.
   for (;;)
     {
       yyn = yypact[yystate];
       if (!yypact_value_is_default (yyn))
         {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+          yyn += YYSYMBOL_YYerror;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror)
             {
               yyn = yytable[yyn];
               if (0 < yyn)
@@ -4719,7 +4639,7 @@ yyerrlab1:
 
 
       yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp);
+                  YY_ACCESSING_SYMBOL (yystate), yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
@@ -4731,7 +4651,7 @@ yyerrlab1:
 
 
   /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+  YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp);
 
   yystate = yyn;
   goto yynewstate;
@@ -4753,7 +4673,7 @@ yyabortlab:
   goto yyreturn;
 
 
-#if !defined yyoverflow || YYERROR_VERBOSE
+#if !defined yyoverflow
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -4783,19 +4703,17 @@ yyreturn:
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-                  yystos[+*yyssp], yyvsp);
+                  YY_ACCESSING_SYMBOL (+*yyssp), yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-#if YYERROR_VERBOSE
-  if (yymsg != yymsgbuf)
-    YYSTACK_FREE (yymsg);
-#endif
+
   return yyresult;
 }
+
 #line 2213 "awkgram.y"
 
 
diff --git a/command.c b/command.c
index c16aeac..8f69643 100644
--- a/command.c
+++ b/command.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.5.4.  */
+/* A Bison parser, made by GNU Bison 3.6.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
@@ -34,6 +34,10 @@
 /* C LALR(1) parser skeleton written by Richard Stallman, by
    simplifying the original so-called "semantic" parser.  */
 
+/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
+   especially those whose name start with YY_ or yy_.  They are
+   private implementation details that can be changed or removed.  */
+
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
    variables, as they might otherwise be expanded by user macros.
@@ -41,14 +45,11 @@
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 
-/* Undocumented macros, especially those whose name start with YY_,
-   are private implementation details.  Do not rely on them.  */
-
 /* Identify Bison output.  */
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.5.4"
+#define YYBISON_VERSION "3.6"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -140,7 +141,7 @@ static void append_cmdarg(CMDARG *arg);
 static int find_argument(CMDARG *arg);
 #define YYSTYPE CMDARG *
 
-#line 144 "command.c"
+#line 145 "command.c"
 
 # ifndef YY_CAST
 #  ifdef __cplusplus
@@ -163,14 +164,6 @@ static int find_argument(CMDARG *arg);
 #  endif
 # endif
 
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
 
 /* Debug traces.  */
 #ifndef YYDEBUG
@@ -180,60 +173,68 @@ static int find_argument(CMDARG *arg);
 extern int zzdebug;
 #endif
 
-/* Token type.  */
+/* Token kinds.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
   enum yytokentype
   {
-    D_BACKTRACE = 258,
-    D_BREAK = 259,
-    D_CLEAR = 260,
-    D_CONTINUE = 261,
-    D_DELETE = 262,
-    D_DISABLE = 263,
-    D_DOWN = 264,
-    D_ENABLE = 265,
-    D_FINISH = 266,
-    D_FRAME = 267,
-    D_HELP = 268,
-    D_IGNORE = 269,
-    D_INFO = 270,
-    D_LIST = 271,
-    D_NEXT = 272,
-    D_NEXTI = 273,
-    D_PRINT = 274,
-    D_PRINTF = 275,
-    D_QUIT = 276,
-    D_RETURN = 277,
-    D_RUN = 278,
-    D_SET = 279,
-    D_STEP = 280,
-    D_STEPI = 281,
-    D_TBREAK = 282,
-    D_UP = 283,
-    D_UNTIL = 284,
-    D_DISPLAY = 285,
-    D_UNDISPLAY = 286,
-    D_WATCH = 287,
-    D_UNWATCH = 288,
-    D_DUMP = 289,
-    D_TRACE = 290,
-    D_INT = 291,
-    D_STRING = 292,
-    D_NODE = 293,
-    D_VARIABLE = 294,
-    D_OPTION = 295,
-    D_COMMANDS = 296,
-    D_END = 297,
-    D_SILENT = 298,
-    D_SOURCE = 299,
-    D_SAVE = 300,
-    D_EVAL = 301,
-    D_CONDITION = 302,
-    D_STATEMENT = 303
+    YYEMPTY = -2,
+    YYEOF = 0,                     /* "end of file"  */
+    YYerror = 256,                 /* error  */
+    YYUNDEF = 257,                 /* "invalid token"  */
+    D_BACKTRACE = 258,             /* D_BACKTRACE  */
+    D_BREAK = 259,                 /* D_BREAK  */
+    D_CLEAR = 260,                 /* D_CLEAR  */
+    D_CONTINUE = 261,              /* D_CONTINUE  */
+    D_DELETE = 262,                /* D_DELETE  */
+    D_DISABLE = 263,               /* D_DISABLE  */
+    D_DOWN = 264,                  /* D_DOWN  */
+    D_ENABLE = 265,                /* D_ENABLE  */
+    D_FINISH = 266,                /* D_FINISH  */
+    D_FRAME = 267,                 /* D_FRAME  */
+    D_HELP = 268,                  /* D_HELP  */
+    D_IGNORE = 269,                /* D_IGNORE  */
+    D_INFO = 270,                  /* D_INFO  */
+    D_LIST = 271,                  /* D_LIST  */
+    D_NEXT = 272,                  /* D_NEXT  */
+    D_NEXTI = 273,                 /* D_NEXTI  */
+    D_PRINT = 274,                 /* D_PRINT  */
+    D_PRINTF = 275,                /* D_PRINTF  */
+    D_QUIT = 276,                  /* D_QUIT  */
+    D_RETURN = 277,                /* D_RETURN  */
+    D_RUN = 278,                   /* D_RUN  */
+    D_SET = 279,                   /* D_SET  */
+    D_STEP = 280,                  /* D_STEP  */
+    D_STEPI = 281,                 /* D_STEPI  */
+    D_TBREAK = 282,                /* D_TBREAK  */
+    D_UP = 283,                    /* D_UP  */
+    D_UNTIL = 284,                 /* D_UNTIL  */
+    D_DISPLAY = 285,               /* D_DISPLAY  */
+    D_UNDISPLAY = 286,             /* D_UNDISPLAY  */
+    D_WATCH = 287,                 /* D_WATCH  */
+    D_UNWATCH = 288,               /* D_UNWATCH  */
+    D_DUMP = 289,                  /* D_DUMP  */
+    D_TRACE = 290,                 /* D_TRACE  */
+    D_INT = 291,                   /* D_INT  */
+    D_STRING = 292,                /* D_STRING  */
+    D_NODE = 293,                  /* D_NODE  */
+    D_VARIABLE = 294,              /* D_VARIABLE  */
+    D_OPTION = 295,                /* D_OPTION  */
+    D_COMMANDS = 296,              /* D_COMMANDS  */
+    D_END = 297,                   /* D_END  */
+    D_SILENT = 298,                /* D_SILENT  */
+    D_SOURCE = 299,                /* D_SOURCE  */
+    D_SAVE = 300,                  /* D_SAVE  */
+    D_EVAL = 301,                  /* D_EVAL  */
+    D_CONDITION = 302,             /* D_CONDITION  */
+    D_STATEMENT = 303              /* D_STATEMENT  */
   };
+  typedef enum yytokentype yytoken_kind_t;
 #endif
-/* Tokens.  */
+/* Token kinds.  */
+#define YYEOF 0
+#define YYerror 256
+#define YYUNDEF 257
 #define D_BACKTRACE 258
 #define D_BREAK 259
 #define D_CLEAR 260
@@ -294,6 +295,127 @@ extern YYSTYPE zzlval;
 int zzparse (void);
 
 
+/* Symbol kind.  */
+enum yysymbol_kind_t
+{
+  YYSYMBOL_YYEMPTY = -2,
+  YYSYMBOL_YYEOF = 0,                      /* "end of file"  */
+  YYSYMBOL_YYerror = 1,                    /* error  */
+  YYSYMBOL_YYUNDEF = 2,                    /* "invalid token"  */
+  YYSYMBOL_D_BACKTRACE = 3,                /* D_BACKTRACE  */
+  YYSYMBOL_D_BREAK = 4,                    /* D_BREAK  */
+  YYSYMBOL_D_CLEAR = 5,                    /* D_CLEAR  */
+  YYSYMBOL_D_CONTINUE = 6,                 /* D_CONTINUE  */
+  YYSYMBOL_D_DELETE = 7,                   /* D_DELETE  */
+  YYSYMBOL_D_DISABLE = 8,                  /* D_DISABLE  */
+  YYSYMBOL_D_DOWN = 9,                     /* D_DOWN  */
+  YYSYMBOL_D_ENABLE = 10,                  /* D_ENABLE  */
+  YYSYMBOL_D_FINISH = 11,                  /* D_FINISH  */
+  YYSYMBOL_D_FRAME = 12,                   /* D_FRAME  */
+  YYSYMBOL_D_HELP = 13,                    /* D_HELP  */
+  YYSYMBOL_D_IGNORE = 14,                  /* D_IGNORE  */
+  YYSYMBOL_D_INFO = 15,                    /* D_INFO  */
+  YYSYMBOL_D_LIST = 16,                    /* D_LIST  */
+  YYSYMBOL_D_NEXT = 17,                    /* D_NEXT  */
+  YYSYMBOL_D_NEXTI = 18,                   /* D_NEXTI  */
+  YYSYMBOL_D_PRINT = 19,                   /* D_PRINT  */
+  YYSYMBOL_D_PRINTF = 20,                  /* D_PRINTF  */
+  YYSYMBOL_D_QUIT = 21,                    /* D_QUIT  */
+  YYSYMBOL_D_RETURN = 22,                  /* D_RETURN  */
+  YYSYMBOL_D_RUN = 23,                     /* D_RUN  */
+  YYSYMBOL_D_SET = 24,                     /* D_SET  */
+  YYSYMBOL_D_STEP = 25,                    /* D_STEP  */
+  YYSYMBOL_D_STEPI = 26,                   /* D_STEPI  */
+  YYSYMBOL_D_TBREAK = 27,                  /* D_TBREAK  */
+  YYSYMBOL_D_UP = 28,                      /* D_UP  */
+  YYSYMBOL_D_UNTIL = 29,                   /* D_UNTIL  */
+  YYSYMBOL_D_DISPLAY = 30,                 /* D_DISPLAY  */
+  YYSYMBOL_D_UNDISPLAY = 31,               /* D_UNDISPLAY  */
+  YYSYMBOL_D_WATCH = 32,                   /* D_WATCH  */
+  YYSYMBOL_D_UNWATCH = 33,                 /* D_UNWATCH  */
+  YYSYMBOL_D_DUMP = 34,                    /* D_DUMP  */
+  YYSYMBOL_D_TRACE = 35,                   /* D_TRACE  */
+  YYSYMBOL_D_INT = 36,                     /* D_INT  */
+  YYSYMBOL_D_STRING = 37,                  /* D_STRING  */
+  YYSYMBOL_D_NODE = 38,                    /* D_NODE  */
+  YYSYMBOL_D_VARIABLE = 39,                /* D_VARIABLE  */
+  YYSYMBOL_D_OPTION = 40,                  /* D_OPTION  */
+  YYSYMBOL_D_COMMANDS = 41,                /* D_COMMANDS  */
+  YYSYMBOL_D_END = 42,                     /* D_END  */
+  YYSYMBOL_D_SILENT = 43,                  /* D_SILENT  */
+  YYSYMBOL_D_SOURCE = 44,                  /* D_SOURCE  */
+  YYSYMBOL_D_SAVE = 45,                    /* D_SAVE  */
+  YYSYMBOL_D_EVAL = 46,                    /* D_EVAL  */
+  YYSYMBOL_D_CONDITION = 47,               /* D_CONDITION  */
+  YYSYMBOL_D_STATEMENT = 48,               /* D_STATEMENT  */
+  YYSYMBOL_49_ = 49,                       /* '='  */
+  YYSYMBOL_50_ = 50,                       /* ','  */
+  YYSYMBOL_51_ = 51,                       /* ':'  */
+  YYSYMBOL_52_ = 52,                       /* '@'  */
+  YYSYMBOL_53_ = 53,                       /* '+'  */
+  YYSYMBOL_54_ = 54,                       /* '-'  */
+  YYSYMBOL_55_ = 55,                       /* '['  */
+  YYSYMBOL_56_ = 56,                       /* ']'  */
+  YYSYMBOL_57_ = 57,                       /* '$'  */
+  YYSYMBOL_58_n_ = 58,                     /* '\n'  */
+  YYSYMBOL_YYACCEPT = 59,                  /* $accept  */
+  YYSYMBOL_input = 60,                     /* input  */
+  YYSYMBOL_line = 61,                      /* line  */
+  YYSYMBOL_control_cmd = 62,               /* control_cmd  */
+  YYSYMBOL_d_cmd = 63,                     /* d_cmd  */
+  YYSYMBOL_frame_cmd = 64,                 /* frame_cmd  */
+  YYSYMBOL_break_cmd = 65,                 /* break_cmd  */
+  YYSYMBOL_set_want_nodeval = 66,          /* set_want_nodeval  */
+  YYSYMBOL_eval_prologue = 67,             /* eval_prologue  */
+  YYSYMBOL_statement_list = 68,            /* statement_list  */
+  YYSYMBOL_69_1 = 69,                      /* @1  */
+  YYSYMBOL_eval_cmd = 70,                  /* eval_cmd  */
+  YYSYMBOL_command = 71,                   /* command  */
+  YYSYMBOL_72_2 = 72,                      /* $@2  */
+  YYSYMBOL_73_3 = 73,                      /* $@3  */
+  YYSYMBOL_74_4 = 74,                      /* $@4  */
+  YYSYMBOL_75_5 = 75,                      /* $@5  */
+  YYSYMBOL_76_6 = 76,                      /* $@6  */
+  YYSYMBOL_77_7 = 77,                      /* $@7  */
+  YYSYMBOL_78_8 = 78,                      /* $@8  */
+  YYSYMBOL_condition_exp = 79,             /* condition_exp  */
+  YYSYMBOL_commands_arg = 80,              /* commands_arg  */
+  YYSYMBOL_opt_param_list = 81,            /* opt_param_list  */
+  YYSYMBOL_param_list = 82,                /* param_list  */
+  YYSYMBOL_opt_string_node = 83,           /* opt_string_node  */
+  YYSYMBOL_string_node = 84,               /* string_node  */
+  YYSYMBOL_option_args = 85,               /* option_args  */
+  YYSYMBOL_func_name = 86,                 /* func_name  */
+  YYSYMBOL_location = 87,                  /* location  */
+  YYSYMBOL_break_args = 88,                /* break_args  */
+  YYSYMBOL_89_9 = 89,                      /* $@9  */
+  YYSYMBOL_90_10 = 90,                     /* $@10  */
+  YYSYMBOL_opt_variable = 91,              /* opt_variable  */
+  YYSYMBOL_opt_string = 92,                /* opt_string  */
+  YYSYMBOL_opt_node = 93,                  /* opt_node  */
+  YYSYMBOL_help_args = 94,                 /* help_args  */
+  YYSYMBOL_enable_args = 95,               /* enable_args  */
+  YYSYMBOL_print_exp = 96,                 /* print_exp  */
+  YYSYMBOL_print_args = 97,                /* print_args  */
+  YYSYMBOL_printf_exp = 98,                /* printf_exp  */
+  YYSYMBOL_printf_args = 99,               /* printf_args  */
+  YYSYMBOL_list_args = 100,                /* list_args  */
+  YYSYMBOL_integer_range = 101,            /* integer_range  */
+  YYSYMBOL_opt_integer_list = 102,         /* opt_integer_list  */
+  YYSYMBOL_integer_list = 103,             /* integer_list  */
+  YYSYMBOL_exp_list = 104,                 /* exp_list  */
+  YYSYMBOL_subscript = 105,                /* subscript  */
+  YYSYMBOL_subscript_list = 106,           /* subscript_list  */
+  YYSYMBOL_variable = 107,                 /* variable  */
+  YYSYMBOL_node = 108,                     /* node  */
+  YYSYMBOL_opt_plus_integer = 109,         /* opt_plus_integer  */
+  YYSYMBOL_opt_integer = 110,              /* opt_integer  */
+  YYSYMBOL_plus_integer = 111,             /* plus_integer  */
+  YYSYMBOL_integer = 112,                  /* integer  */
+  YYSYMBOL_nls = 113                       /* nls  */
+};
+typedef enum yysymbol_kind_t yysymbol_kind_t;
+
 
 
 
@@ -393,6 +515,7 @@ typedef int yytype_uint16;
 
 #define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X))
 
+
 /* Stored state numbers (used for stacks). */
 typedef yytype_uint8 yy_state_t;
 
@@ -411,6 +534,7 @@ typedef int yy_state_fast_t;
 # endif
 #endif
 
+
 #ifndef YY_ATTRIBUTE_PURE
 # if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
 #  define YY_ATTRIBUTE_PURE __attribute__ ((__pure__))
@@ -468,7 +592,7 @@ typedef int yy_state_fast_t;
 
 #define YY_ASSERT(E) ((void) (0 && (E)))
 
-#if ! defined yyoverflow || YYERROR_VERBOSE
+#if !defined yyoverflow
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
@@ -533,8 +657,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 # endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
+#endif /* !defined yyoverflow */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
@@ -610,14 +733,15 @@ union yyalloc
 /* YYNSTATES -- Number of states.  */
 #define YYNSTATES  203
 
-#define YYUNDEFTOK  2
 #define YYMAXUTOK   303
 
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex, with out-of-bounds checking.  */
-#define YYTRANSLATE(YYX)                                                \
-  (0 <= (YYX) && (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+#define YYTRANSLATE(YYX)                                \
+  (0 <= (YYX) && (YYX) <= YYMAXUTOK                     \
+   ? YY_CAST (yysymbol_kind_t, yytranslate[YYX])        \
+   : YYSYMBOL_YYUNDEF)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex.  */
@@ -679,35 +803,48 @@ static const yytype_int16 yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
+/** Accessing symbol of state STATE.  */
+#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State])
+
+#if YYDEBUG || 0
+/* The user-facing name of the symbol whose (internal) number is
+   YYSYMBOL.  No bounds checking.  */
+static const char *yysymbol_name (yysymbol_kind_t yysymbol) 
YY_ATTRIBUTE_UNUSED;
+
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "D_BACKTRACE", "D_BREAK", "D_CLEAR",
-  "D_CONTINUE", "D_DELETE", "D_DISABLE", "D_DOWN", "D_ENABLE", "D_FINISH",
-  "D_FRAME", "D_HELP", "D_IGNORE", "D_INFO", "D_LIST", "D_NEXT", "D_NEXTI",
-  "D_PRINT", "D_PRINTF", "D_QUIT", "D_RETURN", "D_RUN", "D_SET", "D_STEP",
-  "D_STEPI", "D_TBREAK", "D_UP", "D_UNTIL", "D_DISPLAY", "D_UNDISPLAY",
-  "D_WATCH", "D_UNWATCH", "D_DUMP", "D_TRACE", "D_INT", "D_STRING",
-  "D_NODE", "D_VARIABLE", "D_OPTION", "D_COMMANDS", "D_END", "D_SILENT",
-  "D_SOURCE", "D_SAVE", "D_EVAL", "D_CONDITION", "D_STATEMENT", "'='",
-  "','", "':'", "'@'", "'+'", "'-'", "'['", "']'", "'$'", "'\\n'",
-  "$accept", "input", "line", "control_cmd", "d_cmd", "frame_cmd",
-  "break_cmd", "set_want_nodeval", "eval_prologue", "statement_list", "@1",
-  "eval_cmd", "command", "$@2", "$@3", "$@4", "$@5", "$@6", "$@7", "$@8",
-  "condition_exp", "commands_arg", "opt_param_list", "param_list",
-  "opt_string_node", "string_node", "option_args", "func_name", "location",
-  "break_args", "$@9", "$@10", "opt_variable", "opt_string", "opt_node",
-  "help_args", "enable_args", "print_exp", "print_args", "printf_exp",
-  "printf_args", "list_args", "integer_range", "opt_integer_list",
-  "integer_list", "exp_list", "subscript", "subscript_list", "variable",
-  "node", "opt_plus_integer", "opt_integer", "plus_integer", "integer",
-  "nls", YY_NULLPTR
+  "\"end of file\"", "error", "\"invalid token\"", "D_BACKTRACE",
+  "D_BREAK", "D_CLEAR", "D_CONTINUE", "D_DELETE", "D_DISABLE", "D_DOWN",
+  "D_ENABLE", "D_FINISH", "D_FRAME", "D_HELP", "D_IGNORE", "D_INFO",
+  "D_LIST", "D_NEXT", "D_NEXTI", "D_PRINT", "D_PRINTF", "D_QUIT",
+  "D_RETURN", "D_RUN", "D_SET", "D_STEP", "D_STEPI", "D_TBREAK", "D_UP",
+  "D_UNTIL", "D_DISPLAY", "D_UNDISPLAY", "D_WATCH", "D_UNWATCH", "D_DUMP",
+  "D_TRACE", "D_INT", "D_STRING", "D_NODE", "D_VARIABLE", "D_OPTION",
+  "D_COMMANDS", "D_END", "D_SILENT", "D_SOURCE", "D_SAVE", "D_EVAL",
+  "D_CONDITION", "D_STATEMENT", "'='", "','", "':'", "'@'", "'+'", "'-'",
+  "'['", "']'", "'$'", "'\\n'", "$accept", "input", "line", "control_cmd",
+  "d_cmd", "frame_cmd", "break_cmd", "set_want_nodeval", "eval_prologue",
+  "statement_list", "@1", "eval_cmd", "command", "$@2", "$@3", "$@4",
+  "$@5", "$@6", "$@7", "$@8", "condition_exp", "commands_arg",
+  "opt_param_list", "param_list", "opt_string_node", "string_node",
+  "option_args", "func_name", "location", "break_args", "$@9", "$@10",
+  "opt_variable", "opt_string", "opt_node", "help_args", "enable_args",
+  "print_exp", "print_args", "printf_exp", "printf_args", "list_args",
+  "integer_range", "opt_integer_list", "integer_list", "exp_list",
+  "subscript", "subscript_list", "variable", "node", "opt_plus_integer",
+  "opt_integer", "plus_integer", "integer", "nls", YY_NULLPTR
 };
+
+static const char *
+yysymbol_name (yysymbol_kind_t yysymbol)
+{
+  return yytname[yysymbol];
+}
 #endif
 
-# ifdef YYPRINT
+#ifdef YYPRINT
 /* YYTOKNUM[NUM] -- (External) token number corresponding to the
    (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_int16 yytoknum[] =
@@ -719,7 +856,7 @@ static const yytype_int16 yytoknum[] =
      295,   296,   297,   298,   299,   300,   301,   302,   303,    61,
       44,    58,    64,    43,    45,    91,    93,    36,    10
 };
-# endif
+#endif
 
 #define YYPACT_NINF (-151)
 
@@ -931,10 +1068,10 @@ static const yytype_int8 yyr2[] =
 };
 
 
+enum { YYENOMEM = -2 };
+
 #define yyerrok         (yyerrstatus = 0)
 #define yyclearin       (yychar = YYEMPTY)
-#define YYEMPTY         (-2)
-#define YYEOF           0
 
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
@@ -960,10 +1097,9 @@ static const yytype_int8 yyr2[] =
       }                                                           \
   while (0)
 
-/* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
-
+/* Backward compatibility with an undocumented macro.
+   Use YYerror or YYUNDEF. */
+#define YYERRCODE YYUNDEF
 
 
 /* Enable debugging if requested.  */
@@ -981,18 +1117,18 @@ do {                                            \
 } while (0)
 
 /* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
+# ifndef YY_LOCATION_PRINT
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
 do {                                                                      \
   if (yydebug)                                                            \
     {                                                                     \
       YYFPRINTF (stderr, "%s ", Title);                                   \
       yy_symbol_print (stderr,                                            \
-                  Type, Value); \
+                  Kind, Value); \
       YYFPRINTF (stderr, "\n");                                           \
     }                                                                     \
 } while (0)
@@ -1003,18 +1139,19 @@ do {                                                    
                  \
 `-----------------------------------*/
 
 static void
-yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_value_print (FILE *yyo,
+                       yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep)
 {
   FILE *yyoutput = yyo;
   YYUSE (yyoutput);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
+  if (yykind < YYNTOKENS)
+    YYPRINT (yyo, yytoknum[yykind], *yyvaluep);
 # endif
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
+  YYUSE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
@@ -1024,12 +1161,13 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE 
const * const yyvaluep)
 `---------------------------*/
 
 static void
-yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_print (FILE *yyo,
+                 yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep)
 {
   YYFPRINTF (yyo, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
+             yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind));
 
-  yy_symbol_value_print (yyo, yytype, yyvaluep);
+  yy_symbol_value_print (yyo, yykind, yyvaluep);
   YYFPRINTF (yyo, ")");
 }
 
@@ -1062,7 +1200,8 @@ do {                                                      
      \
 `------------------------------------------------*/
 
 static void
-yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp,
+                 int yyrule)
 {
   int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
@@ -1074,9 +1213,8 @@ yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, int 
yyrule)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr,
-                       yystos[+yyssp[yyi + 1 - yynrhs]],
-                       &yyvsp[(yyi + 1) - (yynrhs)]
-                                              );
+                       YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]),
+                       &yyvsp[(yyi + 1) - (yynrhs)]);
       YYFPRINTF (stderr, "\n");
     }
 }
@@ -1091,8 +1229,8 @@ do {                                    \
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YYDPRINTF(Args) ((void) 0)
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -1115,258 +1253,29 @@ int yydebug;
 #endif
 
 
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S)))
-#  else
-/* Return the length of YYSTR.  */
-static YYPTRDIFF_T
-yystrlen (const char *yystr)
-{
-  YYPTRDIFF_T yylen;
-  for (yylen = 0; yystr[yylen]; yylen++)
-    continue;
-  return yylen;
-}
-#  endif
-# endif
 
-# ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-{
-  char *yyd = yydest;
-  const char *yys = yysrc;
 
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYPTRDIFF_T
-yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-    {
-      YYPTRDIFF_T yyn = 0;
-      char const *yyp = yystr;
-
-      for (;;)
-        switch (*++yyp)
-          {
-          case '\'':
-          case ',':
-            goto do_not_strip_quotes;
-
-          case '\\':
-            if (*++yyp != '\\')
-              goto do_not_strip_quotes;
-            else
-              goto append;
-
-          append:
-          default:
-            if (yyres)
-              yyres[yyn] = *yyp;
-            yyn++;
-            break;
-
-          case '"':
-            if (yyres)
-              yyres[yyn] = '\0';
-            return yyn;
-          }
-    do_not_strip_quotes: ;
-    }
-
-  if (yyres)
-    return yystpcpy (yyres, yystr) - yyres;
-  else
-    return yystrlen (yystr);
-}
-# endif
-
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int
-yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
-                yy_state_t *yyssp, int yytoken)
-{
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = YY_NULLPTR;
-  /* Arguments of yyformat: reported tokens (one for the "unexpected",
-     one per "expected"). */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Actual size of YYARG. */
-  int yycount = 0;
-  /* Cumulated lengths of YYARG.  */
-  YYPTRDIFF_T yysize = 0;
-
-  /* There are many possibilities here to consider:
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[+*yyssp];
-      YYPTRDIFF_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
-      yysize = yysize0;
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                {
-                  YYPTRDIFF_T yysize1
-                    = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
-                  if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
-                    yysize = yysize1;
-                  else
-                    return 2;
-                }
-              }
-        }
-    }
-
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-    default: /* Avoid compiler warnings. */
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or 
%s"));
-# undef YYCASE_
-    }
-
-  {
-    /* Don't count the "%s"s in the final size, but reserve room for
-       the terminator.  */
-    YYPTRDIFF_T yysize1 = yysize + (yystrlen (yyformat) - 2 * yycount) + 1;
-    if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
-      yysize = yysize1;
-    else
-      return 2;
-  }
-
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
 
-  /* 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 = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          ++yyp;
-          ++yyformat;
-        }
-  }
-  return 0;
-}
-#endif /* YYERROR_VERBOSE */
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg,
+            yysymbol_kind_t yykind, YYSTYPE *yyvaluep)
 {
   YYUSE (yyvaluep);
   if (!yymsg)
     yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+  YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp);
 
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
+  YYUSE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
-
-
 /* The lookahead symbol.  */
 int yychar;
 
@@ -1376,6 +1285,8 @@ YYSTYPE yylval;
 int yynerrs;
 
 
+
+
 /*----------.
 | yyparse.  |
 `----------*/
@@ -1394,6 +1305,9 @@ yyparse (void)
        Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
+    /* Their size.  */
+    YYPTRDIFF_T yystacksize;
+
     /* The state stack.  */
     yy_state_t yyssa[YYINITDEPTH];
     yy_state_t *yyss;
@@ -1404,22 +1318,16 @@ yyparse (void)
     YYSTYPE *yyvs;
     YYSTYPE *yyvsp;
 
-    YYPTRDIFF_T yystacksize;
-
   int yyn;
+  /* The return value of yyparse.  */
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
+  yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf;
-#endif
+
 
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
@@ -1427,15 +1335,17 @@ yyparse (void)
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
+  yynerrs = 0;
+  yystate = 0;
+  yyerrstatus = 0;
+
+  yystacksize = YYINITDEPTH;
   yyssp = yyss = yyssa;
   yyvsp = yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
+
 
   YYDPRINTF ((stderr, "Starting parse\n"));
 
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
@@ -1458,6 +1368,7 @@ yysetstate:
   YY_IGNORE_USELESS_CAST_BEGIN
   *yyssp = YY_CAST (yy_state_t, yystate);
   YY_IGNORE_USELESS_CAST_END
+  YY_STACK_PRINT (yyss, yyssp);
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
@@ -1503,7 +1414,7 @@ yysetstate:
           goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-# undef YYSTACK_RELOCATE
+#  undef YYSTACK_RELOCATE
         if (yyss1 != yyssa)
           YYSTACK_FREE (yyss1);
       }
@@ -1542,18 +1453,29 @@ yybackup:
 
   /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either empty, or end-of-input, or a valid lookahead.  */
   if (yychar == YYEMPTY)
     {
-      YYDPRINTF ((stderr, "Reading a token: "));
+      YYDPRINTF ((stderr, "Reading a token\n"));
       yychar = yylex ();
     }
 
   if (yychar <= YYEOF)
     {
-      yychar = yytoken = YYEOF;
+      yychar = YYEOF;
+      yytoken = YYSYMBOL_YYEOF;
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
+  else if (yychar == YYerror)
+    {
+      /* The scanner already issued an error message, process directly
+         to error recovery.  But do not keep the error token as
+         lookahead, it is too special and may lead us to an endless
+         loop in error recovery. */
+      yychar = YYUNDEF;
+      yytoken = YYSYMBOL_YYerror;
+      goto yyerrlab1;
+    }
   else
     {
       yytoken = YYTRANSLATE (yychar);
@@ -1638,7 +1560,7 @@ yyreduce:
                        arg_list = NULL;
                }
          }
-#line 1642 "command.c"
+#line 1564 "command.c"
     break;
 
   case 5:
@@ -1692,7 +1614,7 @@ yyreduce:
                                YYACCEPT;
                }
          }
-#line 1696 "command.c"
+#line 1618 "command.c"
     break;
 
   case 6:
@@ -1700,13 +1622,13 @@ yyreduce:
           {
                yyerrok;
          }
-#line 1704 "command.c"
+#line 1626 "command.c"
     break;
 
   case 22:
 #line 214 "command.y"
           { want_nodeval = true; }
-#line 1710 "command.c"
+#line 1632 "command.c"
     break;
 
   case 23:
@@ -1726,7 +1648,7 @@ yyreduce:
                        in_eval = true;
                }
          }
-#line 1730 "command.c"
+#line 1652 "command.c"
     break;
 
   case 24:
@@ -1738,13 +1660,13 @@ yyreduce:
                free_cmdarg(arg_list);
                arg_list = NULL;
          }
-#line 1742 "command.c"
+#line 1664 "command.c"
     break;
 
   case 25:
 #line 245 "command.y"
                                      { yyval = append_statement(yyvsp[-1], 
lexptr_begin); }
-#line 1748 "command.c"
+#line 1670 "command.c"
     break;
 
   case 26:
@@ -1752,7 +1674,7 @@ yyreduce:
           {
                yyval = yyvsp[-1];
          }
-#line 1756 "command.c"
+#line 1678 "command.c"
     break;
 
   case 27:
@@ -1772,7 +1694,7 @@ yyreduce:
                cmd_idx = find_command("eval", 4);
                in_eval = false;
          }
-#line 1776 "command.c"
+#line 1698 "command.c"
     break;
 
   case 28:
@@ -1787,7 +1709,7 @@ yyreduce:
                free_cmdarg(arg_list);
                arg_list = arg;
          }
-#line 1791 "command.c"
+#line 1713 "command.c"
     break;
 
   case 34:
@@ -1797,7 +1719,7 @@ yyreduce:
                                && yyvsp[0] != NULL && yyvsp[0]->a_int < 0)
                        yyerror(_("invalid frame number: %d"), yyvsp[0]->a_int);
          }
-#line 1801 "command.c"
+#line 1723 "command.c"
     break;
 
   case 35:
@@ -1813,43 +1735,43 @@ yyreduce:
                        yyvsp[0]->a_argument = argtab[idx].value;
                }
          }
-#line 1817 "command.c"
+#line 1739 "command.c"
     break;
 
   case 38:
 #line 307 "command.y"
                   { want_nodeval = true; }
-#line 1823 "command.c"
+#line 1745 "command.c"
     break;
 
   case 40:
 #line 308 "command.y"
                    { want_nodeval = true; }
-#line 1829 "command.c"
+#line 1751 "command.c"
     break;
 
   case 46:
 #line 313 "command.y"
                 { want_nodeval = true; }
-#line 1835 "command.c"
+#line 1757 "command.c"
     break;
 
   case 49:
 #line 315 "command.y"
                    { want_nodeval = true; }
-#line 1841 "command.c"
+#line 1763 "command.c"
     break;
 
   case 51:
 #line 316 "command.y"
                     { want_nodeval = true; }
-#line 1847 "command.c"
+#line 1769 "command.c"
     break;
 
   case 53:
 #line 317 "command.y"
                   { want_nodeval = true; }
-#line 1853 "command.c"
+#line 1775 "command.c"
     break;
 
   case 57:
@@ -1858,7 +1780,7 @@ yyreduce:
                if (in_cmd_src(yyvsp[0]->a_string))
                        yyerror(_("source: `%s': already sourced."), 
yyvsp[0]->a_string);
          }
-#line 1862 "command.c"
+#line 1784 "command.c"
     break;
 
   case 58:
@@ -1867,7 +1789,7 @@ yyreduce:
                if (! input_from_tty)
                        yyerror(_("save: `%s': command not permitted."), 
yyvsp[0]->a_string);
          }
-#line 1871 "command.c"
+#line 1793 "command.c"
     break;
 
   case 59:
@@ -1897,7 +1819,7 @@ yyreduce:
                        }
                }
          }
-#line 1901 "command.c"
+#line 1823 "command.c"
     break;
 
   case 60:
@@ -1911,7 +1833,7 @@ yyreduce:
                        in_commands = false;
                }
          }
-#line 1915 "command.c"
+#line 1837 "command.c"
     break;
 
   case 61:
@@ -1920,7 +1842,7 @@ yyreduce:
                if (! in_commands)
                        yyerror(_("`silent' valid only in command `commands'"));
          }
-#line 1924 "command.c"
+#line 1846 "command.c"
     break;
 
   case 62:
@@ -1936,13 +1858,13 @@ yyreduce:
                        yyvsp[0]->a_argument = argtab[idx].value;
                }
          }
-#line 1940 "command.c"
+#line 1862 "command.c"
     break;
 
   case 63:
 #line 383 "command.y"
                                    { want_nodeval = true; }
-#line 1946 "command.c"
+#line 1868 "command.c"
     break;
 
   case 64:
@@ -1954,7 +1876,7 @@ yyreduce:
                if (! type)
                        yyerror(_("condition: invalid breakpoint/watchpoint 
number"));
          }
-#line 1958 "command.c"
+#line 1880 "command.c"
     break;
 
   case 65:
@@ -1969,7 +1891,7 @@ yyreduce:
                        arg_list = arg;
                }
          }
-#line 1973 "command.c"
+#line 1895 "command.c"
     break;
 
   case 66:
@@ -1983,37 +1905,37 @@ yyreduce:
                }
                yyval = yyvsp[0];
          }
-#line 1987 "command.c"
+#line 1909 "command.c"
     break;
 
   case 68:
 #line 420 "command.y"
           {    yyval = NULL; }
-#line 1993 "command.c"
+#line 1915 "command.c"
     break;
 
   case 69:
 #line 425 "command.y"
           { yyval = NULL; }
-#line 1999 "command.c"
+#line 1921 "command.c"
     break;
 
   case 74:
 #line 434 "command.y"
           { yyval = NULL; }
-#line 2005 "command.c"
+#line 1927 "command.c"
     break;
 
   case 75:
 #line 439 "command.y"
           { yyval = NULL; }
-#line 2011 "command.c"
+#line 1933 "command.c"
     break;
 
   case 77:
 #line 442 "command.y"
           { yyval = NULL; }
-#line 2017 "command.c"
+#line 1939 "command.c"
     break;
 
   case 78:
@@ -2024,13 +1946,13 @@ yyreduce:
                if ((n->flags & STRING) == 0)
                        yyerror(_("argument not a string"));
          }
-#line 2028 "command.c"
+#line 1950 "command.c"
     break;
 
   case 79:
 #line 457 "command.y"
           { yyval = NULL; }
-#line 2034 "command.c"
+#line 1956 "command.c"
     break;
 
   case 80:
@@ -2039,7 +1961,7 @@ yyreduce:
                if (find_option(yyvsp[0]->a_string) < 0)
                        yyerror(_("option: invalid parameter - `%s'"), 
yyvsp[0]->a_string);
          }
-#line 2043 "command.c"
+#line 1965 "command.c"
     break;
 
   case 81:
@@ -2048,7 +1970,7 @@ yyreduce:
                if (find_option(yyvsp[-2]->a_string) < 0)
                        yyerror(_("option: invalid parameter - `%s'"), 
yyvsp[-2]->a_string);
          }
-#line 2052 "command.c"
+#line 1974 "command.c"
     break;
 
   case 82:
@@ -2065,49 +1987,49 @@ yyreduce:
                        yyvsp[0]->a_node = n;
                }
          }
-#line 2069 "command.c"
+#line 1991 "command.c"
     break;
 
   case 83:
 #line 488 "command.y"
           { yyval = NULL; }
-#line 2075 "command.c"
+#line 1997 "command.c"
     break;
 
   case 88:
 #line 497 "command.y"
           { yyval = NULL; }
-#line 2081 "command.c"
+#line 2003 "command.c"
     break;
 
   case 89:
 #line 498 "command.y"
                        { want_nodeval = true; }
-#line 2087 "command.c"
+#line 2009 "command.c"
     break;
 
   case 92:
 #line 500 "command.y"
                                     { want_nodeval = true; }
-#line 2093 "command.c"
+#line 2015 "command.c"
     break;
 
   case 95:
 #line 506 "command.y"
           { yyval = NULL; }
-#line 2099 "command.c"
+#line 2021 "command.c"
     break;
 
   case 97:
 #line 512 "command.y"
           { yyval = NULL; }
-#line 2105 "command.c"
+#line 2027 "command.c"
     break;
 
   case 99:
 #line 518 "command.y"
           { yyval = NULL; }
-#line 2111 "command.c"
+#line 2033 "command.c"
     break;
 
   case 104:
@@ -2123,7 +2045,7 @@ yyreduce:
                        yyvsp[-1]->a_argument = argtab[idx].value;
                }
          }
-#line 2127 "command.c"
+#line 2049 "command.c"
     break;
 
   case 106:
@@ -2132,7 +2054,7 @@ yyreduce:
                yyvsp[0]->type = D_array;       /* dump all items */
                yyvsp[0]->a_count = 0;
          }
-#line 2136 "command.c"
+#line 2058 "command.c"
     break;
 
   case 107:
@@ -2141,19 +2063,19 @@ yyreduce:
                yyvsp[-1]->type = D_array;
                yyvsp[-1]->a_count = num_dim;
          }
-#line 2145 "command.c"
+#line 2067 "command.c"
     break;
 
   case 117:
 #line 577 "command.y"
           { yyval = NULL; }
-#line 2151 "command.c"
+#line 2073 "command.c"
     break;
 
   case 118:
 #line 579 "command.y"
           { yyval = NULL; }
-#line 2157 "command.c"
+#line 2079 "command.c"
     break;
 
   case 119:
@@ -2164,7 +2086,7 @@ yyreduce:
                a->a_int = -1;
                append_cmdarg(a);
          }
-#line 2168 "command.c"
+#line 2090 "command.c"
     break;
 
   case 126:
@@ -2177,25 +2099,25 @@ yyreduce:
                        yyvsp[-2]->type = D_range;
                yyval = yyvsp[-2];
          }
-#line 2181 "command.c"
+#line 2103 "command.c"
     break;
 
   case 127:
 #line 609 "command.y"
           { yyval = NULL; }
-#line 2187 "command.c"
+#line 2109 "command.c"
     break;
 
   case 134:
 #line 623 "command.y"
           { yyval = yyvsp[0]; }
-#line 2193 "command.c"
+#line 2115 "command.c"
     break;
 
   case 135:
 #line 625 "command.y"
           { yyval = yyvsp[-2]; }
-#line 2199 "command.c"
+#line 2121 "command.c"
     break;
 
   case 137:
@@ -2214,19 +2136,19 @@ yyreduce:
                yyvsp[-1]->a_node = subs;
                yyval = yyvsp[-1];
          }
-#line 2218 "command.c"
+#line 2140 "command.c"
     break;
 
   case 139:
 #line 650 "command.y"
           { yyval = yyvsp[0]; num_dim = 1; }
-#line 2224 "command.c"
+#line 2146 "command.c"
     break;
 
   case 140:
 #line 652 "command.y"
           {    yyval = yyvsp[-1]; num_dim++; }
-#line 2230 "command.c"
+#line 2152 "command.c"
     break;
 
   case 142:
@@ -2239,7 +2161,7 @@ yyreduce:
                        yyvsp[0]->type = D_field;
                yyval = yyvsp[0];
          }
-#line 2243 "command.c"
+#line 2165 "command.c"
     break;
 
   case 143:
@@ -2250,13 +2172,13 @@ yyreduce:
                yyvsp[-1]->a_count = num_dim;
                yyval = yyvsp[-1];
          }
-#line 2254 "command.c"
+#line 2176 "command.c"
     break;
 
   case 144:
 #line 677 "command.y"
           { yyval = yyvsp[0]; }
-#line 2260 "command.c"
+#line 2182 "command.c"
     break;
 
   case 145:
@@ -2267,7 +2189,7 @@ yyreduce:
                        yyerror(_("non-numeric value found, numeric expected"));
                yyval = yyvsp[0];
          }
-#line 2271 "command.c"
+#line 2193 "command.c"
     break;
 
   case 146:
@@ -2280,31 +2202,31 @@ yyreduce:
                        negate_num(n);
                yyval = yyvsp[0];
          }
-#line 2284 "command.c"
+#line 2206 "command.c"
     break;
 
   case 147:
 #line 698 "command.y"
           { yyval = NULL; }
-#line 2290 "command.c"
+#line 2212 "command.c"
     break;
 
   case 148:
 #line 700 "command.y"
           { yyval = yyvsp[0]; }
-#line 2296 "command.c"
+#line 2218 "command.c"
     break;
 
   case 149:
 #line 705 "command.y"
           { yyval = NULL; }
-#line 2302 "command.c"
+#line 2224 "command.c"
     break;
 
   case 150:
 #line 707 "command.y"
           { yyval = yyvsp[0]; }
-#line 2308 "command.c"
+#line 2230 "command.c"
     break;
 
   case 151:
@@ -2314,7 +2236,7 @@ yyreduce:
                        yyerror(_("non-zero integer value"));
                yyval = yyvsp[0];
          }
-#line 2318 "command.c"
+#line 2240 "command.c"
     break;
 
   case 152:
@@ -2324,19 +2246,19 @@ yyreduce:
                        yyerror(_("non-zero integer value"));
                yyval = yyvsp[0];
          }
-#line 2328 "command.c"
+#line 2250 "command.c"
     break;
 
   case 153:
 #line 727 "command.y"
           { yyval = yyvsp[0]; }
-#line 2334 "command.c"
+#line 2256 "command.c"
     break;
 
   case 154:
 #line 729 "command.y"
           { yyval = yyvsp[0]; }
-#line 2340 "command.c"
+#line 2262 "command.c"
     break;
 
   case 155:
@@ -2345,7 +2267,7 @@ yyreduce:
                yyvsp[0]->a_int = - yyvsp[0]->a_int;
                yyval = yyvsp[0];
          }
-#line 2349 "command.c"
+#line 2271 "command.c"
     break;
 
   case 156:
@@ -2358,11 +2280,11 @@ yyreduce:
                        lexptr_begin = NULL;
                }
          }
-#line 2362 "command.c"
+#line 2284 "command.c"
     break;
 
 
-#line 2366 "command.c"
+#line 2288 "command.c"
 
       default: break;
     }
@@ -2377,11 +2299,10 @@ yyreduce:
      case of YYERROR or YYBACKUP, subsequent parser actions might lead
      to an incorrect destructor call or verbose syntax error message
      before the lookahead is translated.  */
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+  YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, 
&yyloc);
 
   YYPOPSTACK (yylen);
   yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
 
@@ -2405,50 +2326,14 @@ yyreduce:
 yyerrlab:
   /* Make sure we have latest lookahead translation.  See comments at
      user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
+  yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar);
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
-#else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
-      {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = YY_CAST (char *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, 
yymsg_alloc)));
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
-      }
-# undef YYSYNTAX_ERROR
-#endif
     }
 
-
-
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
@@ -2497,13 +2382,14 @@ yyerrorlab:
 yyerrlab1:
   yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
+  // Pop stack until we find a state that shifts the error token.
   for (;;)
     {
       yyn = yypact[yystate];
       if (!yypact_value_is_default (yyn))
         {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+          yyn += YYSYMBOL_YYerror;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror)
             {
               yyn = yytable[yyn];
               if (0 < yyn)
@@ -2517,7 +2403,7 @@ yyerrlab1:
 
 
       yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp);
+                  YY_ACCESSING_SYMBOL (yystate), yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
@@ -2529,7 +2415,7 @@ yyerrlab1:
 
 
   /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+  YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp);
 
   yystate = yyn;
   goto yynewstate;
@@ -2551,7 +2437,7 @@ yyabortlab:
   goto yyreturn;
 
 
-#if !defined yyoverflow || YYERROR_VERBOSE
+#if !defined yyoverflow
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -2581,19 +2467,17 @@ yyreturn:
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-                  yystos[+*yyssp], yyvsp);
+                  YY_ACCESSING_SYMBOL (+*yyssp), yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-#if YYERROR_VERBOSE
-  if (yymsg != yymsgbuf)
-    YYSTACK_FREE (yymsg);
-#endif
+
   return yyresult;
 }
+
 #line 749 "command.y"
 
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    5 +
 NEWS      |    5 +
 awkgram.c | 1146 ++++++++++++++++++++++++++++---------------------------------
 command.c |  860 ++++++++++++++++++++--------------------------
 4 files changed, 914 insertions(+), 1102 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

[Prev in Thread] Current Thread [Next in Thread]