Improve comments after a closing brace on statements.

3 files changed, 441 insertions, 435 deletions

diff --git a/ChangeLog b/ChangeLog
index b7df6225..c6e090c2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-11-11         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awkgram.y (trailing_comment): New variable.
+	(Grammar): For `action', append both trailing comments. This may
+	change. For `statements', append the value of `trailing_comment'
+	if set. At `statement := l_brace statements rbrace' save
+	trailing_comment from r_brace.
+	(make_braced_statements): Don't append the comment from r_brace
+	to the statement list.
+
 2018-10-30         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* awk.h (NODE): New field: sub.nodep.x.cmnt, holds comment for
diff --git a/awkgram.c b/awkgram.c
index 62adeadd..40d2948a 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -98,6 +98,7 @@ static bool load_library(INSTRUCTION *file, void **srcfile_p);
 static void next_sourcefile(void);
 static char *tokexpand(void);
 static NODE *set_profile_text(NODE *n, const char *str, size_t len);
+static INSTRUCTION *trailing_comment;
 
 #define instruction(t)	bcalloc(t, 1, 0)
 
@@ -204,7 +205,7 @@ extern double fmod(double x, double y);
 
 #define YYSTYPE INSTRUCTION *
 
-#line 208 "awkgram.c" /* yacc.c:339  */
+#line 209 "awkgram.c" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -360,7 +361,7 @@ int yyparse (void);
 
 /* Copy the second part of user declarations.  */
 
-#line 364 "awkgram.c" /* yacc.c:358  */
+#line 365 "awkgram.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -662,27 +663,27 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   230,   230,   231,   236,   244,   248,   260,   265,   279,
-     286,   296,   309,   319,   321,   326,   336,   338,   344,   348,
-     353,   383,   396,   409,   416,   426,   438,   440,   442,   448,
-     456,   457,   461,   461,   495,   494,   528,   543,   545,   550,
-     551,   565,   570,   571,   575,   586,   590,   597,   705,   756,
-     806,   932,   953,   974,   984,   994,  1004,  1015,  1028,  1046,
-    1045,  1059,  1077,  1077,  1175,  1175,  1208,  1238,  1246,  1247,
-    1253,  1254,  1261,  1266,  1279,  1294,  1296,  1304,  1311,  1313,
-    1321,  1330,  1332,  1341,  1342,  1350,  1355,  1355,  1368,  1374,
-    1386,  1387,  1409,  1410,  1416,  1417,  1426,  1427,  1432,  1437,
-    1454,  1456,  1458,  1465,  1466,  1472,  1473,  1478,  1480,  1487,
-    1489,  1497,  1502,  1513,  1514,  1519,  1521,  1528,  1530,  1538,
-    1543,  1553,  1554,  1559,  1566,  1570,  1572,  1574,  1587,  1604,
-    1614,  1621,  1623,  1628,  1630,  1632,  1640,  1642,  1647,  1649,
-    1654,  1656,  1658,  1715,  1717,  1719,  1721,  1723,  1725,  1727,
-    1729,  1743,  1748,  1753,  1778,  1784,  1786,  1788,  1790,  1792,
-    1794,  1799,  1803,  1835,  1843,  1849,  1855,  1868,  1869,  1870,
-    1875,  1880,  1884,  1888,  1903,  1924,  1929,  1966,  1995,  1996,
-    2002,  2003,  2008,  2010,  2017,  2034,  2051,  2053,  2060,  2065,
-    2073,  2083,  2095,  2104,  2108,  2113,  2117,  2121,  2125,  2130,
-    2131,  2135,  2139,  2143
+       0,   231,   231,   232,   237,   245,   249,   261,   266,   280,
+     287,   297,   310,   320,   322,   327,   337,   339,   345,   349,
+     354,   384,   397,   410,   417,   427,   442,   444,   446,   452,
+     460,   461,   465,   465,   499,   498,   532,   547,   549,   554,
+     555,   573,   578,   579,   583,   594,   599,   606,   714,   765,
+     815,   941,   962,   983,   993,  1003,  1013,  1024,  1037,  1055,
+    1054,  1068,  1086,  1086,  1184,  1184,  1217,  1247,  1255,  1256,
+    1262,  1263,  1270,  1275,  1288,  1303,  1305,  1313,  1320,  1322,
+    1330,  1339,  1341,  1350,  1351,  1359,  1364,  1364,  1377,  1383,
+    1395,  1396,  1418,  1419,  1425,  1426,  1435,  1436,  1441,  1446,
+    1463,  1465,  1467,  1474,  1475,  1481,  1482,  1487,  1489,  1496,
+    1498,  1506,  1511,  1522,  1523,  1528,  1530,  1537,  1539,  1547,
+    1552,  1562,  1563,  1568,  1575,  1579,  1581,  1583,  1596,  1613,
+    1623,  1630,  1632,  1637,  1639,  1641,  1649,  1651,  1656,  1658,
+    1663,  1665,  1667,  1724,  1726,  1728,  1730,  1732,  1734,  1736,
+    1738,  1752,  1757,  1762,  1787,  1793,  1795,  1797,  1799,  1801,
+    1803,  1808,  1812,  1844,  1852,  1858,  1864,  1877,  1878,  1879,
+    1884,  1889,  1893,  1897,  1912,  1933,  1938,  1975,  2004,  2005,
+    2011,  2012,  2017,  2019,  2026,  2043,  2060,  2062,  2069,  2074,
+    2082,  2092,  2104,  2113,  2117,  2122,  2126,  2130,  2134,  2139,
+    2140,  2144,  2148,  2152
 };
 #endif
 
@@ -1881,22 +1882,22 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 230 "awkgram.y" /* yacc.c:1651  */
+#line 231 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 1887 "awkgram.c" /* yacc.c:1651  */
+#line 1888 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 3:
-#line 232 "awkgram.y" /* yacc.c:1651  */
+#line 233 "awkgram.y" /* yacc.c:1651  */
     {
 		rule = 0;
 		yyerrok;
 	  }
-#line 1896 "awkgram.c" /* yacc.c:1651  */
+#line 1897 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 4:
-#line 237 "awkgram.y" /* yacc.c:1651  */
+#line 238 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[0]) != NULL) {
 			merge_comments((yyvsp[0]), NULL);
@@ -1904,19 +1905,19 @@ yyreduce:
 		} else
 			(yyval) = (yyvsp[-1]);
 	  }
-#line 1908 "awkgram.c" /* yacc.c:1651  */
+#line 1909 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 5:
-#line 245 "awkgram.y" /* yacc.c:1651  */
+#line 246 "awkgram.y" /* yacc.c:1651  */
     {
 		next_sourcefile();
 	  }
-#line 1916 "awkgram.c" /* yacc.c:1651  */
+#line 1917 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 6:
-#line 249 "awkgram.y" /* yacc.c:1651  */
+#line 250 "awkgram.y" /* yacc.c:1651  */
     {
 		rule = 0;
 		/*
@@ -1925,20 +1926,20 @@ yyreduce:
 		 */
   		/* yyerrok; */
 	  }
-#line 1929 "awkgram.c" /* yacc.c:1651  */
+#line 1930 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 7:
-#line 261 "awkgram.y" /* yacc.c:1651  */
+#line 262 "awkgram.y" /* yacc.c:1651  */
     {
 		(void) append_rule((yyvsp[-1]), (yyvsp[0]));
 		first_rule = false;
 	  }
-#line 1938 "awkgram.c" /* yacc.c:1651  */
+#line 1939 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 8:
-#line 266 "awkgram.y" /* yacc.c:1651  */
+#line 267 "awkgram.y" /* yacc.c:1651  */
     {
 		if (rule != Rule) {
 			msg(_("%s blocks must have an action part"), ruletab[rule]);
@@ -1952,22 +1953,22 @@ yyreduce:
 			(void) append_rule((yyvsp[-1]), NULL);
 		}
 	  }
-#line 1956 "awkgram.c" /* yacc.c:1651  */
+#line 1957 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 9:
-#line 280 "awkgram.y" /* yacc.c:1651  */
+#line 281 "awkgram.y" /* yacc.c:1651  */
     {
 		in_function = NULL;
 		(void) mk_function((yyvsp[-1]), (yyvsp[0]));
 		want_param_names = DONT_CHECK;
 		yyerrok;
 	  }
-#line 1967 "awkgram.c" /* yacc.c:1651  */
+#line 1968 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 10:
-#line 287 "awkgram.y" /* yacc.c:1651  */
+#line 288 "awkgram.y" /* yacc.c:1651  */
     {
 		want_source = false;
 		at_seen = false;
@@ -1977,11 +1978,11 @@ yyreduce:
 		}
 		yyerrok;
 	  }
-#line 1981 "awkgram.c" /* yacc.c:1651  */
+#line 1982 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 11:
-#line 297 "awkgram.y" /* yacc.c:1651  */
+#line 298 "awkgram.y" /* yacc.c:1651  */
     {
 		want_source = false;
 		at_seen = false;
@@ -1991,11 +1992,11 @@ yyreduce:
 		}
 		yyerrok;
 	  }
-#line 1995 "awkgram.c" /* yacc.c:1651  */
+#line 1996 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 12:
-#line 310 "awkgram.y" /* yacc.c:1651  */
+#line 311 "awkgram.y" /* yacc.c:1651  */
     {
 		void *srcfile = NULL;
 
@@ -2005,23 +2006,23 @@ yyreduce:
 		bcfree((yyvsp[0]));
 		(yyval) = (INSTRUCTION *) srcfile;
 	  }
-#line 2009 "awkgram.c" /* yacc.c:1651  */
+#line 2010 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 13:
-#line 320 "awkgram.y" /* yacc.c:1651  */
+#line 321 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 2015 "awkgram.c" /* yacc.c:1651  */
+#line 2016 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 14:
-#line 322 "awkgram.y" /* yacc.c:1651  */
+#line 323 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 2021 "awkgram.c" /* yacc.c:1651  */
+#line 2022 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 15:
-#line 327 "awkgram.y" /* yacc.c:1651  */
+#line 328 "awkgram.y" /* yacc.c:1651  */
     {
 		void *srcfile;
 
@@ -2031,40 +2032,40 @@ yyreduce:
 		bcfree((yyvsp[0]));
 		(yyval) = (INSTRUCTION *) srcfile;
 	  }
-#line 2035 "awkgram.c" /* yacc.c:1651  */
+#line 2036 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 16:
-#line 337 "awkgram.y" /* yacc.c:1651  */
+#line 338 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 2041 "awkgram.c" /* yacc.c:1651  */
+#line 2042 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 17:
-#line 339 "awkgram.y" /* yacc.c:1651  */
+#line 340 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 2047 "awkgram.c" /* yacc.c:1651  */
+#line 2048 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 18:
-#line 344 "awkgram.y" /* yacc.c:1651  */
+#line 345 "awkgram.y" /* yacc.c:1651  */
     {
 		rule = Rule;
 		(yyval) = NULL;
 	  }
-#line 2056 "awkgram.c" /* yacc.c:1651  */
+#line 2057 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 19:
-#line 349 "awkgram.y" /* yacc.c:1651  */
+#line 350 "awkgram.y" /* yacc.c:1651  */
     {
 		rule = Rule;
 	  }
-#line 2064 "awkgram.c" /* yacc.c:1651  */
+#line 2065 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 20:
-#line 354 "awkgram.y" /* yacc.c:1651  */
+#line 355 "awkgram.y" /* yacc.c:1651  */
     {
 		INSTRUCTION *tp;
 
@@ -2094,11 +2095,11 @@ yyreduce:
 			(yyval) = list_append(list_merge((yyvsp[-3]), (yyvsp[0])), tp);
 		rule = Rule;
 	  }
-#line 2098 "awkgram.c" /* yacc.c:1651  */
+#line 2099 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 21:
-#line 384 "awkgram.y" /* yacc.c:1651  */
+#line 385 "awkgram.y" /* yacc.c:1651  */
     {
 		static int begin_seen = 0;
 
@@ -2111,11 +2112,11 @@ yyreduce:
 		(yyvsp[0])->source_file = source;
 		(yyval) = (yyvsp[0]);
 	  }
-#line 2115 "awkgram.c" /* yacc.c:1651  */
+#line 2116 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 22:
-#line 397 "awkgram.y" /* yacc.c:1651  */
+#line 398 "awkgram.y" /* yacc.c:1651  */
     {
 		static int end_seen = 0;
 
@@ -2128,83 +2129,86 @@ yyreduce:
 		(yyvsp[0])->source_file = source;
 		(yyval) = (yyvsp[0]);
 	  }
-#line 2132 "awkgram.c" /* yacc.c:1651  */
+#line 2133 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 23:
-#line 410 "awkgram.y" /* yacc.c:1651  */
+#line 411 "awkgram.y" /* yacc.c:1651  */
     {
 		func_first = false;
 		(yyvsp[0])->in_rule = rule = BEGINFILE;
 		(yyvsp[0])->source_file = source;
 		(yyval) = (yyvsp[0]);
 	  }
-#line 2143 "awkgram.c" /* yacc.c:1651  */
+#line 2144 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 24:
-#line 417 "awkgram.y" /* yacc.c:1651  */
+#line 418 "awkgram.y" /* yacc.c:1651  */
     {
 		func_first = false;
 		(yyvsp[0])->in_rule = rule = ENDFILE;
 		(yyvsp[0])->source_file = source;
 		(yyval) = (yyvsp[0]);
 	  }
-#line 2154 "awkgram.c" /* yacc.c:1651  */
+#line 2155 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 25:
-#line 427 "awkgram.y" /* yacc.c:1651  */
+#line 428 "awkgram.y" /* yacc.c:1651  */
     {
 		INSTRUCTION *ip = make_braced_statements((yyvsp[-4]), (yyvsp[-3]), (yyvsp[-2]));
 
+		if ((yyvsp[-2]) != NULL)
+			ip = list_append(ip, (yyvsp[-2]));
+
 		if ((yyvsp[0]) != NULL)
 			ip = list_append(ip, (yyvsp[0]));
 
 		(yyval) = ip;
 	  }
-#line 2167 "awkgram.c" /* yacc.c:1651  */
+#line 2171 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 26:
-#line 439 "awkgram.y" /* yacc.c:1651  */
+#line 443 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 2173 "awkgram.c" /* yacc.c:1651  */
+#line 2177 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 27:
-#line 441 "awkgram.y" /* yacc.c:1651  */
+#line 445 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 2179 "awkgram.c" /* yacc.c:1651  */
+#line 2183 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 28:
-#line 443 "awkgram.y" /* yacc.c:1651  */
+#line 447 "awkgram.y" /* yacc.c:1651  */
     {
 		yyerror(_("`%s' is a built-in function, it cannot be redefined"),
 					tokstart);
 		YYABORT;
 	  }
