Move to bison 2.7.

1 files changed, 96 insertions, 93 deletions

diff --git a/command.c b/command.c
index 4476273f..b818d851 100644
--- a/command.c
+++ b/command.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.6.5.  */
+/* A Bison parser, made by GNU Bison 2.7.  */
 
 /* Bison implementation for Yacc-like parsers in C
    
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.6.5"
+#define YYBISON_VERSION "2.7"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -69,7 +69,7 @@
 #define yynerrs         zznerrs
 
 /* Copy the first part of user declarations.  */
-/* Line 360 of yacc.c  */
+/* Line 371 of yacc.c  */
 #line 26 "command.y"
 
 #include "awk.h"
@@ -137,7 +137,7 @@ static void append_cmdarg(CMDARG *arg);
 static int find_argument(CMDARG *arg);
 #define YYSTYPE CMDARG *
 
-/* Line 360 of yacc.c  */
+/* Line 371 of yacc.c  */
 #line 142 "command.c"
 
 # ifndef YY_NULL
@@ -296,7 +296,7 @@ int zzparse ();
 
 /* Copy the second part of user declarations.  */
 
-/* Line 379 of yacc.c  */
+/* Line 390 of yacc.c  */
 #line 301 "command.c"
 
 #ifdef short
@@ -1023,7 +1023,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
   switch (yytype)
     {
       default:
-	break;
+        break;
     }
 }
 
@@ -1260,7 +1260,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 {
   YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
   YYSIZE_T yysize = yysize0;
-  YYSIZE_T yysize1;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
   const char *yyformat = YY_NULL;
@@ -1323,11 +1322,13 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                     break;
                   }
                 yyarg[yycount++] = yytname[yyx];
-                yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
-                if (! (yysize <= yysize1
-                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                  return 2;
-                yysize = yysize1;
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
               }
         }
     }
@@ -1347,10 +1348,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 # undef YYCASE_
     }
 
-  yysize1 = yysize + yystrlen (yyformat);
-  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-    return 2;
-  yysize = yysize1;
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
 
   if (*yymsg_alloc < yysize)
     {
@@ -1409,7 +1412,7 @@ yydestruct (yymsg, yytype, yyvaluep)
     {
 
       default:
-	break;
+        break;
     }
 }
 
