Merge branch 'gawk-4.0-stable'.

6 files changed, 356 insertions, 298 deletions

diff --git a/ChangeLog b/ChangeLog
index 9c41f822..c0e13a11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-28         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Update bison 2.6.3. Various files regenerated.
+
 2012-10-27         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawkapi.h: Continuing the minor formatting / doc cleanups.
@@ -56,7 +60,7 @@
 
 2012-10-13         Arnold D. Robbins     <arnold@skeeve.com>
 
-	Update to Automake 1.12.4. Various files regenerated.
+	* Update to Automake 1.12.4. Various files regenerated.
 
 2012-10-11         Arnold D. Robbins     <arnold@skeeve.com>
 
diff --git a/NEWS b/NEWS
index 8e839c43..138fb727 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@
    are permitted in any medium without royalty provided the copyright
    notice and this notice are preserved.
 
-Changes from 4.0.1 to 4.1
+Changes from 4.0.2 to 4.1
 -------------------------
 1. The three executables gawk, pgawk, and dgawk, have been merged into
    one, named just gawk.  As a result:
@@ -32,7 +32,7 @@ Changes from 4.0.1 to 4.1
 Changes from 4.0.1 to 4.0.2
 ---------------------------
 
-1. Infrastructure upgrades: Autoconf 2.69, Automake 1.12.4, bison 2.6.3.
+1. Infrastructure upgrades: Autoconf 2.69, Automake 1.12.4, bison 2.6.4.
 
 2. Various minor bug fixes and documentation updates.
  
diff --git a/awkgram.c b/awkgram.c
index 703cf631..56b769f6 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.6.2.  */
+/* A Bison parser, made by GNU Bison 2.6.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
    
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.6.2"
+#define YYBISON_VERSION "2.6.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -62,7 +62,7 @@
 
 
 /* Copy the first part of user declarations.  */
-/* Line 336 of yacc.c  */
+/* Line 358 of yacc.c  */
 #line 26 "awkgram.y"
 
 #ifdef GAWKDEBUG
@@ -193,7 +193,7 @@ extern double fmod(double x, double y);
 
 #define YYSTYPE INSTRUCTION *
 
-/* Line 336 of yacc.c  */
+/* Line 358 of yacc.c  */
 #line 198 "awkgram.c"
 
 # ifndef YY_NULL
@@ -212,10 +212,7 @@ extern double fmod(double x, double y);
 # define YYERROR_VERBOSE 0
 #endif
 
-/* In a future release of Bison, this section will be replaced
-   by #include "".  */
-#ifndef YY_
-# define YY_
+
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -361,12 +358,12 @@ int yyparse ();
 #endif
 #endif /* ! YYPARSE_PARAM */
 
-#endif /* !YY_  */
+
 
 /* Copy the second part of user declarations.  */
 
-/* Line 353 of yacc.c  */
-#line 370 "awkgram.c"
+/* Line 377 of yacc.c  */
+#line 367 "awkgram.c"
 
 #ifdef short
 # undef short
@@ -419,24 +416,24 @@ typedef short int yytype_int16;
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
 #endif
 
 /* Identity function, used to suppress warnings about constant conditions.  */
 #ifndef lint
-# define YYID(n) (n)
+# define YYID(N) (N)
 #else
 #if (defined __STDC__ || defined __C99__FUNC__      || defined __cplusplus || defined _MSC_VER)
 static int
@@ -1079,11 +1076,11 @@ static const yytype_int16 yytable[] =
        0,    90,   214,     0,    92,    93
 };
 
-#define yypact_value_is_default(yystate) \
-  ((yystate) == (-273))
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-273)))
 