-#line 2189 "awkgram.c" /* yacc.c:1651  */
+#line 2193 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 29:
-#line 449 "awkgram.y" /* yacc.c:1651  */
+#line 453 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyval) = (yyvsp[0]);
 		at_seen = false;
 	  }
-#line 2198 "awkgram.c" /* yacc.c:1651  */
+#line 2202 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 32:
-#line 461 "awkgram.y" /* yacc.c:1651  */
+#line 465 "awkgram.y" /* yacc.c:1651  */
     { want_param_names = FUNC_HEADER; }
-#line 2204 "awkgram.c" /* yacc.c:1651  */
+#line 2208 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 33:
-#line 462 "awkgram.y" /* yacc.c:1651  */
+#line 466 "awkgram.y" /* yacc.c:1651  */
     {
 		INSTRUCTION *func_comment = NULL;
 		// Merge any comments found in the parameter list with those
@@ -2230,17 +2234,17 @@ yyreduce:
 		(yyval) = (yyvsp[-6]);
 		want_param_names = FUNC_BODY;
 	  }
-#line 2234 "awkgram.c" /* yacc.c:1651  */
+#line 2238 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 34:
-#line 495 "awkgram.y" /* yacc.c:1651  */
+#line 499 "awkgram.y" /* yacc.c:1651  */
     { want_regexp = true; }
-#line 2240 "awkgram.c" /* yacc.c:1651  */
+#line 2244 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 35:
-#line 497 "awkgram.y" /* yacc.c:1651  */
+#line 501 "awkgram.y" /* yacc.c:1651  */
     {
 		  NODE *n, *exp;
 		  char *re;
@@ -2269,11 +2273,11 @@ yyreduce:
 		  (yyval)->opcode = Op_match_rec;
 		  (yyval)->memory = n;
 		}
-#line 2273 "awkgram.c" /* yacc.c:1651  */
+#line 2277 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 36:
-#line 529 "awkgram.y" /* yacc.c:1651  */
+#line 533 "awkgram.y" /* yacc.c:1651  */
     {
 		  char *re;
 		  size_t len;
@@ -2286,23 +2290,23 @@ yyreduce:
 		  (yyval)->opcode = Op_push_re;
 		  (yyval)->memory = make_typed_regex(re, len);
 		}
-#line 2290 "awkgram.c" /* yacc.c:1651  */
+#line 2294 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 37:
-#line 544 "awkgram.y" /* yacc.c:1651  */
+#line 548 "awkgram.y" /* yacc.c:1651  */
     { bcfree((yyvsp[0])); }
-#line 2296 "awkgram.c" /* yacc.c:1651  */
+#line 2300 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 39:
-#line 550 "awkgram.y" /* yacc.c:1651  */
+#line 554 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 2302 "awkgram.c" /* yacc.c:1651  */
+#line 2306 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 40:
-#line 552 "awkgram.y" /* yacc.c:1651  */
+#line 556 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[0]) == NULL) {
 			(yyval) = (yyvsp[-1]);
