diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c
index 16438ce43f7fc311ef8b10137a580a5826a6e596..4c541fbc88827c287d3d78ee5d1ee8d8f8b21440 100644
--- a/pbx/ael/ael.tab.c
+++ b/pbx/ael/ael.tab.c
@@ -420,16 +420,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 14
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 477
+#define YYLAST 475
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 42
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 56
+#define YYNNTS 57
/* YYNRULES -- Number of rules. */
-#define YYNRULES 145
+#define YYNRULES 146
/* YYNRULES -- Number of states. */
-#define YYNSTATES 302
+#define YYNSTATES 291
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -483,16 +483,16 @@ static const unsigned short int yyprhs[] =
70, 74, 76, 79, 82, 83, 89, 91, 95, 98,
101, 105, 107, 109, 112, 115, 117, 119, 121, 123,
125, 126, 132, 135, 137, 142, 146, 151, 159, 168,
- 170, 173, 176, 182, 184, 185, 191, 192, 198, 209,
- 211, 214, 216, 219, 223, 225, 228, 232, 233, 240,
- 244, 245, 251, 255, 259, 262, 263, 264, 265, 278,
- 279, 286, 289, 293, 297, 300, 303, 304, 310, 313,
- 316, 319, 323, 325, 328, 329, 331, 335, 339, 345,
- 351, 357, 363, 365, 369, 375, 379, 385, 389, 390,
- 396, 400, 401, 405, 409, 412, 414, 415, 417, 418,
- 422, 424, 427, 432, 436, 441, 445, 448, 452, 454,
- 457, 459, 465, 468, 471, 475, 478, 481, 485, 488,
- 491, 502, 506, 518, 521, 526
+ 170, 173, 176, 182, 184, 192, 193, 199, 200, 206,
+ 211, 213, 216, 218, 221, 225, 227, 230, 234, 235,
+ 242, 246, 247, 253, 257, 261, 264, 265, 266, 267,
+ 280, 281, 288, 291, 295, 299, 302, 305, 306, 312,
+ 315, 318, 321, 325, 327, 330, 331, 333, 337, 341,
+ 347, 353, 359, 365, 367, 371, 377, 381, 387, 391,
+ 392, 398, 402, 403, 407, 411, 414, 416, 417, 419,
+ 420, 424, 426, 429, 434, 438, 443, 447, 450, 454,
+ 456, 459, 461, 467, 470, 473, 477, 480, 483, 487,
+ 490, 493, 498, 502, 508, 511, 516
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -501,76 +501,75 @@ static const yysigned_char yyrhs[] =
43, 0, -1, 44, -1, 45, -1, 44, 45, -1,
44, 1, -1, 47, -1, 49, -1, 50, -1, 8,
-1, 41, -1, 36, -1, 48, 3, 46, 55, -1,
- 23, -1, -1, 15, 41, 6, 54, 7, 4, 90,
+ 23, -1, -1, 15, 41, 6, 54, 7, 4, 91,
5, -1, 15, 41, 6, 54, 7, 4, 5, -1,
- 15, 41, 6, 7, 4, 90, 5, -1, 15, 41,
+ 15, 41, 6, 7, 4, 91, 5, -1, 15, 41,
6, 7, 4, 5, -1, 16, 4, 51, 5, -1,
16, 4, 5, -1, 52, -1, 51, 52, -1, 51,
1, -1, -1, 41, 9, 53, 41, 8, -1, 41,
-1, 54, 10, 41, -1, 54, 1, -1, 4, 5,
-1, 4, 56, 5, -1, 57, -1, 1, -1, 56,
- 57, -1, 56, 1, -1, 60, -1, 97, -1, 92,
- -1, 93, -1, 59, -1, -1, 41, 9, 58, 41,
+ 57, -1, 56, 1, -1, 60, -1, 98, -1, 93,
+ -1, 94, -1, 59, -1, -1, 41, 9, 58, 41,
8, -1, 41, 1, -1, 8, -1, 17, 24, 41,
- 8, -1, 41, 24, 71, -1, 30, 41, 24, 71,
- -1, 31, 6, 67, 7, 41, 24, 71, -1, 30,
- 31, 6, 67, 7, 41, 24, 71, -1, 71, -1,
- 61, 71, -1, 61, 1, -1, 67, 11, 67, 11,
- 67, -1, 41, -1, -1, 19, 6, 64, 66, 7,
- -1, -1, 22, 6, 65, 66, 7, -1, 20, 6,
- 62, 13, 67, 13, 67, 13, 67, 7, -1, 41,
- -1, 41, 41, -1, 41, -1, 41, 41, -1, 41,
- 41, 41, -1, 41, -1, 41, 41, -1, 41, 11,
- 41, -1, -1, 18, 6, 70, 41, 7, 4, -1,
- 4, 61, 5, -1, -1, 41, 9, 72, 41, 8,
- -1, 25, 79, 8, -1, 26, 80, 8, -1, 41,
- 11, -1, -1, -1, -1, 32, 6, 73, 41, 8,
- 74, 41, 8, 75, 41, 7, 71, -1, -1, 33,
- 6, 76, 41, 7, 71, -1, 69, 5, -1, 69,
- 88, 5, -1, 12, 81, 8, -1, 85, 8, -1,
- 41, 8, -1, -1, 85, 9, 77, 41, 8, -1,
- 28, 8, -1, 27, 8, -1, 29, 8, -1, 63,
- 71, 78, -1, 8, -1, 21, 71, -1, -1, 68,
- -1, 68, 13, 68, -1, 68, 10, 68, -1, 68,
- 13, 68, 13, 68, -1, 68, 10, 68, 10, 68,
- -1, 36, 13, 68, 13, 68, -1, 36, 10, 68,
- 10, 68, -1, 68, -1, 68, 10, 68, -1, 68,
- 10, 41, 14, 41, -1, 68, 14, 68, -1, 68,
- 10, 41, 14, 36, -1, 68, 14, 36, -1, -1,
- 41, 6, 82, 87, 7, -1, 41, 6, 7, -1,
- -1, 41, 6, 84, -1, 83, 87, 7, -1, 83,
- 7, -1, 41, -1, -1, 66, -1, -1, 87, 10,
- 86, -1, 89, -1, 88, 89, -1, 34, 41, 11,
- 61, -1, 36, 11, 61, -1, 35, 41, 11, 61,
- -1, 34, 41, 11, -1, 36, 11, -1, 35, 41,
- 11, -1, 91, -1, 90, 91, -1, 71, -1, 37,
- 41, 4, 61, 5, -1, 38, 94, -1, 39, 94,
- -1, 4, 95, 5, -1, 4, 5, -1, 41, 8,
- -1, 95, 41, 8, -1, 95, 1, -1, 46, 8,
- -1, 46, 13, 62, 13, 67, 13, 67, 13, 67,
- 8, -1, 96, 46, 8, -1, 96, 46, 13, 62,
- 13, 67, 13, 67, 13, 67, 8, -1, 96, 1,
- -1, 40, 4, 96, 5, -1, 40, 4, 5, -1
+ 8, -1, 41, 24, 72, -1, 30, 41, 24, 72,
+ -1, 31, 6, 68, 7, 41, 24, 72, -1, 30,
+ 31, 6, 68, 7, 41, 24, 72, -1, 72, -1,
+ 61, 72, -1, 61, 1, -1, 68, 11, 68, 11,
+ 68, -1, 41, -1, 62, 13, 68, 13, 68, 13,
+ 68, -1, -1, 19, 6, 65, 67, 7, -1, -1,
+ 22, 6, 66, 67, 7, -1, 20, 6, 63, 7,
+ -1, 41, -1, 41, 41, -1, 41, -1, 41, 41,
+ -1, 41, 41, 41, -1, 41, -1, 41, 41, -1,
+ 41, 11, 41, -1, -1, 18, 6, 71, 41, 7,
+ 4, -1, 4, 61, 5, -1, -1, 41, 9, 73,
+ 41, 8, -1, 25, 80, 8, -1, 26, 81, 8,
+ -1, 41, 11, -1, -1, -1, -1, 32, 6, 74,
+ 41, 8, 75, 41, 8, 76, 41, 7, 72, -1,
+ -1, 33, 6, 77, 41, 7, 72, -1, 70, 5,
+ -1, 70, 89, 5, -1, 12, 82, 8, -1, 86,
+ 8, -1, 41, 8, -1, -1, 86, 9, 78, 41,
+ 8, -1, 28, 8, -1, 27, 8, -1, 29, 8,
+ -1, 64, 72, 79, -1, 8, -1, 21, 72, -1,
+ -1, 69, -1, 69, 13, 69, -1, 69, 10, 69,
+ -1, 69, 13, 69, 13, 69, -1, 69, 10, 69,
+ 10, 69, -1, 36, 13, 69, 13, 69, -1, 36,
+ 10, 69, 10, 69, -1, 69, -1, 69, 10, 69,
+ -1, 69, 10, 41, 14, 41, -1, 69, 14, 69,
+ -1, 69, 10, 41, 14, 36, -1, 69, 14, 36,
+ -1, -1, 41, 6, 83, 88, 7, -1, 41, 6,
+ 7, -1, -1, 41, 6, 85, -1, 84, 88, 7,
+ -1, 84, 7, -1, 41, -1, -1, 67, -1, -1,
+ 88, 10, 87, -1, 90, -1, 89, 90, -1, 34,
+ 41, 11, 61, -1, 36, 11, 61, -1, 35, 41,
+ 11, 61, -1, 34, 41, 11, -1, 36, 11, -1,
+ 35, 41, 11, -1, 92, -1, 91, 92, -1, 72,
+ -1, 37, 41, 4, 61, 5, -1, 38, 95, -1,
+ 39, 95, -1, 4, 96, 5, -1, 4, 5, -1,
+ 41, 8, -1, 96, 41, 8, -1, 96, 1, -1,
+ 46, 8, -1, 46, 13, 63, 8, -1, 97, 46,
+ 8, -1, 97, 46, 13, 63, 8, -1, 97, 1,
+ -1, 40, 4, 97, 5, -1, 40, 4, 5, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const unsigned short int yyrline[] =
{
- 0, 175, 175, 178, 179, 180, 183, 184, 185, 186,
- 189, 190, 193, 201, 202, 205, 208, 211, 215, 220,
- 223, 227, 228, 229, 232, 232, 238, 239, 240, 243,
- 244, 247, 248, 249, 250, 253, 254, 255, 256, 257,
- 258, 258, 262, 263, 266, 271, 275, 280, 285, 294,
- 295, 296, 302, 307, 311, 311, 314, 314, 317, 333,
- 334, 341, 342, 347, 355, 356, 360, 366, 366, 374,
- 377, 377, 381, 384, 387, 390, 391, 392, 390, 398,
- 398, 402, 404, 407, 409, 411, 414, 414, 447, 448,
- 449, 450, 454, 457, 458, 463, 464, 467, 470, 474,
- 478, 482, 489, 492, 495, 499, 503, 507, 513, 513,
- 518, 526, 526, 537, 544, 547, 548, 551, 552, 555,
- 558, 559, 562, 566, 570, 574, 577, 580, 585, 586,
- 589, 590, 596, 601, 606, 607, 610, 611, 612, 615,
- 616, 624, 625, 634, 637, 640
+ 0, 177, 177, 180, 181, 182, 185, 186, 187, 188,
+ 191, 192, 195, 203, 204, 207, 210, 213, 217, 222,
+ 225, 229, 230, 231, 234, 234, 240, 241, 242, 245,
+ 246, 249, 250, 251, 252, 255, 256, 257, 258, 259,
+ 260, 260, 264, 265, 268, 273, 277, 282, 287, 296,
+ 297, 298, 304, 309, 313, 321, 321, 324, 324, 327,
+ 338, 339, 346, 347, 352, 360, 361, 365, 371, 371,
+ 379, 382, 382, 386, 389, 392, 395, 396, 397, 395,
+ 403, 403, 407, 409, 412, 414, 416, 419, 419, 452,
+ 453, 454, 455, 459, 462, 463, 468, 469, 472, 475,
+ 479, 483, 487, 494, 497, 500, 504, 508, 512, 518,
+ 518, 523, 531, 531, 542, 549, 552, 553, 556, 557,
+ 560, 563, 564, 567, 571, 575, 579, 582, 585, 590,
+ 591, 594, 595, 601, 606, 611, 612, 615, 616, 617,
+ 620, 621, 625, 626, 631, 634, 637
};
#endif
@@ -589,13 +588,14 @@ static const char *const yytname[] =
"objects", "object", "word_or_default", "context", "opt_abstract",
"macro", "globals", "global_statements", "global_statement", "@1",
"arglist", "elements_block", "elements", "element", "@2", "ignorepat",
- "extension", "statements", "timerange", "if_like_head", "@3", "@4",
- "word_list", "word3_list", "goto_word", "switch_head", "@5", "statement",
- "@6", "@7", "@8", "@9", "@10", "@11", "opt_else", "target", "jumptarget",
- "macro_call", "@12", "application_call_head", "@13", "application_call",
- "opt_word", "eval_arglist", "case_statements", "case_statement",
- "macro_statements", "macro_statement", "switches", "eswitches",
- "switchlist_block", "switchlist", "includeslist", "includes", 0
+ "extension", "statements", "timerange", "timespec", "if_like_head", "@3",
+ "@4", "word_list", "word3_list", "goto_word", "switch_head", "@5",
+ "statement", "@6", "@7", "@8", "@9", "@10", "@11", "opt_else", "target",
+ "jumptarget", "macro_call", "@12", "application_call_head", "@13",
+ "application_call", "opt_word", "eval_arglist", "case_statements",
+ "case_statement", "macro_statements", "macro_statement", "switches",
+ "eswitches", "switchlist_block", "switchlist", "includeslist",
+ "includes", 0
};
#endif
@@ -620,16 +620,16 @@ static const unsigned char yyr1[] =
50, 51, 51, 51, 53, 52, 54, 54, 54, 55,
55, 56, 56, 56, 56, 57, 57, 57, 57, 57,
58, 57, 57, 57, 59, 60, 60, 60, 60, 61,
- 61, 61, 62, 62, 64, 63, 65, 63, 63, 66,
- 66, 67, 67, 67, 68, 68, 68, 70, 69, 71,
- 72, 71, 71, 71, 71, 73, 74, 75, 71, 76,
- 71, 71, 71, 71, 71, 71, 77, 71, 71, 71,
- 71, 71, 71, 78, 78, 79, 79, 79, 79, 79,
- 79, 79, 80, 80, 80, 80, 80, 80, 82, 81,
- 81, 84, 83, 85, 85, 86, 86, 87, 87, 87,
- 88, 88, 89, 89, 89, 89, 89, 89, 90, 90,
- 91, 91, 92, 93, 94, 94, 95, 95, 95, 96,
- 96, 96, 96, 96, 97, 97
+ 61, 61, 62, 62, 63, 65, 64, 66, 64, 64,
+ 67, 67, 68, 68, 68, 69, 69, 69, 71, 70,
+ 72, 73, 72, 72, 72, 72, 74, 75, 76, 72,
+ 77, 72, 72, 72, 72, 72, 72, 78, 72, 72,
+ 72, 72, 72, 72, 79, 79, 80, 80, 80, 80,
+ 80, 80, 80, 81, 81, 81, 81, 81, 81, 83,
+ 82, 82, 85, 84, 86, 86, 87, 87, 88, 88,
+ 88, 89, 89, 90, 90, 90, 90, 90, 90, 91,
+ 91, 92, 92, 93, 94, 95, 95, 96, 96, 96,
+ 97, 97, 97, 97, 97, 98, 98
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -640,16 +640,16 @@ static const unsigned char yyr2[] =
3, 1, 2, 2, 0, 5, 1, 3, 2, 2,
3, 1, 1, 2, 2, 1, 1, 1, 1, 1,
0, 5, 2, 1, 4, 3, 4, 7, 8, 1,
- 2, 2, 5, 1, 0, 5, 0, 5, 10, 1,
- 2, 1, 2, 3, 1, 2, 3, 0, 6, 3,
- 0, 5, 3, 3, 2, 0, 0, 0, 12, 0,
- 6, 2, 3, 3, 2, 2, 0, 5, 2, 2,
- 2, 3, 1, 2, 0, 1, 3, 3, 5, 5,
- 5, 5, 1, 3, 5, 3, 5, 3, 0, 5,
- 3, 0, 3, 3, 2, 1, 0, 1, 0, 3,
- 1, 2, 4, 3, 4, 3, 2, 3, 1, 2,
- 1, 5, 2, 2, 3, 2, 2, 3, 2, 2,
- 10, 3, 11, 2, 4, 3
+ 2, 2, 5, 1, 7, 0, 5, 0, 5, 4,
+ 1, 2, 1, 2, 3, 1, 2, 3, 0, 6,
+ 3, 0, 5, 3, 3, 2, 0, 0, 0, 12,
+ 0, 6, 2, 3, 3, 2, 2, 0, 5, 2,
+ 2, 2, 3, 1, 2, 0, 1, 3, 3, 5,
+ 5, 5, 5, 1, 3, 5, 3, 5, 3, 0,
+ 5, 3, 0, 3, 3, 2, 1, 0, 1, 0,
+ 3, 1, 2, 4, 3, 4, 3, 2, 3, 1,
+ 2, 1, 5, 2, 2, 3, 2, 2, 3, 2,
+ 2, 4, 3, 5, 2, 4, 3
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -662,32 +662,31 @@ static const unsigned char yydefact[] =
0, 0, 21, 11, 10, 0, 0, 26, 0, 24,
23, 19, 22, 0, 12, 0, 28, 0, 0, 0,
32, 29, 43, 0, 0, 0, 0, 0, 0, 0,
- 0, 31, 39, 35, 37, 38, 36, 0, 18, 92,
+ 0, 31, 39, 35, 37, 38, 36, 0, 18, 93,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 130, 118, 0, 0,
- 128, 0, 27, 0, 0, 0, 0, 0, 0, 132,
- 133, 0, 42, 40, 0, 34, 30, 33, 0, 49,
- 0, 0, 67, 54, 0, 56, 0, 64, 95, 0,
- 102, 0, 89, 88, 90, 75, 79, 0, 111, 85,
- 70, 74, 94, 81, 0, 0, 0, 0, 120, 114,
- 59, 117, 0, 84, 86, 17, 129, 16, 0, 25,
- 0, 0, 0, 61, 0, 135, 0, 0, 145, 0,
- 0, 0, 45, 51, 69, 50, 108, 83, 0, 0,
- 53, 0, 0, 0, 0, 0, 0, 65, 0, 0,
- 72, 0, 0, 73, 0, 0, 0, 112, 0, 0,
- 91, 0, 0, 126, 82, 121, 60, 113, 116, 0,
- 15, 44, 0, 46, 62, 0, 136, 138, 134, 0,
- 139, 0, 143, 144, 0, 0, 110, 118, 0, 0,
- 0, 0, 0, 0, 0, 66, 97, 96, 64, 103,
- 107, 105, 0, 0, 0, 0, 93, 125, 127, 0,
- 115, 119, 0, 0, 63, 0, 137, 0, 141, 0,
- 41, 0, 0, 55, 0, 0, 57, 0, 0, 0,
- 0, 0, 76, 0, 131, 71, 0, 0, 87, 0,
- 0, 0, 0, 109, 68, 0, 0, 101, 100, 99,
- 98, 106, 104, 0, 80, 0, 47, 0, 0, 0,
- 52, 0, 48, 0, 0, 0, 77, 0, 0, 0,
- 0, 0, 0, 58, 0, 0, 0, 0, 140, 0,
- 78, 142
+ 0, 0, 0, 0, 0, 0, 131, 119, 0, 0,
+ 129, 0, 27, 0, 0, 0, 0, 0, 0, 133,
+ 134, 0, 42, 40, 0, 34, 30, 33, 0, 49,
+ 0, 0, 68, 55, 0, 57, 0, 65, 96, 0,
+ 103, 0, 90, 89, 91, 76, 80, 0, 112, 86,
+ 71, 75, 95, 82, 0, 0, 0, 0, 121, 115,
+ 60, 118, 0, 85, 87, 17, 130, 16, 0, 25,
+ 0, 0, 0, 62, 0, 136, 0, 0, 146, 0,
+ 0, 0, 45, 51, 70, 50, 109, 84, 0, 0,
+ 53, 0, 0, 0, 0, 0, 0, 0, 66, 0,
+ 0, 73, 0, 0, 74, 0, 0, 0, 113, 0,
+ 0, 92, 0, 0, 127, 83, 122, 61, 114, 117,
+ 0, 15, 44, 0, 46, 63, 0, 137, 139, 135,
+ 0, 140, 0, 144, 145, 0, 0, 111, 119, 0,
+ 0, 0, 59, 0, 0, 0, 0, 67, 98, 97,
+ 65, 104, 108, 106, 0, 0, 0, 0, 94, 126,
+ 128, 0, 116, 120, 0, 0, 64, 0, 138, 0,
+ 142, 0, 41, 0, 0, 56, 0, 0, 58, 0,
+ 0, 0, 0, 0, 77, 0, 132, 72, 0, 0,
+ 88, 0, 0, 141, 0, 110, 69, 0, 0, 102,
+ 101, 100, 99, 107, 105, 0, 81, 0, 47, 143,
+ 0, 52, 0, 48, 0, 78, 54, 0, 0, 0,
+ 79
};
/* YYDEFGOTO[NTERM-NUM]. */
@@ -695,168 +694,167 @@ static const short int yydefgoto[] =
{
-1, 5, 6, 7, 25, 8, 9, 10, 11, 21,
22, 39, 28, 34, 50, 51, 151, 52, 53, 98,
- 161, 74, 159, 163, 131, 162, 108, 75, 158, 99,
- 178, 174, 273, 290, 175, 189, 180, 109, 111, 101,
- 207, 77, 177, 78, 231, 132, 127, 128, 79, 80,
- 54, 55, 89, 147, 150, 56
+ 161, 162, 74, 159, 164, 131, 163, 108, 75, 158,
+ 99, 179, 175, 275, 287, 176, 190, 181, 109, 111,
+ 101, 208, 77, 178, 78, 233, 132, 127, 128, 79,
+ 80, 54, 55, 89, 147, 150, 56
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -186
+#define YYPACT_NINF -195
static const short int yypact[] =
{
- 11, -186, -23, 20, -186, 43, 454, -186, -186, 69,
- -186, -186, 72, 4, -186, -186, -186, -19, 21, -186,
- 70, 7, -186, -186, -186, 81, 89, -186, 22, -186,
- -186, -186, -186, 173, -186, 316, -186, 108, 50, 63,
- -186, -186, -186, 96, -11, 107, 117, 117, 125, 87,
- 266, -186, -186, -186, -186, -186, -186, 420, -186, -186,
- 97, 131, 139, 160, 161, -3, 128, 119, 162, 163,
- 166, 167, 135, 86, 420, 64, -186, 24, 28, 342,
- -186, 368, -186, 169, 141, 177, 164, 152, 10, -186,
- -186, -1, -186, -186, 420, -186, -186, -186, 260, -186,
- 185, 187, -186, -186, 155, -186, 148, 30, 150, 190,
- 100, 192, -186, -186, -186, -186, -186, 197, -186, -186,
- -186, -186, 186, -186, 165, 168, 204, 118, -186, -186,
- 175, -186, 121, -186, -186, -186, -186, -186, 394, -186,
- 200, 152, 420, 176, 212, -186, 218, 9, -186, 122,
- 6, 188, -186, -186, -186, -186, 221, -186, 189, 191,
- 75, 220, 223, 191, 128, 128, 194, -186, 128, 128,
- -186, 195, 115, -186, 201, 202, 420, -186, 208, 420,
- -186, 239, 245, 420, -186, -186, -186, -186, 216, 217,
- -186, -186, 252, -186, 222, 225, -186, -186, -186, 261,
- -186, 155, -186, -186, 149, 262, -186, 191, 268, 269,
- 152, 152, 270, 263, 271, -186, 280, 286, 76, -186,
- -186, -186, 273, 293, 290, 295, -186, 420, 420, 48,
- -186, -186, 303, 272, -186, 301, -186, 313, -186, 155,
- -186, 158, 310, -186, 314, 318, -186, 128, 128, 128,
- 128, 123, -186, 420, -186, -186, 114, 219, -186, 306,
- 420, 152, 319, -186, -186, 152, 152, -186, -186, -186,
- -186, -186, -186, 292, -186, 420, -186, 324, 152, 326,
- -186, 332, -186, 152, 338, 152, -186, 339, 152, 348,
- 315, 152, 345, -186, 352, 355, 152, 420, -186, 357,
- -186, -186
+ 108, -195, -24, 19, -195, 31, 151, -195, -195, 3,
+ -195, -195, 46, 2, -195, -195, -195, -17, 25, -195,
+ 112, 9, -195, -195, -195, 68, 69, -195, 86, -195,
+ -195, -195, -195, 37, -195, 330, -195, 124, 88, 96,
+ -195, -195, -195, 120, 39, 132, 169, 169, 172, 70,
+ 306, -195, -195, -195, -195, -195, -195, 434, -195, -195,
+ 136, 173, 174, 177, 178, 49, 137, 181, 184, 187,
+ 193, 194, 162, 152, 434, 64, -195, 41, 80, 356,
+ -195, 382, -195, 196, 164, 200, 186, 171, 10, -195,
+ -195, 24, -195, -195, 434, -195, -195, -195, 8, -195,
+ 207, 211, -195, -195, 185, -195, 107, 63, 143, 217,
+ 81, 220, -195, -195, -195, -195, -195, 198, -195, -195,
+ -195, -195, 208, -195, 190, 192, 223, 76, -195, -195,
+ 197, -195, 161, -195, -195, -195, -195, -195, 408, -195,
+ 229, 171, 434, 199, 234, -195, 236, 20, -195, 84,
+ 17, 204, -195, -195, -195, -195, 239, -195, 206, 214,
+ 73, 235, 245, 250, 214, 137, 137, 221, -195, 137,
+ 137, -195, 227, 94, -195, 228, 230, 434, -195, 237,
+ 434, -195, 264, 265, 434, -195, -195, -195, -195, 238,
+ 241, -195, -195, 273, -195, 242, 243, -195, -195, -195,
+ 277, -195, 185, -195, -195, 149, 278, -195, 214, 283,
+ 285, 171, -195, 171, 286, 289, 287, -195, 296, 295,
+ 72, -195, -195, -195, 301, 305, 189, 307, -195, 434,
+ 434, 114, -195, -195, 308, 272, -195, 293, -195, 310,
+ -195, 185, -195, 165, 315, -195, 309, 313, -195, 137,
+ 137, 137, 137, 128, -195, 434, -195, -195, 231, 269,
+ -195, 297, 434, -195, 312, -195, -195, 171, 171, -195,
+ -195, -195, -195, -195, -195, 284, -195, 434, -195, -195,
+ 314, -195, 318, -195, 171, -195, -195, 288, 321, 434,
+ -195
};
/* YYPGOTO[NTERM-NUM]. */
static const short int yypgoto[] =
{
- -186, -186, -186, 360, -89, -186, -186, -186, -186, -186,
- 356, -186, -186, -186, -186, 328, -186, -186, -186, -170,
- -185, -186, -186, -186, -138, -86, -63, -186, -186, -35,
- -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
- -186, -186, -186, -186, -186, 174, -186, 255, 304, -74,
- -186, -186, 337, -186, -186, -186
+ -195, -195, -195, 324, -88, -195, -195, -195, -195, -195,
+ 311, -195, -195, -195, -195, 281, -195, -195, -195, -173,
+ -195, -194, -195, -195, -195, 6, -86, -64, -195, -195,
+ -35, -195, -195, -195, -195, -195, -195, -195, -195, -195,
+ -195, -195, -195, -195, -195, -195, 125, -195, 212, 259,
+ -74, -195, -195, 294, -195, -195, -195
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -125
+#define YYTABLE_NINF -126
static const short int yytable[] =
{
- 76, 144, 149, 110, 148, 136, 224, 202, 30, 19,
- 197, 203, 31, 229, 198, 145, 237, 23, 12, 1,
- 85, 209, 24, 36, 13, 212, 2, 3, 26, 37,
- 86, 129, 38, 106, 4, 23, 133, 134, 107, 122,
- 24, 166, 23, 14, 76, 20, 76, 24, 20, 153,
- 199, 146, 57, -123, 262, 192, 59, 256, 257, 152,
- 60, 204, 27, 155, 136, 130, 61, 62, 63, 123,
- 64, 167, 17, 65, 66, 67, 68, 69, 18, 29,
- 70, 71, -123, -123, -123, 33, -61, 166, 92, 73,
- 251, 82, 118, 35, 119, 120, 93, 121, 124, 125,
- 126, 213, 214, 76, 83, 216, 217, 193, 219, 221,
- 171, 94, 81, 87, 172, 153, 194, 167, 57, -122,
- 84, 88, 59, 184, 244, 245, 60, 112, 187, 91,
- 200, 188, 61, 62, 63, 201, 64, 102, 100, 65,
- 66, 67, 68, 69, 226, 103, 70, 71, -122, -122,
- -122, 220, 124, 125, 126, 73, 107, 238, 164, 271,
- 168, 165, 239, 169, 272, 263, 104, 105, 188, 107,
- 113, 114, 115, 116, 40, 277, 117, 139, 41, 279,
- 280, 42, 140, 141, 267, 268, 269, 270, 142, 155,
- 43, 156, 284, 143, 155, 157, 160, 287, 170, 289,
- 173, 176, 292, 44, 45, 295, 181, 179, 191, 182,
- 299, 46, 47, 48, 49, 183, 186, 194, 274, 195,
- 153, 155, 155, 57, -124, 276, 196, 59, 206, 205,
- 208, 60, 130, 210, 211, 215, 218, 61, 62, 63,
- 282, 64, 222, 223, 65, 66, 67, 68, 69, 225,
- 227, 70, 71, -124, -124, -124, 228, 230, 232, 233,
- 73, 153, 300, 234, 57, 154, 235, 95, 59, 236,
- 240, 96, 60, 247, 42, 242, 243, 246, 61, 62,
- 63, 252, 64, 43, 248, 65, 66, 67, 68, 69,
- 249, 153, 70, 71, 57, 254, 44, 45, 59, 250,
- 253, 73, 60, 255, 46, 47, 48, 49, 61, 62,
- 63, 258, 64, 259, 264, 65, 66, 67, 68, 69,
- 57, 58, 70, 71, 59, 260, 261, 265, 60, 266,
- 275, 73, 278, 281, 61, 62, 63, 283, 64, 285,
- 286, 65, 66, 67, 68, 69, 57, 135, 70, 71,
- 59, 288, 291, 72, 60, 293, 294, 73, 296, 297,
- 61, 62, 63, 298, 64, 301, 16, 65, 66, 67,
- 68, 69, 57, 137, 70, 71, 59, 32, 97, 72,
- 60, 241, 185, 73, 90, 138, 61, 62, 63, 0,
- 64, 0, 0, 65, 66, 67, 68, 69, 57, 190,
+ 76, 144, 110, 149, 226, 136, 17, 19, 239, 153,
+ 30, 231, 57, 154, 31, 145, 59, 12, 203, 23,
+ 60, 198, 204, 13, 24, 199, 61, 62, 63, 148,
+ 64, 14, 26, 65, 66, 67, 68, 69, 40, 122,
+ 70, 71, 41, 20, 76, 42, 76, 264, 129, 73,
+ 20, 146, 18, 23, 43, 193, 258, 259, 24, 152,
+ 23, 200, 205, 155, 136, 24, 27, 44, 45, 123,
+ 85, 92, 33, 35, 167, 46, 47, 48, 49, 93,
+ 86, 185, 130, 167, -62, 106, 253, 36, 133, 134,
+ 107, 172, 201, 37, 94, 173, 38, 202, 124, 125,
+ 126, 215, 216, 76, 168, 218, 219, 194, 221, 223,
+ 124, 125, 126, 168, 195, 153, 1, 165, 57, -124,
+ 166, 29, 59, 2, 3, 246, 60, 247, 81, 82,
+ 222, 4, 61, 62, 63, 107, 64, 83, 87, 65,
+ 66, 67, 68, 69, 84, 228, 70, 71, -124, -124,
+ -124, -2, 15, 169, -14, 73, 170, 240, 118, 1,
+ 119, 120, 241, 121, 273, 210, 2, 3, 188, 274,
+ 214, 189, 265, 88, 4, 189, 91, 100, 107, 102,
+ 103, 280, 281, 104, 105, 269, 270, 271, 272, 112,
+ 153, 155, 113, 57, 256, 114, 155, 59, 286, 115,
+ 116, 60, 177, 117, 139, 140, 141, 61, 62, 63,
+ 142, 64, 143, 156, 65, 66, 67, 68, 69, 157,
+ 276, 70, 71, 155, 155, 171, 160, 278, 174, 180,
+ 73, 182, 153, 183, 184, 57, -123, 192, 187, 59,
+ 195, 196, 283, 60, 197, 206, 207, 209, 211, 61,
+ 62, 63, 212, 64, 290, 130, 65, 66, 67, 68,
+ 69, 213, 217, 70, 71, -123, -123, -123, 220, 224,
+ 153, 225, 73, 57, -125, 229, 230, 59, 227, 232,
+ 235, 60, 234, 236, 237, 238, 242, 61, 62, 63,
+ 244, 64, 245, 248, 65, 66, 67, 68, 69, 249,
+ 250, 70, 71, -125, -125, -125, 251, 95, 252, 254,
+ 73, 96, 255, 261, 42, 257, 260, 262, 263, 266,
+ 279, 277, 267, 43, 268, 282, 285, 284, 289, 288,
+ 16, 97, 32, 243, 57, 58, 44, 45, 59, 186,
+ 138, 90, 60, 0, 46, 47, 48, 49, 61, 62,
+ 63, 0, 64, 0, 0, 65, 66, 67, 68, 69,
+ 57, 135, 70, 71, 59, 0, 0, 72, 60, 0,
+ 0, 73, 0, 0, 61, 62, 63, 0, 64, 0,
+ 0, 65, 66, 67, 68, 69, 57, 137, 70, 71,
+ 59, 0, 0, 72, 60, 0, 0, 73, 0, 0,
+ 61, 62, 63, 0, 64, 0, 0, 65, 66, 67,
+ 68, 69, 57, 191, 70, 71, 59, 0, 0, 72,
+ 60, 0, 0, 73, 0, 0, 61, 62, 63, 0,
+ 64, 0, 0, 65, 66, 67, 68, 69, 57, 0,
70, 71, 59, 0, 0, 72, 60, 0, 0, 73,
0, 0, 61, 62, 63, 0, 64, 0, 0, 65,
- 66, 67, 68, 69, 57, 0, 70, 71, 59, 0,
- 0, 72, 60, 0, 0, 73, 0, 0, 61, 62,
- 63, 0, 64, 0, 0, 65, 66, 67, 68, 69,
- 0, 0, 70, 71, -2, 15, 0, -14, 0, 0,
- 0, 73, 1, 0, 0, 0, 0, 0, 0, 2,
- 3, 0, 0, 0, 0, 0, 0, 4
+ 66, 67, 68, 69, 0, 0, 70, 71, 0, 0,
+ 0, 0, 0, 0, 0, 73
};
static const short int yycheck[] =
{
- 35, 87, 91, 66, 5, 79, 176, 1, 1, 5,
- 1, 5, 5, 183, 5, 5, 201, 36, 41, 8,
- 31, 159, 41, 1, 4, 163, 15, 16, 7, 7,
- 41, 7, 10, 36, 23, 36, 8, 9, 41, 74,
- 41, 11, 36, 0, 79, 41, 81, 41, 41, 1,
- 41, 41, 4, 5, 239, 141, 8, 227, 228, 94,
- 12, 150, 41, 98, 138, 41, 18, 19, 20, 5,
- 22, 41, 3, 25, 26, 27, 28, 29, 6, 9,
- 32, 33, 34, 35, 36, 4, 11, 11, 1, 41,
- 14, 41, 6, 4, 8, 9, 9, 11, 34, 35,
- 36, 164, 165, 138, 41, 168, 169, 142, 171, 172,
- 10, 24, 4, 6, 14, 1, 41, 41, 4, 5,
- 24, 4, 8, 5, 210, 211, 12, 8, 7, 4,
- 8, 10, 18, 19, 20, 13, 22, 6, 41, 25,
- 26, 27, 28, 29, 179, 6, 32, 33, 34, 35,
- 36, 36, 34, 35, 36, 41, 41, 8, 10, 36,
- 10, 13, 13, 13, 41, 7, 6, 6, 10, 41,
- 8, 8, 6, 6, 1, 261, 41, 8, 5, 265,
- 266, 8, 41, 6, 247, 248, 249, 250, 24, 224,
- 17, 6, 278, 41, 229, 8, 41, 283, 8, 285,
- 8, 4, 288, 30, 31, 291, 41, 21, 8, 41,
- 296, 38, 39, 40, 41, 11, 41, 41, 253, 7,
- 1, 256, 257, 4, 5, 260, 8, 8, 7, 41,
- 41, 12, 41, 13, 11, 41, 41, 18, 19, 20,
- 275, 22, 41, 41, 25, 26, 27, 28, 29, 41,
- 11, 32, 33, 34, 35, 36, 11, 41, 41, 7,
- 41, 1, 297, 41, 4, 5, 41, 1, 8, 8,
- 8, 5, 12, 10, 8, 7, 7, 7, 18, 19,
- 20, 8, 22, 17, 13, 25, 26, 27, 28, 29,
- 10, 1, 32, 33, 4, 5, 30, 31, 8, 13,
- 7, 41, 12, 8, 38, 39, 40, 41, 18, 19,
- 20, 8, 22, 41, 4, 25, 26, 27, 28, 29,
- 4, 5, 32, 33, 8, 24, 13, 13, 12, 11,
- 24, 41, 13, 41, 18, 19, 20, 13, 22, 13,
- 8, 25, 26, 27, 28, 29, 4, 5, 32, 33,
- 8, 13, 13, 37, 12, 7, 41, 41, 13, 7,
- 18, 19, 20, 8, 22, 8, 6, 25, 26, 27,
- 28, 29, 4, 5, 32, 33, 8, 21, 50, 37,
- 12, 207, 127, 41, 47, 81, 18, 19, 20, -1,
- 22, -1, -1, 25, 26, 27, 28, 29, 4, 5,
+ 35, 87, 66, 91, 177, 79, 3, 5, 202, 1,
+ 1, 184, 4, 5, 5, 5, 8, 41, 1, 36,
+ 12, 1, 5, 4, 41, 5, 18, 19, 20, 5,
+ 22, 0, 7, 25, 26, 27, 28, 29, 1, 74,
+ 32, 33, 5, 41, 79, 8, 81, 241, 7, 41,
+ 41, 41, 6, 36, 17, 141, 229, 230, 41, 94,
+ 36, 41, 150, 98, 138, 41, 41, 30, 31, 5,
+ 31, 1, 4, 4, 11, 38, 39, 40, 41, 9,
+ 41, 5, 41, 11, 11, 36, 14, 1, 8, 9,
+ 41, 10, 8, 7, 24, 14, 10, 13, 34, 35,
+ 36, 165, 166, 138, 41, 169, 170, 142, 172, 173,
+ 34, 35, 36, 41, 41, 1, 8, 10, 4, 5,
+ 13, 9, 8, 15, 16, 211, 12, 213, 4, 41,
+ 36, 23, 18, 19, 20, 41, 22, 41, 6, 25,
+ 26, 27, 28, 29, 24, 180, 32, 33, 34, 35,
+ 36, 0, 1, 10, 3, 41, 13, 8, 6, 8,
+ 8, 9, 13, 11, 36, 159, 15, 16, 7, 41,
+ 164, 10, 7, 4, 23, 10, 4, 41, 41, 6,
+ 6, 267, 268, 6, 6, 249, 250, 251, 252, 8,
+ 1, 226, 8, 4, 5, 8, 231, 8, 284, 6,
+ 6, 12, 4, 41, 8, 41, 6, 18, 19, 20,
+ 24, 22, 41, 6, 25, 26, 27, 28, 29, 8,
+ 255, 32, 33, 258, 259, 8, 41, 262, 8, 21,
+ 41, 41, 1, 41, 11, 4, 5, 8, 41, 8,
+ 41, 7, 277, 12, 8, 41, 7, 41, 13, 18,
+ 19, 20, 7, 22, 289, 41, 25, 26, 27, 28,
+ 29, 11, 41, 32, 33, 34, 35, 36, 41, 41,
+ 1, 41, 41, 4, 5, 11, 11, 8, 41, 41,
+ 7, 12, 41, 41, 41, 8, 8, 18, 19, 20,
+ 7, 22, 7, 7, 25, 26, 27, 28, 29, 10,
+ 13, 32, 33, 34, 35, 36, 10, 1, 13, 8,
+ 41, 5, 7, 41, 8, 8, 8, 24, 8, 4,
+ 8, 24, 13, 17, 11, 41, 8, 13, 7, 41,
+ 6, 50, 21, 208, 4, 5, 30, 31, 8, 127,
+ 81, 47, 12, -1, 38, 39, 40, 41, 18, 19,
+ 20, -1, 22, -1, -1, 25, 26, 27, 28, 29,
+ 4, 5, 32, 33, 8, -1, -1, 37, 12, -1,
+ -1, 41, -1, -1, 18, 19, 20, -1, 22, -1,
+ -1, 25, 26, 27, 28, 29, 4, 5, 32, 33,
+ 8, -1, -1, 37, 12, -1, -1, 41, -1, -1,
+ 18, 19, 20, -1, 22, -1, -1, 25, 26, 27,
+ 28, 29, 4, 5, 32, 33, 8, -1, -1, 37,
+ 12, -1, -1, 41, -1, -1, 18, 19, 20, -1,
+ 22, -1, -1, 25, 26, 27, 28, 29, 4, -1,
32, 33, 8, -1, -1, 37, 12, -1, -1, 41,
-1, -1, 18, 19, 20, -1, 22, -1, -1, 25,
- 26, 27, 28, 29, 4, -1, 32, 33, 8, -1,
- -1, 37, 12, -1, -1, 41, -1, -1, 18, 19,
- 20, -1, 22, -1, -1, 25, 26, 27, 28, 29,
- -1, -1, 32, 33, 0, 1, -1, 3, -1, -1,
- -1, 41, 8, -1, -1, -1, -1, -1, -1, 15,
- 16, -1, -1, -1, -1, -1, -1, 23
+ 26, 27, 28, 29, -1, -1, 32, 33, -1, -1,
+ -1, -1, -1, -1, -1, 41
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -868,32 +866,31 @@ static const unsigned char yystos[] =
41, 51, 52, 36, 41, 46, 7, 41, 54, 9,
1, 5, 52, 4, 55, 4, 1, 7, 10, 53,
1, 5, 8, 17, 30, 31, 38, 39, 40, 41,
- 56, 57, 59, 60, 92, 93, 97, 4, 5, 8,
+ 56, 57, 59, 60, 93, 94, 98, 4, 5, 8,
12, 18, 19, 20, 22, 25, 26, 27, 28, 29,
- 32, 33, 37, 41, 63, 69, 71, 83, 85, 90,
- 91, 4, 41, 41, 24, 31, 41, 6, 4, 94,
- 94, 4, 1, 9, 24, 1, 5, 57, 61, 71,
- 41, 81, 6, 6, 6, 6, 36, 41, 68, 79,
- 68, 80, 8, 8, 8, 6, 6, 41, 6, 8,
- 9, 11, 71, 5, 34, 35, 36, 88, 89, 7,
- 41, 66, 87, 8, 9, 5, 91, 5, 90, 8,
- 41, 6, 24, 41, 67, 5, 41, 95, 5, 46,
- 96, 58, 71, 1, 5, 71, 6, 8, 70, 64,
- 41, 62, 67, 65, 10, 13, 11, 41, 10, 13,
- 8, 10, 14, 8, 73, 76, 4, 84, 72, 21,
- 78, 41, 41, 11, 5, 89, 41, 7, 10, 77,
- 5, 8, 67, 71, 41, 7, 8, 1, 5, 41,
- 8, 13, 1, 5, 46, 41, 7, 82, 41, 66,
- 13, 11, 66, 68, 68, 41, 68, 68, 41, 68,
- 36, 68, 41, 41, 61, 41, 71, 11, 11, 61,
- 41, 86, 41, 7, 41, 41, 8, 62, 8, 13,
- 8, 87, 7, 7, 67, 67, 7, 10, 13, 10,
- 13, 14, 8, 7, 5, 8, 61, 61, 8, 41,
- 24, 13, 62, 7, 4, 13, 11, 68, 68, 68,
- 68, 36, 41, 74, 71, 24, 71, 67, 13, 67,
- 67, 41, 71, 13, 67, 13, 8, 67, 13, 67,
- 75, 13, 67, 7, 41, 67, 13, 7, 8, 67,
- 71, 8
+ 32, 33, 37, 41, 64, 70, 72, 84, 86, 91,
+ 92, 4, 41, 41, 24, 31, 41, 6, 4, 95,
+ 95, 4, 1, 9, 24, 1, 5, 57, 61, 72,
+ 41, 82, 6, 6, 6, 6, 36, 41, 69, 80,
+ 69, 81, 8, 8, 8, 6, 6, 41, 6, 8,
+ 9, 11, 72, 5, 34, 35, 36, 89, 90, 7,
+ 41, 67, 88, 8, 9, 5, 92, 5, 91, 8,
+ 41, 6, 24, 41, 68, 5, 41, 96, 5, 46,
+ 97, 58, 72, 1, 5, 72, 6, 8, 71, 65,
+ 41, 62, 63, 68, 66, 10, 13, 11, 41, 10,
+ 13, 8, 10, 14, 8, 74, 77, 4, 85, 73,
+ 21, 79, 41, 41, 11, 5, 90, 41, 7, 10,
+ 78, 5, 8, 68, 72, 41, 7, 8, 1, 5,
+ 41, 8, 13, 1, 5, 46, 41, 7, 83, 41,
+ 67, 13, 7, 11, 67, 69, 69, 41, 69, 69,
+ 41, 69, 36, 69, 41, 41, 61, 41, 72, 11,
+ 11, 61, 41, 87, 41, 7, 41, 41, 8, 63,
+ 8, 13, 8, 88, 7, 7, 68, 68, 7, 10,
+ 13, 10, 13, 14, 8, 7, 5, 8, 61, 61,
+ 8, 41, 24, 8, 63, 7, 4, 13, 11, 69,
+ 69, 69, 69, 36, 41, 75, 72, 24, 72, 8,
+ 68, 68, 41, 72, 13, 8, 68, 76, 41, 7,
+ 72
};
#define yyerrok (yyerrstatus = 0)
@@ -1269,311 +1266,319 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
switch (yytype)
{
case 41: /* "word" */
-#line 169 "ael.y"
+#line 171 "ael.y"
{ free((yyvaluep->str));};
-#line 1275 "ael.tab.c"
+#line 1272 "ael.tab.c"
break;
case 44: /* "objects" */
-#line 156 "ael.y"
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1283 "ael.tab.c"
+#line 1280 "ael.tab.c"
break;
case 45: /* "object" */
-#line 156 "ael.y"
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1291 "ael.tab.c"
+#line 1288 "ael.tab.c"
break;
case 46: /* "word_or_default" */
-#line 169 "ael.y"
+#line 171 "ael.y"
{ free((yyvaluep->str));};
-#line 1296 "ael.tab.c"
+#line 1293 "ael.tab.c"
break;
case 47: /* "context" */
-#line 156 "ael.y"
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1304 "ael.tab.c"
+#line 1301 "ael.tab.c"
break;
case 49: /* "macro" */
-#line 156 "ael.y"
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1312 "ael.tab.c"
+#line 1309 "ael.tab.c"
break;
case 50: /* "globals" */
-#line 156 "ael.y"
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1320 "ael.tab.c"
+#line 1317 "ael.tab.c"
break;
case 51: /* "global_statements" */
-#line 156 "ael.y"
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1328 "ael.tab.c"
+#line 1325 "ael.tab.c"
break;
case 52: /* "global_statement" */
-#line 156 "ael.y"
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1336 "ael.tab.c"
+#line 1333 "ael.tab.c"
break;
case 54: /* "arglist" */
-#line 156 "ael.y"
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1344 "ael.tab.c"
+#line 1341 "ael.tab.c"
break;
case 55: /* "elements_block" */
-#line 156 "ael.y"
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1352 "ael.tab.c"
+#line 1349 "ael.tab.c"
break;
case 56: /* "elements" */
-#line 156 "ael.y"
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1360 "ael.tab.c"
+#line 1357 "ael.tab.c"
break;
case 57: /* "element" */
-#line 156 "ael.y"
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1368 "ael.tab.c"
+#line 1365 "ael.tab.c"
break;
case 59: /* "ignorepat" */
-#line 156 "ael.y"
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1376 "ael.tab.c"
+#line 1373 "ael.tab.c"
break;
case 60: /* "extension" */
-#line 156 "ael.y"
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1384 "ael.tab.c"
+#line 1381 "ael.tab.c"
break;
case 61: /* "statements" */
-#line 156 "ael.y"
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1392 "ael.tab.c"
+#line 1389 "ael.tab.c"
break;
case 62: /* "timerange" */
-#line 169 "ael.y"
+#line 171 "ael.y"
{ free((yyvaluep->str));};
-#line 1397 "ael.tab.c"
+#line 1394 "ael.tab.c"
break;
- case 63: /* "if_like_head" */
-#line 156 "ael.y"
+ case 63: /* "timespec" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1405 "ael.tab.c"
+#line 1402 "ael.tab.c"
break;
- case 66: /* "word_list" */
-#line 169 "ael.y"
- { free((yyvaluep->str));};
+ case 64: /* "if_like_head" */
+#line 157 "ael.y"
+ {
+ destroy_pval((yyvaluep->pval));
+ prev_word=0;
+ };
#line 1410 "ael.tab.c"
break;
- case 67: /* "word3_list" */
-#line 169 "ael.y"
+ case 67: /* "word_list" */
+#line 171 "ael.y"
{ free((yyvaluep->str));};
#line 1415 "ael.tab.c"
break;
- case 68: /* "goto_word" */
-#line 169 "ael.y"
+ case 68: /* "word3_list" */
+#line 171 "ael.y"
{ free((yyvaluep->str));};
#line 1420 "ael.tab.c"
break;
- case 69: /* "switch_head" */
-#line 156 "ael.y"
+ case 69: /* "goto_word" */
+#line 171 "ael.y"
+ { free((yyvaluep->str));};
+#line 1425 "ael.tab.c"
+ break;
+ case 70: /* "switch_head" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1428 "ael.tab.c"
+#line 1433 "ael.tab.c"
break;
- case 71: /* "statement" */
-#line 156 "ael.y"
+ case 72: /* "statement" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1436 "ael.tab.c"
+#line 1441 "ael.tab.c"
break;
- case 78: /* "opt_else" */
-#line 156 "ael.y"
+ case 79: /* "opt_else" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1444 "ael.tab.c"
+#line 1449 "ael.tab.c"
break;
- case 79: /* "target" */
-#line 156 "ael.y"
+ case 80: /* "target" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1452 "ael.tab.c"
+#line 1457 "ael.tab.c"
break;
- case 80: /* "jumptarget" */
-#line 156 "ael.y"
+ case 81: /* "jumptarget" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1460 "ael.tab.c"
+#line 1465 "ael.tab.c"
break;
- case 81: /* "macro_call" */
-#line 156 "ael.y"
+ case 82: /* "macro_call" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1468 "ael.tab.c"
+#line 1473 "ael.tab.c"
break;
- case 83: /* "application_call_head" */
-#line 156 "ael.y"
+ case 84: /* "application_call_head" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1476 "ael.tab.c"
+#line 1481 "ael.tab.c"
break;
- case 85: /* "application_call" */
-#line 156 "ael.y"
+ case 86: /* "application_call" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1484 "ael.tab.c"
+#line 1489 "ael.tab.c"
break;
- case 86: /* "opt_word" */
-#line 169 "ael.y"
+ case 87: /* "opt_word" */
+#line 171 "ael.y"
{ free((yyvaluep->str));};
-#line 1489 "ael.tab.c"
+#line 1494 "ael.tab.c"
break;
- case 87: /* "eval_arglist" */
-#line 156 "ael.y"
+ case 88: /* "eval_arglist" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1497 "ael.tab.c"
+#line 1502 "ael.tab.c"
break;
- case 88: /* "case_statements" */
-#line 156 "ael.y"
+ case 89: /* "case_statements" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1505 "ael.tab.c"
+#line 1510 "ael.tab.c"
break;
- case 89: /* "case_statement" */
-#line 156 "ael.y"
+ case 90: /* "case_statement" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1513 "ael.tab.c"
+#line 1518 "ael.tab.c"
break;
- case 90: /* "macro_statements" */
-#line 156 "ael.y"
+ case 91: /* "macro_statements" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1521 "ael.tab.c"
+#line 1526 "ael.tab.c"
break;
- case 91: /* "macro_statement" */
-#line 156 "ael.y"
+ case 92: /* "macro_statement" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1529 "ael.tab.c"
+#line 1534 "ael.tab.c"
break;
- case 92: /* "switches" */
-#line 156 "ael.y"
+ case 93: /* "switches" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1537 "ael.tab.c"
+#line 1542 "ael.tab.c"
break;
- case 93: /* "eswitches" */
-#line 156 "ael.y"
+ case 94: /* "eswitches" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1545 "ael.tab.c"
+#line 1550 "ael.tab.c"
break;
- case 94: /* "switchlist_block" */
-#line 156 "ael.y"
+ case 95: /* "switchlist_block" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1553 "ael.tab.c"
+#line 1558 "ael.tab.c"
break;
- case 95: /* "switchlist" */
-#line 156 "ael.y"
+ case 96: /* "switchlist" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1561 "ael.tab.c"
+#line 1566 "ael.tab.c"
break;
- case 96: /* "includeslist" */
-#line 156 "ael.y"
+ case 97: /* "includeslist" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1569 "ael.tab.c"
+#line 1574 "ael.tab.c"
break;
- case 97: /* "includes" */
-#line 156 "ael.y"
+ case 98: /* "includes" */
+#line 157 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1577 "ael.tab.c"
+#line 1582 "ael.tab.c"
break;
default:
@@ -1890,57 +1895,57 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 175 "ael.y"
+#line 177 "ael.y"
{ (yyval.pval) = parseio->pval = (yyvsp[0].pval); ;}
break;
case 3:
-#line 178 "ael.y"
+#line 180 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 4:
-#line 179 "ael.y"
+#line 181 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
case 5:
-#line 180 "ael.y"
+#line 182 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
case 6:
-#line 183 "ael.y"
+#line 185 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 7:
-#line 184 "ael.y"
+#line 186 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 8:
-#line 185 "ael.y"
+#line 187 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 9:
-#line 186 "ael.y"
+#line 188 "ael.y"
{(yyval.pval)=0;/* allow older docs to be read */;}
break;
case 10:
-#line 189 "ael.y"
+#line 191 "ael.y"
{ (yyval.str) = (yyvsp[0].str); ;}
break;
case 11:
-#line 190 "ael.y"
+#line 192 "ael.y"
{ (yyval.str) = strdup("default"); ;}
break;
case 12:
-#line 193 "ael.y"
+#line 195 "ael.y"
{
(yyval.pval) = npval2(PV_CONTEXT, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);
@@ -1949,31 +1954,31 @@ yyreduce:
break;
case 13:
-#line 201 "ael.y"
+#line 203 "ael.y"
{ (yyval.intval) = 1; ;}
break;
case 14:
-#line 202 "ael.y"
+#line 204 "ael.y"
{ (yyval.intval) = 0; ;}
break;
case 15:
-#line 205 "ael.y"
+#line 207 "ael.y"
{
(yyval.pval) = npval2(PV_MACRO, &(yylsp[-7]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-6].str); (yyval.pval)->u2.arglist = (yyvsp[-4].pval); (yyval.pval)->u3.macro_statements = (yyvsp[-1].pval); ;}
break;
case 16:
-#line 208 "ael.y"
+#line 210 "ael.y"
{
(yyval.pval) = npval2(PV_MACRO, &(yylsp[-6]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-5].str); (yyval.pval)->u2.arglist = (yyvsp[-3].pval); ;}
break;
case 17:
-#line 211 "ael.y"
+#line 213 "ael.y"
{
(yyval.pval) = npval2(PV_MACRO, &(yylsp[-6]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-5].str);
@@ -1981,47 +1986,47 @@ yyreduce:
break;
case 18:
-#line 215 "ael.y"
+#line 217 "ael.y"
{
(yyval.pval) = npval2(PV_MACRO, &(yylsp[-5]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-4].str); ;}
break;
case 19:
-#line 220 "ael.y"
+#line 222 "ael.y"
{
(yyval.pval) = npval2(PV_GLOBALS, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.statements = (yyvsp[-1].pval);;}
break;
case 20:
-#line 223 "ael.y"
+#line 225 "ael.y"
{ /* empty globals is OK */
(yyval.pval) = npval2(PV_GLOBALS, &(yylsp[-2]), &(yylsp[0])); ;}
break;
case 21:
-#line 227 "ael.y"
+#line 229 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 22:
-#line 228 "ael.y"
+#line 230 "ael.y"
{(yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
case 23:
-#line 229 "ael.y"
+#line 231 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
case 24:
-#line 232 "ael.y"
+#line 234 "ael.y"
{ reset_semicount(parseio->scanner); ;}
break;
case 25:
-#line 232 "ael.y"
+#line 234 "ael.y"
{
(yyval.pval) = npval2(PV_VARDEC, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-4].str);
@@ -2029,82 +2034,82 @@ yyreduce:
break;
case 26:
-#line 238 "ael.y"
+#line 240 "ael.y"
{ (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
case 27:
-#line 239 "ael.y"
+#line 241 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[0].str), &(yylsp[0]))); ;}
break;
case 28:
-#line 240 "ael.y"
+#line 242 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
case 29:
-#line 243 "ael.y"
+#line 245 "ael.y"
{ (yyval.pval) = NULL; ;}
break;
case 30:
-#line 244 "ael.y"
+#line 246 "ael.y"
{ (yyval.pval) = (yyvsp[-1].pval); ;}
break;
case 31:
-#line 247 "ael.y"
+#line 249 "ael.y"
{ (yyval.pval)=(yyvsp[0].pval);;}
break;
case 32:
-#line 248 "ael.y"
+#line 250 "ael.y"
{(yyval.pval)=0;;}
break;
case 33:
-#line 249 "ael.y"
+#line 251 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
case 34:
-#line 250 "ael.y"
+#line 252 "ael.y"
{ (yyval.pval)=(yyvsp[-1].pval);;}
break;
case 35:
-#line 253 "ael.y"
+#line 255 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 36:
-#line 254 "ael.y"
+#line 256 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 37:
-#line 255 "ael.y"
+#line 257 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 38:
-#line 256 "ael.y"
+#line 258 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 39:
-#line 257 "ael.y"
+#line 259 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 40:
-#line 258 "ael.y"
+#line 260 "ael.y"
{ reset_semicount(parseio->scanner); ;}
break;
case 41:
-#line 258 "ael.y"
+#line 260 "ael.y"
{
(yyval.pval) = npval2(PV_VARDEC, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-4].str);
@@ -2112,24 +2117,24 @@ yyreduce:
break;
case 42:
-#line 262 "ael.y"
+#line 264 "ael.y"
{free((yyvsp[-1].str)); (yyval.pval)=0;;}
break;
case 43:
-#line 263 "ael.y"
+#line 265 "ael.y"
{(yyval.pval)=0;/* allow older docs to be read */;}
break;
case 44:
-#line 266 "ael.y"
+#line 268 "ael.y"
{
(yyval.pval) = npval2(PV_IGNOREPAT, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
case 45:
-#line 271 "ael.y"
+#line 273 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2137,7 +2142,7 @@ yyreduce:
break;
case 46:
-#line 275 "ael.y"
+#line 277 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2146,7 +2151,7 @@ yyreduce:
break;
case 47:
-#line 280 "ael.y"
+#line 282 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-6]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2155,7 +2160,7 @@ yyreduce:
break;
case 48:
-#line 285 "ael.y"
+#line 287 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-7]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2165,22 +2170,22 @@ yyreduce:
break;
case 49:
-#line 294 "ael.y"
+#line 296 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 50:
-#line 295 "ael.y"
+#line 297 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
case 51:
-#line 296 "ael.y"
+#line 298 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
case 52:
-#line 302 "ael.y"
+#line 304 "ael.y"
{
asprintf(&(yyval.str), "%s:%s:%s", (yyvsp[-4].str), (yyvsp[-2].str), (yyvsp[0].str));
free((yyvsp[-4].str));
@@ -2189,53 +2194,58 @@ yyreduce:
break;
case 53:
-#line 307 "ael.y"
+#line 309 "ael.y"
{ (yyval.str) = (yyvsp[0].str); ;}
break;
case 54:
-#line 311 "ael.y"
- { reset_parencount(parseio->scanner); ;}
+#line 313 "ael.y"
+ {
+ (yyval.pval) = nword((yyvsp[-6].str), &(yylsp[-6]));
+ (yyval.pval)->u1.list = nword((yyvsp[-4].str), &(yylsp[-4]));
+ (yyval.pval)->u1.list->next = nword((yyvsp[-2].str), &(yylsp[-2]));
+ (yyval.pval)->u1.list->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
case 55:
-#line 311 "ael.y"
+#line 321 "ael.y"
+ { reset_parencount(parseio->scanner); ;}
+ break;
+
+ case 56:
+#line 321 "ael.y"
{
(yyval.pval)= npval2(PV_IF, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str); ;}
break;
- case 56:
-#line 314 "ael.y"
+ case 57:
+#line 324 "ael.y"
{ reset_parencount(parseio->scanner); ;}
break;
- case 57:
-#line 314 "ael.y"
+ case 58:
+#line 324 "ael.y"
{
(yyval.pval) = npval2(PV_RANDOM, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str=(yyvsp[-1].str);;}
break;
- case 58:
-#line 317 "ael.y"
+ case 59:
+#line 327 "ael.y"
{
- (yyval.pval) = npval2(PV_IFTIME, &(yylsp[-9]), &(yylsp[-5])); /* XXX @5 or greater ? */
- (yyval.pval)->u1.list = nword((yyvsp[-7].str), &(yylsp[-7]));
- (yyval.pval)->u1.list->next = nword((yyvsp[-5].str), &(yylsp[-5]));
- (yyval.pval)->u1.list->next->next = nword((yyvsp[-3].str), &(yylsp[-3]));
- (yyval.pval)->u1.list->next->next->next = nword((yyvsp[-1].str), &(yylsp[-1]));
- prev_word = 0;
- ;}
+ (yyval.pval) = npval2(PV_IFTIME, &(yylsp[-3]), &(yylsp[0]));
+ (yyval.pval)->u1.list = (yyvsp[-1].pval);
+ prev_word = 0; ;}
break;
- case 59:
-#line 333 "ael.y"
+ case 60:
+#line 338 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;}
break;
- case 60:
-#line 334 "ael.y"
+ case 61:
+#line 339 "ael.y"
{
asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-1].str));
@@ -2243,13 +2253,13 @@ yyreduce:
prev_word = (yyval.str);;}
break;
- case 61:
-#line 341 "ael.y"
+ case 62:
+#line 346 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;}
break;
- case 62:
-#line 342 "ael.y"
+ case 63:
+#line 347 "ael.y"
{
asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-1].str));
@@ -2257,8 +2267,8 @@ yyreduce:
prev_word = (yyval.str);;}
break;
- case 63:
-#line 347 "ael.y"
+ case 64:
+#line 352 "ael.y"
{
asprintf(&((yyval.str)), "%s%s%s", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-2].str));
@@ -2267,97 +2277,97 @@ yyreduce:
prev_word=(yyval.str);;}
break;
- case 64:
-#line 355 "ael.y"
+ case 65:
+#line 360 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;}
break;
- case 65:
-#line 356 "ael.y"
+ case 66:
+#line 361 "ael.y"
{
asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-1].str));
free((yyvsp[0].str));;}
break;
- case 66:
-#line 360 "ael.y"
+ case 67:
+#line 365 "ael.y"
{
asprintf(&((yyval.str)), "%s:%s", (yyvsp[-2].str), (yyvsp[0].str));
free((yyvsp[-2].str));
free((yyvsp[0].str));;}
break;
- case 67:
-#line 366 "ael.y"
+ case 68:
+#line 371 "ael.y"
{ reset_parencount(parseio->scanner); ;}
break;
- case 68:
-#line 366 "ael.y"
+ case 69:
+#line 371 "ael.y"
{
(yyval.pval) = npval2(PV_SWITCH, &(yylsp[-5]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str); ;}
break;
- case 69:
-#line 374 "ael.y"
+ case 70:
+#line 379 "ael.y"
{
(yyval.pval) = npval2(PV_STATEMENTBLOCK, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval); ;}
break;
- case 70:
-#line 377 "ael.y"
+ case 71:
+#line 382 "ael.y"
{reset_semicount(parseio->scanner);;}
break;
- case 71:
-#line 377 "ael.y"
+ case 72:
+#line 382 "ael.y"
{
(yyval.pval) = npval2(PV_VARDEC, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-4].str);
(yyval.pval)->u2.val = (yyvsp[-1].str); ;}
break;
- case 72:
-#line 381 "ael.y"
+ case 73:
+#line 386 "ael.y"
{
(yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
break;
- case 73:
-#line 384 "ael.y"
+ case 74:
+#line 389 "ael.y"
{
(yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
break;
- case 74:
-#line 387 "ael.y"
+ case 75:
+#line 392 "ael.y"
{
(yyval.pval) = npval2(PV_LABEL, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str); ;}
break;
- case 75:
-#line 390 "ael.y"
+ case 76:
+#line 395 "ael.y"
{reset_semicount(parseio->scanner);;}
break;
- case 76:
-#line 391 "ael.y"
+ case 77:
+#line 396 "ael.y"
{reset_semicount(parseio->scanner);;}
break;
- case 77:
-#line 392 "ael.y"
+ case 78:
+#line 397 "ael.y"
{reset_parencount(parseio->scanner);;}
break;
- case 78:
-#line 392 "ael.y"
+ case 79:
+#line 397 "ael.y"
{
(yyval.pval) = npval2(PV_FOR, &(yylsp[-11]), &(yylsp[0]));
(yyval.pval)->u1.for_init = (yyvsp[-8].str);
@@ -2366,58 +2376,58 @@ yyreduce:
(yyval.pval)->u4.for_statements = (yyvsp[0].pval);;}
break;
- case 79:
-#line 398 "ael.y"
+ case 80:
+#line 403 "ael.y"
{reset_parencount(parseio->scanner);;}
break;
- case 80:
-#line 398 "ael.y"
+ case 81:
+#line 403 "ael.y"
{
(yyval.pval) = npval2(PV_WHILE, &(yylsp[-5]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str);
(yyval.pval)->u2.statements = (yyvsp[0].pval); ;}
break;
- case 81:
-#line 402 "ael.y"
+ case 82:
+#line 407 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
break;
- case 82:
-#line 404 "ael.y"
+ case 83:
+#line 409 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[0]));
(yyval.pval)->u2.statements = (yyvsp[-1].pval);;}
break;
- case 83:
-#line 407 "ael.y"
+ case 84:
+#line 412 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[-1])); ;}
break;
- case 84:
-#line 409 "ael.y"
+ case 85:
+#line 414 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
break;
- case 85:
-#line 411 "ael.y"
+ case 86:
+#line 416 "ael.y"
{
(yyval.pval)= npval2(PV_APPLICATION_CALL, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
- case 86:
-#line 414 "ael.y"
+ case 87:
+#line 419 "ael.y"
{reset_semicount(parseio->scanner);;}
break;
- case 87:
-#line 414 "ael.y"
+ case 88:
+#line 419 "ael.y"
{
char *bufx;
int tot=0;
@@ -2453,148 +2463,148 @@ yyreduce:
;}
break;
- case 88:
-#line 447 "ael.y"
+ case 89:
+#line 452 "ael.y"
{ (yyval.pval) = npval2(PV_BREAK, &(yylsp[-1]), &(yylsp[0])); ;}
break;
- case 89:
-#line 448 "ael.y"
+ case 90:
+#line 453 "ael.y"
{ (yyval.pval) = npval2(PV_RETURN, &(yylsp[-1]), &(yylsp[0])); ;}
break;
- case 90:
-#line 449 "ael.y"
+ case 91:
+#line 454 "ael.y"
{ (yyval.pval) = npval2(PV_CONTINUE, &(yylsp[-1]), &(yylsp[0])); ;}
break;
- case 91:
-#line 450 "ael.y"
+ case 92:
+#line 455 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[-1]));
(yyval.pval)->u2.statements = (yyvsp[-1].pval);
(yyval.pval)->u3.else_statements = (yyvsp[0].pval);;}
break;
- case 92:
-#line 454 "ael.y"
+ case 93:
+#line 459 "ael.y"
{ (yyval.pval)=0; ;}
break;
- case 93:
-#line 457 "ael.y"
+ case 94:
+#line 462 "ael.y"
{ (yyval.pval) = (yyvsp[0].pval); ;}
break;
- case 94:
-#line 458 "ael.y"
+ case 95:
+#line 463 "ael.y"
{ (yyval.pval) = NULL ; ;}
break;
- case 95:
-#line 463 "ael.y"
+ case 96:
+#line 468 "ael.y"
{ (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 96:
-#line 464 "ael.y"
+ case 97:
+#line 469 "ael.y"
{
(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 97:
-#line 467 "ael.y"
+ case 98:
+#line 472 "ael.y"
{
(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 98:
-#line 470 "ael.y"
+ case 99:
+#line 475 "ael.y"
{
(yyval.pval) = nword((yyvsp[-4].str), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 99:
-#line 474 "ael.y"
+ case 100:
+#line 479 "ael.y"
{
(yyval.pval) = nword((yyvsp[-4].str), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 100:
-#line 478 "ael.y"
+ case 101:
+#line 483 "ael.y"
{
(yyval.pval) = nword(strdup("default"), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 101:
-#line 482 "ael.y"
+ case 102:
+#line 487 "ael.y"
{
(yyval.pval) = nword(strdup("default"), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 102:
-#line 489 "ael.y"
+ case 103:
+#line 494 "ael.y"
{
(yyval.pval) = nword((yyvsp[0].str), &(yylsp[0]));
(yyval.pval)->next = nword(strdup("1"), &(yylsp[0])); ;}
break;
- case 103:
-#line 492 "ael.y"
+ case 104:
+#line 497 "ael.y"
{
(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 104:
-#line 495 "ael.y"
+ case 105:
+#line 500 "ael.y"
{ /* XXX they are stored in a different order */
(yyval.pval) = nword((yyvsp[0].str), &(yylsp[0]));
(yyval.pval)->next = nword((yyvsp[-4].str), &(yylsp[-4]));
(yyval.pval)->next->next = nword((yyvsp[-2].str), &(yylsp[-2])); ;}
break;
- case 105:
-#line 499 "ael.y"
+ case 106:
+#line 504 "ael.y"
{
(yyval.pval) = nword((yyvsp[0].str), &(yylsp[0]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next->next = nword(strdup("1"), &(yylsp[0])); ;}
break;
- case 106:
-#line 503 "ael.y"
+ case 107:
+#line 508 "ael.y"
{
(yyval.pval) = nword(strdup("default"), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-4].str), &(yylsp[-4]));
(yyval.pval)->next->next = nword((yyvsp[-2].str), &(yylsp[-2])); ;}
break;
- case 107:
-#line 507 "ael.y"
+ case 108:
+#line 512 "ael.y"
{
(yyval.pval) = nword(strdup("default"), &(yylsp[-2]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[0]));
(yyval.pval)->next->next = nword( strdup("1"), &(yylsp[0])); ;}
break;
- case 108:
-#line 513 "ael.y"
+ case 109:
+#line 518 "ael.y"
{reset_argcount(parseio->scanner);;}
break;
- case 109:
-#line 513 "ael.y"
+ case 110:
+#line 518 "ael.y"
{
/* XXX original code had @2 but i think we need @5 */
(yyval.pval) = npval2(PV_MACRO_CALL, &(yylsp[-4]), &(yylsp[0]));
@@ -2602,20 +2612,20 @@ yyreduce:
(yyval.pval)->u2.arglist = (yyvsp[-1].pval);;}
break;
- case 110:
-#line 518 "ael.y"
+ case 111:
+#line 523 "ael.y"
{
(yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str); ;}
break;
- case 111:
-#line 526 "ael.y"
+ case 112:
+#line 531 "ael.y"
{reset_argcount(parseio->scanner);;}
break;
- case 112:
-#line 526 "ael.y"
+ case 113:
+#line 531 "ael.y"
{
if (strcasecmp((yyvsp[-2].str),"goto") == 0) {
(yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[-1]));
@@ -2627,8 +2637,8 @@ yyreduce:
} ;}
break;
- case 113:
-#line 537 "ael.y"
+ case 114:
+#line 542 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[0]));
if( (yyval.pval)->type == PV_GOTO )
@@ -2638,204 +2648,196 @@ yyreduce:
;}
break;
- case 114:
-#line 544 "ael.y"
+ case 115:
+#line 549 "ael.y"
{ (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
break;
- case 115:
-#line 547 "ael.y"
+ case 116:
+#line 552 "ael.y"
{ (yyval.str) = (yyvsp[0].str) ;}
break;
- case 116:
-#line 548 "ael.y"
+ case 117:
+#line 553 "ael.y"
{ (yyval.str) = strdup(""); ;}
break;
- case 117:
-#line 551 "ael.y"
+ case 118:
+#line 556 "ael.y"
{ (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 118:
-#line 552 "ael.y"
+ case 119:
+#line 557 "ael.y"
{
(yyval.pval)= npval(PV_WORD,0/*@1.first_line*/,0/*@1.last_line*/,0/* @1.first_column*/, 0/*@1.last_column*/);
(yyval.pval)->u1.str = strdup(""); ;}
break;
- case 119:
-#line 555 "ael.y"
+ case 120:
+#line 560 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[0].str), &(yylsp[0]))); ;}
break;
- case 120:
-#line 558 "ael.y"
+ case 121:
+#line 563 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
- case 121:
-#line 559 "ael.y"
+ case 122:
+#line 564 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
- case 122:
-#line 562 "ael.y"
+ case 123:
+#line 567 "ael.y"
{
(yyval.pval) = npval2(PV_CASE, &(yylsp[-3]), &(yylsp[-1])); /* XXX 3 or 4 ? */
(yyval.pval)->u1.str = (yyvsp[-2].str);
(yyval.pval)->u2.statements = (yyvsp[0].pval);;}
break;
- case 123:
-#line 566 "ael.y"
+ case 124:
+#line 571 "ael.y"
{
(yyval.pval) = npval2(PV_DEFAULT, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = NULL;
(yyval.pval)->u2.statements = (yyvsp[0].pval);;}
break;
- case 124:
-#line 570 "ael.y"
+ case 125:
+#line 575 "ael.y"
{
(yyval.pval) = npval2(PV_PATTERN, &(yylsp[-3]), &(yylsp[0])); /* XXX@3 or @4 ? */
(yyval.pval)->u1.str = (yyvsp[-2].str);
(yyval.pval)->u2.statements = (yyvsp[0].pval);;}
break;
- case 125:
-#line 574 "ael.y"
+ case 126:
+#line 579 "ael.y"
{
(yyval.pval) = npval2(PV_CASE, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
- case 126:
-#line 577 "ael.y"
+ case 127:
+#line 582 "ael.y"
{
(yyval.pval) = npval2(PV_DEFAULT, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = NULL;;}
break;
- case 127:
-#line 580 "ael.y"
+ case 128:
+#line 585 "ael.y"
{
(yyval.pval) = npval2(PV_PATTERN, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
- case 128:
-#line 585 "ael.y"
+ case 129:
+#line 590 "ael.y"
{(yyval.pval) = (yyvsp[0].pval);;}
break;
- case 129:
-#line 586 "ael.y"
+ case 130:
+#line 591 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
- case 130:
-#line 589 "ael.y"
+ case 131:
+#line 594 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
- case 131:
-#line 590 "ael.y"
+ case 132:
+#line 595 "ael.y"
{
(yyval.pval) = npval2(PV_CATCH, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-3].str);
(yyval.pval)->u2.statements = (yyvsp[-1].pval);;}
break;
- case 132:
-#line 596 "ael.y"
+ case 133:
+#line 601 "ael.y"
{
(yyval.pval) = npval2(PV_SWITCHES, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[0].pval); ;}
break;
- case 133:
-#line 601 "ael.y"
+ case 134:
+#line 606 "ael.y"
{
(yyval.pval) = npval2(PV_ESWITCHES, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[0].pval); ;}
break;
- case 134:
-#line 606 "ael.y"
+ case 135:
+#line 611 "ael.y"
{ (yyval.pval) = (yyvsp[-1].pval); ;}
break;
- case 135:
-#line 607 "ael.y"
+ case 136:
+#line 612 "ael.y"
{ (yyval.pval) = NULL; ;}
break;
- case 136:
-#line 610 "ael.y"
+ case 137:
+#line 615 "ael.y"
{ (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;}
break;
- case 137:
-#line 611 "ael.y"
+ case 138:
+#line 616 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[-1].str), &(yylsp[-1]))); ;}
break;
- case 138:
-#line 612 "ael.y"
+ case 139:
+#line 617 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
- case 139:
-#line 615 "ael.y"
+ case 140:
+#line 620 "ael.y"
{ (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;}
break;
- case 140:
-#line 616 "ael.y"
+ case 141:
+#line 621 "ael.y"
{
- (yyval.pval) = nword((yyvsp[-9].str), &(yylsp[-9]));
- (yyval.pval)->u2.arglist = nword((yyvsp[-7].str), &(yylsp[-7]));
- (yyval.pval)->u2.arglist->next = nword((yyvsp[-5].str), &(yylsp[-5]));
- (yyval.pval)->u2.arglist->next->next = nword((yyvsp[-3].str), &(yylsp[-3]));
- (yyval.pval)->u2.arglist->next->next->next = nword((yyvsp[-1].str), &(yylsp[-1]));
- prev_word=0;
- ;}
+ (yyval.pval) = nword((yyvsp[-3].str), &(yylsp[-3]));
+ (yyval.pval)->u2.arglist = (yyvsp[-1].pval);
+ prev_word=0; ;}
break;
- case 141:
-#line 624 "ael.y"
+ case 142:
+#line 625 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[-1].str), &(yylsp[-1]))); ;}
break;
- case 142:
-#line 625 "ael.y"
+ case 143:
+#line 626 "ael.y"
{
- pval *z = nword((yyvsp[-9].str), &(yylsp[-9]));
- (yyval.pval) = linku1((yyvsp[-10].pval), z);
- z->u2.arglist = nword((yyvsp[-7].str), &(yylsp[-7]));
- z->u2.arglist->next = nword((yyvsp[-5].str), &(yylsp[-5]));
- z->u2.arglist->next->next = nword((yyvsp[-3].str), &(yylsp[-3]));
- z->u2.arglist->next->next->next = nword((yyvsp[-1].str), &(yylsp[-1]));
- prev_word=0;
- ;}
+ pval *z = nword((yyvsp[-3].str), &(yylsp[-3]));
+ z->u2.arglist = (yyvsp[-1].pval);
+ (yyval.pval) = linku1((yyvsp[-4].pval), z);
+ prev_word=0; ;}
break;
- case 143:
-#line 634 "ael.y"
+ case 144:
+#line 631 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
- case 144:
-#line 637 "ael.y"
+ case 145:
+#line 634 "ael.y"
{
(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
break;
- case 145:
-#line 640 "ael.y"
+ case 146:
+#line 637 "ael.y"
{
(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;}
break;
@@ -2845,7 +2847,7 @@ yyreduce:
}
/* Line 1126 of yacc.c. */
-#line 2849 "ael.tab.c"
+#line 2851 "ael.tab.c"
yyvsp -= yylen;
yyssp -= yylen;
@@ -3120,7 +3122,7 @@ yyreturn:
}
-#line 645 "ael.y"
+#line 642 "ael.y"
static char *token_equivs1[] =
diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y
index 7073da18b9492bc0ae45b6cc6b94312df05ce33a..e51777895da9ac6d9d2867300947d21bd2db550c 100644
--- a/pbx/ael/ael.y
+++ b/pbx/ael/ael.y
@@ -119,6 +119,7 @@ static pval *update_last(pval *, YYLTYPE *);
%type <pval>opt_else
%type <pval>elements_block
%type <pval>switchlist_block
+%type <pval>timespec
%type <str>opt_word
%type <str>word_or_default
@@ -165,6 +166,7 @@ static pval *update_last(pval *, YYLTYPE *);
global_statements globals macro context object objects
opt_else
elements_block switchlist_block
+ timespec
%destructor { free($$);} word word_list goto_word word3_list opt_word word_or_default
timerange
@@ -307,6 +309,14 @@ timerange: word3_list COLON word3_list COLON word3_list {
| word { $$ = $1; }
;
+/* full time specification range|dow|*|* */
+timespec : timerange BAR word3_list BAR word3_list BAR word3_list {
+ $$ = nword($1, &@1);
+ $$->u1.list = nword($3, &@3);
+ $$->u1.list->next = nword($5, &@5);
+ $$->u1.list->next->next = nword($7, &@7); }
+ ;
+
/* 'if' like statements: if, iftime, random */
if_like_head : KW_IF LP { reset_parencount(parseio->scanner); } word_list RP {
$$= npval2(PV_IF, &@1, &@5);
@@ -314,15 +324,10 @@ if_like_head : KW_IF LP { reset_parencount(parseio->scanner); } word_list RP {
| KW_RANDOM LP { reset_parencount(parseio->scanner); } word_list RP {
$$ = npval2(PV_RANDOM, &@1, &@5);
$$->u1.str=$4;}
- | KW_IFTIME LP timerange BAR word3_list BAR word3_list BAR word3_list RP {
- $$ = npval2(PV_IFTIME, &@1, &@5); /* XXX @5 or greater ? */
- $$->u1.list = nword($3, &@3);
- $$->u1.list->next = nword($5, &@5);
- $$->u1.list->next->next = nword($7, &@7);
- $$->u1.list->next->next->next = nword($9, &@9);
- prev_word = 0;
- }
-
+ | KW_IFTIME LP timespec RP {
+ $$ = npval2(PV_IFTIME, &@1, &@4);
+ $$->u1.list = $3;
+ prev_word = 0; }
;
/* word_list is a hack to fix a problem with context switching between bison and flex;
@@ -613,24 +618,16 @@ switchlist : word SEMI { $$ = nword($1, &@1); }
;
includeslist : word_or_default SEMI { $$ = nword($1, &@1); }
- | word_or_default BAR timerange BAR word3_list BAR word3_list BAR word3_list SEMI {
+ | word_or_default BAR timespec SEMI {
$$ = nword($1, &@1);
- $$->u2.arglist = nword($3, &@3);
- $$->u2.arglist->next = nword($5, &@5);
- $$->u2.arglist->next->next = nword($7, &@7);
- $$->u2.arglist->next->next->next = nword($9, &@9);
- prev_word=0;
- }
+ $$->u2.arglist = $3;
+ prev_word=0; }
| includeslist word_or_default SEMI { $$ = linku1($1, nword($2, &@2)); }
- | includeslist word_or_default BAR timerange BAR word3_list BAR word3_list BAR word3_list SEMI {
+ | includeslist word_or_default BAR timespec SEMI {
pval *z = nword($2, &@2);
+ z->u2.arglist = $4;
$$ = linku1($1, z);
- z->u2.arglist = nword($4, &@4);
- z->u2.arglist->next = nword($6, &@6);
- z->u2.arglist->next->next = nword($8, &@8);
- z->u2.arglist->next->next->next = nword($10, &@10);
- prev_word=0;
- }
+ prev_word=0; }
| includeslist error {$$=$1;}
;