@@ -1692,7 +1695,7 @@ yyreduce:
   switch (yyn)
     {
         case 3:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 109 "command.y"
     {
 		cmd_idx = -1;
@@ -1711,7 +1714,7 @@ yyreduce:
     break;
 
   case 5:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 128 "command.y"
     {
 		if (errcount == 0 && cmd_idx >= 0) {
@@ -1765,7 +1768,7 @@ yyreduce:
     break;
 
   case 6:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 178 "command.y"
     {
 		yyerrok;
@@ -1773,13 +1776,13 @@ yyreduce:
     break;
 
   case 22:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 212 "command.y"
     { want_nodeval = TRUE; }
     break;
 
   case 23:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 217 "command.y"
     {
 		if (errcount == 0) {
@@ -1799,7 +1802,7 @@ yyreduce:
     break;
 
   case 24:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 236 "command.y"
     {
 		(yyval) = append_statement(arg_list, (char *) start_EVAL);
@@ -1811,13 +1814,13 @@ yyreduce:
     break;
 
   case 25:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 243 "command.y"
     { (yyval) = append_statement((yyvsp[(1) - (2)]), lexptr_begin); }
     break;
 
   case 26:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 244 "command.y"
     {
 		(yyval) = (yyvsp[(3) - (4)]);
@@ -1825,7 +1828,7 @@ yyreduce:
     break;
 
   case 27:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 251 "command.y"
     {
 		arg_list = append_statement((yyvsp[(2) - (3)]), (char *) end_EVAL);
@@ -1845,7 +1848,7 @@ yyreduce:
     break;
 
   case 28:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 267 "command.y"
     {
 		NODE *n;
@@ -1860,7 +1863,7 @@ yyreduce:
     break;
 
   case 34:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 286 "command.y"
     {
 		if (cmdtab[cmd_idx].class == D_FRAME
@@ -1870,7 +1873,7 @@ yyreduce:
     break;
 
   case 35:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 292 "command.y"
     {
 		int idx = find_argument((yyvsp[(2) - (2)]));
@@ -1886,43 +1889,43 @@ yyreduce:
     break;
 
   case 38:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 305 "command.y"
     { want_nodeval = TRUE; }
     break;
 
   case 40:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 306 "command.y"
     { want_nodeval = TRUE; }
     break;
 
   case 46:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 311 "command.y"
     { want_nodeval = TRUE; }
     break;
 
   case 49:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 313 "command.y"
     { want_nodeval = TRUE; }
     break;
 
   case 51:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 314 "command.y"
     { want_nodeval = TRUE; }
     break;
 
   case 53:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 315 "command.y"
     { want_nodeval = TRUE; }
     break;
 
   case 57:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 319 "command.y"
     {
 		if (in_cmd_src((yyvsp[(2) - (2)])->a_string))
@@ -1931,7 +1934,7 @@ yyreduce:
     break;
 
   case 58:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 324 "command.y"
     {
 		if (! input_from_tty)
@@ -1940,7 +1943,7 @@ yyreduce:
     break;
 
   case 59:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 329 "command.y"
     {
 		int type = 0;
@@ -1970,7 +1973,7 @@ yyreduce:
     break;
 
   case 60:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 355 "command.y"
     {
 		if (! in_commands)
@@ -1984,7 +1987,7 @@ yyreduce:
     break;
 
   case 61:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 365 "command.y"
     {
 		if (! in_commands)
@@ -1993,7 +1996,7 @@ yyreduce:
     break;
 
   case 62:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 370 "command.y"
     {
 		int idx = find_argument((yyvsp[(2) - (2)]));
@@ -2009,13 +2012,13 @@ yyreduce:
     break;
 
   case 63:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 381 "command.y"
     { want_nodeval = TRUE; }
     break;
 
   case 64:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 382 "command.y"
     {
 		int type;
@@ -2027,7 +2030,7 @@ yyreduce:
     break;
 
   case 65:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 390 "command.y"
     {
 		if (in_commands) {
@@ -2042,7 +2045,7 @@ yyreduce:
     break;
 
   case 66:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 404 "command.y"
     {
 		if ((yyvsp[(1) - (1)]) != NULL) {
@@ -2056,37 +2059,37 @@ yyreduce:
     break;
 
   case 68:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 418 "command.y"
     {	(yyval) = NULL; }
     break;
 
   case 69:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 423 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 74:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 432 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 75:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 437 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 77:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 440 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 78:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 445 "command.y"
     {
 		NODE *n;
@@ -2097,13 +2100,13 @@ yyreduce:
     break;
 
   case 79:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 455 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 80:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 457 "command.y"
     {
 		if (find_option((yyvsp[(1) - (1)])->a_string) < 0)
@@ -2112,7 +2115,7 @@ yyreduce:
     break;
 
   case 81:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 462 "command.y"
     {
 		if (find_option((yyvsp[(1) - (3)])->a_string) < 0)
@@ -2121,7 +2124,7 @@ yyreduce:
     break;
 
   case 82:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 470 "command.y"
     {
 		NODE *n;
@@ -2138,49 +2141,49 @@ yyreduce:
     break;
 
   case 83:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 486 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 88:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 495 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 89:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 496 "command.y"
     { want_nodeval = TRUE; }
     break;
 
   case 92:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 498 "command.y"
     { want_nodeval = TRUE; }
     break;
 
   case 95:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 504 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 97:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 510 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 99:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 516 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 104:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 528 "command.y"
     {
 		int idx = find_argument((yyvsp[(1) - (2)]));
@@ -2196,7 +2199,7 @@ yyreduce:
     break;
 
   case 106:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 544 "command.y"
     {
 		(yyvsp[(2) - (2)])->type = D_array;	/* dump all items */
@@ -2205,7 +2208,7 @@ yyreduce:
     break;
 
   case 107:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 549 "command.y"
     {
 		(yyvsp[(2) - (3)])->type = D_array;
@@ -2214,19 +2217,19 @@ yyreduce:
     break;
 
   case 117:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 575 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 118:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 577 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 119:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 579 "command.y"
     {
 		CMDARG *a;
@@ -2237,7 +2240,7 @@ yyreduce:
     break;
 
   case 126:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 595 "command.y"
     {
 		if ((yyvsp[(1) - (3)])->a_int > (yyvsp[(3) - (3)])->a_int)
@@ -2250,25 +2253,25 @@ yyreduce:
     break;
 
   case 127:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 607 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 134:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 621 "command.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 135:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 623 "command.y"
     { (yyval) = (yyvsp[(1) - (3)]); }
     break;
 
   case 137:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 629 "command.y"
     {
 		CMDARG *a;
@@ -2287,19 +2290,19 @@ yyreduce:
     break;
 
   case 139:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 648 "command.y"
     { (yyval) = (yyvsp[(1) - (1)]); num_dim = 1; }
     break;
 
   case 140:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 650 "command.y"
     {	(yyval) = (yyvsp[(1) - (2)]); num_dim++; }
     break;
 
   case 142:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 656 "command.y"
     {
 		NODE *n = (yyvsp[(2) - (2)])->a_node;
@@ -2312,7 +2315,7 @@ yyreduce:
     break;
 
   case 143:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 665 "command.y"
     {
 		/* a_string is array name, a_count is dimension count */
@@ -2323,13 +2326,13 @@ yyreduce:
     break;
 
   case 144:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 675 "command.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 145:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 677 "command.y"
     { 
 		NODE *n = (yyvsp[(2) - (2)])->a_node;
@@ -2340,7 +2343,7 @@ yyreduce:
     break;
 
   case 146:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 684 "command.y"
     { 
 		NODE *n = (yyvsp[(2) - (2)])->a_node;
@@ -2353,31 +2356,31 @@ yyreduce:
     break;
 
   case 147:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 696 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 148:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 698 "command.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 149:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 703 "command.y"
     { (yyval) = NULL; }
     break;
 
   case 150:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 705 "command.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 151:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 710 "command.y"
     {
 		if ((yyvsp[(1) - (1)])->a_int == 0)
@@ -2387,7 +2390,7 @@ yyreduce:
     break;
 
   case 152:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 716 "command.y"
     {
 		if ((yyvsp[(2) - (2)])->a_int == 0)
@@ -2397,19 +2400,19 @@ yyreduce:
     break;
 
   case 153:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 725 "command.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 154:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 727 "command.y"
     { (yyval) = (yyvsp[(2) - (2)]); }
     break;
 
   case 155:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 729 "command.y"
     {
 		(yyvsp[(2) - (2)])->a_int = - (yyvsp[(2) - (2)])->a_int;
@@ -2418,7 +2421,7 @@ yyreduce:
     break;
 
   case 156:
-/* Line 1778 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 737 "command.y"
     {
 		if (lexptr_begin != NULL) {
@@ -2431,8 +2434,8 @@ yyreduce:
     break;
 
 
-/* Line 1778 of yacc.c  */
-#line 2448 "command.c"
+/* Line 1792 of yacc.c  */
+#line 2451 "command.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2663,7 +2666,7 @@ yyreturn:
 }
 
 
-/* Line 2041 of yacc.c  */
+/* Line 2055 of yacc.c  */
 #line 747 "command.y"