@@ -2314,31 +2318,35 @@ yyreduce:
 				(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
 			}
 		}
+		if (trailing_comment != NULL) {
+			(yyval) = list_append((yyval), trailing_comment);
+			trailing_comment = NULL;
+		}
 		yyerrok;
 	  }
-#line 2320 "awkgram.c" /* yacc.c:1651  */
+#line 2328 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 41:
-#line 566 "awkgram.y" /* yacc.c:1651  */
+#line 574 "awkgram.y" /* yacc.c:1651  */
     {	(yyval) = NULL; }
-#line 2326 "awkgram.c" /* yacc.c:1651  */
+#line 2334 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 42:
-#line 570 "awkgram.y" /* yacc.c:1651  */
+#line 578 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 2332 "awkgram.c" /* yacc.c:1651  */
+#line 2340 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 43:
-#line 571 "awkgram.y" /* yacc.c:1651  */
+#line 579 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 2338 "awkgram.c" /* yacc.c:1651  */
+#line 2346 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 44:
-#line 576 "awkgram.y" /* yacc.c:1651  */
+#line 584 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[0]) != NULL) {
 			INSTRUCTION *ip;
@@ -2349,30 +2357,31 @@ yyreduce:
 		} else
 			(yyval) = NULL;
 	  }
-#line 2353 "awkgram.c" /* yacc.c:1651  */
+#line 2361 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 45:
-#line 587 "awkgram.y" /* yacc.c:1651  */
+#line 595 "awkgram.y" /* yacc.c:1651  */
     {
+		trailing_comment = (yyvsp[0]);	// NULL or comment
 		(yyval) = make_braced_statements((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
 	  }
-#line 2361 "awkgram.c" /* yacc.c:1651  */
+#line 2370 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 46:
-#line 591 "awkgram.y" /* yacc.c:1651  */
+#line 600 "awkgram.y" /* yacc.c:1651  */
     {
 		if (do_pretty_print)
 			(yyval) = list_prepend((yyvsp[0]), instruction(Op_exec_count));
 		else
 			(yyval) = (yyvsp[0]);
  	  }
-#line 2372 "awkgram.c" /* yacc.c:1651  */
+#line 2381 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 47:
-#line 598 "awkgram.y" /* yacc.c:1651  */
+#line 607 "awkgram.y" /* yacc.c:1651  */
     {
 		INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt;
 		INSTRUCTION *ip, *nextc, *tbreak;
@@ -2480,11 +2489,11 @@ yyreduce:
 		break_allowed--;
 		fix_break_continue(ip, tbreak, NULL);
 	  }
-#line 2484 "awkgram.c" /* yacc.c:1651  */
+#line 2493 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 48:
-#line 706 "awkgram.y" /* yacc.c:1651  */
+#line 715 "awkgram.y" /* yacc.c:1651  */
     {
 		/*
 		 *    -----------------
@@ -2535,11 +2544,11 @@ yyreduce:
 		continue_allowed--;
 		fix_break_continue(ip, tbreak, tcont);
 	  }
-#line 2539 "awkgram.c" /* yacc.c:1651  */
+#line 2548 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 49:
-#line 757 "awkgram.y" /* yacc.c:1651  */
+#line 766 "awkgram.y" /* yacc.c:1651  */
     {
 		/*
 		 *    -----------------
@@ -2589,11 +2598,11 @@ yyreduce:
 		/* else
 			$1 and $4 are NULLs */
 	  }
-#line 2593 "awkgram.c" /* yacc.c:1651  */
+#line 2602 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 50:
-#line 807 "awkgram.y" /* yacc.c:1651  */
+#line 816 "awkgram.y" /* yacc.c:1651  */
     {
 		INSTRUCTION *ip;
 		char *var_name = (yyvsp[-5])->lextok;
@@ -2719,11 +2728,11 @@ regular_loop:
 		break_allowed--;
 		continue_allowed--;
 	  }
-#line 2723 "awkgram.c" /* yacc.c:1651  */
+#line 2732 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 51:
-#line 933 "awkgram.y" /* yacc.c:1651  */
+#line 942 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[-7]) != NULL) {
 			merge_comments((yyvsp[-7]), NULL);
@@ -2744,11 +2753,11 @@ regular_loop:
 		break_allowed--;
 		continue_allowed--;
 	  }
-#line 2748 "awkgram.c" /* yacc.c:1651  */
+#line 2757 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 52:
-#line 954 "awkgram.y" /* yacc.c:1651  */
+#line 963 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[-6]) != NULL) {
 			merge_comments((yyvsp[-6]), NULL);
@@ -2769,22 +2778,22 @@ regular_loop:
 		break_allowed--;
 		continue_allowed--;
 	  }
-#line 2773 "awkgram.c" /* yacc.c:1651  */
+#line 2782 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 53:
-#line 975 "awkgram.y" /* yacc.c:1651  */
+#line 984 "awkgram.y" /* yacc.c:1651  */
     {
 		if (do_pretty_print)
 			(yyval) = list_prepend((yyvsp[0]), instruction(Op_exec_count));
 		else
 			(yyval) = (yyvsp[0]);
 	  }
-#line 2784 "awkgram.c" /* yacc.c:1651  */
+#line 2793 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 54:
-#line 985 "awkgram.y" /* yacc.c:1651  */
+#line 994 "awkgram.y" /* yacc.c:1651  */
     {
 		if (! break_allowed)
 			error_ln((yyvsp[-1])->source_line,
@@ -2794,11 +2803,11 @@ regular_loop:
 		if ((yyvsp[0]) != NULL)
 			(yyval) = list_append((yyval), (yyvsp[0]));
 	  }
-#line 2798 "awkgram.c" /* yacc.c:1651  */
+#line 2807 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 55:
-#line 995 "awkgram.y" /* yacc.c:1651  */
+#line 1004 "awkgram.y" /* yacc.c:1651  */
     {
 		if (! continue_allowed)
 			error_ln((yyvsp[-1])->source_line,
@@ -2808,11 +2817,11 @@ regular_loop:
 		if ((yyvsp[0]) != NULL)
 			(yyval) = list_append((yyval), (yyvsp[0]));
 	  }
-#line 2812 "awkgram.c" /* yacc.c:1651  */
+#line 2821 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 56:
-#line 1005 "awkgram.y" /* yacc.c:1651  */
+#line 1014 "awkgram.y" /* yacc.c:1651  */
     {
 		/* if inside function (rule = 0), resolve context at run-time */
 		if (rule && rule != Rule)
@@ -2823,11 +2832,11 @@ regular_loop:
 		if ((yyvsp[0]) != NULL)
 			(yyval) = list_append((yyval), (yyvsp[0]));
 	  }
-#line 2827 "awkgram.c" /* yacc.c:1651  */
+#line 2836 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 57:
-#line 1016 "awkgram.y" /* yacc.c:1651  */
+#line 1025 "awkgram.y" /* yacc.c:1651  */
     {
 		/* if inside function (rule = 0), resolve context at run-time */
 		if (rule == BEGIN || rule == END || rule == ENDFILE)
@@ -2840,11 +2849,11 @@ regular_loop:
 		if ((yyvsp[0]) != NULL)
 			(yyval) = list_append((yyval), (yyvsp[0]));
 	  }
-#line 2844 "awkgram.c" /* yacc.c:1651  */
+#line 2853 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 58:
-#line 1029 "awkgram.y" /* yacc.c:1651  */
+#line 1038 "awkgram.y" /* yacc.c:1651  */
     {
 		/* Initialize the two possible jump targets, the actual target
 		 * is resolved at run-time.
@@ -2861,20 +2870,20 @@ regular_loop:
 		if ((yyvsp[0]) != NULL)
 			(yyval) = list_append((yyval), (yyvsp[0]));
 	  }
-#line 2865 "awkgram.c" /* yacc.c:1651  */
+#line 2874 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 59:
-#line 1046 "awkgram.y" /* yacc.c:1651  */
+#line 1055 "awkgram.y" /* yacc.c:1651  */
     {
 		if (! in_function)
 			yyerror(_("`return' used outside function context"));
 	  }
-#line 2874 "awkgram.c" /* yacc.c:1651  */
+#line 2883 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 60:
-#line 1049 "awkgram.y" /* yacc.c:1651  */
+#line 1058 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[-1]) == NULL) {
 			(yyval) = list_create((yyvsp[-3]));
@@ -2885,28 +2894,28 @@ regular_loop:
 		if ((yyvsp[0]) != NULL)
 			(yyval) = list_append((yyval), (yyvsp[0]));
 	  }
-#line 2889 "awkgram.c" /* yacc.c:1651  */
+#line 2898 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 61:
-#line 1060 "awkgram.y" /* yacc.c:1651  */
+#line 1069 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[0]) != NULL)
 			(yyval) = list_append((yyvsp[-1]), (yyvsp[0]));
 		else
 			(yyval) = (yyvsp[-1]);
 	  }
-#line 2900 "awkgram.c" /* yacc.c:1651  */
+#line 2909 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 62:
-#line 1077 "awkgram.y" /* yacc.c:1651  */
+#line 1086 "awkgram.y" /* yacc.c:1651  */
     { in_print = true; in_parens = 0; }
-#line 2906 "awkgram.c" /* yacc.c:1651  */
+#line 2915 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 63:
-#line 1078 "awkgram.y" /* yacc.c:1651  */
+#line 1087 "awkgram.y" /* yacc.c:1651  */
     {
 		/*
 		 * Optimization: plain `print' has no expression list, so $3 is null.
@@ -3003,17 +3012,17 @@ regular_print:
 			}
 		}
 	  }
-#line 3007 "awkgram.c" /* yacc.c:1651  */
+#line 3016 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 64:
-#line 1175 "awkgram.y" /* yacc.c:1651  */
+#line 1184 "awkgram.y" /* yacc.c:1651  */
     { sub_counter = 0; }
-#line 3013 "awkgram.c" /* yacc.c:1651  */
+#line 3022 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 65:
-#line 1176 "awkgram.y" /* yacc.c:1651  */
+#line 1185 "awkgram.y" /* yacc.c:1651  */
     {
 		char *arr = (yyvsp[-2])->lextok;
 
@@ -3046,11 +3055,11 @@ regular_print:
 			(yyval) = list_append(list_append((yyvsp[0]), (yyvsp[-2])), (yyvsp[-3]));
 		}
 	  }
-#line 3050 "awkgram.c" /* yacc.c:1651  */
+#line 3059 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 66:
-#line 1213 "awkgram.y" /* yacc.c:1651  */
+#line 1222 "awkgram.y" /* yacc.c:1651  */
     {
 		static bool warned = false;
 		char *arr = (yyvsp[-1])->lextok;
@@ -3076,54 +3085,54 @@ regular_print:
 				fatal(_("`delete' is not allowed with FUNCTAB"));
 		}
 	  }
-#line 3080 "awkgram.c" /* yacc.c:1651  */
+#line 3089 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 67:
-#line 1239 "awkgram.y" /* yacc.c:1651  */
+#line 1248 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyval) = optimize_assignment((yyvsp[0]));
 	  }
