Merge branch 'master' into array-iface

1 files changed, 199 insertions, 197 deletions

diff --git a/awkgram.c b/awkgram.c
index 42f5a5ed..8fd9e04a 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -193,8 +193,10 @@ extern double fmod(double x, double y);
 
 #define YYSTYPE INSTRUCTION *
 
+#define is_identchar(c)		(isalnum(c) || (c) == '_')
+
 /* Line 360 of yacc.c  */
-#line 198 "awkgram.c"
+#line 200 "awkgram.c"
 
 # ifndef YY_NULL
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -363,7 +365,7 @@ int yyparse ();
 /* Copy the second part of user declarations.  */
 
 /* Line 379 of yacc.c  */
-#line 367 "awkgram.c"
+#line 369 "awkgram.c"
 
 #ifdef short
 # undef short
@@ -727,25 +729,25 @@ static const yytype_int16 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   195,   195,   197,   202,   203,   209,   221,   225,   236,
-     242,   247,   255,   263,   265,   270,   278,   280,   286,   287,
-     289,   315,   326,   337,   343,   352,   362,   364,   366,   372,
-     377,   378,   382,   401,   400,   434,   436,   441,   442,   455,
-     460,   461,   465,   467,   469,   476,   566,   608,   650,   763,
-     770,   777,   787,   796,   805,   814,   825,   841,   840,   864,
-     876,   876,   974,   974,  1007,  1037,  1043,  1044,  1050,  1051,
-    1058,  1063,  1075,  1089,  1091,  1099,  1104,  1106,  1114,  1116,
-    1125,  1126,  1134,  1139,  1139,  1150,  1154,  1162,  1163,  1166,
-    1168,  1173,  1174,  1183,  1184,  1189,  1194,  1200,  1202,  1204,
-    1211,  1212,  1218,  1219,  1224,  1226,  1231,  1233,  1235,  1237,
-    1243,  1250,  1252,  1254,  1270,  1280,  1287,  1289,  1294,  1296,
-    1298,  1306,  1308,  1313,  1315,  1320,  1322,  1324,  1374,  1376,
-    1378,  1380,  1382,  1384,  1386,  1388,  1411,  1416,  1421,  1446,
-    1452,  1454,  1456,  1458,  1460,  1462,  1467,  1471,  1503,  1505,
-    1511,  1517,  1530,  1531,  1532,  1537,  1542,  1546,  1550,  1565,
-    1578,  1583,  1619,  1637,  1638,  1644,  1645,  1650,  1652,  1659,
-    1676,  1693,  1695,  1702,  1707,  1715,  1725,  1737,  1746,  1750,
-    1754,  1758,  1762,  1766,  1769,  1771,  1775,  1779,  1783
+       0,   197,   197,   199,   204,   205,   211,   223,   227,   238,
+     244,   249,   257,   265,   267,   272,   280,   282,   288,   289,
+     291,   317,   328,   339,   345,   354,   364,   366,   368,   374,
+     379,   380,   384,   403,   402,   436,   438,   443,   444,   457,
+     462,   463,   467,   469,   471,   478,   568,   610,   652,   765,
+     772,   779,   789,   798,   807,   816,   827,   843,   842,   866,
+     878,   878,   976,   976,  1009,  1039,  1045,  1046,  1052,  1053,
+    1060,  1065,  1077,  1091,  1093,  1101,  1106,  1108,  1116,  1118,
+    1127,  1128,  1136,  1141,  1141,  1152,  1156,  1164,  1165,  1168,
+    1170,  1175,  1176,  1185,  1186,  1191,  1196,  1202,  1204,  1206,
+    1213,  1214,  1220,  1221,  1226,  1228,  1233,  1235,  1237,  1239,
+    1245,  1252,  1254,  1256,  1272,  1282,  1289,  1291,  1296,  1298,
+    1300,  1308,  1310,  1315,  1317,  1322,  1324,  1326,  1376,  1378,
+    1380,  1382,  1384,  1386,  1388,  1390,  1413,  1418,  1423,  1448,
+    1454,  1456,  1458,  1460,  1462,  1464,  1469,  1473,  1505,  1507,
+    1513,  1519,  1532,  1533,  1534,  1539,  1544,  1548,  1552,  1567,
+    1580,  1585,  1621,  1639,  1640,  1646,  1647,  1652,  1654,  1661,
+    1678,  1695,  1697,  1704,  1709,  1717,  1727,  1739,  1748,  1752,
+    1756,  1760,  1764,  1768,  1771,  1773,  1777,  1781,  1785
 };
 #endif
 
