commit a4eddefec148f98c790e390d80fbd69811da48c7
parent d0ee32e585437b76f095379ec84fd753a5d30a3c
Author: Toby Goodwin <toby@paccrat.org>
Date: Thu, 15 Sep 2016 21:39:41 +0100
update parse.[ch]
Diffstat:
| M | parse.c | | | 1328 | ++++++++++++++++++++++++++++++++++++++++++------------------------------------- |
| M | parse.h | | | 11 | +++++++---- |
2 files changed, 713 insertions(+), 626 deletions(-)
diff --git a/parse.c b/parse.c
@@ -1,24 +1,36 @@
-#ifndef lint
-static char const
-yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28 2000/01/17 02:04:06 bde Exp $";
-#endif
-#include "rc.h"
-#include <stdlib.h>
+/* original parser id follows */
+/* yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93" */
+/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
+
#define YYBYACC 1
#define YYMAJOR 1
#define YYMINOR 9
-#define YYLEX yylex()
-#define YYEMPTY -1
-#define yyclearin (yychar=(YYEMPTY))
-#define yyerrok (yyerrflag=0)
-#define YYRECOVERING() (yyerrflag!=0)
-static int yygrowstack();
+#define YYPATCH 20150711
+
+#define YYEMPTY (-1)
+#define yyclearin (yychar = YYEMPTY)
+#define yyerrok (yyerrflag = 0)
+#define YYRECOVERING() (yyerrflag != 0)
+#define YYENOMEM (-2)
+#define YYEOF 0
#define YYPREFIX "yy"
+
+#define YYPURE 0
+
#line 8 "parse.y"
+/* note that this actually needs to appear before any system header
+ files are included; byacc likes to throw in <stdlib.h> first. */
+#include "rc.h"
static Node *star, *nolist;
Node *parsetree; /* not using yylval because bison declares it as an auto */
-#line 26 "parse.y"
+#line 29 "parse.y"
+#ifdef YYSTYPE
+#undef YYSTYPE_IS_DECLARED
+#define YYSTYPE_IS_DECLARED 1
+#endif
+#ifndef YYSTYPE_IS_DECLARED
+#define YYSTYPE_IS_DECLARED 1
typedef union {
struct Node *node;
struct Redir redir;
@@ -27,8 +39,40 @@ typedef union {
struct Word word;
char *keyword;
} YYSTYPE;
-#line 31 "y.tab.c"
-#define YYERRCODE 256
+#endif /* !YYSTYPE_IS_DECLARED */
+#line 44 "y.tab.c"
+
+/* compatibility with bison */
+#ifdef YYPARSE_PARAM
+/* compatibility with FreeBSD */
+# ifdef YYPARSE_PARAM_TYPE
+# define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
+# else
+# define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
+# endif
+#else
+# define YYPARSE_DECL() yyparse(void)
+#endif
+
+/* Parameters sent to lex. */
+#ifdef YYLEX_PARAM
+# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
+# define YYLEX yylex(YYLEX_PARAM)
+#else
+# define YYLEX_DECL() yylex(void)
+# define YYLEX yylex()
+#endif
+
+/* Parameters sent to yyerror. */
+#ifndef YYERROR_DECL
+#define YYERROR_DECL() yyerror(const char *s)
+#endif
+#ifndef YYERROR_CALL
+#define YYERROR_CALL(msg) yyerror(msg)
+#endif
+
+extern int YYPARSE_DECL();
+
#define ANDAND 257
#define BACKBACK 258
#define BANG 259
@@ -53,270 +97,276 @@ typedef union {
#define WHILE 278
#define WORD 279
#define HUH 280
-const short yylhs[] = { -1,
- 0, 0, 22, 22, 8, 8, 13, 13, 3, 3,
+#define YYERRCODE 256
+typedef short YYINT;
+static const YYINT yylhs[] = { -1,
+ 0, 0, 24, 24, 8, 8, 13, 13, 3, 3,
9, 9, 4, 15, 2, 11, 11, 16, 16, 16,
5, 5, 6, 6, 6, 19, 19, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 24, 24, 18, 18, 18,
- 12, 12, 17, 17, 20, 20, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 21, 21,
- 14, 14, 14, 23, 23,
+ 7, 7, 7, 7, 7, 25, 25, 18, 18, 23,
+ 23, 22, 22, 12, 12, 17, 17, 20, 20, 10,
+ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 21, 21, 14, 14, 14, 26, 26,
};
-const short yylen[] = { 2,
+static const YYINT yylen[] = { 2,
2, 2, 1, 1, 2, 2, 1, 2, 1, 2,
- 1, 2, 3, 3, 3, 0, 2, 1, 2, 2,
+ 1, 2, 3, 3, 5, 0, 2, 1, 2, 2,
3, 3, 1, 2, 2, 1, 4, 0, 1, 2,
4, 8, 6, 4, 8, 4, 4, 4, 4, 2,
- 2, 3, 3, 3, 2, 0, 1, 1, 2, 2,
- 1, 3, 1, 1, 1, 3, 2, 5, 2, 2,
- 2, 2, 3, 3, 3, 2, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 0, 2,
- 0, 2, 2, 0, 2,
+ 2, 3, 3, 3, 2, 0, 1, 1, 2, 1,
+ 2, 1, 1, 1, 3, 1, 1, 1, 3, 2,
+ 5, 2, 2, 2, 2, 3, 3, 3, 2, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 0, 2, 0, 2, 2, 0, 2,
};
-const short yydefred[] = { 0,
- 0, 0, 0, 0, 18, 0, 79, 0, 0, 0,
- 0, 0, 0, 0, 0, 67, 0, 0, 81, 0,
- 0, 0, 0, 0, 0, 51, 0, 0, 0, 0,
- 3, 4, 2, 77, 75, 74, 73, 68, 71, 69,
- 0, 78, 72, 76, 70, 54, 53, 55, 0, 47,
- 0, 59, 60, 0, 0, 0, 84, 66, 0, 0,
- 0, 0, 0, 84, 0, 0, 0, 11, 0, 0,
- 62, 61, 0, 0, 30, 0, 84, 84, 84, 5,
- 6, 8, 0, 0, 1, 0, 50, 0, 0, 63,
- 64, 0, 44, 0, 0, 0, 0, 0, 0, 0,
- 0, 79, 13, 12, 10, 65, 82, 0, 17, 0,
- 0, 0, 0, 52, 56, 79, 84, 14, 85, 0,
- 0, 31, 84, 0, 0, 0, 0, 0, 39, 0,
- 0, 84, 0, 58, 84, 0, 0, 0, 0, 0,
- 79, 0, 0, 0, 0, 0, 0, 24, 35, 25,
- 22, 21,
+static const YYINT yydefred[] = { 0,
+ 0, 0, 0, 0, 18, 0, 83, 0, 0, 0,
+ 0, 0, 0, 0, 0, 70, 0, 0, 85, 0,
+ 0, 0, 0, 0, 0, 54, 0, 0, 0, 29,
+ 3, 4, 2, 80, 78, 77, 76, 71, 74, 72,
+ 0, 81, 75, 79, 73, 82, 57, 56, 58, 0,
+ 47, 0, 62, 63, 0, 0, 0, 88, 69, 0,
+ 0, 0, 0, 0, 88, 0, 0, 0, 11, 0,
+ 0, 65, 64, 0, 0, 30, 0, 88, 88, 88,
+ 5, 6, 8, 0, 53, 0, 50, 0, 0, 1,
+ 0, 0, 66, 67, 0, 44, 0, 0, 0, 0,
+ 0, 0, 0, 0, 83, 13, 12, 10, 68, 86,
+ 0, 17, 0, 0, 0, 55, 51, 0, 59, 83,
+ 88, 14, 89, 0, 0, 31, 88, 0, 0, 0,
+ 0, 0, 39, 0, 0, 0, 88, 0, 61, 0,
+ 88, 0, 0, 0, 0, 0, 83, 0, 0, 0,
+ 0, 0, 0, 24, 35, 25, 22, 21,
};
-const short yydgoto[] = { 21,
- 46, 22, 66, 23, 142, 143, 67, 68, 69, 47,
- 75, 27, 28, 70, 57, 29, 48, 30, 122, 94,
- 54, 33, 97, 51,
+static const YYINT yydgoto[] = { 21,
+ 47, 22, 67, 23, 148, 149, 68, 69, 70, 48,
+ 76, 27, 28, 71, 58, 29, 49, 30, 126, 97,
+ 55, 87, 88, 33, 52, 100,
};
-const short yysindex[] = { 874,
- 24, 1001, -82, 1001, 0, 1001, 0, -27, -26, 900,
- 1001, -82, -20, -82, -26, 0, 1001, 1134, 0, 900,
- 0, 1134, -203, -30, 1134, 0, -55, 24, 1134, 826,
+static const YYINT yysindex[] = { 937,
+ 24, 1030, -81, 1030, 0, 1030, 0, -25, -17, 862,
+ 1030, -81, -4, -81, -17, 0, 1030, 1128, 0, 862,
+ 0, 1128, -185, -30, 1128, 0, 796, 24, 1128, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- -66, 0, 0, 0, 0, 0, 0, 0, 849, 0,
- 1134, 0, 0, 900, 1001, 1134, 0, 0, -52, -52,
- 1134, 1001, 1001, 0, -212, -58, 154, 0, 1134, 426,
- 0, 0, -196, 1001, 0, -203, 0, 0, 0, 0,
- 0, 0, 1001, 1001, 0, -196, 0, -52, 1001, 0,
- 0, -196, 0, -52, -38, 36, 502, -196, -36, -52,
- 502, 0, 0, 0, 0, 0, 0, -52, 0, 502,
- 502, 502, -52, 0, 0, 0, 0, 0, 0, -97,
- -234, 0, 0, 1001, -234, 922, -196, -196, 0, 944,
- 502, 0, -9, 0, 0, -234, 502, 967, 502, -234,
- 0, 967, -45, 154, 967, -234, 448, 0, 0, 0,
- 0, 0,
+ -86, 0, 0, 0, 0, 0, 0, 0, 0, 818,
+ 0, 1128, 0, 0, 862, 1030, 1128, 0, 0, -56,
+ -56, 1128, 1030, 1030, 0, -233, -83, 154, 0, 1128,
+ 402, 0, 0, -218, 1030, 0, -185, 0, 0, 0,
+ 0, 0, 0, 1008, 0, -56, 0, 840, -1, 0,
+ -218, 1030, 0, 0, -218, 0, -56, -38, 16, 468,
+ -218, -31, -56, 468, 0, 0, 0, 0, 0, 0,
+ -56, 0, 468, 468, 468, 0, 0, -81, 0, 0,
+ 0, 0, 0, -251, -238, 0, 0, 1030, -238, 884,
+ -218, -218, 0, 1030, 913, 468, 0, -9, 0, -56,
+ 0, -238, 468, 1052, 468, -238, 0, 1052, -64, 154,
+ 1052, -238, 424, 0, 0, 0, 0, 0,
};
-const short yyrindex[] = { 134,
+static const YYINT yyrindex[] = { 134,
0, 0, 356, 0, 0, 0, 0, 0, 0, 0,
- 0, 356, 0, 1024, 0, 0, 0, 571, 0, 0,
- 0, 487, 529, 54, 134, 0, 62, 0, 487, 548,
+ 0, 356, 0, 1074, 0, 0, 0, 491, 0, 0,
+ 0, 187, 500, 54, 134, 0, 485, 0, 187, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 487, 0, 0, 712, 0, 142, 0, 0, 14, 38,
- 487, 0, 0, 0, -10, 0, -32, 0, 744, 0,
- 0, 0, 749, 0, 0, 529, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 763, 0, 86, 0, 0,
- 0, 779, 0, 110, 0, 0, -34, 788, 0, 380,
- -34, 0, 0, 0, 0, 0, 0, 470, 0, -34,
- -34, -34, 404, 0, 0, 0, 0, 0, 0, 529,
- 6, 0, 0, 724, 30, 0, 805, 813, 0, 0,
- -34, 0, 0, 0, 0, 119, -34, 571, -34, 187,
- 0, 571, 0, -44, 571, 396, 0, 0, 0, 0,
- 0, 0,
+ 0, 187, 0, 0, 511, 0, 143, 0, 0, 14,
+ 38, 187, 0, 0, 0, -10, 0, -35, 0, 481,
+ 0, 0, 0, 678, 0, 0, 500, 0, 0, 0,
+ 0, 0, 0, 5, 0, 62, 0, 515, 0, 0,
+ 749, 0, 0, 0, 750, 0, 86, 0, 0, -34,
+ 759, 0, 110, -34, 0, 0, 0, 0, 0, 0,
+ 446, 0, -34, -34, -34, 0, 0, 1074, 0, 0,
+ 0, 0, 0, 500, 6, 0, 0, 541, 30, 0,
+ 779, 783, 0, 0, 0, -34, 0, 0, 0, 380,
+ 0, 95, -34, 491, -34, 119, 0, 491, 0, -45,
+ 491, 139, 0, 0, 0, 0, 0, 0,
};
-const short yygindex[] = { 0,
- 0, 0, -23, 12, 0, -104, 1319, 2, -127, 1307,
- 7, 0, 57, 0, 70, -13, 84, 0, 0, 420,
- -81, 59, 369, 31,
+static const YYINT yygindex[] = { 0,
+ 0, 0, -12, 75, 0, -134, 1336, 2, -105, 1356,
+ 4, 0, 58, 0, 77, -18, 510, 0, 0, 855,
+ -85, 13, 0, 65, 55, 328,
};
-#define YYTABLESIZE 1464
-const short yytable[] = { 57,
- 119, 25, 117, 28, 123, 83, 28, 81, 9, 76,
- 145, 50, 55, 56, 145, 26, 87, 145, 124, 62,
- 126, 58, 77, 19, 28, 57, 25, 57, 80, 57,
- 57, 71, 96, 32, 130, 78, 79, 148, 84, 34,
- 150, 89, 61, 26, 63, 105, 26, 20, 57, 19,
- 57, 19, 58, 19, 19, 89, 18, 89, 5, 147,
- 90, 102, 76, 7, 26, 93, 103, 34, 74, 11,
- 34, 48, 19, 20, 79, 20, 118, 20, 20, 149,
- 23, 82, 109, 57, 64, 57, 85, 52, 34, 53,
- 28, 0, 9, 0, 0, 49, 20, 48, 0, 48,
- 65, 48, 48, 72, 0, 0, 76, 0, 120, 19,
- 0, 0, 57, 138, 57, 0, 0, 0, 0, 80,
- 48, 49, 0, 49, 0, 49, 49, 0, 33, 0,
- 26, 0, 91, 20, 0, 0, 19, 0, 19, 0,
- 0, 0, 0, 28, 49, 80, 0, 80, 0, 80,
- 80, 28, 0, 0, 34, 0, 33, 48, 0, 33,
- 20, 0, 20, 104, 5, 132, 0, 114, 80, 0,
- 0, 28, 115, 0, 74, 11, 0, 33, 0, 28,
- 0, 49, 28, 0, 0, 0, 48, 0, 0, 0,
- 0, 81, 28, 0, 0, 0, 27, 0, 0, 0,
- 28, 0, 0, 0, 0, 80, 0, 0, 0, 0,
- 49, 0, 80, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 28, 0, 27, 0, 77, 27, 0, 28,
- 116, 0, 80, 0, 80, 28, 28, 0, 0, 78,
- 79, 0, 0, 33, 0, 27, 57, 57, 57, 57,
- 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
- 57, 57, 57, 0, 57, 57, 57, 57, 57, 26,
+#define YYTABLESIZE 1507
+static const YYINT yytable[] = { 60,
+ 123, 25, 121, 28, 77, 9, 28, 82, 85, 127,
+ 5, 137, 51, 154, 56, 26, 156, 128, 78, 130,
+ 75, 11, 57, 19, 28, 60, 25, 60, 81, 60,
+ 60, 79, 80, 32, 135, 63, 18, 92, 151, 34,
+ 105, 106, 151, 26, 99, 151, 26, 20, 60, 19,
+ 60, 19, 80, 19, 19, 92, 122, 108, 77, 118,
+ 155, 153, 92, 7, 26, 47, 62, 34, 64, 85,
+ 34, 52, 19, 20, 19, 20, 5, 20, 20, 23,
+ 112, 89, 83, 60, 59, 60, 75, 11, 34, 9,
+ 28, 65, 90, 0, 72, 84, 20, 52, 20, 52,
+ 117, 52, 52, 0, 33, 77, 0, 0, 0, 19,
+ 0, 0, 60, 144, 60, 59, 0, 0, 0, 83,
+ 52, 84, 52, 84, 93, 84, 84, 0, 27, 96,
+ 26, 0, 33, 20, 0, 33, 19, 0, 19, 0,
+ 0, 0, 0, 28, 84, 83, 84, 83, 32, 83,
+ 83, 0, 28, 33, 34, 0, 27, 52, 0, 27,
+ 20, 0, 20, 107, 0, 0, 0, 0, 83, 0,
+ 83, 28, 134, 0, 124, 0, 32, 27, 0, 32,
+ 28, 84, 0, 28, 0, 0, 52, 0, 0, 0,
+ 0, 82, 28, 0, 0, 0, 28, 32, 0, 0,
+ 0, 28, 0, 0, 0, 83, 0, 0, 84, 0,
+ 84, 0, 81, 0, 0, 0, 0, 0, 0, 33,
+ 0, 0, 28, 0, 28, 0, 78, 28, 0, 28,
+ 120, 0, 0, 0, 83, 28, 28, 0, 0, 79,
+ 80, 0, 0, 27, 0, 28, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 32, 60, 60, 60, 60, 60, 26,
19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
19, 19, 19, 19, 19, 19, 19, 31, 19, 19,
19, 19, 19, 34, 20, 20, 20, 20, 20, 20,
20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 27, 20, 20, 20, 20, 20, 7, 48, 48,
- 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
- 48, 48, 48, 48, 48, 0, 48, 48, 48, 48,
- 48, 0, 49, 49, 49, 49, 49, 49, 49, 49,
- 49, 49, 49, 49, 49, 49, 49, 49, 49, 0,
- 49, 49, 49, 49, 49, 46, 80, 80, 80, 80,
- 80, 0, 80, 80, 80, 80, 80, 80, 80, 80,
- 80, 80, 33, 0, 80, 80, 80, 80, 80, 79,
- 28, 46, 0, 46, 0, 46, 46, 28, 28, 0,
- 0, 0, 0, 28, 28, 32, 0, 0, 0, 0,
- 77, 28, 28, 15, 46, 79, 0, 79, 0, 79,
- 79, 49, 0, 78, 79, 0, 0, 0, 0, 59,
- 60, 0, 101, 32, 0, 107, 32, 0, 79, 15,
- 0, 15, 0, 15, 15, 110, 111, 112, 0, 88,
- 27, 46, 0, 0, 32, 0, 0, 151, 0, 0,
- 0, 17, 15, 0, 0, 19, 106, 0, 0, 0,
- 0, 0, 0, 0, 95, 79, 0, 0, 46, 83,
- 46, 99, 100, 17, 0, 131, 0, 19, 0, 108,
- 0, 133, 0, 59, 0, 0, 28, 0, 0, 15,
- 137, 0, 113, 139, 79, 83, 152, 0, 0, 83,
- 83, 119, 0, 0, 0, 0, 0, 0, 0, 0,
- 32, 20, 0, 0, 28, 0, 15, 28, 15, 0,
- 0, 0, 0, 0, 0, 0, 0, 17, 16, 0,
- 0, 19, 0, 20, 0, 28, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 29, 0, 0,
- 0, 0, 0, 0, 0, 83, 16, 0, 0, 16,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 28, 0, 0, 0, 0, 29, 0, 16, 29, 0,
- 0, 0, 0, 0, 0, 0, 0, 20, 0, 0,
- 0, 0, 0, 0, 0, 0, 29, 0, 28, 0,
- 0, 28, 46, 46, 46, 0, 46, 46, 0, 46,
- 46, 46, 46, 46, 18, 46, 46, 46, 46, 28,
- 46, 46, 46, 46, 46, 0, 79, 79, 79, 79,
- 79, 0, 79, 79, 79, 79, 79, 79, 79, 79,
- 79, 79, 0, 16, 79, 79, 79, 79, 79, 32,
- 15, 15, 15, 0, 15, 15, 0, 15, 15, 15,
- 15, 15, 29, 15, 15, 15, 15, 0, 15, 15,
- 15, 15, 15, 2, 34, 35, 4, 0, 36, 0,
- 6, 37, 38, 39, 40, 28, 0, 41, 0, 0,
- 42, 43, 44, 45, 16, 2, 34, 35, 4, 0,
- 36, 0, 6, 37, 38, 39, 40, 0, 0, 41,
- 0, 45, 42, 43, 44, 45, 16, 83, 83, 83,
- 83, 0, 83, 36, 83, 83, 83, 83, 83, 0,
- 0, 83, 0, 28, 83, 83, 83, 83, 83, 45,
- 28, 0, 45, 28, 0, 0, 28, 28, 41, 2,
- 3, 36, 4, 5, 36, 0, 6, 7, 8, 9,
- 45, 0, 40, 10, 11, 0, 12, 13, 14, 15,
- 16, 28, 36, 0, 28, 16, 41, 0, 42, 41,
- 0, 0, 16, 0, 0, 0, 0, 43, 16, 16,
- 40, 0, 28, 40, 29, 0, 0, 41, 0, 0,
- 0, 29, 0, 0, 37, 0, 42, 29, 29, 42,
- 0, 40, 38, 0, 0, 43, 0, 28, 43, 0,
- 0, 0, 0, 0, 0, 0, 45, 42, 0, 0,
- 28, 28, 37, 0, 0, 37, 43, 0, 36, 0,
+ 20, 28, 20, 20, 20, 20, 20, 7, 52, 52,
+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
+ 52, 52, 52, 52, 52, 0, 52, 52, 52, 52,
+ 52, 0, 84, 84, 84, 84, 84, 0, 84, 84,
+ 84, 84, 84, 84, 84, 84, 84, 84, 33, 0,
+ 84, 84, 84, 84, 84, 46, 83, 83, 83, 83,
+ 83, 0, 83, 83, 83, 83, 83, 83, 83, 83,
+ 83, 83, 27, 0, 83, 83, 83, 83, 83, 15,
+ 28, 46, 104, 46, 0, 46, 46, 28, 0, 28,
+ 0, 0, 32, 28, 28, 113, 114, 115, 0, 0,
+ 78, 110, 28, 28, 46, 15, 0, 15, 0, 15,
+ 15, 0, 0, 79, 80, 0, 0, 0, 0, 0,
+ 0, 0, 0, 157, 0, 0, 0, 17, 15, 0,
+ 0, 19, 109, 28, 0, 0, 0, 0, 136, 0,
+ 28, 46, 0, 0, 138, 87, 28, 28, 0, 17,
+ 0, 0, 46, 19, 143, 0, 0, 0, 145, 0,
+ 0, 0, 0, 0, 0, 15, 0, 123, 46, 0,
+ 46, 87, 158, 0, 46, 87, 87, 0, 0, 0,
+ 28, 0, 0, 0, 48, 0, 0, 20, 0, 0,
+ 28, 0, 15, 17, 15, 0, 87, 19, 0, 16,
+ 0, 0, 0, 53, 0, 54, 0, 0, 28, 20,
+ 45, 28, 48, 0, 49, 48, 66, 0, 28, 73,
+ 0, 0, 0, 0, 0, 0, 0, 16, 0, 28,
+ 16, 87, 0, 48, 0, 46, 0, 0, 45, 28,
+ 36, 45, 49, 0, 0, 49, 0, 0, 16, 94,
+ 0, 0, 0, 20, 0, 0, 0, 0, 0, 45,
+ 0, 0, 0, 49, 0, 0, 0, 0, 36, 0,
+ 0, 36, 0, 0, 0, 0, 0, 0, 0, 0,
+ 18, 0, 0, 116, 0, 0, 0, 0, 0, 36,
+ 0, 119, 0, 0, 0, 28, 0, 0, 0, 48,
+ 0, 0, 46, 46, 46, 28, 46, 46, 0, 46,
+ 46, 46, 46, 46, 16, 46, 46, 46, 46, 0,
+ 46, 46, 46, 46, 46, 45, 15, 15, 15, 49,
+ 15, 15, 0, 15, 15, 15, 15, 15, 0, 15,
+ 15, 15, 15, 0, 15, 15, 15, 15, 15, 2,
+ 34, 35, 4, 0, 36, 36, 6, 37, 38, 39,
+ 40, 0, 0, 41, 0, 0, 42, 43, 44, 45,
+ 16, 2, 34, 35, 4, 0, 36, 41, 6, 37,
+ 38, 39, 40, 0, 0, 41, 0, 0, 42, 43,
+ 44, 45, 16, 87, 87, 87, 87, 0, 87, 0,
+ 87, 87, 87, 87, 87, 41, 0, 87, 41, 0,
+ 87, 87, 87, 87, 87, 2, 3, 0, 4, 5,
+ 0, 0, 6, 7, 8, 9, 41, 28, 0, 10,
+ 11, 48, 12, 13, 14, 15, 16, 28, 48, 0,
+ 28, 28, 0, 0, 48, 48, 16, 0, 40, 42,
+ 28, 28, 0, 16, 0, 0, 0, 45, 43, 16,
+ 16, 49, 0, 0, 45, 0, 0, 0, 49, 0,
+ 45, 45, 0, 0, 49, 49, 40, 42, 37, 40,
+ 42, 0, 38, 0, 0, 0, 43, 36, 0, 43,
+ 0, 0, 41, 0, 36, 0, 0, 40, 42, 0,
+ 36, 36, 0, 0, 0, 0, 37, 43, 0, 37,
38, 0, 0, 38, 0, 0, 0, 0, 0, 0,
- 0, 17, 0, 37, 0, 19, 0, 0, 28, 0,
- 0, 38, 0, 41, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 17, 0, 0, 40, 19, 0,
+ 0, 17, 0, 0, 0, 19, 0, 37, 0, 0,
+ 0, 38, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 17, 0, 0, 50, 19, 0, 0,
+ 0, 0, 0, 0, 60, 61, 0, 0, 0, 0,
+ 0, 0, 0, 40, 42, 17, 0, 0, 46, 19,
+ 0, 86, 0, 43, 0, 0, 0, 0, 0, 84,
+ 0, 20, 0, 0, 0, 0, 0, 17, 0, 0,
+ 46, 19, 0, 37, 0, 0, 0, 38, 0, 0,
+ 98, 92, 0, 20, 0, 0, 0, 102, 103, 17,
+ 0, 0, 46, 19, 139, 111, 0, 0, 0, 60,
+ 0, 0, 0, 0, 41, 20, 0, 0, 0, 0,
+ 18, 41, 86, 0, 46, 0, 0, 41, 17, 0,
+ 0, 0, 19, 141, 0, 0, 0, 20, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 17, 46, 0, 0, 19, 0, 0, 20,
+ 0, 0, 0, 0, 18, 0, 0, 0, 140, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 42, 0, 0, 0, 0, 0, 17,
- 0, 0, 43, 19, 0, 0, 0, 0, 0, 0,
- 0, 20, 0, 0, 0, 0, 0, 0, 0, 37,
- 0, 0, 0, 0, 0, 17, 0, 38, 0, 19,
- 0, 0, 89, 0, 20, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 17, 0, 0,
- 0, 19, 134, 0, 0, 0, 0, 0, 45, 20,
- 0, 18, 0, 0, 0, 45, 0, 0, 0, 17,
- 36, 45, 45, 19, 135, 0, 0, 36, 0, 0,
- 0, 0, 0, 36, 36, 20, 18, 0, 0, 0,
- 28, 0, 17, 0, 0, 41, 19, 0, 0, 0,
- 0, 0, 41, 28, 28, 0, 0, 20, 41, 40,
- 0, 0, 18, 0, 0, 0, 40, 0, 0, 0,
- 0, 0, 40, 0, 0, 42, 17, 0, 0, 20,
- 19, 0, 42, 0, 43, 0, 0, 0, 42, 0,
- 0, 43, 0, 0, 0, 0, 0, 43, 0, 46,
- 0, 37, 20, 46, 0, 0, 0, 0, 37, 38,
- 0, 0, 0, 0, 37, 0, 38, 0, 0, 0,
+ 0, 0, 0, 0, 0, 40, 42, 0, 20, 0,
+ 0, 0, 40, 42, 0, 43, 0, 0, 40, 42,
+ 0, 0, 43, 0, 0, 0, 0, 0, 43, 0,
+ 0, 0, 20, 0, 0, 37, 0, 0, 0, 38,
+ 0, 0, 37, 17, 0, 0, 38, 19, 37, 0,
0, 0, 38, 2, 34, 35, 4, 5, 36, 18,
- 6, 37, 38, 39, 40, 0, 20, 10, 11, 0,
- 42, 43, 44, 45, 16, 0, 2, 34, 35, 4,
- 0, 36, 0, 6, 37, 38, 39, 40, 0, 46,
- 41, 0, 0, 42, 43, 44, 45, 16, 0, 1,
- 0, 2, 3, 0, 4, 5, 0, 0, 6, 7,
- 8, 9, 0, 0, 0, 10, 11, 0, 12, 13,
- 14, 15, 16, 0, 0, 0, 0, 2, 34, 35,
- 4, 0, 36, 0, 6, 37, 38, 39, 40, 17,
- 0, 41, 0, 19, 42, 43, 44, 45, 16, 2,
- 34, 35, 4, 0, 36, 0, 6, 37, 38, 39,
- 40, 0, 0, 41, 0, 0, 42, 43, 44, 45,
- 16, 2, 34, 35, 4, 0, 36, 0, 6, 37,
+ 6, 37, 38, 39, 40, 17, 0, 10, 11, 19,
+ 42, 43, 44, 45, 16, 2, 34, 35, 4, 0,
+ 36, 0, 6, 37, 38, 39, 40, 17, 0, 41,
+ 46, 19, 42, 43, 44, 45, 16, 2, 34, 35,
+ 4, 5, 36, 20, 6, 37, 38, 39, 40, 46,
+ 0, 10, 11, 46, 42, 43, 44, 45, 16, 2,
+ 34, 35, 4, 0, 36, 20, 6, 37, 38, 39,
+ 40, 0, 0, 41, 46, 0, 42, 43, 44, 45,
+ 16, 2, 34, 35, 4, 0, 36, 20, 6, 37,
38, 39, 40, 0, 0, 41, 0, 0, 42, 43,
- 44, 45, 16, 0, 2, 3, 141, 4, 5, 20,
+ 44, 45, 16, 17, 0, 0, 0, 19, 0, 46,
+ 2, 34, 35, 4, 18, 36, 0, 6, 37, 38,
+ 39, 40, 0, 0, 41, 0, 0, 42, 43, 44,
+ 45, 16, 1, 0, 2, 3, 0, 4, 5, 0,
0, 6, 7, 8, 9, 0, 0, 0, 10, 11,
0, 12, 13, 14, 15, 16, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 18, 0, 2, 34,
- 35, 4, 0, 36, 0, 6, 37, 38, 39, 40,
- 0, 0, 41, 0, 0, 42, 43, 44, 45, 16,
- 0, 46, 46, 46, 46, 0, 46, 0, 46, 46,
- 46, 46, 46, 0, 0, 46, 0, 0, 46, 46,
- 46, 46, 46, 0, 0, 0, 26, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 24, 0,
- 0, 0, 0, 0, 26, 0, 0, 0, 26, 0,
- 0, 26, 0, 0, 0, 26, 0, 0, 0, 0,
- 73, 0, 0, 24, 0, 0, 0, 86, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 26, 0, 0,
- 0, 0, 26, 0, 0, 0, 0, 26, 0, 92,
- 0, 0, 0, 0, 0, 26, 0, 0, 0, 98,
+ 0, 0, 0, 20, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 2, 3, 0, 4, 5, 0, 0, 6, 7,
- 8, 9, 0, 26, 0, 10, 11, 26, 12, 13,
- 14, 15, 16, 0, 0, 121, 26, 26, 26, 125,
- 0, 0, 0, 0, 0, 0, 0, 0, 127, 128,
- 129, 0, 0, 0, 0, 0, 0, 26, 0, 0,
- 0, 0, 0, 26, 26, 26, 0, 0, 26, 136,
- 0, 26, 0, 0, 0, 140, 144, 146, 0, 0,
- 144, 0, 0, 144,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 18, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 2, 34, 35, 4, 0,
+ 36, 0, 6, 37, 38, 39, 40, 0, 0, 41,
+ 0, 0, 42, 43, 44, 45, 16, 2, 34, 35,
+ 4, 0, 36, 0, 6, 37, 38, 39, 40, 0,
+ 0, 41, 0, 0, 42, 43, 44, 45, 16, 2,
+ 3, 147, 4, 5, 0, 0, 6, 7, 8, 9,
+ 0, 0, 0, 10, 11, 0, 12, 13, 14, 15,
+ 16, 46, 46, 46, 46, 24, 46, 0, 46, 46,
+ 46, 46, 46, 0, 0, 46, 0, 0, 46, 46,
+ 46, 46, 46, 0, 0, 26, 0, 74, 0, 0,
+ 24, 0, 0, 0, 91, 0, 0, 0, 0, 0,
+ 0, 0, 0, 26, 0, 0, 0, 26, 0, 0,
+ 26, 0, 0, 0, 26, 2, 3, 95, 4, 5,
+ 0, 0, 6, 7, 8, 9, 0, 101, 0, 10,
+ 11, 0, 12, 13, 14, 15, 16, 26, 0, 0,
+ 0, 0, 26, 0, 0, 0, 0, 26, 0, 0,
+ 0, 0, 0, 0, 0, 26, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 125, 0, 0, 0, 129,
+ 0, 0, 0, 0, 0, 0, 0, 0, 131, 132,
+ 133, 0, 0, 0, 0, 26, 0, 0, 0, 26,
+ 0, 0, 0, 0, 0, 0, 0, 0, 26, 26,
+ 26, 142, 0, 0, 0, 0, 0, 0, 146, 150,
+ 152, 0, 0, 150, 0, 0, 150, 0, 0, 0,
+ 0, 26, 0, 0, 0, 0, 0, 0, 26, 26,
+ 26, 0, 0, 26, 0, 0, 26,
};
-const short yycheck[] = { 10,
- 10, 0, 41, 38, 41, 61, 41, 38, 41, 23,
- 138, 94, 40, 40, 142, 10, 30, 145, 100, 40,
- 102, 10, 257, 10, 59, 36, 25, 38, 59, 40,
- 41, 20, 56, 10, 116, 270, 271, 142, 94, 10,
- 145, 94, 12, 38, 14, 69, 41, 10, 59, 36,
- 61, 38, 41, 40, 41, 94, 123, 94, 262, 141,
- 49, 274, 76, 10, 59, 54, 125, 38, 272, 273,
- 41, 10, 59, 36, 271, 38, 41, 40, 41, 125,
- 125, 25, 76, 94, 15, 96, 28, 4, 59, 6,
- 125, -1, 125, -1, -1, 10, 59, 36, -1, 38,
- 17, 40, 41, 20, -1, -1, 120, -1, 97, 96,
- -1, -1, 123, 123, 125, -1, -1, -1, -1, 10,
- 59, 36, -1, 38, -1, 40, 41, -1, 10, -1,
- 125, -1, 49, 96, -1, -1, 123, -1, 125, -1,
- -1, -1, -1, 10, 59, 36, -1, 38, -1, 40,
- 41, 10, -1, -1, 125, -1, 38, 96, -1, 41,
- 123, -1, 125, 10, 262, 263, -1, 84, 59, -1,
- -1, 38, 89, -1, 272, 273, -1, 59, -1, 38,
- -1, 96, 41, -1, -1, -1, 125, -1, -1, -1,
- -1, 38, 59, -1, -1, -1, 10, -1, -1, -1,
- 59, -1, -1, -1, -1, 96, -1, -1, -1, -1,
- 125, -1, 59, -1, -1, -1, -1, -1, -1, -1,
+static const YYINT yycheck[] = { 10,
+ 10, 0, 41, 38, 23, 41, 41, 38, 27, 41,
+ 262, 263, 94, 148, 40, 10, 151, 103, 257, 105,
+ 272, 273, 40, 10, 59, 36, 25, 38, 59, 40,
+ 41, 270, 271, 10, 120, 40, 123, 94, 144, 10,
+ 274, 125, 148, 38, 57, 151, 41, 10, 59, 36,
+ 61, 38, 271, 40, 41, 94, 41, 70, 77, 61,
+ 125, 147, 94, 10, 59, 61, 12, 38, 14, 88,
+ 41, 10, 59, 36, 61, 38, 262, 40, 41, 125,
+ 77, 27, 25, 94, 10, 96, 272, 273, 59, 125,
+ 125, 15, 28, -1, 20, 10, 59, 36, 61, 38,
+ 88, 40, 41, -1, 10, 124, -1, -1, -1, 96,
+ -1, -1, 123, 123, 125, 41, -1, -1, -1, 10,
+ 59, 36, 61, 38, 50, 40, 41, -1, 10, 55,
+ 125, -1, 38, 96, -1, 41, 123, -1, 125, -1,
+ -1, -1, -1, 10, 59, 36, 61, 38, 10, 40,
+ 41, -1, 10, 59, 125, -1, 38, 96, -1, 41,
+ 123, -1, 125, 10, -1, -1, -1, -1, 59, -1,
+ 61, 38, 118, -1, 100, -1, 38, 59, -1, 41,
+ 38, 96, -1, 41, -1, -1, 125, -1, -1, -1,
+ -1, 38, 59, -1, -1, -1, 10, 59, -1, -1,
+ -1, 59, -1, -1, -1, 96, -1, -1, 123, -1,
+ 125, -1, 59, -1, -1, -1, -1, -1, -1, 125,
-1, -1, 257, -1, 38, -1, 257, 41, -1, 264,
- 269, -1, 123, -1, 125, 270, 271, -1, -1, 270,
+ 269, -1, -1, -1, 125, 270, 271, -1, -1, 270,
271, -1, -1, 125, -1, 59, 257, 258, 259, 260,
261, 262, 263, 264, 265, 266, 267, 268, 269, 270,
- 271, 272, 273, -1, 275, 276, 277, 278, 279, 264,
+ 271, 272, 273, 125, 275, 276, 277, 278, 279, 264,
257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
267, 268, 269, 270, 271, 272, 273, 264, 275, 276,
277, 278, 279, 264, 257, 258, 259, 260, 261, 262,
@@ -324,127 +374,134 @@ const short yycheck[] = { 10,
273, 125, 275, 276, 277, 278, 279, 264, 257, 258,
259, 260, 261, 262, 263, 264, 265, 266, 267, 268,
269, 270, 271, 272, 273, -1, 275, 276, 277, 278,
- 279, -1, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, -1,
+ 279, -1, 257, 258, 259, 260, 261, -1, 263, 264,
+ 265, 266, 267, 268, 269, 270, 271, 272, 264, -1,
275, 276, 277, 278, 279, 10, 257, 258, 259, 260,
261, -1, 263, 264, 265, 266, 267, 268, 269, 270,
271, 272, 264, -1, 275, 276, 277, 278, 279, 10,
- 257, 36, -1, 38, -1, 40, 41, 264, 257, -1,
- -1, -1, -1, 270, 271, 10, -1, -1, -1, -1,
- 257, 270, 271, 10, 59, 36, -1, 38, -1, 40,
- 41, 2, -1, 270, 271, -1, -1, -1, -1, 10,
- 11, -1, 64, 38, -1, 10, 41, -1, 59, 36,
- -1, 38, -1, 40, 41, 77, 78, 79, -1, 30,
- 264, 96, -1, -1, 59, -1, -1, 10, -1, -1,
- -1, 36, 59, -1, -1, 40, 41, -1, -1, -1,
- -1, -1, -1, -1, 55, 96, -1, -1, 123, 10,
- 125, 62, 63, 36, -1, 117, -1, 40, -1, 70,
- -1, 123, -1, 74, -1, -1, 10, -1, -1, 96,
- 132, -1, 83, 135, 125, 36, 59, -1, -1, 40,
- 41, 10, -1, -1, -1, -1, -1, -1, -1, -1,
- 125, 96, -1, -1, 38, -1, 123, 41, 125, -1,
- -1, -1, -1, -1, -1, -1, -1, 36, 10, -1,
- -1, 40, -1, 96, -1, 59, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 10, -1, -1,
- -1, -1, -1, -1, -1, 96, 38, -1, -1, 41,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 10, -1, -1, -1, -1, 38, -1, 59, 41, -1,
- -1, -1, -1, -1, -1, -1, -1, 96, -1, -1,
- -1, -1, -1, -1, -1, -1, 59, -1, 38, -1,
- -1, 125, 257, 258, 259, -1, 261, 262, -1, 264,
- 265, 266, 267, 268, 123, 270, 271, 272, 273, 59,
- 275, 276, 277, 278, 279, -1, 257, 258, 259, 260,
- 261, -1, 263, 264, 265, 266, 267, 268, 269, 270,
- 271, 272, -1, 125, 275, 276, 277, 278, 279, 264,
- 257, 258, 259, -1, 261, 262, -1, 264, 265, 266,
- 267, 268, 125, 270, 271, 272, 273, -1, 275, 276,
+ 257, 36, 65, 38, -1, 40, 41, 264, -1, 257,
+ -1, -1, 264, 270, 271, 78, 79, 80, -1, -1,
+ 257, 10, 270, 271, 59, 36, -1, 38, -1, 40,
+ 41, -1, -1, 270, 271, -1, -1, -1, -1, -1,
+ -1, -1, -1, 10, -1, -1, -1, 36, 59, -1,
+ -1, 40, 41, 257, -1, -1, -1, -1, 121, -1,
+ 264, 96, -1, -1, 127, 10, 270, 271, -1, 36,
+ -1, -1, 61, 40, 137, -1, -1, -1, 141, -1,
+ -1, -1, -1, -1, -1, 96, -1, 10, 123, -1,
+ 125, 36, 59, -1, 61, 40, 41, -1, -1, -1,
+ 10, -1, -1, -1, 10, -1, -1, 96, -1, -1,
+ 10, -1, 123, 36, 125, -1, 61, 40, -1, 10,
+ -1, -1, -1, 4, -1, 6, -1, -1, 38, 96,
+ 10, 41, 38, -1, 10, 41, 17, -1, 38, 20,
+ -1, -1, -1, -1, -1, -1, -1, 38, -1, 59,
+ 41, 96, -1, 59, -1, 61, -1, -1, 38, 59,
+ 10, 41, 38, -1, -1, 41, -1, -1, 59, 50,
+ -1, -1, -1, 96, -1, -1, -1, -1, -1, 59,
+ -1, -1, -1, 59, -1, -1, -1, -1, 38, -1,
+ -1, 41, -1, -1, -1, -1, -1, -1, -1, -1,
+ 123, -1, -1, 84, -1, -1, -1, -1, -1, 59,
+ -1, 92, -1, -1, -1, 125, -1, -1, -1, 125,
+ -1, -1, 257, 258, 259, 125, 261, 262, -1, 264,
+ 265, 266, 267, 268, 125, 270, 271, 272, 273, -1,
+ 275, 276, 277, 278, 279, 125, 257, 258, 259, 125,
+ 261, 262, -1, 264, 265, 266, 267, 268, -1, 270,
+ 271, 272, 273, -1, 275, 276, 277, 278, 279, 258,
+ 259, 260, 261, -1, 263, 125, 265, 266, 267, 268,
+ 269, -1, -1, 272, -1, -1, 275, 276, 277, 278,
+ 279, 258, 259, 260, 261, -1, 263, 10, 265, 266,
+ 267, 268, 269, -1, -1, 272, -1, -1, 275, 276,
277, 278, 279, 258, 259, 260, 261, -1, 263, -1,
- 265, 266, 267, 268, 269, 125, -1, 272, -1, -1,
- 275, 276, 277, 278, 279, 258, 259, 260, 261, -1,
- 263, -1, 265, 266, 267, 268, 269, -1, -1, 272,
- -1, 10, 275, 276, 277, 278, 279, 258, 259, 260,
- 261, -1, 263, 10, 265, 266, 267, 268, 269, -1,
- -1, 272, -1, 257, 275, 276, 277, 278, 279, 38,
- 264, -1, 41, 10, -1, -1, 270, 271, 10, 258,
- 259, 38, 261, 262, 41, -1, 265, 266, 267, 268,
- 59, -1, 10, 272, 273, -1, 275, 276, 277, 278,
- 279, 38, 59, -1, 41, 257, 38, -1, 10, 41,
- -1, -1, 264, -1, -1, -1, -1, 10, 270, 271,
- 38, -1, 59, 41, 257, -1, -1, 59, -1, -1,
- -1, 264, -1, -1, 10, -1, 38, 270, 271, 41,
- -1, 59, 10, -1, -1, 38, -1, 257, 41, -1,
- -1, -1, -1, -1, -1, -1, 125, 59, -1, -1,
- 270, 271, 38, -1, -1, 41, 59, -1, 125, -1,
+ 265, 266, 267, 268, 269, 38, -1, 272, 41, -1,
+ 275, 276, 277, 278, 279, 258, 259, -1, 261, 262,
+ -1, -1, 265, 266, 267, 268, 59, 257, -1, 272,
+ 273, 257, 275, 276, 277, 278, 279, 257, 264, -1,
+ 270, 271, -1, -1, 270, 271, 257, -1, 10, 10,
+ 270, 271, -1, 264, -1, -1, -1, 257, 10, 270,
+ 271, 257, -1, -1, 264, -1, -1, -1, 264, -1,
+ 270, 271, -1, -1, 270, 271, 38, 38, 10, 41,
+ 41, -1, 10, -1, -1, -1, 38, 257, -1, 41,
+ -1, -1, 125, -1, 264, -1, -1, 59, 59, -1,
+ 270, 271, -1, -1, -1, -1, 38, 59, -1, 41,
38, -1, -1, 41, -1, -1, -1, -1, -1, -1,
- -1, 36, -1, 59, -1, 40, -1, -1, 125, -1,
- -1, 59, -1, 125, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 36, -1, -1, 125, 40, -1,
+ -1, 36, -1, -1, -1, 40, -1, 59, -1, -1,
+ -1, 59, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 36, -1, -1, 2, 40, -1, -1,
+ -1, -1, -1, -1, 10, 11, -1, -1, -1, -1,
+ -1, -1, -1, 125, 125, 36, -1, -1, 61, 40,
+ -1, 27, -1, 125, -1, -1, -1, -1, -1, 94,
+ -1, 96, -1, -1, -1, -1, -1, 36, -1, -1,
+ 61, 40, -1, 125, -1, -1, -1, 125, -1, -1,
+ 56, 94, -1, 96, -1, -1, -1, 63, 64, 36,
+ -1, -1, 61, 40, 41, 71, -1, -1, -1, 75,
+ -1, -1, -1, -1, 257, 96, -1, -1, -1, -1,
+ 123, 264, 88, -1, 61, -1, -1, 270, 36, -1,
+ -1, -1, 40, 41, -1, -1, -1, 96, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 125, -1, -1, -1, -1, -1, 36,
- -1, -1, 125, 40, -1, -1, -1, -1, -1, -1,
- -1, 96, -1, -1, -1, -1, -1, -1, -1, 125,
- -1, -1, -1, -1, -1, 36, -1, 125, -1, 40,
- -1, -1, 94, -1, 96, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 36, -1, -1,
- -1, 40, 41, -1, -1, -1, -1, -1, 257, 96,
- -1, 123, -1, -1, -1, 264, -1, -1, -1, 36,
- 257, 270, 271, 40, 41, -1, -1, 264, -1, -1,
- -1, -1, -1, 270, 271, 96, 123, -1, -1, -1,
- 257, -1, 36, -1, -1, 257, 40, -1, -1, -1,
- -1, -1, 264, 270, 271, -1, -1, 96, 270, 257,
- -1, -1, 123, -1, -1, -1, 264, -1, -1, -1,
- -1, -1, 270, -1, -1, 257, 36, -1, -1, 96,
- 40, -1, 264, -1, 257, -1, -1, -1, 270, -1,
- -1, 264, -1, -1, -1, -1, -1, 270, -1, 36,
- -1, 257, 96, 40, -1, -1, -1, -1, 264, 257,
- -1, -1, -1, -1, 270, -1, 264, -1, -1, -1,
+ -1, -1, 36, 61, -1, -1, 40, -1, -1, 96,
+ -1, -1, -1, -1, 123, -1, -1, -1, 134, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 257, 257, -1, 96, -1,
+ -1, -1, 264, 264, -1, 257, -1, -1, 270, 270,
+ -1, -1, 264, -1, -1, -1, -1, -1, 270, -1,
+ -1, -1, 96, -1, -1, 257, -1, -1, -1, 257,
+ -1, -1, 264, 36, -1, -1, 264, 40, 270, -1,
-1, -1, 270, 258, 259, 260, 261, 262, 263, 123,
- 265, 266, 267, 268, 269, -1, 96, 272, 273, -1,
- 275, 276, 277, 278, 279, -1, 258, 259, 260, 261,
- -1, 263, -1, 265, 266, 267, 268, 269, -1, 96,
- 272, -1, -1, 275, 276, 277, 278, 279, -1, 256,
- -1, 258, 259, -1, 261, 262, -1, -1, 265, 266,
- 267, 268, -1, -1, -1, 272, 273, -1, 275, 276,
- 277, 278, 279, -1, -1, -1, -1, 258, 259, 260,
- 261, -1, 263, -1, 265, 266, 267, 268, 269, 36,
- -1, 272, -1, 40, 275, 276, 277, 278, 279, 258,
- 259, 260, 261, -1, 263, -1, 265, 266, 267, 268,
- 269, -1, -1, 272, -1, -1, 275, 276, 277, 278,
- 279, 258, 259, 260, 261, -1, 263, -1, 265, 266,
+ 265, 266, 267, 268, 269, 36, -1, 272, 273, 40,
+ 275, 276, 277, 278, 279, 258, 259, 260, 261, -1,
+ 263, -1, 265, 266, 267, 268, 269, 36, -1, 272,
+ 61, 40, 275, 276, 277, 278, 279, 258, 259, 260,
+ 261, 262, 263, 96, 265, 266, 267, 268, 269, 36,
+ -1, 272, 273, 40, 275, 276, 277, 278, 279, 258,
+ 259, 260, 261, -1, 263, 96, 265, 266, 267, 268,
+ 269, -1, -1, 272, 61, -1, 275, 276, 277, 278,
+ 279, 258, 259, 260, 261, -1, 263, 96, 265, 266,
267, 268, 269, -1, -1, 272, -1, -1, 275, 276,
- 277, 278, 279, -1, 258, 259, 260, 261, 262, 96,
+ 277, 278, 279, 36, -1, -1, -1, 40, -1, 96,
+ 258, 259, 260, 261, 123, 263, -1, 265, 266, 267,
+ 268, 269, -1, -1, 272, -1, -1, 275, 276, 277,
+ 278, 279, 256, -1, 258, 259, -1, 261, 262, -1,
-1, 265, 266, 267, 268, -1, -1, -1, 272, 273,
-1, 275, 276, 277, 278, 279, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 123, -1, 258, 259,
- 260, 261, -1, 263, -1, 265, 266, 267, 268, 269,
- -1, -1, 272, -1, -1, 275, 276, 277, 278, 279,
- -1, 258, 259, 260, 261, -1, 263, -1, 265, 266,
- 267, 268, 269, -1, -1, 272, -1, -1, 275, 276,
- 277, 278, 279, -1, -1, -1, 0, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 0, -1,
- -1, -1, -1, -1, 18, -1, -1, -1, 22, -1,
- -1, 25, -1, -1, -1, 29, -1, -1, -1, -1,
- 22, -1, -1, 25, -1, -1, -1, 29, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 51, -1, -1,
- -1, -1, 56, -1, -1, -1, -1, 61, -1, 51,
- -1, -1, -1, -1, -1, 69, -1, -1, -1, 61,
+ -1, -1, -1, 96, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 258, 259, -1, 261, 262, -1, -1, 265, 266,
- 267, 268, -1, 97, -1, 272, 273, 101, 275, 276,
- 277, 278, 279, -1, -1, 97, 110, 111, 112, 101,
- -1, -1, -1, -1, -1, -1, -1, -1, 110, 111,
- 112, -1, -1, -1, -1, -1, -1, 131, -1, -1,
- -1, -1, -1, 137, 138, 139, -1, -1, 142, 131,
- -1, 145, -1, -1, -1, 137, 138, 139, -1, -1,
- 142, -1, -1, 145,
+ 123, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 258, 259, 260, 261, -1,
+ 263, -1, 265, 266, 267, 268, 269, -1, -1, 272,
+ -1, -1, 275, 276, 277, 278, 279, 258, 259, 260,
+ 261, -1, 263, -1, 265, 266, 267, 268, 269, -1,
+ -1, 272, -1, -1, 275, 276, 277, 278, 279, 258,
+ 259, 260, 261, 262, -1, -1, 265, 266, 267, 268,
+ -1, -1, -1, 272, 273, -1, 275, 276, 277, 278,
+ 279, 258, 259, 260, 261, 0, 263, -1, 265, 266,
+ 267, 268, 269, -1, -1, 272, -1, -1, 275, 276,
+ 277, 278, 279, -1, -1, 0, -1, 22, -1, -1,
+ 25, -1, -1, -1, 29, -1, -1, -1, -1, -1,
+ -1, -1, -1, 18, -1, -1, -1, 22, -1, -1,
+ 25, -1, -1, -1, 29, 258, 259, 52, 261, 262,
+ -1, -1, 265, 266, 267, 268, -1, 62, -1, 272,
+ 273, -1, 275, 276, 277, 278, 279, 52, -1, -1,
+ -1, -1, 57, -1, -1, -1, -1, 62, -1, -1,
+ -1, -1, -1, -1, -1, 70, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 100, -1, -1, -1, 104,
+ -1, -1, -1, -1, -1, -1, -1, -1, 113, 114,
+ 115, -1, -1, -1, -1, 100, -1, -1, -1, 104,
+ -1, -1, -1, -1, -1, -1, -1, -1, 113, 114,
+ 115, 136, -1, -1, -1, -1, -1, -1, 143, 144,
+ 145, -1, -1, 148, -1, -1, 151, -1, -1, -1,
+ -1, 136, -1, -1, -1, -1, -1, -1, 143, 144,
+ 145, -1, -1, 148, -1, -1, 151,
};
#define YYFINAL 21
#ifndef YYDEBUG
#define YYDEBUG 0
#endif
#define YYMAXTOKEN 280
+#define YYUNDFTOKEN 309
+#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a))
#if YYDEBUG
-const char * const yyname[] = {
+static const char *const yyname[] = {
+
"end-of-file",0,0,0,0,0,0,0,0,0,"'\\n'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,"'$'",0,"'&'",0,"'('","')'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"';'",0,
"'='",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"'^'",0,
@@ -454,9 +511,10 @@ const char * const yyname[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,"ANDAND","BACKBACK","BANG","CASE","COUNT","DUP","ELSE","END",
"FLAT","FN","FOR","IF","IN","OROR","PIPE","REDIR","SREDIR","SUB","SUBSHELL",
-"SWITCH","TWIDDLE","WHILE","WORD","HUH",
+"SWITCH","TWIDDLE","WHILE","WORD","HUH",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,"illegal-symbol",
};
-const char * const yyrule[] = {
+static const char *const yyrule[] = {
"$accept : rc",
"rc : line end",
"rc : error end",
@@ -472,7 +530,7 @@ const char * const yyrule[] = {
"cmdsan : cmd '\\n'",
"brace : '{' body '}'",
"paren : '(' body ')'",
-"assign : first '=' word",
+"assign : first optcaret '=' optcaret word",
"epilog :",
"epilog : redir epilog",
"redir : DUP",
@@ -506,8 +564,11 @@ const char * const yyrule[] = {
"optcaret :",
"optcaret : '^'",
"simple : first",
-"simple : simple word",
-"simple : simple redir",
+"simple : first args",
+"args : arg",
+"args : args arg",
+"arg : word",
+"arg : redir",
"first : comword",
"first : first '^' sword",
"sword : comword",
@@ -536,6 +597,7 @@ const char * const yyrule[] = {
"keyword : TWIDDLE",
"keyword : BANG",
"keyword : SUBSHELL",
+"keyword : '='",
"words :",
"words : words word",
"nlwords :",
@@ -543,109 +605,118 @@ const char * const yyrule[] = {
"nlwords : nlwords word",
"optnl :",
"optnl : optnl '\\n'",
+
};
#endif
-#if YYDEBUG
-#include <stdio.h>
-#endif
+
+int yydebug;
+int yynerrs;
+
+int yyerrflag;
+int yychar;
+YYSTYPE yyval;
+YYSTYPE yylval;
+
+/* define the initial stack-sizes */
#ifdef YYSTACKSIZE
#undef YYMAXDEPTH
-#define YYMAXDEPTH YYSTACKSIZE
+#define YYMAXDEPTH YYSTACKSIZE
#else
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
#define YYSTACKSIZE 10000
-#define YYMAXDEPTH 10000
+#define YYMAXDEPTH 10000
#endif
#endif
+
#define YYINITSTACKSIZE 200
-int yydebug;
-int yynerrs;
-int yyerrflag;
-int yychar;
-short *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE yyval;
-YYSTYPE yylval;
-short *yyss;
-short *yysslim;
-YYSTYPE *yyvs;
-int yystacksize;
-#line 167 "parse.y"
+
+typedef struct {
+ unsigned stacksize;
+ YYINT *s_base;
+ YYINT *s_mark;
+ YYINT *s_last;
+ YYSTYPE *l_base;
+ YYSTYPE *l_mark;
+} YYSTACKDATA;
+/* variables for the parser stack */
+static YYSTACKDATA yystack;
+#line 177 "parse.y"
void initparse() {
star = treecpy(mk(nVar, mk(nWord,"*", NULL, FALSE)), ealloc);
nolist = treecpy(mk(nVar, mk(nWord,"ifs", NULL, FALSE)), ealloc);
}
-#line 583 "y.tab.c"
+#line 653 "y.tab.c"
+
+#if YYDEBUG
+#include <stdio.h> /* needed for printf */
+#endif
+
+#include <stdlib.h> /* needed for malloc, etc */
+#include <string.h> /* needed for memset */
+
/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack()
+static int yygrowstack(YYSTACKDATA *data)
{
- int newsize, i;
- short *newss;
+ int i;
+ unsigned newsize;
+ YYINT *newss;
YYSTYPE *newvs;
- if ((newsize = yystacksize) == 0)
+ if ((newsize = data->stacksize) == 0)
newsize = YYINITSTACKSIZE;
else if (newsize >= YYMAXDEPTH)
- return -1;
+ return YYENOMEM;
else if ((newsize *= 2) > YYMAXDEPTH)
newsize = YYMAXDEPTH;
- i = yyssp - yyss;
- newss = yyss ? (short *)realloc(yyss, newsize * sizeof *newss) :
- (short *)malloc(newsize * sizeof *newss);
- if (newss == NULL)
- return -1;
- yyss = newss;
- yyssp = newss + i;
- newvs = yyvs ? (YYSTYPE *)realloc(yyvs, newsize * sizeof *newvs) :
- (YYSTYPE *)malloc(newsize * sizeof *newvs);
- if (newvs == NULL)
- return -1;
- yyvs = newvs;
- yyvsp = newvs + i;
- yystacksize = newsize;
- yysslim = yyss + newsize - 1;
+
+ i = (int) (data->s_mark - data->s_base);
+ newss = (YYINT *)realloc(data->s_base, newsize * sizeof(*newss));
+ if (newss == 0)
+ return YYENOMEM;
+
+ data->s_base = newss;
+ data->s_mark = newss + i;
+
+ newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
+ if (newvs == 0)
+ return YYENOMEM;
+
+ data->l_base = newvs;
+ data->l_mark = newvs + i;
+
+ data->stacksize = newsize;
+ data->s_last = data->s_base + newsize - 1;
return 0;
}
-#define YYABORT goto yyabort
+#if YYPURE || defined(YY_NO_LEAKS)
+static void yyfreestack(YYSTACKDATA *data)
+{
+ free(data->s_base);
+ free(data->l_base);
+ memset(data, 0, sizeof(*data));
+}
+#else
+#define yyfreestack(data) /* nothing */
+#endif
+
+#define YYABORT goto yyabort
#define YYREJECT goto yyabort
#define YYACCEPT goto yyaccept
-#define YYERROR goto yyerrlab
-
-#ifndef YYPARSE_PARAM
-#if defined(__cplusplus) || __STDC__
-#define YYPARSE_PARAM_ARG void
-#define YYPARSE_PARAM_DECL
-#else /* ! ANSI-C/C++ */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* ANSI-C/C++ */
-#else /* YYPARSE_PARAM */
-#ifndef YYPARSE_PARAM_TYPE
-#define YYPARSE_PARAM_TYPE void *
-#endif
-#if defined(__cplusplus) || __STDC__
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM_TYPE YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* ! ANSI-C/C++ */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL YYPARSE_PARAM_TYPE YYPARSE_PARAM;
-#endif /* ANSI-C/C++ */
-#endif /* ! YYPARSE_PARAM */
+#define YYERROR goto yyerrlab
int
-yyparse (YYPARSE_PARAM_ARG)
- YYPARSE_PARAM_DECL
+YYPARSE_DECL()
{
- register int yym, yyn, yystate;
+ int yym, yyn, yystate;
#if YYDEBUG
- register const char *yys;
+ const char *yys;
- if ((yys = getenv("YYDEBUG")))
+ if ((yys = getenv("YYDEBUG")) != 0)
{
yyn = *yys;
if (yyn >= '0' && yyn <= '9')
@@ -655,24 +726,28 @@ yyparse (YYPARSE_PARAM_ARG)
yynerrs = 0;
yyerrflag = 0;
- yychar = (-1);
+ yychar = YYEMPTY;
+ yystate = 0;
+
+#if YYPURE
+ memset(&yystack, 0, sizeof(yystack));
+#endif
- if (yyss == NULL && yygrowstack()) goto yyoverflow;
- yyssp = yyss;
- yyvsp = yyvs;
- *yyssp = yystate = 0;
+ if (yystack.s_base == NULL && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow;
+ yystack.s_mark = yystack.s_base;
+ yystack.l_mark = yystack.l_base;
+ yystate = 0;
+ *yystack.s_mark = 0;
yyloop:
- if ((yyn = yydefred[yystate])) goto yyreduce;
+ if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
if (yychar < 0)
{
- if ((yychar = yylex()) < 0) yychar = 0;
+ if ((yychar = YYLEX) < 0) yychar = YYEOF;
#if YYDEBUG
if (yydebug)
{
- yys = 0;
- if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
- if (!yys) yys = "illegal-symbol";
+ yys = yyname[YYTRANSLATE(yychar)];
printf("%sdebug: state %d, reading %d (%s)\n",
YYPREFIX, yystate, yychar, yys);
}
@@ -686,13 +761,14 @@ yyloop:
printf("%sdebug: state %d, shifting to state %d\n",
YYPREFIX, yystate, yytable[yyn]);
#endif
- if (yyssp >= yysslim && yygrowstack())
+ if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
{
goto yyoverflow;
}
- *++yyssp = yystate = yytable[yyn];
- *++yyvsp = yylval;
- yychar = (-1);
+ yystate = yytable[yyn];
+ *++yystack.s_mark = yytable[yyn];
+ *++yystack.l_mark = yylval;
+ yychar = YYEMPTY;
if (yyerrflag > 0) --yyerrflag;
goto yyloop;
}
@@ -703,36 +779,35 @@ yyloop:
goto yyreduce;
}
if (yyerrflag) goto yyinrecovery;
-#if defined(lint) || defined(__GNUC__)
- goto yynewerror;
-#endif
-yynewerror:
- yyerror("syntax error");
-#if defined(lint) || defined(__GNUC__)
+
+ YYERROR_CALL("syntax error");
+
goto yyerrlab;
-#endif
+
yyerrlab:
++yynerrs;
+
yyinrecovery:
if (yyerrflag < 3)
{
yyerrflag = 3;
for (;;)
{
- if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 &&
+ if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
{
#if YYDEBUG
if (yydebug)
printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yyssp, yytable[yyn]);
+ to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
#endif
- if (yyssp >= yysslim && yygrowstack())
+ if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
{
goto yyoverflow;
}
- *++yyssp = yystate = yytable[yyn];
- *++yyvsp = yylval;
+ yystate = yytable[yyn];
+ *++yystack.s_mark = yytable[yyn];
+ *++yystack.l_mark = yylval;
goto yyloop;
}
else
@@ -740,30 +815,29 @@ yyinrecovery:
#if YYDEBUG
if (yydebug)
printf("%sdebug: error recovery discarding state %d\n",
- YYPREFIX, *yyssp);
+ YYPREFIX, *yystack.s_mark);
#endif
- if (yyssp <= yyss) goto yyabort;
- --yyssp;
- --yyvsp;
+ if (yystack.s_mark <= yystack.s_base) goto yyabort;
+ --yystack.s_mark;
+ --yystack.l_mark;
}
}
}
else
{
- if (yychar == 0) goto yyabort;
+ if (yychar == YYEOF) goto yyabort;
#if YYDEBUG
if (yydebug)
{
- yys = 0;
- if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
- if (!yys) yys = "illegal-symbol";
+ yys = yyname[YYTRANSLATE(yychar)];
printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
YYPREFIX, yystate, yychar, yys);
}
#endif
- yychar = (-1);
+ yychar = YYEMPTY;
goto yyloop;
}
+
yyreduce:
#if YYDEBUG
if (yydebug)
@@ -771,298 +845,305 @@ yyreduce:
YYPREFIX, yystate, yyn, yyrule[yyn]);
#endif
yym = yylen[yyn];
- yyval = yyvsp[1-yym];
+ if (yym)
+ yyval = yystack.l_mark[1-yym];
+ else
+ memset(&yyval, 0, sizeof yyval);
switch (yyn)
{
case 1:
-#line 47 "parse.y"
-{ parsetree = yyvsp[-1].node; YYACCEPT; }
+#line 51 "parse.y"
+ { parsetree = yystack.l_mark[-1].node; YYACCEPT; }
break;
case 2:
-#line 48 "parse.y"
-{ yyerrok; parsetree = NULL; YYABORT; }
+#line 52 "parse.y"
+ { yyerrok; parsetree = NULL; YYABORT; }
break;
case 3:
-#line 51 "parse.y"
-{ if (!heredoc(1)) YYABORT; }
+#line 55 "parse.y"
+ { if (!heredoc(1)) YYABORT; }
break;
case 4:
-#line 52 "parse.y"
-{ if (!heredoc(0)) YYABORT; }
+#line 56 "parse.y"
+ { if (!heredoc(0)) YYABORT; }
break;
case 6:
-#line 56 "parse.y"
-{ yyval.node = (yyvsp[-1].node != NULL ? mk(nNowait,yyvsp[-1].node) : yyvsp[-1].node); }
+#line 60 "parse.y"
+ { yyval.node = (yystack.l_mark[-1].node != NULL ? mk(nNowait,yystack.l_mark[-1].node) : yystack.l_mark[-1].node); }
break;
case 8:
-#line 60 "parse.y"
-{ yyval.node = (yyvsp[-1].node != NULL ? mk(nBody,yyvsp[-1].node,yyvsp[0].node) : yyvsp[0].node); }
+#line 64 "parse.y"
+ { yyval.node = (yystack.l_mark[-1].node != NULL ? mk(nBody,yystack.l_mark[-1].node,yystack.l_mark[0].node) : yystack.l_mark[0].node); }
break;
case 10:
-#line 64 "parse.y"
-{ yyval.node = (yyvsp[-1].node == NULL ? yyvsp[0].node : yyvsp[0].node == NULL ? yyvsp[-1].node : mk(nBody,yyvsp[-1].node,yyvsp[0].node)); }
+#line 68 "parse.y"
+ { yyval.node = (yystack.l_mark[-1].node == NULL ? yystack.l_mark[0].node : yystack.l_mark[0].node == NULL ? yystack.l_mark[-1].node : mk(nBody,yystack.l_mark[-1].node,yystack.l_mark[0].node)); }
break;
case 12:
-#line 67 "parse.y"
-{ yyval.node = yyvsp[-1].node; if (!heredoc(0)) YYABORT; }
+#line 71 "parse.y"
+ { yyval.node = yystack.l_mark[-1].node; if (!heredoc(0)) YYABORT; }
break;
case 13:
-#line 69 "parse.y"
-{ yyval.node = yyvsp[-1].node; }
+#line 73 "parse.y"
+ { yyval.node = yystack.l_mark[-1].node; }
break;
case 14:
-#line 71 "parse.y"
-{ yyval.node = yyvsp[-1].node; }
+#line 75 "parse.y"
+ { yyval.node = yystack.l_mark[-1].node; }
break;
case 15:
-#line 73 "parse.y"
-{ yyval.node = mk(nAssign,yyvsp[-2].node,yyvsp[0].node); }
+#line 77 "parse.y"
+ { yyval.node = mk(nAssign,yystack.l_mark[-4].node,yystack.l_mark[0].node); }
break;
case 16:
-#line 75 "parse.y"
-{ yyval.node = NULL; }
+#line 79 "parse.y"
+ { yyval.node = NULL; }
break;
case 17:
-#line 76 "parse.y"
-{ yyval.node = mk(nEpilog,yyvsp[-1].node,yyvsp[0].node); }
+#line 80 "parse.y"
+ { yyval.node = mk(nEpilog,yystack.l_mark[-1].node,yystack.l_mark[0].node); }
break;
case 18:
-#line 79 "parse.y"
-{ yyval.node = mk(nDup,yyvsp[0].dup.type,yyvsp[0].dup.left,yyvsp[0].dup.right); }
+#line 83 "parse.y"
+ { yyval.node = mk(nDup,yystack.l_mark[0].dup.type,yystack.l_mark[0].dup.left,yystack.l_mark[0].dup.right); }
break;
case 19:
-#line 80 "parse.y"
-{ yyval.node = mk(nRedir,yyvsp[-1].redir.type,yyvsp[-1].redir.fd,yyvsp[0].node);
- if (yyvsp[-1].redir.type == rHeredoc && !qdoc(yyvsp[0].node, yyval.node)) YYABORT; /* queue heredocs up */
+#line 84 "parse.y"
+ { yyval.node = mk(nRedir,yystack.l_mark[-1].redir.type,yystack.l_mark[-1].redir.fd,yystack.l_mark[0].node);
+ if (yystack.l_mark[-1].redir.type == rHeredoc && !qdoc(yystack.l_mark[0].node, yyval.node)) YYABORT; /* queue heredocs up */
}
break;
case 20:
-#line 83 "parse.y"
-{ yyval.node = mk(nRedir,yyvsp[-1].redir.type,yyvsp[-1].redir.fd,yyvsp[0].node);
- if (yyvsp[-1].redir.type == rHeredoc && !qdoc(yyvsp[0].node, yyval.node)) YYABORT; /* queue heredocs up */
+#line 87 "parse.y"
+ { yyval.node = mk(nRedir,yystack.l_mark[-1].redir.type,yystack.l_mark[-1].redir.fd,yystack.l_mark[0].node);
+ if (yystack.l_mark[-1].redir.type == rHeredoc && !qdoc(yystack.l_mark[0].node, yyval.node)) YYABORT; /* queue heredocs up */
}
break;
case 21:
-#line 87 "parse.y"
-{ yyval.node = mk(nCase, yyvsp[-1].node); }
+#line 91 "parse.y"
+ { yyval.node = mk(nCase, yystack.l_mark[-1].node); }
break;
case 22:
-#line 88 "parse.y"
-{ yyval.node = mk(nCase, yyvsp[-1].node); }
+#line 92 "parse.y"
+ { yyval.node = mk(nCase, yystack.l_mark[-1].node); }
break;
case 23:
-#line 90 "parse.y"
-{ yyval.node = mk(nCbody, yyvsp[0].node, NULL); }
+#line 94 "parse.y"
+ { yyval.node = mk(nCbody, yystack.l_mark[0].node, NULL); }
break;
case 24:
-#line 91 "parse.y"
-{ yyval.node = mk(nCbody, yyvsp[-1].node, yyvsp[0].node); }
+#line 95 "parse.y"
+ { yyval.node = mk(nCbody, yystack.l_mark[-1].node, yystack.l_mark[0].node); }
break;
case 25:
-#line 92 "parse.y"
-{ yyval.node = mk(nCbody, yyvsp[-1].node, yyvsp[0].node); }
+#line 96 "parse.y"
+ { yyval.node = mk(nCbody, yystack.l_mark[-1].node, yystack.l_mark[0].node); }
break;
case 27:
-#line 95 "parse.y"
-{ yyval.node = mk(nElse,yyvsp[-3].node,yyvsp[0].node); }
+#line 99 "parse.y"
+ { yyval.node = mk(nElse,yystack.l_mark[-3].node,yystack.l_mark[0].node); }
break;
case 28:
-#line 97 "parse.y"
-{ yyval.node = NULL; }
+#line 101 "parse.y"
+ { yyval.node = NULL; }
break;
case 30:
-#line 99 "parse.y"
-{ yyval.node = mk(nBrace,yyvsp[-1].node,yyvsp[0].node); }
+#line 103 "parse.y"
+ { yyval.node = mk(nBrace,yystack.l_mark[-1].node,yystack.l_mark[0].node); }
break;
case 31:
-#line 100 "parse.y"
-{ yyval.node = mk(nIf,yyvsp[-2].node,yyvsp[0].node); }
+#line 104 "parse.y"
+ { yyval.node = mk(nIf,yystack.l_mark[-2].node,yystack.l_mark[0].node); }
break;
case 32:
-#line 101 "parse.y"
-{ yyval.node = mk(nForin,yyvsp[-5].node,yyvsp[-3].node,yyvsp[0].node); }
+#line 105 "parse.y"
+ { yyval.node = mk(nForin,yystack.l_mark[-5].node,yystack.l_mark[-3].node,yystack.l_mark[0].node); }
break;
case 33:
-#line 102 "parse.y"
-{ yyval.node = mk(nForin,yyvsp[-3].node,star,yyvsp[0].node); }
+#line 106 "parse.y"
+ { yyval.node = mk(nForin,yystack.l_mark[-3].node,star,yystack.l_mark[0].node); }
break;
case 34:
-#line 103 "parse.y"
-{ yyval.node = mk(nWhile,yyvsp[-2].node,yyvsp[0].node); }
+#line 107 "parse.y"
+ { yyval.node = mk(nWhile,yystack.l_mark[-2].node,yystack.l_mark[0].node); }
break;
case 35:
-#line 104 "parse.y"
-{ yyval.node = mk(nSwitch,yyvsp[-5].node,yyvsp[-1].node); }
+#line 108 "parse.y"
+ { yyval.node = mk(nSwitch,yystack.l_mark[-5].node,yystack.l_mark[-1].node); }
break;
case 36:
-#line 105 "parse.y"
-{ yyval.node = mk(nMatch,yyvsp[-1].node,yyvsp[0].node); }
+#line 109 "parse.y"
+ { yyval.node = mk(nMatch,yystack.l_mark[-1].node,yystack.l_mark[0].node); }
break;
case 37:
-#line 106 "parse.y"
-{ yyval.node = mk(nAndalso,yyvsp[-3].node,yyvsp[0].node); }
+#line 110 "parse.y"
+ { yyval.node = mk(nAndalso,yystack.l_mark[-3].node,yystack.l_mark[0].node); }
break;
case 38:
-#line 107 "parse.y"
-{ yyval.node = mk(nOrelse,yyvsp[-3].node,yyvsp[0].node); }
+#line 111 "parse.y"
+ { yyval.node = mk(nOrelse,yystack.l_mark[-3].node,yystack.l_mark[0].node); }
break;
case 39:
-#line 108 "parse.y"
-{ yyval.node = mk(nPipe,yyvsp[-2].pipe.left,yyvsp[-2].pipe.right,yyvsp[-3].node,yyvsp[0].node); }
+#line 112 "parse.y"
+ { yyval.node = mk(nPipe,yystack.l_mark[-2].pipe.left,yystack.l_mark[-2].pipe.right,yystack.l_mark[-3].node,yystack.l_mark[0].node); }
break;
case 40:
-#line 109 "parse.y"
-{ yyval.node = (yyvsp[0].node != NULL ? mk(nPre,yyvsp[-1].node,yyvsp[0].node) : yyvsp[-1].node); }
+#line 113 "parse.y"
+ { yyval.node = (yystack.l_mark[0].node != NULL ? mk(nPre,yystack.l_mark[-1].node,yystack.l_mark[0].node) : yystack.l_mark[-1].node); }
break;
case 41:
-#line 110 "parse.y"
-{ yyval.node = (yyvsp[0].node != NULL ? mk(nPre,yyvsp[-1].node,yyvsp[0].node) : yyvsp[-1].node); }
+#line 114 "parse.y"
+ { yyval.node = (yystack.l_mark[0].node != NULL ? mk(nPre,yystack.l_mark[-1].node,yystack.l_mark[0].node) : yystack.l_mark[-1].node); }
break;
case 42:
-#line 111 "parse.y"
-{ yyval.node = mk(nBang,yyvsp[0].node); }
+#line 115 "parse.y"
+ { yyval.node = mk(nBang,yystack.l_mark[0].node); }
break;
case 43:
-#line 112 "parse.y"
-{ yyval.node = mk(nSubshell,yyvsp[0].node); }
+#line 116 "parse.y"
+ { yyval.node = mk(nSubshell,yystack.l_mark[0].node); }
break;
case 44:
-#line 113 "parse.y"
-{ yyval.node = mk(nNewfn,yyvsp[-1].node,yyvsp[0].node); }
+#line 117 "parse.y"
+ { yyval.node = mk(nNewfn,yystack.l_mark[-1].node,yystack.l_mark[0].node); }
break;
case 45:
-#line 114 "parse.y"
-{ yyval.node = mk(nRmfn,yyvsp[0].node); }
+#line 118 "parse.y"
+ { yyval.node = mk(nRmfn,yystack.l_mark[0].node); }
break;
case 49:
-#line 120 "parse.y"
-{ yyval.node = (yyvsp[0].node != NULL ? mk(nArgs,yyvsp[-1].node,yyvsp[0].node) : yyvsp[-1].node); }
-break;
-case 50:
-#line 121 "parse.y"
-{ yyval.node = mk(nArgs,yyvsp[-1].node,yyvsp[0].node); }
-break;
-case 52:
#line 124 "parse.y"
-{ yyval.node = mk(nConcat,yyvsp[-2].node,yyvsp[0].node); }
+ { yyval.node = (yystack.l_mark[0].node != NULL ? mk(nArgs,yystack.l_mark[-1].node,yystack.l_mark[0].node) : yystack.l_mark[-1].node); }
break;
-case 54:
+case 51:
#line 127 "parse.y"
-{ yyval.node = mk(nWord, yyvsp[0].keyword, NULL, FALSE); }
+ { yyval.node = (yystack.l_mark[0].node != NULL ? mk(nArgs,yystack.l_mark[-1].node,yystack.l_mark[0].node) : yystack.l_mark[-1].node); }
break;
-case 56:
-#line 130 "parse.y"
-{ yyval.node = mk(nConcat,yyvsp[-2].node,yyvsp[0].node); }
+case 55:
+#line 133 "parse.y"
+ { yyval.node = mk(nConcat,yystack.l_mark[-2].node,yystack.l_mark[0].node); }
break;
case 57:
-#line 132 "parse.y"
-{ yyval.node = mk(nVar,yyvsp[0].node); }
-break;
-case 58:
-#line 133 "parse.y"
-{ yyval.node = mk(nVarsub,yyvsp[-3].node,yyvsp[-1].node); }
+#line 136 "parse.y"
+ { yyval.node = mk(nWord, yystack.l_mark[0].keyword, NULL, FALSE); }
break;
case 59:
-#line 134 "parse.y"
-{ yyval.node = mk(nCount,yyvsp[0].node); }
+#line 139 "parse.y"
+ { yyval.node = mk(nConcat,yystack.l_mark[-2].node,yystack.l_mark[0].node); }
break;
case 60:
-#line 135 "parse.y"
-{ yyval.node = mk(nFlat, yyvsp[0].node); }
+#line 141 "parse.y"
+ { yyval.node = mk(nVar,yystack.l_mark[0].node); }
break;
case 61:
-#line 136 "parse.y"
-{ yyval.node = mk(nBackq,nolist,yyvsp[0].node); }
+#line 142 "parse.y"
+ { yyval.node = mk(nVarsub,yystack.l_mark[-3].node,yystack.l_mark[-1].node); }
break;
case 62:
-#line 137 "parse.y"
-{ yyval.node = mk(nBackq,nolist,yyvsp[0].node); }
+#line 143 "parse.y"
+ { yyval.node = mk(nCount,yystack.l_mark[0].node); }
break;
case 63:
-#line 138 "parse.y"
-{ yyval.node = mk(nBackq,yyvsp[-1].node,yyvsp[0].node); }
+#line 144 "parse.y"
+ { yyval.node = mk(nFlat, yystack.l_mark[0].node); }
break;
case 64:
-#line 139 "parse.y"
-{ yyval.node = mk(nBackq,yyvsp[-1].node,yyvsp[0].node); }
+#line 145 "parse.y"
+ { yyval.node = mk(nBackq,nolist,yystack.l_mark[0].node); }
break;
case 65:
-#line 140 "parse.y"
-{ yyval.node = yyvsp[-1].node; }
+#line 146 "parse.y"
+ { yyval.node = mk(nBackq,nolist,yystack.l_mark[0].node); }
break;
case 66:
-#line 141 "parse.y"
-{ yyval.node = mk(nNmpipe,yyvsp[-1].redir.type,yyvsp[-1].redir.fd,yyvsp[0].node); }
+#line 147 "parse.y"
+ { yyval.node = mk(nBackq,yystack.l_mark[-1].node,yystack.l_mark[0].node); }
break;
case 67:
-#line 142 "parse.y"
-{ yyval.node = mk(nWord, yyvsp[0].word.w, yyvsp[0].word.m, yyvsp[0].word.q); }
+#line 148 "parse.y"
+ { yyval.node = mk(nBackq,yystack.l_mark[-1].node,yystack.l_mark[0].node); }
break;
case 68:
-#line 144 "parse.y"
-{ yyval.keyword = "for"; }
+#line 149 "parse.y"
+ { yyval.node = yystack.l_mark[-1].node; }
break;
case 69:
-#line 145 "parse.y"
-{ yyval.keyword = "in"; }
+#line 150 "parse.y"
+ { yyval.node = mk(nNmpipe,yystack.l_mark[-1].redir.type,yystack.l_mark[-1].redir.fd,yystack.l_mark[0].node); }
break;
case 70:
-#line 146 "parse.y"
-{ yyval.keyword = "while"; }
+#line 151 "parse.y"
+ { yyval.node = mk(nWord, yystack.l_mark[0].word.w, yystack.l_mark[0].word.m, yystack.l_mark[0].word.q); }
break;
case 71:
-#line 147 "parse.y"
-{ yyval.keyword = "if"; }
+#line 153 "parse.y"
+ { yyval.keyword = "for"; }
break;
case 72:
-#line 148 "parse.y"
-{ yyval.keyword = "switch"; }
+#line 154 "parse.y"
+ { yyval.keyword = "in"; }
break;
case 73:
-#line 149 "parse.y"
-{ yyval.keyword = "fn"; }
+#line 155 "parse.y"
+ { yyval.keyword = "while"; }
break;
case 74:
-#line 150 "parse.y"
-{ yyval.keyword = "else"; }
+#line 156 "parse.y"
+ { yyval.keyword = "if"; }
break;
case 75:
-#line 151 "parse.y"
-{ yyval.keyword = "case"; }
+#line 157 "parse.y"
+ { yyval.keyword = "switch"; }
break;
case 76:
-#line 152 "parse.y"
-{ yyval.keyword = "~"; }
+#line 158 "parse.y"
+ { yyval.keyword = "fn"; }
break;
case 77:
-#line 153 "parse.y"
-{ yyval.keyword = "!"; }
+#line 159 "parse.y"
+ { yyval.keyword = "else"; }
break;
case 78:
-#line 154 "parse.y"
-{ yyval.keyword = "@"; }
+#line 160 "parse.y"
+ { yyval.keyword = "case"; }
break;
case 79:
-#line 156 "parse.y"
-{ yyval.node = NULL; }
+#line 161 "parse.y"
+ { yyval.keyword = "~"; }
break;
case 80:
-#line 157 "parse.y"
-{ yyval.node = (yyvsp[-1].node != NULL ? (yyvsp[0].node != NULL ? mk(nLappend,yyvsp[-1].node,yyvsp[0].node) : yyvsp[-1].node) : yyvsp[0].node); }
+#line 162 "parse.y"
+ { yyval.keyword = "!"; }
break;
case 81:
-#line 159 "parse.y"
-{ yyval.node = NULL; }
+#line 163 "parse.y"
+ { yyval.keyword = "@"; }
+break;
+case 82:
+#line 164 "parse.y"
+ { yyval.keyword = "="; }
break;
case 83:
-#line 161 "parse.y"
-{ yyval.node = (yyvsp[-1].node != NULL ? (yyvsp[0].node != NULL ? mk(nLappend,yyvsp[-1].node,yyvsp[0].node) : yyvsp[-1].node) : yyvsp[0].node); }
+#line 166 "parse.y"
+ { yyval.node = NULL; }
+break;
+case 84:
+#line 167 "parse.y"
+ { yyval.node = (yystack.l_mark[-1].node != NULL ? (yystack.l_mark[0].node != NULL ? mk(nLappend,yystack.l_mark[-1].node,yystack.l_mark[0].node) : yystack.l_mark[-1].node) : yystack.l_mark[0].node); }
break;
-#line 1062 "y.tab.c"
+case 85:
+#line 169 "parse.y"
+ { yyval.node = NULL; }
+break;
+case 87:
+#line 171 "parse.y"
+ { yyval.node = (yystack.l_mark[-1].node != NULL ? (yystack.l_mark[0].node != NULL ? mk(nLappend,yystack.l_mark[-1].node,yystack.l_mark[0].node) : yystack.l_mark[-1].node) : yystack.l_mark[0].node); }
+break;
+#line 1143 "y.tab.c"
}
- yyssp -= yym;
- yystate = *yyssp;
- yyvsp -= yym;
+ yystack.s_mark -= yym;
+ yystate = *yystack.s_mark;
+ yystack.l_mark -= yym;
yym = yylhs[yyn];
if (yystate == 0 && yym == 0)
{
@@ -1072,23 +1153,21 @@ break;
state %d\n", YYPREFIX, YYFINAL);
#endif
yystate = YYFINAL;
- *++yyssp = YYFINAL;
- *++yyvsp = yyval;
+ *++yystack.s_mark = YYFINAL;
+ *++yystack.l_mark = yyval;
if (yychar < 0)
{
- if ((yychar = yylex()) < 0) yychar = 0;
+ if ((yychar = YYLEX) < 0) yychar = YYEOF;
#if YYDEBUG
if (yydebug)
{
- yys = 0;
- if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
- if (!yys) yys = "illegal-symbol";
+ yys = yyname[YYTRANSLATE(yychar)];
printf("%sdebug: state %d, reading %d (%s)\n",
YYPREFIX, YYFINAL, yychar, yys);
}
#endif
}
- if (yychar == 0) goto yyaccept;
+ if (yychar == YYEOF) goto yyaccept;
goto yyloop;
}
if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
@@ -1099,19 +1178,24 @@ break;
#if YYDEBUG
if (yydebug)
printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yyssp, yystate);
+to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
#endif
- if (yyssp >= yysslim && yygrowstack())
+ if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
{
goto yyoverflow;
}
- *++yyssp = yystate;
- *++yyvsp = yyval;
+ *++yystack.s_mark = (YYINT) yystate;
+ *++yystack.l_mark = yyval;
goto yyloop;
+
yyoverflow:
- yyerror("yacc stack overflow");
+ YYERROR_CALL("yacc stack overflow");
+
yyabort:
+ yyfreestack(&yystack);
return (1);
+
yyaccept:
+ yyfreestack(&yystack);
return (0);
}
diff --git a/parse.h b/parse.h
@@ -1,7 +1,3 @@
-#ifndef YYERRCODE
-#define YYERRCODE 256
-#endif
-
#define ANDAND 257
#define BACKBACK 258
#define BANG 259
@@ -26,6 +22,12 @@
#define WHILE 278
#define WORD 279
#define HUH 280
+#ifdef YYSTYPE
+#undef YYSTYPE_IS_DECLARED
+#define YYSTYPE_IS_DECLARED 1
+#endif
+#ifndef YYSTYPE_IS_DECLARED
+#define YYSTYPE_IS_DECLARED 1
typedef union {
struct Node *node;
struct Redir redir;
@@ -34,4 +36,5 @@ typedef union {
struct Word word;
char *keyword;
} YYSTYPE;
+#endif /* !YYSTYPE_IS_DECLARED */
extern YYSTYPE yylval;