-#line 3088 "awkgram.c" /* yacc.c:1651  */
+#line 3097 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 68:
-#line 1246 "awkgram.y" /* yacc.c:1651  */
+#line 1255 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 3094 "awkgram.c" /* yacc.c:1651  */
+#line 3103 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 69:
-#line 1248 "awkgram.y" /* yacc.c:1651  */
+#line 1257 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3100 "awkgram.c" /* yacc.c:1651  */
+#line 3109 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 70:
-#line 1253 "awkgram.y" /* yacc.c:1651  */
+#line 1262 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 3106 "awkgram.c" /* yacc.c:1651  */
+#line 3115 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 71:
-#line 1255 "awkgram.y" /* yacc.c:1651  */
+#line 1264 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[-1]) == NULL)
 			(yyval) = list_create((yyvsp[0]));
 		else
 			(yyval) = list_prepend((yyvsp[-1]), (yyvsp[0]));
 	  }
-#line 3117 "awkgram.c" /* yacc.c:1651  */
+#line 3126 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 72:
-#line 1262 "awkgram.y" /* yacc.c:1651  */
+#line 1271 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 3123 "awkgram.c" /* yacc.c:1651  */
+#line 3132 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 73:
-#line 1267 "awkgram.y" /* yacc.c:1651  */
+#line 1276 "awkgram.y" /* yacc.c:1651  */
     {
 		INSTRUCTION *casestmt = (yyvsp[0]);
 		if ((yyvsp[0]) == NULL)
@@ -3136,11 +3145,11 @@ regular_print:
 		bcfree((yyvsp[-2]));
 		(yyval) = (yyvsp[-4]);
 	  }
-#line 3140 "awkgram.c" /* yacc.c:1651  */
+#line 3149 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 74:
-#line 1280 "awkgram.y" /* yacc.c:1651  */
+#line 1289 "awkgram.y" /* yacc.c:1651  */
     {
 		INSTRUCTION *casestmt = (yyvsp[0]);
 		if ((yyvsp[0]) == NULL)
@@ -3152,17 +3161,17 @@ regular_print:
 		(yyvsp[-3])->comment = (yyvsp[-1]);
 		(yyval) = (yyvsp[-3]);
 	  }
-#line 3156 "awkgram.c" /* yacc.c:1651  */
+#line 3165 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 75:
-#line 1295 "awkgram.y" /* yacc.c:1651  */
+#line 1304 "awkgram.y" /* yacc.c:1651  */
     {	(yyval) = (yyvsp[0]); }
-#line 3162 "awkgram.c" /* yacc.c:1651  */
+#line 3171 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 76:
-#line 1297 "awkgram.y" /* yacc.c:1651  */
+#line 1306 "awkgram.y" /* yacc.c:1651  */
     {
 		NODE *n = (yyvsp[0])->memory;
 		(void) force_number(n);
@@ -3170,28 +3179,28 @@ regular_print:
 		bcfree((yyvsp[-1]));
 		(yyval) = (yyvsp[0]);
 	  }
-#line 3174 "awkgram.c" /* yacc.c:1651  */
+#line 3183 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 77:
-#line 1305 "awkgram.y" /* yacc.c:1651  */
+#line 1314 "awkgram.y" /* yacc.c:1651  */
     {
 		NODE *n = (yyvsp[0])->lasti->memory;
 		bcfree((yyvsp[-1]));
 		add_sign_to_num(n, '+');
 		(yyval) = (yyvsp[0]);
 	  }
-#line 3185 "awkgram.c" /* yacc.c:1651  */
+#line 3194 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 78:
-#line 1312 "awkgram.y" /* yacc.c:1651  */
+#line 1321 "awkgram.y" /* yacc.c:1651  */
     {	(yyval) = (yyvsp[0]); }
-#line 3191 "awkgram.c" /* yacc.c:1651  */
+#line 3200 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 79:
-#line 1314 "awkgram.y" /* yacc.c:1651  */
+#line 1323 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[0])->memory->type == Node_regex)
 			(yyvsp[0])->opcode = Op_push_re;
@@ -3199,57 +3208,57 @@ regular_print:
 			(yyvsp[0])->opcode = Op_push;
 		(yyval) = (yyvsp[0]);
 	  }
-#line 3203 "awkgram.c" /* yacc.c:1651  */
+#line 3212 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 80:
-#line 1322 "awkgram.y" /* yacc.c:1651  */
+#line 1331 "awkgram.y" /* yacc.c:1651  */
     {
 		assert(((yyvsp[0])->memory->flags & REGEX) == REGEX);
 		(yyvsp[0])->opcode = Op_push_re;
 		(yyval) = (yyvsp[0]);
 	  }
-#line 3213 "awkgram.c" /* yacc.c:1651  */
+#line 3222 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 81:
-#line 1331 "awkgram.y" /* yacc.c:1651  */
+#line 1340 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3219 "awkgram.c" /* yacc.c:1651  */
+#line 3228 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 82:
-#line 1333 "awkgram.y" /* yacc.c:1651  */
+#line 1342 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3225 "awkgram.c" /* yacc.c:1651  */
+#line 3234 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 84:
-#line 1343 "awkgram.y" /* yacc.c:1651  */
+#line 1352 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyval) = (yyvsp[-1]);
 	  }
-#line 3233 "awkgram.c" /* yacc.c:1651  */
+#line 3242 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 85:
-#line 1350 "awkgram.y" /* yacc.c:1651  */
+#line 1359 "awkgram.y" /* yacc.c:1651  */
     {
 		in_print = false;
 		in_parens = 0;
 		(yyval) = NULL;
 	  }
-#line 3243 "awkgram.c" /* yacc.c:1651  */
+#line 3252 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 86:
-#line 1355 "awkgram.y" /* yacc.c:1651  */
+#line 1364 "awkgram.y" /* yacc.c:1651  */
     { in_print = false; in_parens = 0; }
-#line 3249 "awkgram.c" /* yacc.c:1651  */
+#line 3258 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 87:
-#line 1356 "awkgram.y" /* yacc.c:1651  */
+#line 1365 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[-2])->redir_type == redirect_twoway
 		    	&& (yyvsp[0])->lasti->opcode == Op_K_getline_redir
@@ -3259,21 +3268,21 @@ regular_print:
 			lintwarn(_("concatenation as I/O `>' redirection target is ambiguous"));
 		(yyval) = list_prepend((yyvsp[0]), (yyvsp[-2]));
 	  }