-#define yytable_value_is_error(yytable_value) \
-  ((yytable_value) == (-104))
+#define yytable_value_is_error(Yytable_value) \
+  (!!((Yytable_value) == (-104)))
 
 static const yytype_int16 yycheck[] =
 {
@@ -1787,6 +1784,15 @@ yydestruct (yymsg, yytype, yyvaluep)
 /* The lookahead symbol.  */
 int yychar;
 
+
+#ifndef YYLVAL_INITIALIZE
+# define YYLVAL_INITIALIZE()
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
@@ -1844,7 +1850,7 @@ yyparse ()
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
+  int yytoken = 0;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
@@ -1862,7 +1868,6 @@ yyparse ()
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
   yyss = yyssa;
   yyvs = yyvsa;
   yystacksize = YYINITDEPTH;
@@ -1880,6 +1885,8 @@ yyparse ()
      The wasted elements are never initialized.  */
   yyssp = yyss;
   yyvsp = yyvs;
+
+  YYLVAL_INITIALIZE ();
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -2020,7 +2027,9 @@ yybackup:
   yychar = YYEMPTY;
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -2057,7 +2066,7 @@ yyreduce:
   switch (yyn)
     {
         case 3:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 198 "awkgram.y"
     {
 		rule = 0;
@@ -2066,7 +2075,7 @@ yyreduce:
     break;
 
   case 5:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 204 "awkgram.y"
     {
 		next_sourcefile();
@@ -2076,7 +2085,7 @@ yyreduce:
     break;
 
   case 6:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 210 "awkgram.y"
     {
 		rule = 0;
@@ -2089,7 +2098,7 @@ yyreduce:
     break;
 
   case 7:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 222 "awkgram.y"
     {
 		(void) append_rule((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
@@ -2097,7 +2106,7 @@ yyreduce:
     break;
 
   case 8:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 226 "awkgram.y"
     {
 		if (rule != Rule) {
@@ -2112,7 +2121,7 @@ yyreduce:
     break;
 
   case 9:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 237 "awkgram.y"
     {
 		in_function = NULL;
@@ -2122,7 +2131,7 @@ yyreduce:
     break;
 
   case 10:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 243 "awkgram.y"
     {
 		want_source = false;
@@ -2131,7 +2140,7 @@ yyreduce:
     break;
 
   case 11:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 248 "awkgram.y"
     {
 		want_source = false;
@@ -2140,7 +2149,7 @@ yyreduce:
     break;
 
   case 12:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 256 "awkgram.y"
     {
 		if (include_source((yyvsp[(1) - (1)])) < 0)
@@ -2152,19 +2161,19 @@ yyreduce:
     break;
 
   case 13:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 264 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 14:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 266 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 15:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 271 "awkgram.y"
     {
 		if (load_library((yyvsp[(1) - (1)])) < 0)
@@ -2176,31 +2185,31 @@ yyreduce:
     break;
 
   case 16:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 279 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 17:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 281 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 18:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 286 "awkgram.y"
     {	(yyval) = NULL; rule = Rule; }
     break;
 
   case 19:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 288 "awkgram.y"
     {	(yyval) = (yyvsp[(1) - (1)]); rule = Rule; }
     break;
 
   case 20:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 290 "awkgram.y"
     {
 		INSTRUCTION *tp;
@@ -2230,7 +2239,7 @@ yyreduce:
     break;
 
   case 21:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 316 "awkgram.y"
     {
 		static int begin_seen = 0;
@@ -2245,7 +2254,7 @@ yyreduce:
     break;
 
   case 22:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 327 "awkgram.y"
     {
 		static int end_seen = 0;
@@ -2260,7 +2269,7 @@ yyreduce:
     break;
 
   case 23:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 338 "awkgram.y"
     {
 		(yyvsp[(1) - (1)])->in_rule = rule = BEGINFILE;
@@ -2270,7 +2279,7 @@ yyreduce:
     break;
 
   case 24:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 344 "awkgram.y"
     {
 		(yyvsp[(1) - (1)])->in_rule = rule = ENDFILE;
@@ -2280,7 +2289,7 @@ yyreduce:
     break;
 
   case 25:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 353 "awkgram.y"
     {
 		if ((yyvsp[(2) - (5)]) == NULL)
@@ -2291,19 +2300,19 @@ yyreduce:
     break;
 
   case 26:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 363 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 27:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 365 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 28:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 367 "awkgram.y"
     {
 		yyerror(_("`%s' is a built-in function, it cannot be redefined"),
@@ -2313,13 +2322,13 @@ yyreduce:
     break;
 
   case 29:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 373 "awkgram.y"
     { (yyval) = (yyvsp[(2) - (2)]); }
     break;
 
   case 32:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 383 "awkgram.y"
     {
 		(yyvsp[(1) - (6)])->source_file = source;
@@ -2334,13 +2343,13 @@ yyreduce:
     break;
 
   case 33:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 401 "awkgram.y"
     { ++want_regexp; }
     break;
 
   case 34:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 403 "awkgram.y"
     {
 		  NODE *n, *exp;
@@ -2373,19 +2382,19 @@ yyreduce:
     break;
 
   case 35:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 435 "awkgram.y"
     { bcfree((yyvsp[(1) - (1)])); }
     break;
 
   case 37:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 441 "awkgram.y"
     {	(yyval) = NULL; }
     break;
 
   case 38:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 443 "awkgram.y"
     {
 		if ((yyvsp[(2) - (2)]) == NULL)
@@ -2402,25 +2411,25 @@ yyreduce:
     break;
 
   case 39:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 456 "awkgram.y"
     {	(yyval) = NULL; }
     break;
 
   case 42:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 466 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 43:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 468 "awkgram.y"
     { (yyval) = (yyvsp[(2) - (3)]); }
     break;
 
   case 44:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 470 "awkgram.y"
     {
 		if (do_pretty_print)
@@ -2431,7 +2440,7 @@ yyreduce:
     break;
 
   case 45:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 477 "awkgram.y"
     {
 		INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt;
@@ -2525,7 +2534,7 @@ yyreduce:
     break;
 
   case 46:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 567 "awkgram.y"
     { 
 		/*
@@ -2571,7 +2580,7 @@ yyreduce:
     break;
 
   case 47:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 609 "awkgram.y"
     {
 		/*
@@ -2617,7 +2626,7 @@ yyreduce:
     break;
 
   case 48:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 651 "awkgram.y"
     {
 		INSTRUCTION *ip;
@@ -2734,7 +2743,7 @@ regular_loop:
     break;
 
   case 49:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 764 "awkgram.y"
     {
 		(yyval) = mk_for_loop((yyvsp[(1) - (12)]), (yyvsp[(3) - (12)]), (yyvsp[(6) - (12)]), (yyvsp[(9) - (12)]), (yyvsp[(12) - (12)]));
@@ -2745,7 +2754,7 @@ regular_loop:
     break;
 
   case 50:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 771 "awkgram.y"
     {
 		(yyval) = mk_for_loop((yyvsp[(1) - (11)]), (yyvsp[(3) - (11)]), (INSTRUCTION *) NULL, (yyvsp[(8) - (11)]), (yyvsp[(11) - (11)]));
@@ -2756,7 +2765,7 @@ regular_loop:
     break;
 
   case 51:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 778 "awkgram.y"
     {
 		if (do_pretty_print)
@@ -2767,7 +2776,7 @@ regular_loop:
     break;
 
   case 52:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 788 "awkgram.y"
     { 
 		if (! break_allowed)
@@ -2780,7 +2789,7 @@ regular_loop:
     break;
 
   case 53:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 797 "awkgram.y"
     {
 		if (! continue_allowed)
@@ -2793,7 +2802,7 @@ regular_loop:
     break;
 
   case 54:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 806 "awkgram.y"
     {
 		/* if inside function (rule = 0), resolve context at run-time */
@@ -2806,7 +2815,7 @@ regular_loop:
     break;
 
   case 55:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 815 "awkgram.y"
     {
 		/* if inside function (rule = 0), resolve context at run-time */
@@ -2821,7 +2830,7 @@ regular_loop:
     break;
 
   case 56:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 826 "awkgram.y"
     {
 		/* Initialize the two possible jump targets, the actual target
@@ -2840,7 +2849,7 @@ regular_loop:
     break;
 
   case 57:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 841 "awkgram.y"
     {
 		if (! in_function)
@@ -2849,7 +2858,7 @@ regular_loop:
     break;
 
   case 58:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 844 "awkgram.y"
     {
 		if ((yyvsp[(3) - (4)]) == NULL) {
@@ -2874,13 +2883,13 @@ regular_loop:
     break;
 
   case 60:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 876 "awkgram.y"
     { in_print = true; in_parens = 0; }
     break;
 
   case 61:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 877 "awkgram.y"
     {
 		/*
@@ -2981,13 +2990,13 @@ regular_print:
     break;
 
   case 62:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 974 "awkgram.y"
     { sub_counter = 0; }
     break;
 
   case 63:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 975 "awkgram.y"
     {
 		char *arr = (yyvsp[(2) - (4)])->lextok;
@@ -3024,7 +3033,7 @@ regular_print:
     break;
 
   case 64:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1012 "awkgram.y"
     {
 		static bool warned = false;
@@ -3054,31 +3063,31 @@ regular_print:
     break;
 
   case 65:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1038 "awkgram.y"
     {	(yyval) = optimize_assignment((yyvsp[(1) - (1)])); }
     break;
 
   case 66:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1043 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 67:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1045 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 68:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1050 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 69:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1052 "awkgram.y"
     {
 		if ((yyvsp[(1) - (2)]) == NULL)
@@ -3089,13 +3098,13 @@ regular_print:
     break;
 
   case 70:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1059 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 71:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1064 "awkgram.y"
     {
 		INSTRUCTION *casestmt = (yyvsp[(5) - (5)]);
@@ -3111,7 +3120,7 @@ regular_print:
     break;
 
   case 72:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1076 "awkgram.y"
     {
 		INSTRUCTION *casestmt = (yyvsp[(4) - (4)]);
@@ -3126,13 +3135,13 @@ regular_print:
     break;
 
   case 73:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1090 "awkgram.y"
     {	(yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 74:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1092 "awkgram.y"
     { 
 		NODE *n = (yyvsp[(2) - (2)])->memory;
@@ -3144,7 +3153,7 @@ regular_print:
     break;
 
   case 75:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1100 "awkgram.y"
     {
 		bcfree((yyvsp[(1) - (2)]));
@@ -3153,13 +3162,13 @@ regular_print:
     break;
 
   case 76:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1105 "awkgram.y"
     {	(yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 77:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1107 "awkgram.y"
     {
 		(yyvsp[(1) - (1)])->opcode = Op_push_re;
@@ -3168,19 +3177,19 @@ regular_print:
     break;
 
   case 78:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1115 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 79:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1117 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 81:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1127 "awkgram.y"
     {
 		(yyval) = (yyvsp[(2) - (3)]);
@@ -3188,7 +3197,7 @@ regular_print:
     break;
 
   case 82:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1134 "awkgram.y"
     {
 		in_print = false;
@@ -3198,13 +3207,13 @@ regular_print:
     break;
 
   case 83:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1139 "awkgram.y"
     { in_print = false; in_parens = 0; }
     break;
 
   case 84:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1140 "awkgram.y"
     {
 		if ((yyvsp[(1) - (3)])->redir_type == redirect_twoway
@@ -3216,7 +3225,7 @@ regular_print:
     break;
 
   case 85:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1151 "awkgram.y"
     {
 		(yyval) = mk_condition((yyvsp[(3) - (6)]), (yyvsp[(1) - (6)]), (yyvsp[(6) - (6)]), NULL, NULL);
@@ -3224,7 +3233,7 @@ regular_print:
     break;
 
   case 86:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1156 "awkgram.y"
     {
 		(yyval) = mk_condition((yyvsp[(3) - (9)]), (yyvsp[(1) - (9)]), (yyvsp[(6) - (9)]), (yyvsp[(7) - (9)]), (yyvsp[(9) - (9)]));
@@ -3232,13 +3241,13 @@ regular_print:
     break;
 
   case 91:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1173 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 92:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1175 "awkgram.y"
     {
 		bcfree((yyvsp[(1) - (2)]));
@@ -3247,19 +3256,19 @@ regular_print:
     break;
 
   case 93:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1183 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 94:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1185 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]) ; }
     break;
 
   case 95:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1190 "awkgram.y"
     {
 		(yyvsp[(1) - (1)])->param_count = 0;
@@ -3268,7 +3277,7 @@ regular_print:
     break;
 
   case 96:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1195 "awkgram.y"
     {
 		(yyvsp[(3) - (3)])->param_count =  (yyvsp[(1) - (3)])->lasti->param_count + 1;
@@ -3278,55 +3287,55 @@ regular_print:
     break;
 
   case 97:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1201 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 98:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1203 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (2)]); }
     break;
 
   case 99:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1205 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (3)]); }
     break;
 
   case 100:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1211 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 101:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1213 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 102:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1218 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 103:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1220 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 104:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1225 "awkgram.y"
     {	(yyval) = mk_expression_list(NULL, (yyvsp[(1) - (1)])); }
     break;
 
   case 105:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1227 "awkgram.y"
     {
 		(yyval) = mk_expression_list((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
@@ -3335,31 +3344,31 @@ regular_print:
     break;
 
   case 106:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1232 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 107:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1234 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 108:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1236 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 109:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1238 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 110:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1244 "awkgram.y"
     {
 		if (do_lint && (yyvsp[(3) - (3)])->lasti->opcode == Op_match_rec)
@@ -3370,19 +3379,19 @@ regular_print:
     break;
 
   case 111:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1251 "awkgram.y"
     {	(yyval) = mk_boolean((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 112:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1253 "awkgram.y"
     {	(yyval) = mk_boolean((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 113:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1255 "awkgram.y"
     {
 		if ((yyvsp[(1) - (3)])->lasti->opcode == Op_match_rec)
@@ -3402,7 +3411,7 @@ regular_print:
     break;
 
   case 114:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1271 "awkgram.y"
     {
 		if (do_lint_old)
@@ -3416,7 +3425,7 @@ regular_print:
     break;
 
   case 115:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1281 "awkgram.y"
     {
 		if (do_lint && (yyvsp[(3) - (3)])->lasti->opcode == Op_match_rec)
@@ -3427,31 +3436,31 @@ regular_print:
     break;
 
   case 116:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1288 "awkgram.y"
     { (yyval) = mk_condition((yyvsp[(1) - (5)]), (yyvsp[(2) - (5)]), (yyvsp[(3) - (5)]), (yyvsp[(4) - (5)]), (yyvsp[(5) - (5)])); }
     break;
 
   case 117:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1290 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 118:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1295 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 119:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1297 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 120:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1299 "awkgram.y"
     {	
 		(yyvsp[(2) - (2)])->opcode = Op_assign_quotient;
@@ -3460,43 +3469,43 @@ regular_print:
     break;
 
   case 121:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1307 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 122:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1309 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 123:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1314 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 124:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1316 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 125:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1321 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 126:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1323 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 127:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1325 "awkgram.y"
     {
 		int count = 2;
@@ -3547,43 +3556,43 @@ regular_print:
     break;
 
   case 129:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1377 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 130:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1379 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 131:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1381 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 132:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1383 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 133:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1385 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 134:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1387 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 135:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1389 "awkgram.y"
     {
 		/*
@@ -3610,7 +3619,7 @@ regular_print:
     break;
 
   case 136:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1412 "awkgram.y"
     {
 		(yyvsp[(2) - (2)])->opcode = Op_postincrement;
@@ -3619,7 +3628,7 @@ regular_print:
     break;
 
   case 137:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1417 "awkgram.y"
     {
 		(yyvsp[(2) - (2)])->opcode = Op_postdecrement;
@@ -3628,7 +3637,7 @@ regular_print:
     break;
 
   case 138:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1422 "awkgram.y"
     {
 		if (do_lint_old) {
@@ -3652,7 +3661,7 @@ regular_print:
     break;
 
   case 139:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1447 "awkgram.y"
     {
 		  (yyval) = mk_getline((yyvsp[(3) - (4)]), (yyvsp[(4) - (4)]), (yyvsp[(1) - (4)]), (yyvsp[(2) - (4)])->redir_type);
@@ -3661,43 +3670,43 @@ regular_print:
     break;
 
   case 140:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1453 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 141:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1455 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 142:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1457 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 143:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1459 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 144:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1461 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 145:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1463 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 146:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1468 "awkgram.y"
     {
 		(yyval) = list_create((yyvsp[(1) - (1)]));
@@ -3705,7 +3714,7 @@ regular_print:
     break;
 
   case 147:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1472 "awkgram.y"
     {
 		if ((yyvsp[(2) - (2)])->opcode == Op_match_rec) {
@@ -3741,13 +3750,13 @@ regular_print:
     break;
 
   case 148:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1504 "awkgram.y"
     { (yyval) = (yyvsp[(2) - (3)]); }
     break;
 
   case 149:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1506 "awkgram.y"
     {
 		(yyval) = snode((yyvsp[(3) - (4)]), (yyvsp[(1) - (4)]));
@@ -3757,7 +3766,7 @@ regular_print:
     break;
 
   case 150:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1512 "awkgram.y"
     {
 		(yyval) = snode((yyvsp[(3) - (4)]), (yyvsp[(1) - (4)]));
@@ -3767,7 +3776,7 @@ regular_print:
     break;
 
   case 151:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1518 "awkgram.y"
     {
 		static bool warned = false;
@@ -3784,7 +3793,7 @@ regular_print:
     break;
 
   case 154:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1533 "awkgram.y"
     {
 		(yyvsp[(1) - (2)])->opcode = Op_preincrement;
@@ -3793,7 +3802,7 @@ regular_print:
     break;
 
   case 155:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1538 "awkgram.y"
     {
 		(yyvsp[(1) - (2)])->opcode = Op_predecrement;
@@ -3802,7 +3811,7 @@ regular_print:
     break;
 
   case 156:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1543 "awkgram.y"
     {
 		(yyval) = list_create((yyvsp[(1) - (1)]));
@@ -3810,7 +3819,7 @@ regular_print:
     break;
 
   case 157:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1547 "awkgram.y"
     {
 		(yyval) = list_create((yyvsp[(1) - (1)]));
@@ -3818,7 +3827,7 @@ regular_print:
     break;
 
   case 158:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1551 "awkgram.y"
     {
 		if ((yyvsp[(2) - (2)])->lasti->opcode == Op_push_i
@@ -3837,7 +3846,7 @@ regular_print:
     break;
 
   case 159:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1566 "awkgram.y"
     {
 	    /*
@@ -3851,7 +3860,7 @@ regular_print:
     break;
 
   case 160:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1579 "awkgram.y"
     {
 		func_use((yyvsp[(1) - (1)])->lasti->func_name, FUNC_USE);
@@ -3860,7 +3869,7 @@ regular_print:
     break;
 
   case 161:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1584 "awkgram.y"
     {
 		/* indirect function call */
@@ -3897,7 +3906,7 @@ regular_print:
     break;
 
   case 162:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1620 "awkgram.y"
     {
 		param_sanity((yyvsp[(3) - (4)]));
@@ -3915,37 +3924,37 @@ regular_print:
     break;
 
   case 163:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1637 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 164:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1639 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 165:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1644 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 166:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1646 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (2)]); }
     break;
 
   case 167:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1651 "awkgram.y"
     {	(yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 168:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1653 "awkgram.y"
     {
 		(yyval) = list_merge((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
@@ -3953,7 +3962,7 @@ regular_print:
     break;
 
   case 169:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1660 "awkgram.y"
     {
 		INSTRUCTION *ip = (yyvsp[(1) - (1)])->lasti; 
@@ -3971,7 +3980,7 @@ regular_print:
     break;
 
   case 170:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1677 "awkgram.y"
     {
 		INSTRUCTION *t = (yyvsp[(2) - (3)]);
@@ -3989,13 +3998,13 @@ regular_print:
     break;
 
   case 171:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1694 "awkgram.y"
     {	(yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 172:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1696 "awkgram.y"
     {
 		(yyval) = list_merge((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
@@ -4003,13 +4012,13 @@ regular_print:
     break;
 
   case 173:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1703 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (2)]); }
     break;
 
   case 174:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1708 "awkgram.y"
     {
 		char *var_name = (yyvsp[(1) - (1)])->lextok;
@@ -4021,7 +4030,7 @@ regular_print:
     break;
 
   case 175:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1716 "awkgram.y"
     {
 		char *arr = (yyvsp[(1) - (2)])->lextok;
@@ -4032,7 +4041,7 @@ regular_print:
     break;
 
   case 176:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1726 "awkgram.y"
     {
 		INSTRUCTION *ip = (yyvsp[(1) - (1)])->nexti;
@@ -4048,7 +4057,7 @@ regular_print:
     break;
 
   case 177:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1738 "awkgram.y"
     {
 		(yyval) = list_append((yyvsp[(2) - (3)]), (yyvsp[(1) - (3)]));
@@ -4058,7 +4067,7 @@ regular_print:
     break;
 
   case 178:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1747 "awkgram.y"
     {
 		(yyvsp[(1) - (1)])->opcode = Op_postincrement;
@@ -4066,7 +4075,7 @@ regular_print:
     break;
 
   case 179:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1751 "awkgram.y"
     {
 		(yyvsp[(1) - (1)])->opcode = Op_postdecrement;
@@ -4074,44 +4083,44 @@ regular_print:
     break;
 
   case 180:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1754 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 182:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1762 "awkgram.y"
     { yyerrok; }
     break;
 
   case 183:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1766 "awkgram.y"
     { yyerrok; }
     break;
 
   case 186:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1775 "awkgram.y"
     { yyerrok; }
     break;
 
   case 187:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1779 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); yyerrok; }
     break;
 
   case 188:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 1783 "awkgram.y"
     { yyerrok; }
     break;
 
 
-/* Line 1787 of yacc.c  */
-#line 4127 "awkgram.c"
+/* Line 1813 of yacc.c  */
+#line 4136 "awkgram.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -4274,7 +4283,9 @@ yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -4340,7 +4351,7 @@ yyreturn:
 }
 
 
-/* Line 2048 of yacc.c  */
+/* Line 2076 of yacc.c  */
 #line 1785 "awkgram.y"
 
 
diff --git a/command.c b/command.c
index 5334978d..f04eead8 100644
--- a/command.c
+++ b/command.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.6.2.  */
+/* A Bison parser, made by GNU Bison 2.6.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
    
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.6.2"
+#define YYBISON_VERSION "2.6.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -69,7 +69,7 @@
 #define yynerrs         zznerrs
 
 /* Copy the first part of user declarations.  */
-/* Line 336 of yacc.c  */
+/* Line 358 of yacc.c  */
 #line 26 "command.y"
 
 #include "awk.h"
@@ -137,7 +137,7 @@ static void append_cmdarg(CMDARG *arg);
 static int find_argument(CMDARG *arg);
 #define YYSTYPE CMDARG *
 
-/* Line 336 of yacc.c  */
+/* Line 358 of yacc.c  */
 #line 142 "command.c"
 
 # ifndef YY_NULL
@@ -156,10 +156,7 @@ static int find_argument(CMDARG *arg);
 # define YYERROR_VERBOSE 0
 #endif
 
-/* In a future release of Bison, this section will be replaced
-   by #include "".  */
-#ifndef ZZ_
-# define ZZ_
+
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -295,12 +292,12 @@ int zzparse ();
 #endif
 #endif /* ! YYPARSE_PARAM */
 
-#endif /* !ZZ_  */
+
 
 /* Copy the second part of user declarations.  */
 
-/* Line 353 of yacc.c  */
-#line 304 "command.c"
+/* Line 377 of yacc.c  */
+#line 301 "command.c"
 
 #ifdef short
 # undef short
@@ -353,24 +350,24 @@ typedef short int yytype_int16;
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
 #endif
 
 /* Identity function, used to suppress warnings about constant conditions.  */
 #ifndef lint
-# define YYID(n) (n)
+# define YYID(N) (N)
 #else
 #if (defined __STDC__ || defined __C99__FUNC__      || defined __cplusplus || defined _MSC_VER)
 static int
@@ -851,10 +848,10 @@ static const yytype_int16 yytable[] =
        0,     0,     0,    45
 };
 
-#define yypact_value_is_default(yystate) \
-  ((yystate) == (-151))
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-151)))
 
-#define yytable_value_is_error(yytable_value) \
+#define yytable_value_is_error(Yytable_value) \
   YYID (0)
 
 static const yytype_int16 yycheck[] =
@@ -1451,6 +1448,15 @@ yydestruct (yymsg, yytype, yyvaluep)
 /* The lookahead symbol.  */
 int yychar;
 
+
+#ifndef YYLVAL_INITIALIZE
+# define YYLVAL_INITIALIZE()
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
@@ -1508,7 +1514,7 @@ yyparse ()
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
+  int yytoken = 0;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
@@ -1526,7 +1532,6 @@ yyparse ()
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
   yyss = yyssa;
   yyvs = yyvsa;
   yystacksize = YYINITDEPTH;
@@ -1544,6 +1549,8 @@ yyparse ()
      The wasted elements are never initialized.  */
   yyssp = yyss;
   yyvsp = yyvs;
+
+  YYLVAL_INITIALIZE ();
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1684,7 +1691,9 @@ yybackup:
   yychar = YYEMPTY;
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -1721,7 +1730,7 @@ yyreduce:
   switch (yyn)
     {
         case 3:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 109 "command.y"
     {
 		cmd_idx = -1;
@@ -1740,7 +1749,7 @@ yyreduce:
     break;
 
   case 5:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 128 "command.y"
     {
 		if (errcount == 0 && cmd_idx >= 0) {
@@ -1794,7 +1803,7 @@ yyreduce:
     break;
 
   case 6:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 178 "command.y"
     {
 		yyerrok;
@@ -1802,13 +1811,13 @@ yyreduce:
     break;
 
   case 22:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 212 "command.y"
     { want_nodeval = true; }
     break;
 
   case 23:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 217 "command.y"
     {
 		if (errcount == 0) {
@@ -1828,7 +1837,7 @@ yyreduce:
     break;
 
   case 24:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 236 "command.y"
     {
 		(yyval) = append_statement(arg_list, (char *) start_EVAL);
@@ -1840,13 +1849,13 @@ yyreduce:
     break;
 
   case 25:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 243 "command.y"
     { (yyval) = append_statement((yyvsp[(1) - (2)]), lexptr_begin); }
     break;
 
   case 26:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 244 "command.y"
     {
 		(yyval) = (yyvsp[(3) - (4)]);
@@ -1854,7 +1863,7 @@ yyreduce:
     break;
 
   case 27:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 251 "command.y"
     {
 		arg_list = append_statement((yyvsp[(2) - (3)]), (char *) end_EVAL);
@@ -1874,7 +1883,7 @@ yyreduce:
     break;
 
   case 28:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 267 "command.y"
     {
 		NODE *n;
@@ -1889,7 +1898,7 @@ yyreduce:
     break;
 
   case 34:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 286 "command.y"
     {
 		if (cmdtab[cmd_idx].class == D_FRAME
@@ -1899,7 +1908,7 @@ yyreduce:
     break;
 
   case 35:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 292 "command.y"
     {
 		int idx = find_argument((yyvsp[(2) - (2)]));
@@ -1915,43 +1924,43 @@ yyreduce:
     break;
 
   case 38:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 305 "command.y"
     { want_nodeval = true; }
     break;
 
   case 40:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 306 "command.y"
     { want_nodeval = true; }
     break;
 
   case 46:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 311 "command.y"
     { want_nodeval = true; }
     break;
 
   case 49:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 313 "command.y"
     { want_nodeval = true; }
     break;
 
   case 51:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 314 "command.y"
     { want_nodeval = true; }
     break;
 
   case 53:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 315 "command.y"
     { want_nodeval = true; }
     break;
 
   case 57:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 319 "command.y"
     {
 		if (in_cmd_src((yyvsp[(2) - (2)])->a_string))
@@ -1960,7 +1969,7 @@ yyreduce:
     break;
 
   case 58:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 324 "command.y"
     {
 		if (! input_from_tty)
@@ -1969,7 +1978,7 @@ yyreduce:
     break;
 
   case 59:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 329 "command.y"
     {
 		int type = 0;
@@ -1999,7 +2008,7 @@ yyreduce:
     break;
 
   case 60:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 355 "command.y"
     {
 		if (! in_commands)
@@ -2013,7 +2022,7 @@ yyreduce:
     break;
 
   case 61:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 365 "command.y"
     {
 		if (! in_commands)
@@ -2022,7 +2031,7 @@ yyreduce:
     break;
 
   case 62:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 370 "command.y"
     {
 		int idx = find_argument((yyvsp[(2) - (2)]));
@@ -2038,13 +2047,13 @@ yyreduce:
     break;
 
   case 63:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 381 "command.y"
     { want_nodeval = true; }
     break;
 
   case 64:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 382 "command.y"
     {
 		int type;
@@ -2056,7 +2065,7 @@ yyreduce:
     break;
 
   case 65:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 390 "command.y"
     {
 		if (in_commands) {
@@ -2071,7 +2080,7 @@ yyreduce:
     break;
 
   case 66:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 404 "command.y"
     {
 		if ((yyvsp[(1) - (1)]) != NULL) {
@@ -2085,37 +2094,37 @@ yyreduce:
     break;
 
   case 68:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 418 "command.y"
     {	(yyval) = NULL; }
     break;
 
   case 69:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 423 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 74:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 432 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 75:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 437 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 77:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 440 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 78:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 445 "command.y"
     {
 		NODE *n;
@@ -2126,13 +2135,13 @@ yyreduce:
     break;
 
   case 79:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 455 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 80:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 457 "command.y"
     {
 		if (find_option((yyvsp[(1) - (1)])->a_string) < 0)
@@ -2141,7 +2150,7 @@ yyreduce:
     break;
 
   case 81:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 462 "command.y"
     {
 		if (find_option((yyvsp[(1) - (3)])->a_string) < 0)
@@ -2150,7 +2159,7 @@ yyreduce:
     break;
 
   case 82:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 470 "command.y"
     {
 		NODE *n;
@@ -2167,49 +2176,49 @@ yyreduce:
     break;
 
   case 83:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 486 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 88:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 495 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 89:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 496 "command.y"
     { want_nodeval = true; }
     break;
 
   case 92:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 498 "command.y"
     { want_nodeval = true; }
     break;
 
   case 95:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 504 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 97:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 510 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 99:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 516 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 104:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 528 "command.y"
     {
 		int idx = find_argument((yyvsp[(1) - (2)]));
@@ -2225,7 +2234,7 @@ yyreduce:
     break;
 
   case 106:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 544 "command.y"
     {
 		(yyvsp[(2) - (2)])->type = D_array;	/* dump all items */
@@ -2234,7 +2243,7 @@ yyreduce:
     break;
 
   case 107:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 549 "command.y"
     {
 		(yyvsp[(2) - (3)])->type = D_array;
@@ -2243,19 +2252,19 @@ yyreduce:
     break;
 
   case 117:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 575 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 118:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 577 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 119:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 579 "command.y"
     {
 		CMDARG *a;
@@ -2266,7 +2275,7 @@ yyreduce:
     break;
 
   case 126:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 595 "command.y"
     {
 		if ((yyvsp[(1) - (3)])->a_int > (yyvsp[(3) - (3)])->a_int)
@@ -2279,25 +2288,25 @@ yyreduce:
     break;
 
   case 127:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 607 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 134:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 621 "command.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 135:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 623 "command.y"
     { (yyval) = (yyvsp[(1) - (3)]); }
     break;
 
   case 137:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 629 "command.y"
     {
 		CMDARG *a;
@@ -2316,19 +2325,19 @@ yyreduce:
     break;
 
   case 139:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 648 "command.y"
     { (yyval) = (yyvsp[(1) - (1)]); num_dim = 1; }
     break;
 
   case 140:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 650 "command.y"
     {	(yyval) = (yyvsp[(1) - (2)]); num_dim++; }
     break;
 
   case 142:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 656 "command.y"
     {
 		NODE *n = (yyvsp[(2) - (2)])->a_node;
@@ -2341,7 +2350,7 @@ yyreduce:
     break;
 
   case 143:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 665 "command.y"
     {
 		/* a_string is array name, a_count is dimension count */
@@ -2352,13 +2361,13 @@ yyreduce:
     break;
 
   case 144:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 675 "command.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 145:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 677 "command.y"
     { 
 		NODE *n = (yyvsp[(2) - (2)])->a_node;
@@ -2369,7 +2378,7 @@ yyreduce:
     break;
 
   case 146:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 684 "command.y"
     { 
 		NODE *n = (yyvsp[(2) - (2)])->a_node;
@@ -2382,31 +2391,31 @@ yyreduce:
     break;
 
   case 147:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 696 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 148:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 698 "command.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 149:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 703 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 150:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 705 "command.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 151:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 710 "command.y"
     {
 		if ((yyvsp[(1) - (1)])->a_int == 0)
@@ -2416,7 +2425,7 @@ yyreduce:
     break;
 
   case 152:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 716 "command.y"
     {
 		if ((yyvsp[(2) - (2)])->a_int == 0)
@@ -2426,19 +2435,19 @@ yyreduce:
     break;
 
   case 153:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 725 "command.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 154:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 727 "command.y"
     { (yyval) = (yyvsp[(2) - (2)]); }
     break;
 
   case 155:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 729 "command.y"
     {
 		(yyvsp[(2) - (2)])->a_int = - (yyvsp[(2) - (2)])->a_int;
@@ -2447,7 +2456,7 @@ yyreduce:
     break;
 
   case 156:
-/* Line 1787 of yacc.c  */
+/* Line 1813 of yacc.c  */
 #line 737 "command.y"
     {
 		if (lexptr_begin != NULL) {
@@ -2460,8 +2469,8 @@ yyreduce:
     break;
 
 
-/* Line 1787 of yacc.c  */
-#line 2477 "command.c"
+/* Line 1813 of yacc.c  */
+#line 2486 "command.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2624,7 +2633,9 @@ yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -2690,7 +2701,7 @@ yyreturn:
 }
 
 
-/* Line 2048 of yacc.c  */
+/* Line 2076 of yacc.c  */
 #line 747 "command.y"
 
 
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 1ecf0781..5258c098 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-28   Scott Deifik  <scottd.mail@sbcglobal.net>
+
+	* Makefile.tst: Sync with mainline version.
+
 2012-10-28         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
 	* Makefile.pc (messages): Adjust to use standard failure test for
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 6f8f54de..12bdf2d8 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -138,7 +138,7 @@ BASIC_TESTS = \
 	fcall_exit fcall_exit2 fldchg fldchgnf fnamedat fnarray fnarray2 \
 	fnaryscl fnasgnm fnmisc fordel forref forsimp fsbs fsrs fsspcoln \
 	fstabplus funsemnl funsmnam funstack \
-	getline getline2 getline3 getline4 getlnbuf getnr2tb getnr2tm \
+	getline getline2 getline3 getline4 getline5 getlnbuf getnr2tb getnr2tm \
 	gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 \
 	gsubtst7 gsubtst8 \
 	hex hsprint \
@@ -148,11 +148,12 @@ BASIC_TESTS = \
 	nasty nasty2 negexp negrange nested nfldstr nfneg nfset nlfldsep \
 	nlinstr nlstrina noeffect nofile nofmtch noloop1 noloop2 nonl \
 	noparms nors nulrsend numindex numsubstr \
-	octsub ofmt ofmta ofmtbig ofmtfidl ofmts onlynl opasnidx opasnslf \
+	octsub ofmt ofmta ofmtbig ofmtfidl ofmts ofs1 onlynl opasnidx opasnslf \
 	paramdup paramres paramtyp parse1 parsefld parseme pcntplus \
 	posix2008sub prdupval prec printf0 printf1 prmarscl prmreuse \
 	prt1eval prtoeval \
-	rand range1 rebt8b1 redfilnm regeq regrange reindops reparse \
+	rand range1 rebt8b1 redfilnm regeq regexprange regrange \
+	reindops reparse \
 	resplit rri1 rs rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 \
 	rstest3 rstest4 rstest5 rswhite \
 	scalar sclforin sclifin sortempty splitargv splitarr splitdef \
@@ -168,7 +169,7 @@ UNIX_TESTS = \
 
 GAWK_EXT_TESTS = \
 	aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
-	backw badargs beginfile1 beginfile2  binmode1 \
+	backw badargs beginfile1 beginfile2 binmode1 charasbytes \
 	clos1way delsub devfd devfd1 devfd2 dumpvars exit \
 	fieldwdth fpat1 fpat2 fpat3  fpatnull fsfwfs funlen \
 	fwtest fwtest2 fwtest3 \
@@ -188,7 +189,7 @@ INET_TESTS = inetdayu inetdayt inetechu inetecht
 MACHINE_TESTS = double1 double2 fmtspcl intformat
 MPFR_TESTS = mpfrnr mpfrrnd mpfrieee mpfrexprange mpfrsort mpfrbigint
 LOCALE_CHARSET_TESTS = \
-	asort asorti fmttest fnarydel fnparydl lc_num1 mbfw1 \
+	asort asorti fmttest fnarydel fnparydl jarebug lc_num1 mbfw1 \
 	mbprintf1 mbprintf2 mbprintf3 rebt8b2 rtlenmb sort1 sprintfc
 
 # List of the tests which should be run with --lint option:
@@ -838,6 +839,18 @@ rri1::
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
 	AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+jarebug::
+	@echo $@
+	@$(srcdir)/$@.sh "$(AWKPROG)" "$(srcdir)/$@.awk" "$(srcdir)/$@.in" "_$@"
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+charasbytes:
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH=$(srcdir) $(AWK) -b -f $@.awk $(srcdir)/$@.in | \
+	od -c -t x1 | sed -e 's/  */ /g' -e 's/ *$$//' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
@@ -1161,6 +1174,11 @@ getline4:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+getline5:
+	@echo getline5
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 getnr2tb:
 	@echo getnr2tb
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1398,6 +1416,11 @@ ofmts:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+ofs1:
+	@echo ofs1
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 onlynl:
 	@echo onlynl
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1503,6 +1526,11 @@ regeq:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+regexprange:
+	@echo regexprange
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 regrange:
 	@echo regrange
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@