@@ -2029,7 +2031,7 @@ yyreduce:
     {
         case 3:
 /* Line 1778 of yacc.c  */
-#line 198 "awkgram.y"
+#line 200 "awkgram.y"
     {
 		rule = 0;
 		yyerrok;
@@ -2038,7 +2040,7 @@ yyreduce:
 
   case 5:
 /* Line 1778 of yacc.c  */
-#line 204 "awkgram.y"
+#line 206 "awkgram.y"
     {
 		next_sourcefile();
 		if (sourcefile == srcfiles)
@@ -2048,7 +2050,7 @@ yyreduce:
 
   case 6:
 /* Line 1778 of yacc.c  */
-#line 210 "awkgram.y"
+#line 212 "awkgram.y"
     {
 		rule = 0;
 		/*
@@ -2061,7 +2063,7 @@ yyreduce:
 
   case 7:
 /* Line 1778 of yacc.c  */
-#line 222 "awkgram.y"
+#line 224 "awkgram.y"
     {
 		(void) append_rule((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
 	  }
@@ -2069,7 +2071,7 @@ yyreduce:
 
   case 8:
 /* Line 1778 of yacc.c  */
-#line 226 "awkgram.y"
+#line 228 "awkgram.y"
     {
 		if (rule != Rule) {
 			msg(_("%s blocks must have an action part"), ruletab[rule]);
@@ -2084,7 +2086,7 @@ yyreduce:
 
   case 9:
 /* Line 1778 of yacc.c  */
-#line 237 "awkgram.y"
+#line 239 "awkgram.y"
     {
 		in_function = NULL;
 		(void) mk_function((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
@@ -2094,7 +2096,7 @@ yyreduce:
 
   case 10:
 /* Line 1778 of yacc.c  */
-#line 243 "awkgram.y"
+#line 245 "awkgram.y"
     {
 		want_source = false;
 		yyerrok;
@@ -2103,7 +2105,7 @@ yyreduce:
 
   case 11:
 /* Line 1778 of yacc.c  */
-#line 248 "awkgram.y"
+#line 250 "awkgram.y"
     {
 		want_source = false;
 		yyerrok;
@@ -2112,7 +2114,7 @@ yyreduce:
 
   case 12:
 /* Line 1778 of yacc.c  */
-#line 256 "awkgram.y"
+#line 258 "awkgram.y"
     {
 		if (include_source((yyvsp[(1) - (1)])) < 0)
 			YYABORT;
@@ -2124,19 +2126,19 @@ yyreduce:
 
   case 13:
 /* Line 1778 of yacc.c  */
-#line 264 "awkgram.y"
+#line 266 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 14:
 /* Line 1778 of yacc.c  */
-#line 266 "awkgram.y"
+#line 268 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 15:
 /* Line 1778 of yacc.c  */
-#line 271 "awkgram.y"
+#line 273 "awkgram.y"
     {
 		if (load_library((yyvsp[(1) - (1)])) < 0)
 			YYABORT;
@@ -2148,31 +2150,31 @@ yyreduce:
 
   case 16:
 /* Line 1778 of yacc.c  */
-#line 279 "awkgram.y"
+#line 281 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 17:
 /* Line 1778 of yacc.c  */
-#line 281 "awkgram.y"
+#line 283 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 18:
 /* Line 1778 of yacc.c  */
-#line 286 "awkgram.y"
+#line 288 "awkgram.y"
     {	(yyval) = NULL; rule = Rule; }
     break;
 
   case 19:
 /* Line 1778 of yacc.c  */
-#line 288 "awkgram.y"
+#line 290 "awkgram.y"
     {	(yyval) = (yyvsp[(1) - (1)]); rule = Rule; }
     break;
 
   case 20:
 /* Line 1778 of yacc.c  */
-#line 290 "awkgram.y"
+#line 292 "awkgram.y"
     {
 		INSTRUCTION *tp;
 
@@ -2202,7 +2204,7 @@ yyreduce:
 
   case 21:
 /* Line 1778 of yacc.c  */
-#line 316 "awkgram.y"
+#line 318 "awkgram.y"
     {
 		static int begin_seen = 0;
 		if (do_lint_old && ++begin_seen == 2)
@@ -2217,7 +2219,7 @@ yyreduce:
 
   case 22:
 /* Line 1778 of yacc.c  */
-#line 327 "awkgram.y"
+#line 329 "awkgram.y"
     {
 		static int end_seen = 0;
 		if (do_lint_old && ++end_seen == 2)
@@ -2232,7 +2234,7 @@ yyreduce:
 
   case 23:
 /* Line 1778 of yacc.c  */
-#line 338 "awkgram.y"
+#line 340 "awkgram.y"
     {
 		(yyvsp[(1) - (1)])->in_rule = rule = BEGINFILE;
 		(yyvsp[(1) - (1)])->source_file = source;
@@ -2242,7 +2244,7 @@ yyreduce:
 
   case 24:
 /* Line 1778 of yacc.c  */
-#line 344 "awkgram.y"
+#line 346 "awkgram.y"
     {
 		(yyvsp[(1) - (1)])->in_rule = rule = ENDFILE;
 		(yyvsp[(1) - (1)])->source_file = source;
@@ -2252,7 +2254,7 @@ yyreduce:
 
   case 25:
 /* Line 1778 of yacc.c  */
-#line 353 "awkgram.y"
+#line 355 "awkgram.y"
     {
 		if ((yyvsp[(2) - (5)]) == NULL)
 			(yyval) = list_create(instruction(Op_no_op));
@@ -2263,19 +2265,19 @@ yyreduce:
 
   case 26:
 /* Line 1778 of yacc.c  */
-#line 363 "awkgram.y"
+#line 365 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 27:
 /* Line 1778 of yacc.c  */
-#line 365 "awkgram.y"
+#line 367 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 28:
 /* Line 1778 of yacc.c  */
-#line 367 "awkgram.y"
+#line 369 "awkgram.y"
     {
 		yyerror(_("`%s' is a built-in function, it cannot be redefined"),
 					tokstart);
@@ -2285,13 +2287,13 @@ yyreduce:
 
   case 29:
 /* Line 1778 of yacc.c  */
-#line 373 "awkgram.y"
+#line 375 "awkgram.y"
     { (yyval) = (yyvsp[(2) - (2)]); }
     break;
 
   case 32:
 /* Line 1778 of yacc.c  */
-#line 383 "awkgram.y"
+#line 385 "awkgram.y"
     {
 		(yyvsp[(1) - (6)])->source_file = source;
 		if (install_function((yyvsp[(2) - (6)])->lextok, (yyvsp[(1) - (6)]), (yyvsp[(4) - (6)])) < 0)
@@ -2306,13 +2308,13 @@ yyreduce:
 
   case 33:
 /* Line 1778 of yacc.c  */
-#line 401 "awkgram.y"
+#line 403 "awkgram.y"
     { want_regexp = true; }
     break;
 
   case 34:
 /* Line 1778 of yacc.c  */
-#line 403 "awkgram.y"
+#line 405 "awkgram.y"
     {
 		  NODE *n, *exp;
 		  char *re;
@@ -2345,19 +2347,19 @@ yyreduce:
 
   case 35:
 /* Line 1778 of yacc.c  */
-#line 435 "awkgram.y"
+#line 437 "awkgram.y"
     { bcfree((yyvsp[(1) - (1)])); }
     break;
 
   case 37:
 /* Line 1778 of yacc.c  */
-#line 441 "awkgram.y"
+#line 443 "awkgram.y"
     {	(yyval) = NULL; }
     break;
 
   case 38:
 /* Line 1778 of yacc.c  */
-#line 443 "awkgram.y"
+#line 445 "awkgram.y"
     {
 		if ((yyvsp[(2) - (2)]) == NULL)
 			(yyval) = (yyvsp[(1) - (2)]);
@@ -2374,25 +2376,25 @@ yyreduce:
 
   case 39:
 /* Line 1778 of yacc.c  */
-#line 456 "awkgram.y"
+#line 458 "awkgram.y"
     {	(yyval) = NULL; }
     break;
 
   case 42:
 /* Line 1778 of yacc.c  */
-#line 466 "awkgram.y"
+#line 468 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 43:
 /* Line 1778 of yacc.c  */
-#line 468 "awkgram.y"
+#line 470 "awkgram.y"
     { (yyval) = (yyvsp[(2) - (3)]); }
     break;
 
   case 44:
 /* Line 1778 of yacc.c  */
-#line 470 "awkgram.y"
+#line 472 "awkgram.y"
     {
 		if (do_pretty_print)
 			(yyval) = list_prepend((yyvsp[(1) - (1)]), instruction(Op_exec_count));
@@ -2403,7 +2405,7 @@ yyreduce:
 
   case 45:
 /* Line 1778 of yacc.c  */
-#line 477 "awkgram.y"
+#line 479 "awkgram.y"
     {
 		INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt;
 		INSTRUCTION *ip, *nextc, *tbreak;
@@ -2497,7 +2499,7 @@ yyreduce:
 
   case 46:
 /* Line 1778 of yacc.c  */
-#line 567 "awkgram.y"
+#line 569 "awkgram.y"
     { 
 		/*
 		 *    -----------------
@@ -2543,7 +2545,7 @@ yyreduce:
 
   case 47:
 /* Line 1778 of yacc.c  */
-#line 609 "awkgram.y"
+#line 611 "awkgram.y"
     {
 		/*
 		 *    -----------------
@@ -2589,7 +2591,7 @@ yyreduce:
 
   case 48:
 /* Line 1778 of yacc.c  */
-#line 651 "awkgram.y"
+#line 653 "awkgram.y"
     {
 		INSTRUCTION *ip;
 		char *var_name = (yyvsp[(3) - (8)])->lextok;
@@ -2706,7 +2708,7 @@ regular_loop:
 
   case 49:
 /* Line 1778 of yacc.c  */
-#line 764 "awkgram.y"
+#line 766 "awkgram.y"
     {
 		(yyval) = mk_for_loop((yyvsp[(1) - (12)]), (yyvsp[(3) - (12)]), (yyvsp[(6) - (12)]), (yyvsp[(9) - (12)]), (yyvsp[(12) - (12)]));
 
@@ -2717,7 +2719,7 @@ regular_loop:
 
   case 50:
 /* Line 1778 of yacc.c  */
-#line 771 "awkgram.y"
+#line 773 "awkgram.y"
     {
 		(yyval) = mk_for_loop((yyvsp[(1) - (11)]), (yyvsp[(3) - (11)]), (INSTRUCTION *) NULL, (yyvsp[(8) - (11)]), (yyvsp[(11) - (11)]));
 
@@ -2728,7 +2730,7 @@ regular_loop:
 
   case 51:
 /* Line 1778 of yacc.c  */
-#line 778 "awkgram.y"
+#line 780 "awkgram.y"
     {
 		if (do_pretty_print)
 			(yyval) = list_prepend((yyvsp[(1) - (1)]), instruction(Op_exec_count));
@@ -2739,7 +2741,7 @@ regular_loop:
 
   case 52:
 /* Line 1778 of yacc.c  */
-#line 788 "awkgram.y"
+#line 790 "awkgram.y"
     { 
 		if (! break_allowed)
 			error_ln((yyvsp[(1) - (2)])->source_line,
@@ -2752,7 +2754,7 @@ regular_loop:
 
   case 53:
 /* Line 1778 of yacc.c  */
-#line 797 "awkgram.y"
+#line 799 "awkgram.y"
     {
 		if (! continue_allowed)
 			error_ln((yyvsp[(1) - (2)])->source_line,
@@ -2765,7 +2767,7 @@ regular_loop:
 
   case 54:
 /* Line 1778 of yacc.c  */
-#line 806 "awkgram.y"
+#line 808 "awkgram.y"
     {
 		/* if inside function (rule = 0), resolve context at run-time */
 		if (rule && rule != Rule)
@@ -2778,7 +2780,7 @@ regular_loop:
 
   case 55:
 /* Line 1778 of yacc.c  */
-#line 815 "awkgram.y"
+#line 817 "awkgram.y"
     {
 		/* if inside function (rule = 0), resolve context at run-time */
 		if (rule == BEGIN || rule == END || rule == ENDFILE)
@@ -2793,7 +2795,7 @@ regular_loop:
 
   case 56:
 /* Line 1778 of yacc.c  */
-#line 826 "awkgram.y"
+#line 828 "awkgram.y"
     {
 		/* Initialize the two possible jump targets, the actual target
 		 * is resolved at run-time. 
@@ -2812,7 +2814,7 @@ regular_loop:
 
   case 57:
 /* Line 1778 of yacc.c  */
-#line 841 "awkgram.y"
+#line 843 "awkgram.y"
     {
 		if (! in_function)
 			yyerror(_("`return' used outside function context"));
@@ -2821,7 +2823,7 @@ regular_loop:
 
   case 58:
 /* Line 1778 of yacc.c  */
-#line 844 "awkgram.y"
+#line 846 "awkgram.y"
     {
 		if ((yyvsp[(3) - (4)]) == NULL) {
 			(yyval) = list_create((yyvsp[(1) - (4)]));
@@ -2846,13 +2848,13 @@ regular_loop:
 
   case 60:
 /* Line 1778 of yacc.c  */
-#line 876 "awkgram.y"
+#line 878 "awkgram.y"
     { in_print = true; in_parens = 0; }
     break;
 
   case 61:
 /* Line 1778 of yacc.c  */
-#line 877 "awkgram.y"
+#line 879 "awkgram.y"
     {
 		/*
 		 * Optimization: plain `print' has no expression list, so $3 is null.
@@ -2953,13 +2955,13 @@ regular_print:
 
   case 62:
 /* Line 1778 of yacc.c  */
-#line 974 "awkgram.y"
+#line 976 "awkgram.y"
     { sub_counter = 0; }
     break;
 
   case 63:
 /* Line 1778 of yacc.c  */
-#line 975 "awkgram.y"
+#line 977 "awkgram.y"
     {
 		char *arr = (yyvsp[(2) - (4)])->lextok;
 
@@ -2996,7 +2998,7 @@ regular_print:
 
   case 64:
 /* Line 1778 of yacc.c  */
-#line 1012 "awkgram.y"
+#line 1014 "awkgram.y"
     {
 		static bool warned = false;
 		char *arr = (yyvsp[(3) - (4)])->lextok;
@@ -3026,31 +3028,31 @@ regular_print:
 
   case 65:
 /* Line 1778 of yacc.c  */
-#line 1038 "awkgram.y"
+#line 1040 "awkgram.y"
     {	(yyval) = optimize_assignment((yyvsp[(1) - (1)])); }
     break;
 
   case 66:
 /* Line 1778 of yacc.c  */
-#line 1043 "awkgram.y"
+#line 1045 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 67:
 /* Line 1778 of yacc.c  */
-#line 1045 "awkgram.y"
+#line 1047 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 68:
 /* Line 1778 of yacc.c  */
-#line 1050 "awkgram.y"
+#line 1052 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 69:
 /* Line 1778 of yacc.c  */
-#line 1052 "awkgram.y"
+#line 1054 "awkgram.y"
     {
 		if ((yyvsp[(1) - (2)]) == NULL)
 			(yyval) = list_create((yyvsp[(2) - (2)]));
@@ -3061,13 +3063,13 @@ regular_print:
 
   case 70:
 /* Line 1778 of yacc.c  */
-#line 1059 "awkgram.y"
+#line 1061 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 71:
 /* Line 1778 of yacc.c  */
-#line 1064 "awkgram.y"
+#line 1066 "awkgram.y"
     {
 		INSTRUCTION *casestmt = (yyvsp[(5) - (5)]);
 		if ((yyvsp[(5) - (5)]) == NULL)
@@ -3083,7 +3085,7 @@ regular_print:
 
   case 72:
 /* Line 1778 of yacc.c  */
-#line 1076 "awkgram.y"
+#line 1078 "awkgram.y"
     {
 		INSTRUCTION *casestmt = (yyvsp[(4) - (4)]);
 		if ((yyvsp[(4) - (4)]) == NULL)
@@ -3098,13 +3100,13 @@ regular_print:
 
   case 73:
 /* Line 1778 of yacc.c  */
-#line 1090 "awkgram.y"
+#line 1092 "awkgram.y"
     {	(yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 74:
 /* Line 1778 of yacc.c  */
-#line 1092 "awkgram.y"
+#line 1094 "awkgram.y"
     { 
 		NODE *n = (yyvsp[(2) - (2)])->memory;
 		(void) force_number(n);
@@ -3116,7 +3118,7 @@ regular_print:
 
   case 75:
 /* Line 1778 of yacc.c  */
-#line 1100 "awkgram.y"
+#line 1102 "awkgram.y"
     {
 		bcfree((yyvsp[(1) - (2)]));
 		(yyval) = (yyvsp[(2) - (2)]);
@@ -3125,13 +3127,13 @@ regular_print:
 
   case 76:
 /* Line 1778 of yacc.c  */
-#line 1105 "awkgram.y"
+#line 1107 "awkgram.y"
     {	(yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 77:
 /* Line 1778 of yacc.c  */
-#line 1107 "awkgram.y"
+#line 1109 "awkgram.y"
     {
 		(yyvsp[(1) - (1)])->opcode = Op_push_re;
 		(yyval) = (yyvsp[(1) - (1)]);
@@ -3140,19 +3142,19 @@ regular_print:
 
   case 78:
 /* Line 1778 of yacc.c  */
-#line 1115 "awkgram.y"
+#line 1117 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 79:
 /* Line 1778 of yacc.c  */
-#line 1117 "awkgram.y"
+#line 1119 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 81:
 /* Line 1778 of yacc.c  */
-#line 1127 "awkgram.y"
+#line 1129 "awkgram.y"
     {
 		(yyval) = (yyvsp[(2) - (3)]);
 	  }
@@ -3160,7 +3162,7 @@ regular_print:
 
   case 82:
 /* Line 1778 of yacc.c  */
-#line 1134 "awkgram.y"
+#line 1136 "awkgram.y"
     {
 		in_print = false;
 		in_parens = 0;
@@ -3170,13 +3172,13 @@ regular_print:
 
   case 83:
 /* Line 1778 of yacc.c  */
-#line 1139 "awkgram.y"
+#line 1141 "awkgram.y"
     { in_print = false; in_parens = 0; }
     break;
 
   case 84:
 /* Line 1778 of yacc.c  */
-#line 1140 "awkgram.y"
+#line 1142 "awkgram.y"
     {
 		if ((yyvsp[(1) - (3)])->redir_type == redirect_twoway
 		    	&& (yyvsp[(3) - (3)])->lasti->opcode == Op_K_getline_redir
@@ -3188,7 +3190,7 @@ regular_print:
 
   case 85:
 /* Line 1778 of yacc.c  */
-#line 1151 "awkgram.y"
+#line 1153 "awkgram.y"
     {
 		(yyval) = mk_condition((yyvsp[(3) - (6)]), (yyvsp[(1) - (6)]), (yyvsp[(6) - (6)]), NULL, NULL);
 	  }
@@ -3196,7 +3198,7 @@ regular_print:
 
   case 86:
 /* Line 1778 of yacc.c  */
-#line 1156 "awkgram.y"
+#line 1158 "awkgram.y"
     {
 		(yyval) = mk_condition((yyvsp[(3) - (9)]), (yyvsp[(1) - (9)]), (yyvsp[(6) - (9)]), (yyvsp[(7) - (9)]), (yyvsp[(9) - (9)]));
 	  }
@@ -3204,13 +3206,13 @@ regular_print:
 
   case 91:
 /* Line 1778 of yacc.c  */
-#line 1173 "awkgram.y"
+#line 1175 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 92:
 /* Line 1778 of yacc.c  */
-#line 1175 "awkgram.y"
+#line 1177 "awkgram.y"
     {
 		bcfree((yyvsp[(1) - (2)]));
 		(yyval) = (yyvsp[(2) - (2)]);
@@ -3219,19 +3221,19 @@ regular_print:
 
   case 93:
 /* Line 1778 of yacc.c  */
-#line 1183 "awkgram.y"
+#line 1185 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 94:
 /* Line 1778 of yacc.c  */
-#line 1185 "awkgram.y"
+#line 1187 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]) ; }
     break;
 
   case 95:
 /* Line 1778 of yacc.c  */
-#line 1190 "awkgram.y"
+#line 1192 "awkgram.y"
     {
 		(yyvsp[(1) - (1)])->param_count = 0;
 		(yyval) = list_create((yyvsp[(1) - (1)]));
@@ -3240,7 +3242,7 @@ regular_print:
 
   case 96:
 /* Line 1778 of yacc.c  */
-#line 1195 "awkgram.y"
+#line 1197 "awkgram.y"
     {
 		(yyvsp[(3) - (3)])->param_count =  (yyvsp[(1) - (3)])->lasti->param_count + 1;
 		(yyval) = list_append((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
@@ -3250,55 +3252,55 @@ regular_print:
 
   case 97:
 /* Line 1778 of yacc.c  */
-#line 1201 "awkgram.y"
+#line 1203 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 98:
 /* Line 1778 of yacc.c  */
-#line 1203 "awkgram.y"
+#line 1205 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (2)]); }
     break;
 
   case 99:
 /* Line 1778 of yacc.c  */
-#line 1205 "awkgram.y"
+#line 1207 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (3)]); }
     break;
 
   case 100:
 /* Line 1778 of yacc.c  */
-#line 1211 "awkgram.y"
+#line 1213 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 101:
 /* Line 1778 of yacc.c  */
-#line 1213 "awkgram.y"
+#line 1215 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 102:
 /* Line 1778 of yacc.c  */
-#line 1218 "awkgram.y"
+#line 1220 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 103:
 /* Line 1778 of yacc.c  */
-#line 1220 "awkgram.y"
+#line 1222 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 104:
 /* Line 1778 of yacc.c  */
-#line 1225 "awkgram.y"
+#line 1227 "awkgram.y"
     {	(yyval) = mk_expression_list(NULL, (yyvsp[(1) - (1)])); }
     break;
 
   case 105:
 /* Line 1778 of yacc.c  */
-#line 1227 "awkgram.y"
+#line 1229 "awkgram.y"
     {
 		(yyval) = mk_expression_list((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
 		yyerrok;
@@ -3307,31 +3309,31 @@ regular_print:
 
   case 106:
 /* Line 1778 of yacc.c  */
-#line 1232 "awkgram.y"
+#line 1234 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 107:
 /* Line 1778 of yacc.c  */
-#line 1234 "awkgram.y"
+#line 1236 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 108:
 /* Line 1778 of yacc.c  */
-#line 1236 "awkgram.y"
+#line 1238 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 109:
 /* Line 1778 of yacc.c  */
-#line 1238 "awkgram.y"
+#line 1240 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 110:
 /* Line 1778 of yacc.c  */
-#line 1244 "awkgram.y"
+#line 1246 "awkgram.y"
     {
 		if (do_lint && (yyvsp[(3) - (3)])->lasti->opcode == Op_match_rec)
 			lintwarn_ln((yyvsp[(2) - (3)])->source_line,
@@ -3342,19 +3344,19 @@ regular_print:
 
   case 111:
 /* Line 1778 of yacc.c  */
-#line 1251 "awkgram.y"
+#line 1253 "awkgram.y"
     {	(yyval) = mk_boolean((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 112:
 /* Line 1778 of yacc.c  */
-#line 1253 "awkgram.y"
+#line 1255 "awkgram.y"
     {	(yyval) = mk_boolean((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 113:
 /* Line 1778 of yacc.c  */
-#line 1255 "awkgram.y"
+#line 1257 "awkgram.y"
     {
 		if ((yyvsp[(1) - (3)])->lasti->opcode == Op_match_rec)
 			warning_ln((yyvsp[(2) - (3)])->source_line,
@@ -3374,7 +3376,7 @@ regular_print:
 
   case 114:
 /* Line 1778 of yacc.c  */
-#line 1271 "awkgram.y"
+#line 1273 "awkgram.y"
     {
 		if (do_lint_old)
 			warning_ln((yyvsp[(2) - (3)])->source_line,
@@ -3388,7 +3390,7 @@ regular_print:
 
   case 115:
 /* Line 1778 of yacc.c  */
-#line 1281 "awkgram.y"
+#line 1283 "awkgram.y"
     {
 		if (do_lint && (yyvsp[(3) - (3)])->lasti->opcode == Op_match_rec)
 			lintwarn_ln((yyvsp[(2) - (3)])->source_line,
@@ -3399,31 +3401,31 @@ regular_print:
 
   case 116:
 /* Line 1778 of yacc.c  */
-#line 1288 "awkgram.y"
+#line 1290 "awkgram.y"
     { (yyval) = mk_condition((yyvsp[(1) - (5)]), (yyvsp[(2) - (5)]), (yyvsp[(3) - (5)]), (yyvsp[(4) - (5)]), (yyvsp[(5) - (5)])); }
     break;
 
   case 117:
 /* Line 1778 of yacc.c  */
-#line 1290 "awkgram.y"
+#line 1292 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 118:
 /* Line 1778 of yacc.c  */
-#line 1295 "awkgram.y"
+#line 1297 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 119:
 /* Line 1778 of yacc.c  */
-#line 1297 "awkgram.y"
+#line 1299 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 120:
 /* Line 1778 of yacc.c  */
-#line 1299 "awkgram.y"
+#line 1301 "awkgram.y"
     {	
 		(yyvsp[(2) - (2)])->opcode = Op_assign_quotient;
 		(yyval) = (yyvsp[(2) - (2)]);
@@ -3432,43 +3434,43 @@ regular_print:
 
   case 121:
 /* Line 1778 of yacc.c  */
-#line 1307 "awkgram.y"
+#line 1309 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 122:
 /* Line 1778 of yacc.c  */
-#line 1309 "awkgram.y"
+#line 1311 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 123:
 /* Line 1778 of yacc.c  */
-#line 1314 "awkgram.y"
+#line 1316 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 124:
 /* Line 1778 of yacc.c  */
-#line 1316 "awkgram.y"
+#line 1318 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 125:
 /* Line 1778 of yacc.c  */
-#line 1321 "awkgram.y"
+#line 1323 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 126:
 /* Line 1778 of yacc.c  */
-#line 1323 "awkgram.y"
+#line 1325 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 127:
 /* Line 1778 of yacc.c  */
-#line 1325 "awkgram.y"
+#line 1327 "awkgram.y"
     {
 		int count = 2;
 		bool is_simple_var = false;
@@ -3519,43 +3521,43 @@ regular_print:
 
   case 129:
 /* Line 1778 of yacc.c  */
-#line 1377 "awkgram.y"
+#line 1379 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 130:
 /* Line 1778 of yacc.c  */
-#line 1379 "awkgram.y"
+#line 1381 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 131:
 /* Line 1778 of yacc.c  */
-#line 1381 "awkgram.y"
+#line 1383 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 132:
 /* Line 1778 of yacc.c  */
-#line 1383 "awkgram.y"
+#line 1385 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 133:
 /* Line 1778 of yacc.c  */
-#line 1385 "awkgram.y"
+#line 1387 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 134:
 /* Line 1778 of yacc.c  */
-#line 1387 "awkgram.y"
+#line 1389 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 135:
 /* Line 1778 of yacc.c  */
-#line 1389 "awkgram.y"
+#line 1391 "awkgram.y"
     {
 		/*
 		 * In BEGINFILE/ENDFILE, allow `getline var < file'
@@ -3582,7 +3584,7 @@ regular_print:
 
   case 136:
 /* Line 1778 of yacc.c  */
-#line 1412 "awkgram.y"
+#line 1414 "awkgram.y"
     {
 		(yyvsp[(2) - (2)])->opcode = Op_postincrement;
 		(yyval) = mk_assignment((yyvsp[(1) - (2)]), NULL, (yyvsp[(2) - (2)]));
@@ -3591,7 +3593,7 @@ regular_print:
 
   case 137:
 /* Line 1778 of yacc.c  */
-#line 1417 "awkgram.y"
+#line 1419 "awkgram.y"
     {
 		(yyvsp[(2) - (2)])->opcode = Op_postdecrement;
 		(yyval) = mk_assignment((yyvsp[(1) - (2)]), NULL, (yyvsp[(2) - (2)]));
@@ -3600,7 +3602,7 @@ regular_print:
 
   case 138:
 /* Line 1778 of yacc.c  */
-#line 1422 "awkgram.y"
+#line 1424 "awkgram.y"
     {
 		if (do_lint_old) {
 		    warning_ln((yyvsp[(4) - (5)])->source_line,
@@ -3624,7 +3626,7 @@ regular_print:
 
   case 139:
 /* Line 1778 of yacc.c  */
-#line 1447 "awkgram.y"
+#line 1449 "awkgram.y"
     {
 		  (yyval) = mk_getline((yyvsp[(3) - (4)]), (yyvsp[(4) - (4)]), (yyvsp[(1) - (4)]), (yyvsp[(2) - (4)])->redir_type);
 		  bcfree((yyvsp[(2) - (4)]));
@@ -3633,43 +3635,43 @@ regular_print:
 
   case 140:
 /* Line 1778 of yacc.c  */
-#line 1453 "awkgram.y"
+#line 1455 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 141:
 /* Line 1778 of yacc.c  */
-#line 1455 "awkgram.y"
+#line 1457 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 142:
 /* Line 1778 of yacc.c  */
-#line 1457 "awkgram.y"
+#line 1459 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 143:
 /* Line 1778 of yacc.c  */
-#line 1459 "awkgram.y"
+#line 1461 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 144:
 /* Line 1778 of yacc.c  */
-#line 1461 "awkgram.y"
+#line 1463 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 145:
 /* Line 1778 of yacc.c  */
-#line 1463 "awkgram.y"
+#line 1465 "awkgram.y"
     { (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) - (3)])); }
     break;
 
   case 146:
 /* Line 1778 of yacc.c  */
-#line 1468 "awkgram.y"
+#line 1470 "awkgram.y"
     {
 		(yyval) = list_create((yyvsp[(1) - (1)]));
 	  }
@@ -3677,7 +3679,7 @@ regular_print:
 
   case 147:
 /* Line 1778 of yacc.c  */
-#line 1472 "awkgram.y"
+#line 1474 "awkgram.y"
     {
 		if ((yyvsp[(2) - (2)])->opcode == Op_match_rec) {
 			(yyvsp[(2) - (2)])->opcode = Op_nomatch;
@@ -3713,13 +3715,13 @@ regular_print:
 
   case 148:
 /* Line 1778 of yacc.c  */
-#line 1504 "awkgram.y"
+#line 1506 "awkgram.y"
     { (yyval) = (yyvsp[(2) - (3)]); }
     break;
 
   case 149:
 /* Line 1778 of yacc.c  */
-#line 1506 "awkgram.y"
+#line 1508 "awkgram.y"
     {
 		(yyval) = snode((yyvsp[(3) - (4)]), (yyvsp[(1) - (4)]));
 		if ((yyval) == NULL)
@@ -3729,7 +3731,7 @@ regular_print:
 
   case 150:
 /* Line 1778 of yacc.c  */
-#line 1512 "awkgram.y"
+#line 1514 "awkgram.y"
     {
 		(yyval) = snode((yyvsp[(3) - (4)]), (yyvsp[(1) - (4)]));
 		if ((yyval) == NULL)
@@ -3739,7 +3741,7 @@ regular_print:
 
   case 151:
 /* Line 1778 of yacc.c  */
-#line 1518 "awkgram.y"
+#line 1520 "awkgram.y"
     {
 		static bool warned = false;
 
@@ -3756,7 +3758,7 @@ regular_print:
 
   case 154:
 /* Line 1778 of yacc.c  */
-#line 1533 "awkgram.y"
+#line 1535 "awkgram.y"
     {
 		(yyvsp[(1) - (2)])->opcode = Op_preincrement;
 		(yyval) = mk_assignment((yyvsp[(2) - (2)]), NULL, (yyvsp[(1) - (2)]));
@@ -3765,7 +3767,7 @@ regular_print:
 
   case 155:
 /* Line 1778 of yacc.c  */
-#line 1538 "awkgram.y"
+#line 1540 "awkgram.y"
     {
 		(yyvsp[(1) - (2)])->opcode = Op_predecrement;
 		(yyval) = mk_assignment((yyvsp[(2) - (2)]), NULL, (yyvsp[(1) - (2)]));
@@ -3774,7 +3776,7 @@ regular_print:
 
   case 156:
 /* Line 1778 of yacc.c  */
-#line 1543 "awkgram.y"
+#line 1545 "awkgram.y"
     {
 		(yyval) = list_create((yyvsp[(1) - (1)]));
 	  }
@@ -3782,7 +3784,7 @@ regular_print:
 
   case 157:
 /* Line 1778 of yacc.c  */
-#line 1547 "awkgram.y"
+#line 1549 "awkgram.y"
     {
 		(yyval) = list_create((yyvsp[(1) - (1)]));
 	  }
@@ -3790,7 +3792,7 @@ regular_print:
 
   case 158:
 /* Line 1778 of yacc.c  */
-#line 1551 "awkgram.y"
+#line 1553 "awkgram.y"
     {
 		if ((yyvsp[(2) - (2)])->lasti->opcode == Op_push_i
 			&& ((yyvsp[(2) - (2)])->lasti->memory->flags & (STRCUR|STRING)) == 0
@@ -3809,7 +3811,7 @@ regular_print:
 
   case 159:
 /* Line 1778 of yacc.c  */
-#line 1566 "awkgram.y"
+#line 1568 "awkgram.y"
     {
 	    /*
 	     * was: $$ = $2
@@ -3823,7 +3825,7 @@ regular_print:
 
   case 160:
 /* Line 1778 of yacc.c  */
-#line 1579 "awkgram.y"
+#line 1581 "awkgram.y"
     {
 		func_use((yyvsp[(1) - (1)])->lasti->func_name, FUNC_USE);
 		(yyval) = (yyvsp[(1) - (1)]);
@@ -3832,7 +3834,7 @@ regular_print:
 
   case 161:
 /* Line 1778 of yacc.c  */
-#line 1584 "awkgram.y"
+#line 1586 "awkgram.y"
     {
 		/* indirect function call */
 		INSTRUCTION *f, *t;
@@ -3869,7 +3871,7 @@ regular_print:
 
   case 162:
 /* Line 1778 of yacc.c  */
-#line 1620 "awkgram.y"
+#line 1622 "awkgram.y"
     {
 		param_sanity((yyvsp[(3) - (4)]));
 		(yyvsp[(1) - (4)])->opcode = Op_func_call;
@@ -3887,37 +3889,37 @@ regular_print:
 
   case 163:
 /* Line 1778 of yacc.c  */
-#line 1637 "awkgram.y"
+#line 1639 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 164:
 /* Line 1778 of yacc.c  */
-#line 1639 "awkgram.y"
+#line 1641 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 165:
 /* Line 1778 of yacc.c  */
-#line 1644 "awkgram.y"
+#line 1646 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 166:
 /* Line 1778 of yacc.c  */
-#line 1646 "awkgram.y"
+#line 1648 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (2)]); }
     break;
 
   case 167:
 /* Line 1778 of yacc.c  */
-#line 1651 "awkgram.y"
+#line 1653 "awkgram.y"
     {	(yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 168:
 /* Line 1778 of yacc.c  */
-#line 1653 "awkgram.y"
+#line 1655 "awkgram.y"
     {
 		(yyval) = list_merge((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
 	  }
@@ -3925,7 +3927,7 @@ regular_print:
 
   case 169:
 /* Line 1778 of yacc.c  */
-#line 1660 "awkgram.y"
+#line 1662 "awkgram.y"
     {
 		INSTRUCTION *ip = (yyvsp[(1) - (1)])->lasti; 
 		int count = ip->sub_count;	/* # of SUBSEP-seperated expressions */
@@ -3943,7 +3945,7 @@ regular_print:
 
   case 170:
 /* Line 1778 of yacc.c  */
-#line 1677 "awkgram.y"
+#line 1679 "awkgram.y"
     {
 		INSTRUCTION *t = (yyvsp[(2) - (3)]);
 		if ((yyvsp[(2) - (3)]) == NULL) {
@@ -3961,13 +3963,13 @@ regular_print:
 
   case 171:
 /* Line 1778 of yacc.c  */
-#line 1694 "awkgram.y"
+#line 1696 "awkgram.y"
     {	(yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 172:
 /* Line 1778 of yacc.c  */
-#line 1696 "awkgram.y"
+#line 1698 "awkgram.y"
     {
 		(yyval) = list_merge((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
 	  }
@@ -3975,13 +3977,13 @@ regular_print:
 
   case 173:
 /* Line 1778 of yacc.c  */
-#line 1703 "awkgram.y"
+#line 1705 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (2)]); }
     break;
 
   case 174:
 /* Line 1778 of yacc.c  */
-#line 1708 "awkgram.y"
+#line 1710 "awkgram.y"
     {
 		char *var_name = (yyvsp[(1) - (1)])->lextok;
 
@@ -3993,7 +3995,7 @@ regular_print:
 
   case 175:
 /* Line 1778 of yacc.c  */
-#line 1716 "awkgram.y"
+#line 1718 "awkgram.y"
     {
 		char *arr = (yyvsp[(1) - (2)])->lextok;
 		(yyvsp[(1) - (2)])->memory = variable((yyvsp[(1) - (2)])->source_line, arr, Node_var_new);
@@ -4004,7 +4006,7 @@ regular_print:
 
   case 176:
 /* Line 1778 of yacc.c  */
-#line 1726 "awkgram.y"
+#line 1728 "awkgram.y"
     {
 		INSTRUCTION *ip = (yyvsp[(1) - (1)])->nexti;
 		if (ip->opcode == Op_push
@@ -4020,7 +4022,7 @@ regular_print:
 
   case 177:
 /* Line 1778 of yacc.c  */
-#line 1738 "awkgram.y"
+#line 1740 "awkgram.y"
     {
 		(yyval) = list_append((yyvsp[(2) - (3)]), (yyvsp[(1) - (3)]));
 		if ((yyvsp[(3) - (3)]) != NULL)
@@ -4030,7 +4032,7 @@ regular_print:
 
   case 178:
 /* Line 1778 of yacc.c  */
-#line 1747 "awkgram.y"
+#line 1749 "awkgram.y"
     {
 		(yyvsp[(1) - (1)])->opcode = Op_postincrement;
 	  }
@@ -4038,7 +4040,7 @@ regular_print:
 
   case 179:
 /* Line 1778 of yacc.c  */
-#line 1751 "awkgram.y"
+#line 1753 "awkgram.y"
     {
 		(yyvsp[(1) - (1)])->opcode = Op_postdecrement;
 	  }
@@ -4046,43 +4048,43 @@ regular_print:
 
   case 180:
 /* Line 1778 of yacc.c  */
-#line 1754 "awkgram.y"
+#line 1756 "awkgram.y"
     { (yyval) = NULL; }
     break;
 
   case 182:
 /* Line 1778 of yacc.c  */
-#line 1762 "awkgram.y"
+#line 1764 "awkgram.y"
     { yyerrok; }
     break;
 
   case 183:
 /* Line 1778 of yacc.c  */
-#line 1766 "awkgram.y"
+#line 1768 "awkgram.y"
     { yyerrok; }
     break;
 
   case 186:
 /* Line 1778 of yacc.c  */
-#line 1775 "awkgram.y"
+#line 1777 "awkgram.y"
     { yyerrok; }
     break;
 
   case 187:
 /* Line 1778 of yacc.c  */
-#line 1779 "awkgram.y"
+#line 1781 "awkgram.y"
     { (yyval) = (yyvsp[(1) - (1)]); yyerrok; }
     break;
 
   case 188:
 /* Line 1778 of yacc.c  */
-#line 1783 "awkgram.y"
+#line 1785 "awkgram.y"
     { yyerrok; }
     break;
 
 
 /* Line 1778 of yacc.c  */
-#line 4098 "awkgram.c"
+#line 4100 "awkgram.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -4314,7 +4316,7 @@ yyreturn:
 
 
 /* Line 2041 of yacc.c  */
-#line 1785 "awkgram.y"
+#line 1787 "awkgram.y"
 
 
 struct token {
@@ -6136,28 +6138,28 @@ retry:
 			goto out;
 
 		if (do_lint) {
-			if ((tokentab[mid].flags & GAWKX) && ! (warntab[mid] & GAWKX)) {
+			if ((tokentab[mid].flags & GAWKX) != 0 && (warntab[mid] & GAWKX) == 0) {
 				lintwarn(_("`%s' is a gawk extension"),
 					tokentab[mid].operator);
 				warntab[mid] |= GAWKX;
 			}
-			if ((tokentab[mid].flags & NOT_POSIX) && ! (warntab[mid] & NOT_POSIX)) {
+			if ((tokentab[mid].flags & NOT_POSIX) != 0 && (warntab[mid] & NOT_POSIX) == 0) {
 				lintwarn(_("POSIX does not allow `%s'"),
 					tokentab[mid].operator);
 				warntab[mid] |= NOT_POSIX;
 			}
 		}
-		if (do_lint_old && (tokentab[mid].flags & NOT_OLD)
-				 && ! (warntab[mid] & NOT_OLD)
+		if (do_lint_old && (tokentab[mid].flags & NOT_OLD) != 0
+				 && (warntab[mid] & NOT_OLD) == 0
 		) {
 			warning(_("`%s' is not supported in old awk"),
 					tokentab[mid].operator);
 			warntab[mid] |= NOT_OLD;
 		}
 
-		if (tokentab[mid].flags & BREAK)
+		if ((tokentab[mid].flags & BREAK) != 0)
 			break_allowed++;
-		if (tokentab[mid].flags & CONTINUE)
+		if ((tokentab[mid].flags & CONTINUE) != 0)
 			continue_allowed++;
 
 		switch (class) {