-#line 3263 "awkgram.c" /* yacc.c:1651  */
+#line 3272 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 88:
-#line 1369 "awkgram.y" /* yacc.c:1651  */
+#line 1378 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[-1]) != NULL)
 			(yyvsp[-5])->comment = (yyvsp[-1]);
 		(yyval) = mk_condition((yyvsp[-3]), (yyvsp[-5]), (yyvsp[0]), NULL, NULL);
 	  }
-#line 3273 "awkgram.c" /* yacc.c:1651  */
+#line 3282 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 89:
-#line 1376 "awkgram.y" /* yacc.c:1651  */
+#line 1385 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[-4]) != NULL)
 			(yyvsp[-8])->comment = (yyvsp[-4]);
@@ -3281,17 +3290,17 @@ regular_print:
 			(yyvsp[-2])->comment = (yyvsp[-1]);
 		(yyval) = mk_condition((yyvsp[-6]), (yyvsp[-8]), (yyvsp[-3]), (yyvsp[-2]), (yyvsp[0]));
 	  }
-#line 3285 "awkgram.c" /* yacc.c:1651  */
+#line 3294 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 90:
-#line 1386 "awkgram.y" /* yacc.c:1651  */
+#line 1395 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3291 "awkgram.c" /* yacc.c:1651  */
+#line 3300 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 91:
-#line 1388 "awkgram.y" /* yacc.c:1651  */
+#line 1397 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[-1]) != NULL && (yyvsp[0]) != NULL) {
 			if ((yyvsp[-1])->memory->comment_type == EOL_COMMENT) {
@@ -3309,59 +3318,59 @@ regular_print:
 		} else
 			(yyval) = NULL;
 	  }
-#line 3313 "awkgram.c" /* yacc.c:1651  */
+#line 3322 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 92:
-#line 1409 "awkgram.y" /* yacc.c:1651  */
+#line 1418 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 3319 "awkgram.c" /* yacc.c:1651  */
+#line 3328 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 93:
-#line 1411 "awkgram.y" /* yacc.c:1651  */
+#line 1420 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3325 "awkgram.c" /* yacc.c:1651  */
+#line 3334 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 94:
-#line 1416 "awkgram.y" /* yacc.c:1651  */
+#line 1425 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 3331 "awkgram.c" /* yacc.c:1651  */
+#line 3340 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 95:
-#line 1418 "awkgram.y" /* yacc.c:1651  */
+#line 1427 "awkgram.y" /* yacc.c:1651  */
     {
 		bcfree((yyvsp[-1]));
 		(yyval) = (yyvsp[0]);
 	  }
-#line 3340 "awkgram.c" /* yacc.c:1651  */
+#line 3349 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 96:
-#line 1426 "awkgram.y" /* yacc.c:1651  */
+#line 1435 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 3346 "awkgram.c" /* yacc.c:1651  */
+#line 3355 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 97:
-#line 1428 "awkgram.y" /* yacc.c:1651  */
+#line 1437 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3352 "awkgram.c" /* yacc.c:1651  */
+#line 3361 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 98:
-#line 1433 "awkgram.y" /* yacc.c:1651  */
+#line 1442 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyvsp[0])->param_count = 0;
 		(yyval) = list_create((yyvsp[0]));
 	  }
-#line 3361 "awkgram.c" /* yacc.c:1651  */
+#line 3370 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 99:
-#line 1438 "awkgram.y" /* yacc.c:1651  */
+#line 1447 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[-2]) != NULL && (yyvsp[0]) != NULL) {
 			(yyvsp[0])->param_count = (yyvsp[-2])->lasti->param_count + 1;
@@ -3378,76 +3387,76 @@ regular_print:
 		} else
 			(yyval) = NULL;
 	  }
-#line 3382 "awkgram.c" /* yacc.c:1651  */
+#line 3391 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 100:
-#line 1455 "awkgram.y" /* yacc.c:1651  */
+#line 1464 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 3388 "awkgram.c" /* yacc.c:1651  */
+#line 3397 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 101:
-#line 1457 "awkgram.y" /* yacc.c:1651  */
+#line 1466 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[-1]); }
-#line 3394 "awkgram.c" /* yacc.c:1651  */
+#line 3403 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 102:
-#line 1459 "awkgram.y" /* yacc.c:1651  */
+#line 1468 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[-2]); }
-#line 3400 "awkgram.c" /* yacc.c:1651  */
+#line 3409 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 103:
-#line 1465 "awkgram.y" /* yacc.c:1651  */
+#line 1474 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 3406 "awkgram.c" /* yacc.c:1651  */
+#line 3415 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 104:
-#line 1467 "awkgram.y" /* yacc.c:1651  */
+#line 1476 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3412 "awkgram.c" /* yacc.c:1651  */
+#line 3421 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 105:
-#line 1472 "awkgram.y" /* yacc.c:1651  */
+#line 1481 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 3418 "awkgram.c" /* yacc.c:1651  */
+#line 3427 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 106:
-#line 1474 "awkgram.y" /* yacc.c:1651  */
+#line 1483 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3424 "awkgram.c" /* yacc.c:1651  */
+#line 3433 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 107:
-#line 1479 "awkgram.y" /* yacc.c:1651  */
+#line 1488 "awkgram.y" /* yacc.c:1651  */
     {	(yyval) = mk_expression_list(NULL, (yyvsp[0])); }
-#line 3430 "awkgram.c" /* yacc.c:1651  */
+#line 3439 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 108:
-#line 1481 "awkgram.y" /* yacc.c:1651  */
+#line 1490 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[-1]) != NULL)
 			(yyvsp[-2])->lasti->comment = (yyvsp[-1]);
 		(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
 		yyerrok;
 	  }
-#line 3441 "awkgram.c" /* yacc.c:1651  */
+#line 3450 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 109:
-#line 1488 "awkgram.y" /* yacc.c:1651  */
+#line 1497 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 3447 "awkgram.c" /* yacc.c:1651  */
+#line 3456 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 110:
-#line 1490 "awkgram.y" /* yacc.c:1651  */
+#line 1499 "awkgram.y" /* yacc.c:1651  */
     {
 		/*
 		 * Returning the expression list instead of NULL lets
@@ -3455,66 +3464,66 @@ regular_print:
 		 */
 		(yyval) = (yyvsp[-1]);
 	  }
-#line 3459 "awkgram.c" /* yacc.c:1651  */
+#line 3468 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 111:
-#line 1498 "awkgram.y" /* yacc.c:1651  */
+#line 1507 "awkgram.y" /* yacc.c:1651  */
     {
 		/* Ditto */
 		(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
 	  }
-#line 3468 "awkgram.c" /* yacc.c:1651  */
+#line 3477 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 112:
-#line 1503 "awkgram.y" /* yacc.c:1651  */
+#line 1512 "awkgram.y" /* yacc.c:1651  */
     {
 		/* Ditto */
 		if ((yyvsp[-1]) != NULL)
 			(yyvsp[-2])->lasti->comment = (yyvsp[-1]);
 		(yyval) = (yyvsp[-2]);
 	  }
-#line 3479 "awkgram.c" /* yacc.c:1651  */
+#line 3488 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 113:
-#line 1513 "awkgram.y" /* yacc.c:1651  */
+#line 1522 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 3485 "awkgram.c" /* yacc.c:1651  */
+#line 3494 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 114:
-#line 1515 "awkgram.y" /* yacc.c:1651  */
+#line 1524 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3491 "awkgram.c" /* yacc.c:1651  */
+#line 3500 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 115:
-#line 1520 "awkgram.y" /* yacc.c:1651  */
+#line 1529 "awkgram.y" /* yacc.c:1651  */
     {	(yyval) = mk_expression_list(NULL, (yyvsp[0])); }
-#line 3497 "awkgram.c" /* yacc.c:1651  */
+#line 3506 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 116:
-#line 1522 "awkgram.y" /* yacc.c:1651  */
+#line 1531 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[-1]) != NULL)
 			(yyvsp[-2])->lasti->comment = (yyvsp[-1]);
 		(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
 		yyerrok;
 	  }
-#line 3508 "awkgram.c" /* yacc.c:1651  */
+#line 3517 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 117:
-#line 1529 "awkgram.y" /* yacc.c:1651  */
+#line 1538 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 3514 "awkgram.c" /* yacc.c:1651  */
+#line 3523 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 118:
-#line 1531 "awkgram.y" /* yacc.c:1651  */
+#line 1540 "awkgram.y" /* yacc.c:1651  */
     {
 		/*
 		 * Returning the expression list instead of NULL lets
@@ -3522,74 +3531,74 @@ regular_print:
 		 */
 		(yyval) = (yyvsp[-1]);
 	  }
-#line 3526 "awkgram.c" /* yacc.c:1651  */
+#line 3535 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 119:
-#line 1539 "awkgram.y" /* yacc.c:1651  */
+#line 1548 "awkgram.y" /* yacc.c:1651  */
     {
 		/* Ditto */
 		(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
 	  }
-#line 3535 "awkgram.c" /* yacc.c:1651  */
+#line 3544 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 120:
-#line 1544 "awkgram.y" /* yacc.c:1651  */
+#line 1553 "awkgram.y" /* yacc.c:1651  */
     {
 		/* Ditto */
 		if ((yyvsp[-1]) != NULL)
 			(yyvsp[-2])->comment = (yyvsp[-1]);
 		(yyval) = (yyvsp[-2]);
 	  }
-#line 3546 "awkgram.c" /* yacc.c:1651  */
+#line 3555 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 121:
-#line 1553 "awkgram.y" /* yacc.c:1651  */
+#line 1562 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3552 "awkgram.c" /* yacc.c:1651  */
+#line 3561 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 122:
-#line 1554 "awkgram.y" /* yacc.c:1651  */
+#line 1563 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = list_create((yyvsp[0])); }
-#line 3558 "awkgram.c" /* yacc.c:1651  */
+#line 3567 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 123:
-#line 1560 "awkgram.y" /* yacc.c:1651  */
+#line 1569 "awkgram.y" /* yacc.c:1651  */
     {
 		if (do_lint && (yyvsp[0])->lasti->opcode == Op_match_rec)
 			lintwarn_ln((yyvsp[-1])->source_line,
 				_("regular expression on right of assignment"));
 		(yyval) = mk_assignment((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1]));
 	  }
-#line 3569 "awkgram.c" /* yacc.c:1651  */
+#line 3578 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 124:
-#line 1567 "awkgram.y" /* yacc.c:1651  */
+#line 1576 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyval) = mk_assignment((yyvsp[-2]), list_create((yyvsp[0])), (yyvsp[-1]));
 	  }
-#line 3577 "awkgram.c" /* yacc.c:1651  */
+#line 3586 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 125:
-#line 1571 "awkgram.y" /* yacc.c:1651  */
+#line 1580 "awkgram.y" /* yacc.c:1651  */
     {	(yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3583 "awkgram.c" /* yacc.c:1651  */
+#line 3592 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 126:
-#line 1573 "awkgram.y" /* yacc.c:1651  */
+#line 1582 "awkgram.y" /* yacc.c:1651  */
     {	(yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3589 "awkgram.c" /* yacc.c:1651  */
+#line 3598 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 127:
-#line 1575 "awkgram.y" /* yacc.c:1651  */
+#line 1584 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[-2])->lasti->opcode == Op_match_rec)
 			warning_ln((yyvsp[-1])->source_line,
@@ -3602,11 +3611,11 @@ regular_print:
 		bcfree((yyvsp[0]));
 		(yyval) = list_append((yyvsp[-2]), (yyvsp[-1]));
 	  }
-#line 3606 "awkgram.c" /* yacc.c:1651  */
+#line 3615 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 128:
-#line 1588 "awkgram.y" /* yacc.c:1651  */
+#line 1597 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[-2])->lasti->opcode == Op_match_rec)
 			warning_ln((yyvsp[-1])->source_line,
@@ -3623,11 +3632,11 @@ regular_print:
 			(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1]));
 		}
 	  }
-#line 3627 "awkgram.c" /* yacc.c:1651  */
+#line 3636 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 129:
-#line 1605 "awkgram.y" /* yacc.c:1651  */
+#line 1614 "awkgram.y" /* yacc.c:1651  */
     {
 		if (do_lint_old)
 			warning_ln((yyvsp[-1])->source_line,
@@ -3637,91 +3646,91 @@ regular_print:
 		(yyvsp[-1])->expr_count = 1;
 		(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1]));
 	  }
-#line 3641 "awkgram.c" /* yacc.c:1651  */
+#line 3650 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 130:
-#line 1615 "awkgram.y" /* yacc.c:1651  */
+#line 1624 "awkgram.y" /* yacc.c:1651  */
     {
 		if (do_lint && (yyvsp[0])->lasti->opcode == Op_match_rec)
 			lintwarn_ln((yyvsp[-1])->source_line,
 				_("regular expression on right of comparison"));
 		(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1]));
 	  }
-#line 3652 "awkgram.c" /* yacc.c:1651  */
+#line 3661 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 131:
-#line 1622 "awkgram.y" /* yacc.c:1651  */
+#line 1631 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = mk_condition((yyvsp[-4]), (yyvsp[-3]), (yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])); }
-#line 3658 "awkgram.c" /* yacc.c:1651  */
+#line 3667 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 132:
-#line 1624 "awkgram.y" /* yacc.c:1651  */
+#line 1633 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3664 "awkgram.c" /* yacc.c:1651  */
+#line 3673 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 133:
-#line 1629 "awkgram.y" /* yacc.c:1651  */
+#line 1638 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3670 "awkgram.c" /* yacc.c:1651  */
+#line 3679 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 134:
-#line 1631 "awkgram.y" /* yacc.c:1651  */
+#line 1640 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3676 "awkgram.c" /* yacc.c:1651  */
+#line 3685 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 135:
-#line 1633 "awkgram.y" /* yacc.c:1651  */
+#line 1642 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyvsp[0])->opcode = Op_assign_quotient;
 		(yyval) = (yyvsp[0]);
 	  }
-#line 3685 "awkgram.c" /* yacc.c:1651  */
+#line 3694 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 136:
-#line 1641 "awkgram.y" /* yacc.c:1651  */
+#line 1650 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3691 "awkgram.c" /* yacc.c:1651  */
+#line 3700 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 137:
-#line 1643 "awkgram.y" /* yacc.c:1651  */
+#line 1652 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3697 "awkgram.c" /* yacc.c:1651  */
+#line 3706 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 138:
-#line 1648 "awkgram.y" /* yacc.c:1651  */
+#line 1657 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3703 "awkgram.c" /* yacc.c:1651  */
+#line 3712 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 139:
-#line 1650 "awkgram.y" /* yacc.c:1651  */
+#line 1659 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3709 "awkgram.c" /* yacc.c:1651  */
+#line 3718 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 140:
-#line 1655 "awkgram.y" /* yacc.c:1651  */
+#line 1664 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3715 "awkgram.c" /* yacc.c:1651  */
+#line 3724 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 141:
-#line 1657 "awkgram.y" /* yacc.c:1651  */
+#line 1666 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 3721 "awkgram.c" /* yacc.c:1651  */
+#line 3730 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 142:
-#line 1659 "awkgram.y" /* yacc.c:1651  */
+#line 1668 "awkgram.y" /* yacc.c:1651  */
     {
 		int count = 2;
 		bool is_simple_var = false;
@@ -3775,47 +3784,47 @@ regular_print:
 				max_args = count;
 		}
 	  }
-#line 3779 "awkgram.c" /* yacc.c:1651  */
+#line 3788 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 144:
-#line 1718 "awkgram.y" /* yacc.c:1651  */
+#line 1727 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3785 "awkgram.c" /* yacc.c:1651  */
+#line 3794 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 145:
-#line 1720 "awkgram.y" /* yacc.c:1651  */
+#line 1729 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3791 "awkgram.c" /* yacc.c:1651  */
+#line 3800 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 146:
-#line 1722 "awkgram.y" /* yacc.c:1651  */
+#line 1731 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3797 "awkgram.c" /* yacc.c:1651  */
+#line 3806 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 147:
-#line 1724 "awkgram.y" /* yacc.c:1651  */
+#line 1733 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3803 "awkgram.c" /* yacc.c:1651  */
+#line 3812 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 148:
-#line 1726 "awkgram.y" /* yacc.c:1651  */
+#line 1735 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3809 "awkgram.c" /* yacc.c:1651  */
+#line 3818 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 149:
-#line 1728 "awkgram.y" /* yacc.c:1651  */
+#line 1737 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3815 "awkgram.c" /* yacc.c:1651  */
+#line 3824 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 150:
-#line 1730 "awkgram.y" /* yacc.c:1651  */
+#line 1739 "awkgram.y" /* yacc.c:1651  */
     {
 		/*
 		 * In BEGINFILE/ENDFILE, allow `getline [var] < file'
@@ -3829,29 +3838,29 @@ regular_print:
 				_("non-redirected `getline' undefined inside END action"));
 		(yyval) = mk_getline((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]), redirect_input);
 	  }
-#line 3833 "awkgram.c" /* yacc.c:1651  */
+#line 3842 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 151:
-#line 1744 "awkgram.y" /* yacc.c:1651  */
+#line 1753 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyvsp[0])->opcode = Op_postincrement;
 		(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
 	  }
-#line 3842 "awkgram.c" /* yacc.c:1651  */
+#line 3851 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 152:
-#line 1749 "awkgram.y" /* yacc.c:1651  */
+#line 1758 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyvsp[0])->opcode = Op_postdecrement;
 		(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
 	  }
-#line 3851 "awkgram.c" /* yacc.c:1651  */
+#line 3860 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 153:
-#line 1754 "awkgram.y" /* yacc.c:1651  */
+#line 1763 "awkgram.y" /* yacc.c:1651  */
     {
 		if (do_lint_old) {
 		    warning_ln((yyvsp[-1])->source_line,
@@ -3871,64 +3880,64 @@ regular_print:
 			(yyval) = list_append(list_merge(t, (yyvsp[0])), (yyvsp[-1]));
 		}
 	  }
-#line 3875 "awkgram.c" /* yacc.c:1651  */
+#line 3884 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 154:
-#line 1779 "awkgram.y" /* yacc.c:1651  */
+#line 1788 "awkgram.y" /* yacc.c:1651  */
     {
 		  (yyval) = mk_getline((yyvsp[-1]), (yyvsp[0]), (yyvsp[-3]), (yyvsp[-2])->redir_type);
 		  bcfree((yyvsp[-2]));
 		}
-#line 3884 "awkgram.c" /* yacc.c:1651  */
+#line 3893 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 155:
-#line 1785 "awkgram.y" /* yacc.c:1651  */
+#line 1794 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3890 "awkgram.c" /* yacc.c:1651  */
+#line 3899 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 156:
-#line 1787 "awkgram.y" /* yacc.c:1651  */
+#line 1796 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3896 "awkgram.c" /* yacc.c:1651  */
+#line 3905 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 157:
-#line 1789 "awkgram.y" /* yacc.c:1651  */
+#line 1798 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3902 "awkgram.c" /* yacc.c:1651  */
+#line 3911 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 158:
-#line 1791 "awkgram.y" /* yacc.c:1651  */
+#line 1800 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3908 "awkgram.c" /* yacc.c:1651  */
+#line 3917 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 159:
-#line 1793 "awkgram.y" /* yacc.c:1651  */
+#line 1802 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3914 "awkgram.c" /* yacc.c:1651  */
+#line 3923 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 160:
-#line 1795 "awkgram.y" /* yacc.c:1651  */
+#line 1804 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = mk_binary((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3920 "awkgram.c" /* yacc.c:1651  */
+#line 3929 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 161:
-#line 1800 "awkgram.y" /* yacc.c:1651  */
+#line 1809 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyval) = list_create((yyvsp[0]));
 	  }
-#line 3928 "awkgram.c" /* yacc.c:1651  */
+#line 3937 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 162:
-#line 1804 "awkgram.y" /* yacc.c:1651  */
+#line 1813 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[0])->opcode == Op_match_rec) {
 			(yyvsp[0])->opcode = Op_nomatch;
@@ -3960,11 +3969,11 @@ regular_print:
 			}
 		}
 	   }
-#line 3964 "awkgram.c" /* yacc.c:1651  */
+#line 3973 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 163:
-#line 1836 "awkgram.y" /* yacc.c:1651  */
+#line 1845 "awkgram.y" /* yacc.c:1651  */
     {
 		// Always include. Allows us to lint warn on
 		// print "foo" > "bar" 1
@@ -3972,31 +3981,31 @@ regular_print:
 		// print "foo" > ("bar" 1)
 		(yyval) = list_append((yyvsp[-1]), bcalloc(Op_parens, 1, sourceline));
 	  }
-#line 3976 "awkgram.c" /* yacc.c:1651  */
+#line 3985 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 164:
-#line 1844 "awkgram.y" /* yacc.c:1651  */
+#line 1853 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
 		if ((yyval) == NULL)
 			YYABORT;
 	  }
-#line 3986 "awkgram.c" /* yacc.c:1651  */
+#line 3995 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 165:
-#line 1850 "awkgram.y" /* yacc.c:1651  */
+#line 1859 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
 		if ((yyval) == NULL)
 			YYABORT;
 	  }
-#line 3996 "awkgram.c" /* yacc.c:1651  */
+#line 4005 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 166:
-#line 1856 "awkgram.y" /* yacc.c:1651  */
+#line 1865 "awkgram.y" /* yacc.c:1651  */
     {
 		static bool warned = false;
 
@@ -4009,45 +4018,45 @@ regular_print:
 		if ((yyval) == NULL)
 			YYABORT;
 	  }
-#line 4013 "awkgram.c" /* yacc.c:1651  */
+#line 4022 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 169:
-#line 1871 "awkgram.y" /* yacc.c:1651  */
+#line 1880 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyvsp[-1])->opcode = Op_preincrement;
 		(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
 	  }
-#line 4022 "awkgram.c" /* yacc.c:1651  */
+#line 4031 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 170:
-#line 1876 "awkgram.y" /* yacc.c:1651  */
+#line 1885 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyvsp[-1])->opcode = Op_predecrement;
 		(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
 	  }
-#line 4031 "awkgram.c" /* yacc.c:1651  */
+#line 4040 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 171:
-#line 1881 "awkgram.y" /* yacc.c:1651  */
+#line 1890 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyval) = list_create((yyvsp[0]));
 	  }
-#line 4039 "awkgram.c" /* yacc.c:1651  */
+#line 4048 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 172:
-#line 1885 "awkgram.y" /* yacc.c:1651  */
+#line 1894 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyval) = list_create((yyvsp[0]));
 	  }
-#line 4047 "awkgram.c" /* yacc.c:1651  */
+#line 4056 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 173:
-#line 1889 "awkgram.y" /* yacc.c:1651  */
+#line 1898 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[0])->lasti->opcode == Op_push_i
 			&& ((yyvsp[0])->lasti->memory->flags & STRING) == 0
@@ -4062,11 +4071,11 @@ regular_print:
 			(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
 		}
 	  }
-#line 4066 "awkgram.c" /* yacc.c:1651  */
+#line 4075 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 174:
-#line 1904 "awkgram.y" /* yacc.c:1651  */
+#line 1913 "awkgram.y" /* yacc.c:1651  */
     {
 		if ((yyvsp[0])->lasti->opcode == Op_push_i
 			&& ((yyvsp[0])->lasti->memory->flags & STRING) == 0
@@ -4084,20 +4093,20 @@ regular_print:
 			(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
 		}
 	  }
-#line 4088 "awkgram.c" /* yacc.c:1651  */
+#line 4097 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 175:
-#line 1925 "awkgram.y" /* yacc.c:1651  */
+#line 1934 "awkgram.y" /* yacc.c:1651  */
     {
 		func_use((yyvsp[0])->lasti->func_name, FUNC_USE);
 		(yyval) = (yyvsp[0]);
 	  }
-#line 4097 "awkgram.c" /* yacc.c:1651  */
+#line 4106 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 176:
-#line 1930 "awkgram.y" /* yacc.c:1651  */
+#line 1939 "awkgram.y" /* yacc.c:1651  */
     {
 		/* indirect function call */
 		INSTRUCTION *f, *t;
@@ -4131,11 +4140,11 @@ regular_print:
 		(yyval) = list_prepend((yyvsp[0]), t);
 		at_seen = false;
 	  }
-#line 4135 "awkgram.c" /* yacc.c:1651  */
+#line 4144 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 177:
-#line 1967 "awkgram.y" /* yacc.c:1651  */
+#line 1976 "awkgram.y" /* yacc.c:1651  */
     {
 		NODE *n;
 
@@ -4160,49 +4169,49 @@ regular_print:
 			(yyval) = list_append(t, (yyvsp[-3]));
 		}
 	  }
-#line 4164 "awkgram.c" /* yacc.c:1651  */
+#line 4173 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 178:
-#line 1995 "awkgram.y" /* yacc.c:1651  */
+#line 2004 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 4170 "awkgram.c" /* yacc.c:1651  */
+#line 4179 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 179:
-#line 1997 "awkgram.y" /* yacc.c:1651  */
+#line 2006 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 4176 "awkgram.c" /* yacc.c:1651  */
+#line 4185 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 180:
-#line 2002 "awkgram.y" /* yacc.c:1651  */
+#line 2011 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 4182 "awkgram.c" /* yacc.c:1651  */
+#line 4191 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 181:
-#line 2004 "awkgram.y" /* yacc.c:1651  */
+#line 2013 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[-1]); }
-#line 4188 "awkgram.c" /* yacc.c:1651  */
+#line 4197 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 182:
-#line 2009 "awkgram.y" /* yacc.c:1651  */
+#line 2018 "awkgram.y" /* yacc.c:1651  */
     {	(yyval) = (yyvsp[0]); }
-#line 4194 "awkgram.c" /* yacc.c:1651  */
+#line 4203 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 183:
-#line 2011 "awkgram.y" /* yacc.c:1651  */
+#line 2020 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
 	  }
-#line 4202 "awkgram.c" /* yacc.c:1651  */
+#line 4211 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 184:
-#line 2018 "awkgram.y" /* yacc.c:1651  */
+#line 2027 "awkgram.y" /* yacc.c:1651  */
     {
 		INSTRUCTION *ip = (yyvsp[0])->lasti;
 		int count = ip->sub_count;	/* # of SUBSEP-seperated expressions */
@@ -4216,11 +4225,11 @@ regular_print:
 		sub_counter++;	/* count # of dimensions */
 		(yyval) = (yyvsp[0]);
 	  }
-#line 4220 "awkgram.c" /* yacc.c:1651  */
+#line 4229 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 185:
-#line 2035 "awkgram.y" /* yacc.c:1651  */
+#line 2044 "awkgram.y" /* yacc.c:1651  */
     {
 		INSTRUCTION *t = (yyvsp[-1]);
 		if ((yyvsp[-1]) == NULL) {
@@ -4234,31 +4243,31 @@ regular_print:
 			(yyvsp[0])->sub_count = count_expressions(&t, false);
 		(yyval) = list_append(t, (yyvsp[0]));
 	  }
-#line 4238 "awkgram.c" /* yacc.c:1651  */
+#line 4247 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 186:
-#line 2052 "awkgram.y" /* yacc.c:1651  */
+#line 2061 "awkgram.y" /* yacc.c:1651  */
     {	(yyval) = (yyvsp[0]); }
-#line 4244 "awkgram.c" /* yacc.c:1651  */
+#line 4253 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 187:
-#line 2054 "awkgram.y" /* yacc.c:1651  */
+#line 2063 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
 	  }
-#line 4252 "awkgram.c" /* yacc.c:1651  */
+#line 4261 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 188:
-#line 2061 "awkgram.y" /* yacc.c:1651  */
+#line 2070 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[-1]); }
-#line 4258 "awkgram.c" /* yacc.c:1651  */
+#line 4267 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 189:
-#line 2066 "awkgram.y" /* yacc.c:1651  */
+#line 2075 "awkgram.y" /* yacc.c:1651  */
     {
 		char *var_name = (yyvsp[0])->lextok;
 
@@ -4266,22 +4275,22 @@ regular_print:
 		(yyvsp[0])->memory = variable((yyvsp[0])->source_line, var_name, Node_var_new);
 		(yyval) = list_create((yyvsp[0]));
 	  }
-#line 4270 "awkgram.c" /* yacc.c:1651  */
+#line 4279 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 190:
-#line 2074 "awkgram.y" /* yacc.c:1651  */
+#line 2083 "awkgram.y" /* yacc.c:1651  */
     {
 		char *arr = (yyvsp[-1])->lextok;
 		(yyvsp[-1])->memory = variable((yyvsp[-1])->source_line, arr, Node_var_new);
 		(yyvsp[-1])->opcode = Op_push_array;
 		(yyval) = list_prepend((yyvsp[0]), (yyvsp[-1]));
 	  }
-#line 4281 "awkgram.c" /* yacc.c:1651  */
+#line 4290 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 191:
-#line 2084 "awkgram.y" /* yacc.c:1651  */
+#line 2093 "awkgram.y" /* yacc.c:1651  */
     {
 		INSTRUCTION *ip = (yyvsp[0])->nexti;
 		if (ip->opcode == Op_push
@@ -4293,85 +4302,85 @@ regular_print:
 		} else
 			(yyval) = (yyvsp[0]);
 	  }
-#line 4297 "awkgram.c" /* yacc.c:1651  */
+#line 4306 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 192:
-#line 2096 "awkgram.y" /* yacc.c:1651  */
+#line 2105 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyval) = list_append((yyvsp[-1]), (yyvsp[-2]));
 		if ((yyvsp[0]) != NULL)
 			mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
 	  }
-#line 4307 "awkgram.c" /* yacc.c:1651  */
+#line 4316 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 193:
-#line 2105 "awkgram.y" /* yacc.c:1651  */
+#line 2114 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyvsp[0])->opcode = Op_postincrement;
 	  }
-#line 4315 "awkgram.c" /* yacc.c:1651  */
+#line 4324 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 194:
-#line 2109 "awkgram.y" /* yacc.c:1651  */
+#line 2118 "awkgram.y" /* yacc.c:1651  */
     {
 		(yyvsp[0])->opcode = Op_postdecrement;
 	  }
-#line 4323 "awkgram.c" /* yacc.c:1651  */
+#line 4332 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 195:
-#line 2113 "awkgram.y" /* yacc.c:1651  */
+#line 2122 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 4329 "awkgram.c" /* yacc.c:1651  */
+#line 4338 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 196:
-#line 2117 "awkgram.y" /* yacc.c:1651  */
+#line 2126 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); }
-#line 4335 "awkgram.c" /* yacc.c:1651  */
+#line 4344 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 197:
-#line 2121 "awkgram.y" /* yacc.c:1651  */
+#line 2130 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); yyerrok; }
-#line 4341 "awkgram.c" /* yacc.c:1651  */
+#line 4350 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 198:
-#line 2125 "awkgram.y" /* yacc.c:1651  */
+#line 2134 "awkgram.y" /* yacc.c:1651  */
     { yyerrok; }
-#line 4347 "awkgram.c" /* yacc.c:1651  */
+#line 4356 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 199:
-#line 2130 "awkgram.y" /* yacc.c:1651  */
+#line 2139 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = NULL; }
-#line 4353 "awkgram.c" /* yacc.c:1651  */
+#line 4362 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 201:
-#line 2135 "awkgram.y" /* yacc.c:1651  */
+#line 2144 "awkgram.y" /* yacc.c:1651  */
     { yyerrok; }
-#line 4359 "awkgram.c" /* yacc.c:1651  */
+#line 4368 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 202:
-#line 2139 "awkgram.y" /* yacc.c:1651  */
+#line 2148 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); yyerrok; }
-#line 4365 "awkgram.c" /* yacc.c:1651  */
+#line 4374 "awkgram.c" /* yacc.c:1651  */
     break;
 
   case 203:
-#line 2143 "awkgram.y" /* yacc.c:1651  */
+#line 2152 "awkgram.y" /* yacc.c:1651  */
     { (yyval) = (yyvsp[0]); yyerrok; }
-#line 4371 "awkgram.c" /* yacc.c:1651  */
+#line 4380 "awkgram.c" /* yacc.c:1651  */
     break;
 
 
-#line 4375 "awkgram.c" /* yacc.c:1651  */
+#line 4384 "awkgram.c" /* yacc.c:1651  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -4599,7 +4608,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 2145 "awkgram.y" /* yacc.c:1910  */
+#line 2154 "awkgram.y" /* yacc.c:1910  */
 
 
 struct token {
@@ -8927,16 +8936,5 @@ make_braced_statements(INSTRUCTION *lbrace, INSTRUCTION *stmts, INSTRUCTION *rbr
 		ip = list_prepend(ip, lbrace);
 	}
 
-	/* Tack any comment onto the end. */
-	if (rbrace != NULL) {
-		INSTRUCTION *comment2 = rbrace->comment;
-		rbrace->comment = NULL;
-		if (rbrace->memory->comment_type == EOL_COMMENT)
-			rbrace->memory->comment_type = BLOCK_COMMENT;
-		ip = list_append(ip, rbrace);
-		if (comment2 != NULL)
-			ip = list_append(ip, comment2);
-	}
-
 	return ip;
 }
diff --git a/awkgram.y b/awkgram.y
index af2c326e..93735433 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -79,6 +79,7 @@ static bool load_library(INSTRUCTION *file, void **srcfile_p);
 static void next_sourcefile(void);
 static char *tokexpand(void);
 static NODE *set_profile_text(NODE *n, const char *str, size_t len);
+static INSTRUCTION *trailing_comment;
 
 #define instruction(t)	bcalloc(t, 1, 0)
 
@@ -427,6 +428,9 @@ action
 	  {
 		INSTRUCTION *ip = make_braced_statements($1, $2, $3);
 
+		if ($3 != NULL)
+			ip = list_append(ip, $3);
+
 		if ($5 != NULL)
 			ip = list_append(ip, $5);
 
@@ -560,6 +564,10 @@ statements
 				$$ = list_merge($1, $2);
 			}
 		}
+		if (trailing_comment != NULL) {
+			$$ = list_append($$, trailing_comment);
+			trailing_comment = NULL;
+		}
 		yyerrok;
 	  }
 	| statements error
@@ -585,6 +593,7 @@ statement
 	  }
 	| l_brace statements r_brace
 	  {
+		trailing_comment = $3;	// NULL or comment
 		$$ = make_braced_statements($1, $2, $3);
 	  }
 	| if_statement
@@ -6469,16 +6478,5 @@ make_braced_statements(INSTRUCTION *lbrace, INSTRUCTION *stmts, INSTRUCTION *rbr
 		ip = list_prepend(ip, lbrace);
 	}
 
-	/* Tack any comment onto the end. */
-	if (rbrace != NULL) {
-		INSTRUCTION *comment2 = rbrace->comment;
-		rbrace->comment = NULL;
-		if (rbrace->memory->comment_type == EOL_COMMENT)
-			rbrace->memory->comment_type = BLOCK_COMMENT;
-		ip = list_append(ip, rbrace);
-		if (comment2 != NULL)
-			ip = list_append(ip, comment2);
-	}
-
 	return ip;
 }