From b222d1247f6a28e99fce0551a20bc8be73f04eb1 Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <rizzo@icir.org>
Date: Tue, 2 May 2006 19:17:49 +0000
Subject: [PATCH] expressions used in if, while, switch are all of the same
kind (it remains to see why 'random' gives 16 shift/reduce conflicts...)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24292 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
pbx/ael/ael.tab.c | 1195 ++++++++++++++++++++++-----------------------
pbx/ael/ael.y | 35 +-
2 files changed, 613 insertions(+), 617 deletions(-)
diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c
index 8f782498bf..5e478f7466 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 407
+#define YYLAST 390
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 42
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 58
+#define YYNNTS 56
/* YYNRULES -- Number of rules. */
-#define YYNRULES 145
+#define YYNRULES 143
/* YYNRULES -- Number of states. */
-#define YYNSTATES 282
+#define YYNSTATES 274
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -483,16 +483,16 @@ static const unsigned short int yyprhs[] =
56, 59, 60, 66, 67, 69, 73, 76, 79, 83,
85, 87, 90, 93, 95, 97, 99, 101, 103, 104,
110, 113, 115, 120, 124, 129, 137, 146, 148, 151,
- 154, 160, 162, 170, 171, 177, 178, 184, 189, 191,
- 194, 196, 199, 203, 205, 208, 212, 213, 220, 224,
- 225, 231, 235, 239, 242, 243, 244, 245, 258, 259,
- 266, 269, 273, 277, 280, 283, 284, 290, 293, 296,
- 299, 303, 305, 308, 309, 311, 315, 319, 325, 331,
- 337, 343, 345, 349, 355, 359, 365, 369, 370, 376,
- 380, 381, 385, 389, 392, 394, 395, 397, 398, 402,
- 404, 407, 412, 416, 421, 425, 428, 432, 433, 435,
- 438, 440, 446, 449, 452, 456, 459, 462, 466, 469,
- 472, 477, 479, 482, 485, 490
+ 154, 160, 162, 170, 171, 176, 179, 182, 187, 189,
+ 192, 194, 197, 201, 203, 206, 210, 214, 218, 219,
+ 225, 229, 233, 236, 237, 238, 239, 252, 256, 259,
+ 263, 267, 270, 273, 274, 280, 283, 286, 289, 293,
+ 295, 298, 299, 301, 305, 309, 315, 321, 327, 333,
+ 335, 339, 345, 349, 355, 359, 360, 366, 370, 371,
+ 375, 379, 382, 384, 385, 387, 388, 392, 394, 397,
+ 402, 406, 411, 415, 418, 422, 423, 425, 428, 430,
+ 436, 439, 442, 446, 449, 452, 456, 459, 462, 467,
+ 469, 472, 475, 480
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -501,73 +501,72 @@ 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, 91,
+ 23, -1, -1, 15, 41, 6, 54, 7, 4, 89,
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, -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, 99, -1, 93, -1, 94,
+ 56, 1, -1, 60, -1, 97, -1, 91, -1, 92,
-1, 59, -1, -1, 41, 9, 58, 41, 8, -1,
41, 1, -1, 8, -1, 17, 24, 41, 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,
+ 41, 24, 71, -1, 30, 41, 24, 71, -1, 31,
+ 6, 68, 7, 41, 24, 71, -1, 30, 31, 6,
+ 68, 7, 41, 24, 71, -1, 71, -1, 61, 71,
-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, 6, 65, 67, 7, -1, 19, 64, -1, 22,
+ 64, -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,
+ 18, 64, 4, -1, 4, 61, 5, -1, -1, 41,
+ 9, 72, 41, 8, -1, 25, 78, 8, -1, 26,
+ 79, 8, -1, 41, 11, -1, -1, -1, -1, 32,
+ 6, 73, 41, 8, 74, 41, 8, 75, 41, 7,
+ 71, -1, 33, 64, 71, -1, 70, 5, -1, 70,
+ 87, 5, -1, 12, 80, 8, -1, 84, 8, -1,
+ 41, 8, -1, -1, 84, 9, 76, 41, 8, -1,
+ 28, 8, -1, 27, 8, -1, 29, 8, -1, 66,
+ 71, 77, -1, 8, -1, 21, 71, -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,
+ 41, 6, 81, 86, 7, -1, 41, 6, 7, -1,
+ -1, 41, 6, 83, -1, 82, 86, 7, -1, 82,
+ 7, -1, 41, -1, -1, 67, -1, -1, 86, 10,
+ 85, -1, 88, -1, 87, 88, -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, -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, -1, 98,
- 97, -1, 98, 1, -1, 40, 4, 98, 5, -1,
+ 11, -1, -1, 90, -1, 89, 90, -1, 71, -1,
+ 37, 41, 4, 61, 5, -1, 38, 93, -1, 39,
+ 93, -1, 4, 94, 5, -1, 4, 5, -1, 41,
+ 8, -1, 94, 41, 8, -1, 94, 1, -1, 46,
+ 8, -1, 46, 13, 63, 8, -1, 95, -1, 96,
+ 95, -1, 96, 1, -1, 40, 4, 96, 5, -1,
40, 4, 5, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const unsigned short int yyrline[] =
{
- 0, 178, 178, 181, 182, 183, 186, 187, 188, 189,
- 192, 193, 196, 204, 205, 208, 213, 216, 220, 221,
- 222, 225, 225, 231, 232, 233, 234, 237, 238, 241,
- 242, 243, 244, 247, 248, 249, 250, 251, 252, 252,
- 256, 257, 260, 265, 269, 274, 279, 288, 289, 290,
- 296, 301, 305, 313, 313, 316, 316, 319, 330, 331,
- 338, 339, 344, 352, 353, 357, 363, 363, 371, 374,
- 374, 378, 381, 384, 387, 388, 389, 387, 395, 395,
- 399, 401, 404, 406, 408, 411, 411, 444, 445, 446,
- 447, 451, 454, 455, 460, 461, 464, 467, 471, 475,
- 479, 486, 489, 492, 496, 500, 504, 510, 510, 515,
- 523, 523, 534, 541, 544, 545, 548, 549, 552, 555,
- 556, 559, 563, 567, 571, 574, 577, 582, 583, 584,
- 587, 588, 594, 599, 604, 605, 608, 609, 610, 613,
- 614, 621, 622, 623, 626, 629
+ 0, 180, 180, 183, 184, 185, 188, 189, 190, 191,
+ 194, 195, 198, 206, 207, 210, 215, 218, 222, 223,
+ 224, 227, 227, 233, 234, 235, 236, 239, 240, 243,
+ 244, 245, 246, 249, 250, 251, 252, 253, 254, 254,
+ 258, 259, 262, 267, 271, 276, 281, 290, 291, 292,
+ 298, 303, 307, 315, 315, 320, 323, 326, 337, 338,
+ 345, 346, 351, 359, 360, 364, 370, 378, 381, 381,
+ 385, 388, 391, 394, 395, 396, 394, 402, 406, 408,
+ 411, 413, 415, 418, 418, 451, 452, 453, 454, 458,
+ 461, 462, 467, 468, 471, 474, 478, 482, 486, 493,
+ 496, 499, 503, 507, 511, 517, 517, 522, 530, 530,
+ 541, 548, 551, 552, 555, 556, 559, 562, 563, 566,
+ 570, 574, 578, 581, 584, 589, 590, 591, 594, 595,
+ 601, 606, 611, 612, 615, 616, 617, 620, 621, 628,
+ 629, 630, 633, 636
};
#endif
@@ -586,14 +585,13 @@ static const char *const yytname[] =
"objects", "object", "context_name", "context", "opt_abstract", "macro",
"globals", "global_statements", "global_statement", "@1", "arglist",
"elements_block", "elements", "element", "@2", "ignorepat", "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", "included_entry", "includeslist",
- "includes", 0
+ "statements", "timerange", "timespec", "test_expr", "@3", "if_like_head",
+ "word_list", "word3_list", "goto_word", "switch_head", "statement", "@4",
+ "@5", "@6", "@7", "@8", "opt_else", "target", "jumptarget", "macro_call",
+ "@9", "application_call_head", "@10", "application_call", "opt_word",
+ "eval_arglist", "case_statements", "case_statement", "macro_statements",
+ "macro_statement", "switches", "eswitches", "switchlist_block",
+ "switchlist", "included_entry", "includeslist", "includes", 0
};
#endif
@@ -618,16 +616,16 @@ static const unsigned char yyr1[] =
51, 53, 52, 54, 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, 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, 91,
- 92, 92, 93, 94, 95, 95, 96, 96, 96, 97,
- 97, 98, 98, 98, 99, 99
+ 62, 62, 63, 65, 64, 66, 66, 66, 67, 67,
+ 68, 68, 68, 69, 69, 69, 70, 71, 72, 71,
+ 71, 71, 71, 73, 74, 75, 71, 71, 71, 71,
+ 71, 71, 71, 76, 71, 71, 71, 71, 71, 71,
+ 77, 77, 78, 78, 78, 78, 78, 78, 78, 79,
+ 79, 79, 79, 79, 79, 81, 80, 80, 83, 82,
+ 84, 84, 85, 85, 86, 86, 86, 87, 87, 88,
+ 88, 88, 88, 88, 88, 89, 89, 89, 90, 90,
+ 91, 92, 93, 93, 94, 94, 94, 95, 95, 96,
+ 96, 96, 97, 97
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -638,16 +636,16 @@ static const unsigned char yyr2[] =
2, 0, 5, 0, 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, 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, 0, 1, 2,
- 1, 5, 2, 2, 3, 2, 2, 3, 2, 2,
- 4, 1, 2, 2, 4, 3
+ 5, 1, 7, 0, 4, 2, 2, 4, 1, 2,
+ 1, 2, 3, 1, 2, 3, 3, 3, 0, 5,
+ 3, 3, 2, 0, 0, 0, 12, 3, 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, 0, 1, 2, 1, 5,
+ 2, 2, 3, 2, 2, 3, 2, 2, 4, 1,
+ 2, 2, 4, 3
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -660,30 +658,29 @@ static const unsigned char yydefact[] =
0, 0, 18, 11, 10, 0, 24, 0, 21, 20,
16, 19, 0, 12, 26, 0, 0, 0, 30, 27,
41, 0, 0, 0, 0, 0, 0, 0, 0, 29,
- 37, 33, 35, 36, 34, 127, 25, 0, 0, 0,
- 0, 0, 0, 132, 133, 0, 40, 38, 0, 32,
- 28, 31, 0, 91, 0, 0, 0, 0, 0, 0,
+ 37, 33, 35, 36, 34, 125, 25, 0, 0, 0,
+ 0, 0, 0, 130, 131, 0, 40, 38, 0, 32,
+ 28, 31, 0, 89, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 130, 117, 0, 0, 128, 22, 0, 0, 0, 60,
- 0, 135, 0, 0, 145, 0, 141, 0, 0, 43,
- 0, 47, 0, 0, 66, 53, 0, 55, 0, 63,
- 94, 0, 101, 0, 88, 87, 89, 74, 78, 0,
- 110, 84, 69, 73, 93, 80, 0, 0, 0, 0,
- 119, 113, 58, 116, 0, 83, 85, 15, 129, 42,
- 0, 44, 61, 0, 136, 138, 134, 0, 139, 0,
- 143, 144, 142, 0, 49, 68, 48, 107, 82, 0,
- 0, 51, 0, 0, 0, 0, 0, 0, 0, 64,
- 0, 0, 71, 0, 0, 72, 0, 0, 0, 111,
- 0, 0, 90, 0, 0, 125, 81, 120, 59, 112,
- 115, 0, 0, 62, 0, 137, 0, 39, 109, 117,
- 0, 0, 0, 57, 0, 0, 0, 0, 65, 96,
- 95, 63, 102, 106, 104, 0, 0, 0, 0, 92,
- 124, 126, 0, 114, 118, 0, 0, 0, 140, 0,
- 0, 54, 0, 0, 56, 0, 0, 0, 0, 0,
- 75, 0, 131, 70, 0, 0, 86, 0, 45, 108,
- 67, 0, 0, 100, 99, 98, 97, 105, 103, 0,
- 79, 46, 0, 50, 0, 0, 76, 52, 0, 0,
- 0, 77
+ 128, 115, 0, 0, 126, 22, 0, 0, 0, 60,
+ 0, 133, 0, 0, 143, 0, 139, 0, 0, 43,
+ 0, 47, 0, 0, 53, 0, 55, 0, 56, 0,
+ 63, 92, 0, 99, 0, 86, 85, 87, 73, 0,
+ 0, 108, 82, 68, 72, 91, 78, 0, 0, 0,
+ 0, 117, 111, 58, 114, 0, 81, 83, 15, 127,
+ 42, 0, 44, 61, 0, 134, 136, 132, 0, 137,
+ 0, 141, 142, 140, 0, 49, 67, 48, 105, 80,
+ 0, 66, 51, 0, 0, 0, 0, 0, 0, 64,
+ 0, 0, 70, 0, 0, 71, 0, 77, 0, 109,
+ 0, 0, 88, 0, 0, 123, 79, 118, 59, 110,
+ 113, 0, 0, 62, 0, 135, 0, 39, 107, 115,
+ 0, 0, 57, 0, 0, 0, 65, 94, 93, 63,
+ 100, 104, 102, 0, 0, 0, 90, 122, 124, 0,
+ 112, 116, 0, 0, 0, 138, 0, 54, 0, 0,
+ 0, 0, 0, 0, 0, 74, 129, 69, 0, 0,
+ 84, 0, 45, 106, 0, 0, 98, 97, 96, 95,
+ 103, 101, 0, 46, 0, 50, 0, 0, 75, 52,
+ 0, 0, 0, 76
};
/* YYDEFGOTO[NTERM-NUM]. */
@@ -691,152 +688,149 @@ static const short int yydefgoto[] =
{
-1, 5, 6, 7, 105, 8, 9, 10, 11, 21,
22, 37, 27, 33, 48, 49, 108, 50, 51, 110,
- 172, 173, 88, 170, 175, 143, 174, 120, 89, 169,
- 111, 190, 186, 269, 278, 187, 201, 192, 121, 123,
- 113, 209, 91, 189, 92, 234, 144, 139, 140, 93,
- 94, 52, 53, 63, 103, 106, 107, 54
+ 173, 174, 115, 170, 88, 144, 175, 121, 89, 111,
+ 190, 186, 262, 270, 201, 192, 122, 124, 113, 209,
+ 91, 189, 92, 231, 145, 140, 141, 93, 94, 52,
+ 53, 63, 103, 106, 107, 54
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -187
+#define YYPACT_NINF -142
static const short int yypact[] =
{
- 103, -187, -4, 48, -187, 75, 384, -187, -187, 81,
- -187, -187, 89, 0, -187, -187, -187, -20, 96, -187,
- 121, 7, -187, -187, -187, 138, -187, 16, -187, -187,
- -187, -187, 140, -187, -187, 139, 106, 108, -187, -187,
- -187, 120, -21, 146, 147, 147, 151, 67, 145, -187,
- -187, -187, -187, -187, -187, 324, -187, 150, 119, 153,
- 137, 122, 10, -187, -187, -1, -187, -187, 350, -187,
- -187, -187, 350, -187, 123, 159, 167, 168, 181, -17,
- 148, 180, 182, 183, 186, 187, 154, 19, 350, 24,
- -187, 15, 131, 298, -187, -187, 189, 122, 350, 157,
- 194, -187, 198, 13, -187, 74, -187, 6, 166, -187,
- 242, -187, 188, 202, -187, -187, 170, -187, 56, -5,
- 99, 205, 117, 206, -187, -187, -187, -187, -187, 211,
- -187, -187, -187, -187, 197, -187, 178, 179, 210, 98,
- -187, -187, 193, -187, 118, -187, -187, -187, -187, -187,
- 220, -187, 200, 201, -187, -187, -187, 227, -187, 170,
- -187, -187, -187, 236, -187, -187, -187, 221, -187, 207,
- 208, 21, 238, 245, 244, 208, 148, 148, 212, -187,
- 148, 148, -187, 215, 47, -187, 216, 217, 350, -187,
- 218, 350, -187, 252, 254, 350, -187, -187, -187, -187,
- 225, 231, 237, -187, 255, -187, 273, -187, -187, 208,
- 275, 278, 122, -187, 122, 279, 277, 276, -187, 283,
- 282, 20, -187, -187, -187, 280, 289, 272, 299, -187,
- 350, 350, 45, -187, -187, 300, 285, 350, -187, 128,
- 307, -187, 301, 304, -187, 148, 148, 148, 148, 49,
- -187, 350, -187, -187, 88, 204, -187, 350, -187, -187,
- -187, 122, 122, -187, -187, -187, -187, -187, -187, 271,
- -187, -187, 306, -187, 313, 122, -187, -187, 281, 322,
- 350, -187
+ 111, -142, -36, 28, -142, 7, 367, -142, -142, 27,
+ -142, -142, 10, 3, -142, -142, -142, -12, -7, -142,
+ 48, 26, -142, -142, -142, 64, -142, 13, -142, -142,
+ -142, -142, 20, -142, -142, 86, 58, 62, -142, -142,
+ -142, 94, -22, 125, 129, 129, 133, 2, 127, -142,
+ -142, -142, -142, -142, -142, 307, -142, 145, 118, 165,
+ 148, 143, 12, -142, -142, 89, -142, -142, 333, -142,
+ -142, -142, 333, -142, 144, 180, 180, 181, 180, 47,
+ 149, 192, 193, 194, 183, 180, 162, 139, 333, 104,
+ -142, -5, 174, 281, -142, -142, 196, 143, 333, 170,
+ 201, -142, 210, 34, -142, 138, -142, 5, 184, -142,
+ 225, -142, 218, 219, -142, 227, -142, 191, -142, 163,
+ 54, 167, 226, 8, 228, -142, -142, -142, -142, 333,
+ 231, -142, -142, -142, -142, 217, -142, 198, 199, 230,
+ 107, -142, -142, 205, -142, 142, -142, -142, -142, -142,
+ -142, 235, -142, 207, 208, -142, -142, -142, 247, -142,
+ 191, -142, -142, -142, 253, -142, -142, -142, 257, -142,
+ 221, -142, 70, 252, 261, 258, 149, 149, 229, -142,
+ 149, 149, -142, 237, 119, -142, 238, -142, 333, -142,
+ 249, 333, -142, 260, 265, 333, -142, -142, -142, -142,
+ 250, 251, 254, -142, 248, -142, 286, -142, -142, 221,
+ 290, 143, -142, 143, 288, 289, -142, 294, 292, 1,
+ -142, -142, -142, 304, 255, 308, -142, 333, 333, 44,
+ -142, -142, 309, 296, 333, -142, 171, -142, 310, 313,
+ 149, 149, 149, 149, 134, -142, -142, -142, 88, 187,
+ -142, 333, -142, -142, 143, 143, -142, -142, -142, -142,
+ -142, -142, 280, -142, 315, -142, 322, 143, -142, -142,
+ 297, 324, 333, -142
};
/* YYPGOTO[NTERM-NUM]. */
static const short int yypgoto[] =
{
- -187, -187, -187, 327, 317, -187, -187, -187, -187, -187,
- 316, -187, -187, -187, -187, 290, -187, -187, -187, -186,
- -187, 196, -187, -187, -187, -76, -58, -79, -187, -187,
- -55, -187, -187, -187, -187, -187, -187, -187, -187, -187,
- -187, -187, -187, -187, -187, -187, 132, -187, 209, -187,
- 247, -187, -187, 302, -187, 253, -187, -187
+ -142, -142, -142, 336, 326, -142, -142, -142, -142, -142,
+ 325, -142, -142, -142, -142, 299, -142, -142, -142, -141,
+ -142, 189, 6, -142, -142, 186, -57, -79, -142, -55,
+ -142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
+ -142, -142, -142, -142, 141, -142, 214, -142, 264, -142,
+ -142, 318, -142, 262, -142, -142
};
/* 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 -124
+#define YYTABLE_NINF -122
static const short int yytable[] =
{
- 90, 122, 227, 100, 104, 19, 178, 160, 29, 232,
- 59, 161, 30, 109, 155, 101, 23, 34, 156, 118,
- 60, 24, 141, 35, 119, 130, 36, 131, 132, 135,
- 133, 178, -60, 134, 249, 23, 179, 12, 90, 150,
- 24, 20, 23, 151, 254, 255, 164, 24, 20, 72,
- -122, 102, 13, 73, 157, 166, 142, 74, 136, 137,
- 138, 179, 152, 75, 76, 77, 176, 78, 66, 177,
- 79, 80, 81, 82, 83, 14, 67, 84, 85, -122,
- -122, -122, 158, 223, 17, 267, 87, 159, 119, 164,
- 268, 68, 72, -121, 211, 18, 73, 216, 217, 215,
- 74, 219, 220, 196, 222, 224, 75, 76, 77, 180,
- 78, 1, 181, 79, 80, 81, 82, 83, 2, 3,
- 84, 85, -121, -121, -121, 199, 4, 183, 200, 87,
- 28, 184, 136, 137, 138, 259, 229, 26, 200, 145,
- 146, 38, 32, 55, 58, 39, 69, 56, 40, 57,
- 70, 62, 61, 40, 242, 65, 243, 41, 95, 97,
- 96, 98, 41, 99, 112, 114, 263, 264, 265, 266,
- 42, 43, 166, 115, 116, 42, 43, 166, 44, 45,
- 46, 47, 258, 44, 45, 46, 47, 117, 124, 119,
- 125, 126, 127, 128, 167, 129, 270, 149, 152, 166,
- 166, 153, 271, 272, 273, 164, 154, 163, 72, -123,
- 168, 171, 73, 182, 185, 188, 74, 277, 191, 193,
- 194, 195, 75, 76, 77, 281, 78, 202, 208, 79,
- 80, 81, 82, 83, 198, 205, 84, 85, -123, -123,
- -123, 203, 204, 164, 207, 87, 72, 165, 210, 142,
- 73, 212, 213, 218, 74, 214, 221, 225, 226, 228,
- 75, 76, 77, 230, 78, 231, 233, 79, 80, 81,
- 82, 83, 235, 164, 84, 85, 72, 252, 236, 237,
- 73, 238, 240, 87, 74, 241, 244, 245, 250, 246,
- 75, 76, 77, 247, 78, 248, 251, 79, 80, 81,
- 82, 83, 72, 147, 84, 85, 73, 253, 256, 257,
- 74, 260, 274, 87, 261, 262, 75, 76, 77, 275,
- 78, 276, 279, 79, 80, 81, 82, 83, 72, 280,
- 84, 85, 73, 16, 25, 86, 74, 31, 71, 87,
- 148, 239, 75, 76, 77, 0, 78, 64, 197, 79,
- 80, 81, 82, 83, 72, 206, 84, 85, 73, 0,
- 162, 86, 74, 0, 0, 87, 0, 0, 75, 76,
- 77, 0, 78, 0, 0, 79, 80, 81, 82, 83,
- 0, 0, 84, 85, -2, 15, 0, -14, 0, 0,
- 0, 87, 1, 0, 0, 0, 0, 0, 0, 2,
- 3, 0, 0, 0, 0, 0, 0, 4
+ 90, 123, 142, 66, 100, 12, 161, 14, 19, 59,
+ 162, 67, 178, 109, 34, 244, 18, 101, 183, 60,
+ 35, 38, 184, 36, 23, 39, 68, 29, 40, 24,
+ 17, 30, 13, 135, 26, 156, 143, 41, 90, 157,
+ 151, 23, 179, 152, 20, 165, 24, 224, 72, -120,
+ 42, 43, 73, 102, 229, 167, 74, 28, 44, 45,
+ 46, 47, 75, 76, 77, 178, 78, 20, 32, 79,
+ 80, 81, 82, 83, 187, 158, 84, 85, -120, -120,
+ -120, -60, 116, 119, 118, 87, 248, 249, 120, 165,
+ 55, 129, 72, -119, 104, 179, 73, 214, 215, 56,
+ 74, 217, 218, 57, 220, 222, 75, 76, 77, 136,
+ 78, 153, 196, 79, 80, 81, 82, 83, 58, 1,
+ 84, 85, -119, -119, -119, 23, 2, 3, 69, 87,
+ 24, 61, 70, 62, 4, 40, 226, 65, 137, 138,
+ 139, 137, 138, 139, 41, 131, 159, 132, 133, 199,
+ 134, 160, 200, 95, 238, 221, 239, 42, 43, 96,
+ 120, 256, 257, 258, 259, 44, 45, 46, 47, 167,
+ 260, 97, 98, 176, 167, 261, 177, 180, 253, 252,
+ 181, 200, 146, 147, 99, 112, 114, 117, 165, 128,
+ 120, 72, -121, 167, 167, 73, 263, 264, 265, 74,
+ 125, 126, 127, 130, 150, 75, 76, 77, 154, 78,
+ 269, 153, 79, 80, 81, 82, 83, 273, 155, 84,
+ 85, -121, -121, -121, 168, 164, 165, 169, 87, 72,
+ 166, 171, 172, 73, 182, 188, 185, 74, 191, 193,
+ 194, 195, 202, 75, 76, 77, 198, 78, 203, 204,
+ 79, 80, 81, 82, 83, 205, 165, 84, 85, 72,
+ 246, 207, 143, 73, 208, 211, 87, 74, 212, 213,
+ 216, 227, 234, 75, 76, 77, 228, 78, 219, 223,
+ 79, 80, 81, 82, 83, 72, 148, 84, 85, 73,
+ 225, 230, 232, 74, 235, 233, 87, 237, 240, 75,
+ 76, 77, 241, 78, 242, 243, 79, 80, 81, 82,
+ 83, 72, 245, 84, 85, 73, 247, 250, 86, 74,
+ 251, 266, 87, 254, 255, 75, 76, 77, 267, 78,
+ 268, 272, 79, 80, 81, 82, 83, 72, 271, 84,
+ 85, 73, 16, 25, 86, 74, 31, 71, 87, 206,
+ 236, 75, 76, 77, 197, 78, 210, 149, 79, 80,
+ 81, 82, 83, 64, 0, 84, 85, -2, 15, 163,
+ -14, 0, 0, 0, 87, 1, 0, 0, 0, 0,
+ 0, 0, 2, 3, 0, 0, 0, 0, 0, 0,
+ 4
};
static const short int yycheck[] =
{
- 55, 80, 188, 61, 5, 5, 11, 1, 1, 195,
- 31, 5, 5, 68, 1, 5, 36, 1, 5, 36,
- 41, 41, 7, 7, 41, 6, 10, 8, 9, 5,
- 11, 11, 11, 88, 14, 36, 41, 41, 93, 97,
- 41, 41, 36, 98, 230, 231, 1, 41, 41, 4,
- 5, 41, 4, 8, 41, 110, 41, 12, 34, 35,
- 36, 41, 41, 18, 19, 20, 10, 22, 1, 13,
- 25, 26, 27, 28, 29, 0, 9, 32, 33, 34,
- 35, 36, 8, 36, 3, 36, 41, 13, 41, 1,
- 41, 24, 4, 5, 170, 6, 8, 176, 177, 175,
- 12, 180, 181, 5, 183, 184, 18, 19, 20, 10,
- 22, 8, 13, 25, 26, 27, 28, 29, 15, 16,
- 32, 33, 34, 35, 36, 7, 23, 10, 10, 41,
- 9, 14, 34, 35, 36, 7, 191, 41, 10, 8,
- 9, 1, 4, 4, 24, 5, 1, 41, 8, 41,
- 5, 4, 6, 8, 212, 4, 214, 17, 8, 6,
- 41, 24, 17, 41, 41, 6, 245, 246, 247, 248,
- 30, 31, 227, 6, 6, 30, 31, 232, 38, 39,
- 40, 41, 237, 38, 39, 40, 41, 6, 8, 41,
- 8, 8, 6, 6, 6, 41, 251, 8, 41, 254,
- 255, 7, 257, 261, 262, 1, 8, 41, 4, 5,
- 8, 41, 8, 8, 8, 4, 12, 275, 21, 41,
- 41, 11, 18, 19, 20, 280, 22, 7, 7, 25,
- 26, 27, 28, 29, 41, 8, 32, 33, 34, 35,
- 36, 41, 41, 1, 8, 41, 4, 5, 41, 41,
- 8, 13, 7, 41, 12, 11, 41, 41, 41, 41,
- 18, 19, 20, 11, 22, 11, 41, 25, 26, 27,
- 28, 29, 41, 1, 32, 33, 4, 5, 41, 24,
- 8, 8, 7, 41, 12, 7, 7, 10, 8, 13,
- 18, 19, 20, 10, 22, 13, 7, 25, 26, 27,
- 28, 29, 4, 5, 32, 33, 8, 8, 8, 24,
- 12, 4, 41, 41, 13, 11, 18, 19, 20, 13,
- 22, 8, 41, 25, 26, 27, 28, 29, 4, 7,
- 32, 33, 8, 6, 17, 37, 12, 21, 48, 41,
- 93, 209, 18, 19, 20, -1, 22, 45, 139, 25,
- 26, 27, 28, 29, 4, 159, 32, 33, 8, -1,
- 107, 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
+ 55, 80, 7, 1, 61, 41, 1, 0, 5, 31,
+ 5, 9, 11, 68, 1, 14, 6, 5, 10, 41,
+ 7, 1, 14, 10, 36, 5, 24, 1, 8, 41,
+ 3, 5, 4, 88, 41, 1, 41, 17, 93, 5,
+ 97, 36, 41, 98, 41, 1, 41, 188, 4, 5,
+ 30, 31, 8, 41, 195, 110, 12, 9, 38, 39,
+ 40, 41, 18, 19, 20, 11, 22, 41, 4, 25,
+ 26, 27, 28, 29, 129, 41, 32, 33, 34, 35,
+ 36, 11, 76, 36, 78, 41, 227, 228, 41, 1,
+ 4, 85, 4, 5, 5, 41, 8, 176, 177, 41,
+ 12, 180, 181, 41, 183, 184, 18, 19, 20, 5,
+ 22, 41, 5, 25, 26, 27, 28, 29, 24, 8,
+ 32, 33, 34, 35, 36, 36, 15, 16, 1, 41,
+ 41, 6, 5, 4, 23, 8, 191, 4, 34, 35,
+ 36, 34, 35, 36, 17, 6, 8, 8, 9, 7,
+ 11, 13, 10, 8, 211, 36, 213, 30, 31, 41,
+ 41, 240, 241, 242, 243, 38, 39, 40, 41, 224,
+ 36, 6, 24, 10, 229, 41, 13, 10, 7, 234,
+ 13, 10, 8, 9, 41, 41, 6, 6, 1, 6,
+ 41, 4, 5, 248, 249, 8, 251, 254, 255, 12,
+ 8, 8, 8, 41, 8, 18, 19, 20, 7, 22,
+ 267, 41, 25, 26, 27, 28, 29, 272, 8, 32,
+ 33, 34, 35, 36, 6, 41, 1, 8, 41, 4,
+ 5, 4, 41, 8, 8, 4, 8, 12, 21, 41,
+ 41, 11, 7, 18, 19, 20, 41, 22, 41, 41,
+ 25, 26, 27, 28, 29, 8, 1, 32, 33, 4,
+ 5, 8, 41, 8, 7, 13, 41, 12, 7, 11,
+ 41, 11, 24, 18, 19, 20, 11, 22, 41, 41,
+ 25, 26, 27, 28, 29, 4, 5, 32, 33, 8,
+ 41, 41, 41, 12, 8, 41, 41, 7, 10, 18,
+ 19, 20, 13, 22, 10, 13, 25, 26, 27, 28,
+ 29, 4, 8, 32, 33, 8, 8, 8, 37, 12,
+ 24, 41, 41, 13, 11, 18, 19, 20, 13, 22,
+ 8, 7, 25, 26, 27, 28, 29, 4, 41, 32,
+ 33, 8, 6, 17, 37, 12, 21, 48, 41, 160,
+ 209, 18, 19, 20, 140, 22, 170, 93, 25, 26,
+ 27, 28, 29, 45, -1, 32, 33, 0, 1, 107,
+ 3, -1, -1, -1, 41, 8, -1, -1, -1, -1,
+ -1, -1, 15, 16, -1, -1, -1, -1, -1, -1,
+ 23
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -848,30 +842,29 @@ static const unsigned char yystos[] =
41, 51, 52, 36, 41, 46, 41, 54, 9, 1,
5, 52, 4, 55, 1, 7, 10, 53, 1, 5,
8, 17, 30, 31, 38, 39, 40, 41, 56, 57,
- 59, 60, 93, 94, 99, 4, 41, 41, 24, 31,
- 41, 6, 4, 95, 95, 4, 1, 9, 24, 1,
+ 59, 60, 91, 92, 97, 4, 41, 41, 24, 31,
+ 41, 6, 4, 93, 93, 4, 1, 9, 24, 1,
5, 57, 4, 8, 12, 18, 19, 20, 22, 25,
- 26, 27, 28, 29, 32, 33, 37, 41, 64, 70,
- 72, 84, 86, 91, 92, 8, 41, 6, 24, 41,
- 68, 5, 41, 96, 5, 46, 97, 98, 58, 72,
- 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, 8,
- 68, 72, 41, 7, 8, 1, 5, 41, 8, 13,
- 1, 5, 97, 41, 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, 7, 41, 41, 8, 63, 8, 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, 41, 24, 8, 88,
- 7, 7, 68, 68, 7, 10, 13, 10, 13, 14,
- 8, 7, 5, 8, 61, 61, 8, 24, 72, 7,
- 4, 13, 11, 69, 69, 69, 69, 36, 41, 75,
- 72, 72, 68, 68, 41, 13, 8, 68, 76, 41,
- 7, 72
+ 26, 27, 28, 29, 32, 33, 37, 41, 66, 70,
+ 71, 82, 84, 89, 90, 8, 41, 6, 24, 41,
+ 68, 5, 41, 94, 5, 46, 95, 96, 58, 71,
+ 61, 71, 41, 80, 6, 64, 64, 6, 64, 36,
+ 41, 69, 78, 69, 79, 8, 8, 8, 6, 64,
+ 41, 6, 8, 9, 11, 71, 5, 34, 35, 36,
+ 87, 88, 7, 41, 67, 86, 8, 9, 5, 90,
+ 8, 68, 71, 41, 7, 8, 1, 5, 41, 8,
+ 13, 1, 5, 95, 41, 1, 5, 71, 6, 8,
+ 65, 4, 41, 62, 63, 68, 10, 13, 11, 41,
+ 10, 13, 8, 10, 14, 8, 73, 71, 4, 83,
+ 72, 21, 77, 41, 41, 11, 5, 88, 41, 7,
+ 10, 76, 7, 41, 41, 8, 63, 8, 7, 81,
+ 67, 13, 7, 11, 69, 69, 41, 69, 69, 41,
+ 69, 36, 69, 41, 61, 41, 71, 11, 11, 61,
+ 41, 85, 41, 41, 24, 8, 86, 7, 68, 68,
+ 10, 13, 10, 13, 14, 8, 5, 8, 61, 61,
+ 8, 24, 71, 7, 13, 11, 69, 69, 69, 69,
+ 36, 41, 74, 71, 68, 68, 41, 13, 8, 68,
+ 75, 41, 7, 71
};
#define yyerrok (yyerrstatus = 0)
@@ -1247,327 +1240,332 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
switch (yytype)
{
case 41: /* "word" */
-#line 172 "ael.y"
+#line 173 "ael.y"
{ free((yyvaluep->str));};
-#line 1253 "ael.tab.c"
+#line 1246 "ael.tab.c"
break;
case 44: /* "objects" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1261 "ael.tab.c"
+#line 1254 "ael.tab.c"
break;
case 45: /* "object" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1269 "ael.tab.c"
+#line 1262 "ael.tab.c"
break;
case 46: /* "context_name" */
-#line 172 "ael.y"
+#line 173 "ael.y"
{ free((yyvaluep->str));};
-#line 1274 "ael.tab.c"
+#line 1267 "ael.tab.c"
break;
case 47: /* "context" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1282 "ael.tab.c"
+#line 1275 "ael.tab.c"
break;
case 49: /* "macro" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1290 "ael.tab.c"
+#line 1283 "ael.tab.c"
break;
case 50: /* "globals" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1298 "ael.tab.c"
+#line 1291 "ael.tab.c"
break;
case 51: /* "global_statements" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1306 "ael.tab.c"
+#line 1299 "ael.tab.c"
break;
case 52: /* "global_statement" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1314 "ael.tab.c"
+#line 1307 "ael.tab.c"
break;
case 54: /* "arglist" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1322 "ael.tab.c"
+#line 1315 "ael.tab.c"
break;
case 55: /* "elements_block" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1330 "ael.tab.c"
+#line 1323 "ael.tab.c"
break;
case 56: /* "elements" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1338 "ael.tab.c"
+#line 1331 "ael.tab.c"
break;
case 57: /* "element" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1346 "ael.tab.c"
+#line 1339 "ael.tab.c"
break;
case 59: /* "ignorepat" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1354 "ael.tab.c"
+#line 1347 "ael.tab.c"
break;
case 60: /* "extension" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1362 "ael.tab.c"
+#line 1355 "ael.tab.c"
break;
case 61: /* "statements" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1370 "ael.tab.c"
+#line 1363 "ael.tab.c"
break;
case 62: /* "timerange" */
-#line 172 "ael.y"
+#line 173 "ael.y"
{ free((yyvaluep->str));};
-#line 1375 "ael.tab.c"
+#line 1368 "ael.tab.c"
break;
case 63: /* "timespec" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1383 "ael.tab.c"
+#line 1376 "ael.tab.c"
break;
- case 64: /* "if_like_head" */
-#line 158 "ael.y"
+ case 64: /* "test_expr" */
+#line 173 "ael.y"
+ { free((yyvaluep->str));};
+#line 1381 "ael.tab.c"
+ break;
+ case 66: /* "if_like_head" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1391 "ael.tab.c"
+#line 1389 "ael.tab.c"
break;
case 67: /* "word_list" */
-#line 172 "ael.y"
+#line 173 "ael.y"
{ free((yyvaluep->str));};
-#line 1396 "ael.tab.c"
+#line 1394 "ael.tab.c"
break;
case 68: /* "word3_list" */
-#line 172 "ael.y"
+#line 173 "ael.y"
{ free((yyvaluep->str));};
-#line 1401 "ael.tab.c"
+#line 1399 "ael.tab.c"
break;
case 69: /* "goto_word" */
-#line 172 "ael.y"
+#line 173 "ael.y"
{ free((yyvaluep->str));};
-#line 1406 "ael.tab.c"
+#line 1404 "ael.tab.c"
break;
case 70: /* "switch_head" */
-#line 158 "ael.y"
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1414 "ael.tab.c"
+#line 1412 "ael.tab.c"
break;
- case 72: /* "statement" */
-#line 158 "ael.y"
+ case 71: /* "statement" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1422 "ael.tab.c"
+#line 1420 "ael.tab.c"
break;
- case 79: /* "opt_else" */
-#line 158 "ael.y"
+ case 77: /* "opt_else" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1430 "ael.tab.c"
+#line 1428 "ael.tab.c"
break;
- case 80: /* "target" */
-#line 158 "ael.y"
+ case 78: /* "target" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1438 "ael.tab.c"
+#line 1436 "ael.tab.c"
break;
- case 81: /* "jumptarget" */
-#line 158 "ael.y"
+ case 79: /* "jumptarget" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1446 "ael.tab.c"
+#line 1444 "ael.tab.c"
break;
- case 82: /* "macro_call" */
-#line 158 "ael.y"
+ case 80: /* "macro_call" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1454 "ael.tab.c"
+#line 1452 "ael.tab.c"
break;
- case 84: /* "application_call_head" */
-#line 158 "ael.y"
+ case 82: /* "application_call_head" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1462 "ael.tab.c"
+#line 1460 "ael.tab.c"
break;
- case 86: /* "application_call" */
-#line 158 "ael.y"
+ case 84: /* "application_call" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1470 "ael.tab.c"
+#line 1468 "ael.tab.c"
break;
- case 87: /* "opt_word" */
-#line 172 "ael.y"
+ case 85: /* "opt_word" */
+#line 173 "ael.y"
{ free((yyvaluep->str));};
-#line 1475 "ael.tab.c"
+#line 1473 "ael.tab.c"
break;
- case 88: /* "eval_arglist" */
-#line 158 "ael.y"
+ case 86: /* "eval_arglist" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1483 "ael.tab.c"
+#line 1481 "ael.tab.c"
break;
- case 89: /* "case_statements" */
-#line 158 "ael.y"
+ case 87: /* "case_statements" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1491 "ael.tab.c"
+#line 1489 "ael.tab.c"
break;
- case 90: /* "case_statement" */
-#line 158 "ael.y"
+ case 88: /* "case_statement" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1499 "ael.tab.c"
+#line 1497 "ael.tab.c"
break;
- case 91: /* "macro_statements" */
-#line 158 "ael.y"
+ case 89: /* "macro_statements" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1507 "ael.tab.c"
+#line 1505 "ael.tab.c"
break;
- case 92: /* "macro_statement" */
-#line 158 "ael.y"
+ case 90: /* "macro_statement" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1515 "ael.tab.c"
+#line 1513 "ael.tab.c"
break;
- case 93: /* "switches" */
-#line 158 "ael.y"
+ case 91: /* "switches" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1523 "ael.tab.c"
+#line 1521 "ael.tab.c"
break;
- case 94: /* "eswitches" */
-#line 158 "ael.y"
+ case 92: /* "eswitches" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1531 "ael.tab.c"
+#line 1529 "ael.tab.c"
break;
- case 95: /* "switchlist_block" */
-#line 158 "ael.y"
+ case 93: /* "switchlist_block" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1539 "ael.tab.c"
+#line 1537 "ael.tab.c"
break;
- case 96: /* "switchlist" */
-#line 158 "ael.y"
+ case 94: /* "switchlist" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1547 "ael.tab.c"
+#line 1545 "ael.tab.c"
break;
- case 97: /* "included_entry" */
-#line 158 "ael.y"
+ case 95: /* "included_entry" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1555 "ael.tab.c"
+#line 1553 "ael.tab.c"
break;
- case 98: /* "includeslist" */
-#line 158 "ael.y"
+ case 96: /* "includeslist" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1563 "ael.tab.c"
+#line 1561 "ael.tab.c"
break;
- case 99: /* "includes" */
-#line 158 "ael.y"
+ case 97: /* "includes" */
+#line 159 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-#line 1571 "ael.tab.c"
+#line 1569 "ael.tab.c"
break;
default:
@@ -1884,57 +1882,57 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 178 "ael.y"
+#line 180 "ael.y"
{ (yyval.pval) = parseio->pval = (yyvsp[0].pval); ;}
break;
case 3:
-#line 181 "ael.y"
+#line 183 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 4:
-#line 182 "ael.y"
+#line 184 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
case 5:
-#line 183 "ael.y"
+#line 185 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
case 6:
-#line 186 "ael.y"
+#line 188 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 7:
-#line 187 "ael.y"
+#line 189 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 8:
-#line 188 "ael.y"
+#line 190 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 9:
-#line 189 "ael.y"
+#line 191 "ael.y"
{(yyval.pval)=0;/* allow older docs to be read */;}
break;
case 10:
-#line 192 "ael.y"
+#line 194 "ael.y"
{ (yyval.str) = (yyvsp[0].str); ;}
break;
case 11:
-#line 193 "ael.y"
+#line 195 "ael.y"
{ (yyval.str) = strdup("default"); ;}
break;
case 12:
-#line 196 "ael.y"
+#line 198 "ael.y"
{
(yyval.pval) = npval2(PV_CONTEXT, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);
@@ -1943,57 +1941,57 @@ yyreduce:
break;
case 13:
-#line 204 "ael.y"
+#line 206 "ael.y"
{ (yyval.intval) = 1; ;}
break;
case 14:
-#line 205 "ael.y"
+#line 207 "ael.y"
{ (yyval.intval) = 0; ;}
break;
case 15:
-#line 208 "ael.y"
+#line 210 "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 213 "ael.y"
+#line 215 "ael.y"
{
(yyval.pval) = npval2(PV_GLOBALS, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.statements = (yyvsp[-1].pval);;}
break;
case 17:
-#line 216 "ael.y"
+#line 218 "ael.y"
{ /* empty globals is OK */
(yyval.pval) = npval2(PV_GLOBALS, &(yylsp[-2]), &(yylsp[0])); ;}
break;
case 18:
-#line 220 "ael.y"
+#line 222 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 19:
-#line 221 "ael.y"
+#line 223 "ael.y"
{(yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
case 20:
-#line 222 "ael.y"
+#line 224 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
case 21:
-#line 225 "ael.y"
+#line 227 "ael.y"
{ reset_semicount(parseio->scanner); ;}
break;
case 22:
-#line 225 "ael.y"
+#line 227 "ael.y"
{
(yyval.pval) = npval2(PV_VARDEC, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-4].str);
@@ -2001,87 +1999,87 @@ yyreduce:
break;
case 23:
-#line 231 "ael.y"
+#line 233 "ael.y"
{ (yyval.pval) = NULL; ;}
break;
case 24:
-#line 232 "ael.y"
+#line 234 "ael.y"
{ (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
case 25:
-#line 233 "ael.y"
+#line 235 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[0].str), &(yylsp[0]))); ;}
break;
case 26:
-#line 234 "ael.y"
+#line 236 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
case 27:
-#line 237 "ael.y"
+#line 239 "ael.y"
{ (yyval.pval) = NULL; ;}
break;
case 28:
-#line 238 "ael.y"
+#line 240 "ael.y"
{ (yyval.pval) = (yyvsp[-1].pval); ;}
break;
case 29:
-#line 241 "ael.y"
+#line 243 "ael.y"
{ (yyval.pval)=(yyvsp[0].pval);;}
break;
case 30:
-#line 242 "ael.y"
+#line 244 "ael.y"
{(yyval.pval)=0;;}
break;
case 31:
-#line 243 "ael.y"
+#line 245 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
case 32:
-#line 244 "ael.y"
+#line 246 "ael.y"
{ (yyval.pval)=(yyvsp[-1].pval);;}
break;
case 33:
-#line 247 "ael.y"
+#line 249 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 34:
-#line 248 "ael.y"
+#line 250 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 35:
-#line 249 "ael.y"
+#line 251 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 36:
-#line 250 "ael.y"
+#line 252 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 37:
-#line 251 "ael.y"
+#line 253 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 38:
-#line 252 "ael.y"
+#line 254 "ael.y"
{ reset_semicount(parseio->scanner); ;}
break;
case 39:
-#line 252 "ael.y"
+#line 254 "ael.y"
{
(yyval.pval) = npval2(PV_VARDEC, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-4].str);
@@ -2089,24 +2087,24 @@ yyreduce:
break;
case 40:
-#line 256 "ael.y"
+#line 258 "ael.y"
{free((yyvsp[-1].str)); (yyval.pval)=0;;}
break;
case 41:
-#line 257 "ael.y"
+#line 259 "ael.y"
{(yyval.pval)=0;/* allow older docs to be read */;}
break;
case 42:
-#line 260 "ael.y"
+#line 262 "ael.y"
{
(yyval.pval) = npval2(PV_IGNOREPAT, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
case 43:
-#line 265 "ael.y"
+#line 267 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2114,7 +2112,7 @@ yyreduce:
break;
case 44:
-#line 269 "ael.y"
+#line 271 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2123,7 +2121,7 @@ yyreduce:
break;
case 45:
-#line 274 "ael.y"
+#line 276 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-6]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2132,7 +2130,7 @@ yyreduce:
break;
case 46:
-#line 279 "ael.y"
+#line 281 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-7]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2142,22 +2140,22 @@ yyreduce:
break;
case 47:
-#line 288 "ael.y"
+#line 290 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 48:
-#line 289 "ael.y"
+#line 291 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
case 49:
-#line 290 "ael.y"
+#line 292 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
case 50:
-#line 296 "ael.y"
+#line 298 "ael.y"
{
asprintf(&(yyval.str), "%s:%s:%s", (yyvsp[-4].str), (yyvsp[-2].str), (yyvsp[0].str));
free((yyvsp[-4].str));
@@ -2166,12 +2164,12 @@ yyreduce:
break;
case 51:
-#line 301 "ael.y"
+#line 303 "ael.y"
{ (yyval.str) = (yyvsp[0].str); ;}
break;
case 52:
-#line 305 "ael.y"
+#line 307 "ael.y"
{
(yyval.pval) = nword((yyvsp[-6].str), &(yylsp[-6]));
(yyval.pval)->u1.list = nword((yyvsp[-4].str), &(yylsp[-4]));
@@ -2180,31 +2178,32 @@ yyreduce:
break;
case 53:
-#line 313 "ael.y"
+#line 315 "ael.y"
{ reset_parencount(parseio->scanner); ;}
break;
case 54:
-#line 313 "ael.y"
+#line 315 "ael.y"
{
- (yyval.pval)= npval2(PV_IF, &(yylsp[-4]), &(yylsp[0]));
- (yyval.pval)->u1.str = (yyvsp[-1].str); ;}
+ (yyval.str) = (yyvsp[-1].str); ;}
break;
case 55:
-#line 316 "ael.y"
- { reset_parencount(parseio->scanner); ;}
+#line 320 "ael.y"
+ {
+ (yyval.pval)= npval2(PV_IF, &(yylsp[-1]), &(yylsp[0]));
+ (yyval.pval)->u1.str = (yyvsp[0].str); ;}
break;
case 56:
-#line 316 "ael.y"
+#line 323 "ael.y"
{
- (yyval.pval) = npval2(PV_RANDOM, &(yylsp[-4]), &(yylsp[0]));
- (yyval.pval)->u1.str=(yyvsp[-1].str);;}
+ (yyval.pval) = npval2(PV_RANDOM, &(yylsp[-1]), &(yylsp[0]));
+ (yyval.pval)->u1.str=(yyvsp[0].str);;}
break;
case 57:
-#line 319 "ael.y"
+#line 326 "ael.y"
{
(yyval.pval) = npval2(PV_IFTIME, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval);
@@ -2212,12 +2211,12 @@ yyreduce:
break;
case 58:
-#line 330 "ael.y"
+#line 337 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;}
break;
case 59:
-#line 331 "ael.y"
+#line 338 "ael.y"
{
asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-1].str));
@@ -2226,12 +2225,12 @@ yyreduce:
break;
case 60:
-#line 338 "ael.y"
+#line 345 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;}
break;
case 61:
-#line 339 "ael.y"
+#line 346 "ael.y"
{
asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-1].str));
@@ -2240,7 +2239,7 @@ yyreduce:
break;
case 62:
-#line 344 "ael.y"
+#line 351 "ael.y"
{
asprintf(&((yyval.str)), "%s%s%s", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-2].str));
@@ -2250,12 +2249,12 @@ yyreduce:
break;
case 63:
-#line 352 "ael.y"
+#line 359 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;}
break;
case 64:
-#line 353 "ael.y"
+#line 360 "ael.y"
{
asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-1].str));
@@ -2263,7 +2262,7 @@ yyreduce:
break;
case 65:
-#line 357 "ael.y"
+#line 364 "ael.y"
{
asprintf(&((yyval.str)), "%s:%s", (yyvsp[-2].str), (yyvsp[0].str));
free((yyvsp[-2].str));
@@ -2271,76 +2270,71 @@ yyreduce:
break;
case 66:
-#line 363 "ael.y"
- { reset_parencount(parseio->scanner); ;}
- break;
-
- case 67:
-#line 363 "ael.y"
+#line 370 "ael.y"
{
- (yyval.pval) = npval2(PV_SWITCH, &(yylsp[-5]), &(yylsp[0]));
- (yyval.pval)->u1.str = (yyvsp[-2].str); ;}
+ (yyval.pval) = npval2(PV_SWITCH, &(yylsp[-2]), &(yylsp[0]));
+ (yyval.pval)->u1.str = (yyvsp[-1].str); ;}
break;
- case 68:
-#line 371 "ael.y"
+ case 67:
+#line 378 "ael.y"
{
(yyval.pval) = npval2(PV_STATEMENTBLOCK, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval); ;}
break;
- case 69:
-#line 374 "ael.y"
+ case 68:
+#line 381 "ael.y"
{reset_semicount(parseio->scanner);;}
break;
- case 70:
-#line 374 "ael.y"
+ case 69:
+#line 381 "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 71:
-#line 378 "ael.y"
+ case 70:
+#line 385 "ael.y"
{
(yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
break;
- case 72:
-#line 381 "ael.y"
+ case 71:
+#line 388 "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 72:
+#line 391 "ael.y"
{
(yyval.pval) = npval2(PV_LABEL, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str); ;}
break;
- case 74:
-#line 387 "ael.y"
+ case 73:
+#line 394 "ael.y"
{reset_semicount(parseio->scanner);;}
break;
- case 75:
-#line 388 "ael.y"
+ case 74:
+#line 395 "ael.y"
{reset_semicount(parseio->scanner);;}
break;
- case 76:
-#line 389 "ael.y"
+ case 75:
+#line 396 "ael.y"
{reset_parencount(parseio->scanner);;}
break;
- case 77:
-#line 389 "ael.y"
- {
+ case 76:
+#line 396 "ael.y"
+ { /* XXX word_list maybe ? */
(yyval.pval) = npval2(PV_FOR, &(yylsp[-11]), &(yylsp[0]));
(yyval.pval)->u1.for_init = (yyvsp[-8].str);
(yyval.pval)->u2.for_test=(yyvsp[-5].str);
@@ -2348,58 +2342,53 @@ yyreduce:
(yyval.pval)->u4.for_statements = (yyvsp[0].pval);;}
break;
- case 78:
-#line 395 "ael.y"
- {reset_parencount(parseio->scanner);;}
- break;
-
- case 79:
-#line 395 "ael.y"
+ case 77:
+#line 402 "ael.y"
{
- (yyval.pval) = npval2(PV_WHILE, &(yylsp[-5]), &(yylsp[0]));
- (yyval.pval)->u1.str = (yyvsp[-2].str);
+ (yyval.pval) = npval2(PV_WHILE, &(yylsp[-2]), &(yylsp[0]));
+ (yyval.pval)->u1.str = (yyvsp[-1].str);
(yyval.pval)->u2.statements = (yyvsp[0].pval); ;}
break;
- case 80:
-#line 399 "ael.y"
+ case 78:
+#line 406 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
break;
- case 81:
-#line 401 "ael.y"
+ case 79:
+#line 408 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[0]));
(yyval.pval)->u2.statements = (yyvsp[-1].pval);;}
break;
- case 82:
-#line 404 "ael.y"
+ case 80:
+#line 411 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[-1])); ;}
break;
- case 83:
-#line 406 "ael.y"
+ case 81:
+#line 413 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
break;
- case 84:
-#line 408 "ael.y"
+ case 82:
+#line 415 "ael.y"
{
(yyval.pval)= npval2(PV_APPLICATION_CALL, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
- case 85:
-#line 411 "ael.y"
+ case 83:
+#line 418 "ael.y"
{reset_semicount(parseio->scanner);;}
break;
- case 86:
-#line 411 "ael.y"
+ case 84:
+#line 418 "ael.y"
{
char *bufx;
int tot=0;
@@ -2435,148 +2424,148 @@ yyreduce:
;}
break;
- case 87:
-#line 444 "ael.y"
+ case 85:
+#line 451 "ael.y"
{ (yyval.pval) = npval2(PV_BREAK, &(yylsp[-1]), &(yylsp[0])); ;}
break;
- case 88:
-#line 445 "ael.y"
+ case 86:
+#line 452 "ael.y"
{ (yyval.pval) = npval2(PV_RETURN, &(yylsp[-1]), &(yylsp[0])); ;}
break;
- case 89:
-#line 446 "ael.y"
+ case 87:
+#line 453 "ael.y"
{ (yyval.pval) = npval2(PV_CONTINUE, &(yylsp[-1]), &(yylsp[0])); ;}
break;
- case 90:
-#line 447 "ael.y"
+ case 88:
+#line 454 "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 91:
-#line 451 "ael.y"
+ case 89:
+#line 458 "ael.y"
{ (yyval.pval)=0; ;}
break;
- case 92:
-#line 454 "ael.y"
+ case 90:
+#line 461 "ael.y"
{ (yyval.pval) = (yyvsp[0].pval); ;}
break;
- case 93:
-#line 455 "ael.y"
+ case 91:
+#line 462 "ael.y"
{ (yyval.pval) = NULL ; ;}
break;
- case 94:
-#line 460 "ael.y"
+ case 92:
+#line 467 "ael.y"
{ (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 95:
-#line 461 "ael.y"
+ case 93:
+#line 468 "ael.y"
{
(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 96:
-#line 464 "ael.y"
+ case 94:
+#line 471 "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 95:
+#line 474 "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 98:
-#line 471 "ael.y"
+ case 96:
+#line 478 "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 475 "ael.y"
+ case 97:
+#line 482 "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 100:
-#line 479 "ael.y"
+ case 98:
+#line 486 "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 486 "ael.y"
+ case 99:
+#line 493 "ael.y"
{
(yyval.pval) = nword((yyvsp[0].str), &(yylsp[0]));
(yyval.pval)->next = nword(strdup("1"), &(yylsp[0])); ;}
break;
- case 102:
-#line 489 "ael.y"
+ case 100:
+#line 496 "ael.y"
{
(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 103:
-#line 492 "ael.y"
+ case 101:
+#line 499 "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 104:
-#line 496 "ael.y"
+ case 102:
+#line 503 "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 105:
-#line 500 "ael.y"
+ case 103:
+#line 507 "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 106:
-#line 504 "ael.y"
+ case 104:
+#line 511 "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 107:
-#line 510 "ael.y"
+ case 105:
+#line 517 "ael.y"
{reset_argcount(parseio->scanner);;}
break;
- case 108:
-#line 510 "ael.y"
+ case 106:
+#line 517 "ael.y"
{
/* XXX original code had @2 but i think we need @5 */
(yyval.pval) = npval2(PV_MACRO_CALL, &(yylsp[-4]), &(yylsp[0]));
@@ -2584,20 +2573,20 @@ yyreduce:
(yyval.pval)->u2.arglist = (yyvsp[-1].pval);;}
break;
- case 109:
-#line 515 "ael.y"
+ case 107:
+#line 522 "ael.y"
{
(yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str); ;}
break;
- case 110:
-#line 523 "ael.y"
+ case 108:
+#line 530 "ael.y"
{reset_argcount(parseio->scanner);;}
break;
- case 111:
-#line 523 "ael.y"
+ case 109:
+#line 530 "ael.y"
{
if (strcasecmp((yyvsp[-2].str),"goto") == 0) {
(yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[-1]));
@@ -2609,8 +2598,8 @@ yyreduce:
} ;}
break;
- case 112:
-#line 534 "ael.y"
+ case 110:
+#line 541 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[0]));
if( (yyval.pval)->type == PV_GOTO )
@@ -2620,197 +2609,197 @@ yyreduce:
;}
break;
- case 113:
-#line 541 "ael.y"
+ case 111:
+#line 548 "ael.y"
{ (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
break;
- case 114:
-#line 544 "ael.y"
+ case 112:
+#line 551 "ael.y"
{ (yyval.str) = (yyvsp[0].str) ;}
break;
- case 115:
-#line 545 "ael.y"
+ case 113:
+#line 552 "ael.y"
{ (yyval.str) = strdup(""); ;}
break;
- case 116:
-#line 548 "ael.y"
+ case 114:
+#line 555 "ael.y"
{ (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 117:
-#line 549 "ael.y"
+ case 115:
+#line 556 "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 118:
-#line 552 "ael.y"
+ case 116:
+#line 559 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[0].str), &(yylsp[0]))); ;}
break;
- case 119:
-#line 555 "ael.y"
+ case 117:
+#line 562 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
- case 120:
-#line 556 "ael.y"
+ case 118:
+#line 563 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
- case 121:
-#line 559 "ael.y"
+ case 119:
+#line 566 "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 122:
-#line 563 "ael.y"
+ case 120:
+#line 570 "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 123:
-#line 567 "ael.y"
+ case 121:
+#line 574 "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 124:
-#line 571 "ael.y"
+ case 122:
+#line 578 "ael.y"
{
(yyval.pval) = npval2(PV_CASE, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
- case 125:
-#line 574 "ael.y"
+ case 123:
+#line 581 "ael.y"
{
(yyval.pval) = npval2(PV_DEFAULT, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = NULL;;}
break;
- case 126:
-#line 577 "ael.y"
+ case 124:
+#line 584 "ael.y"
{
(yyval.pval) = npval2(PV_PATTERN, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
- case 127:
-#line 582 "ael.y"
+ case 125:
+#line 589 "ael.y"
{ (yyval.pval) = NULL; ;}
break;
- case 128:
-#line 583 "ael.y"
+ case 126:
+#line 590 "ael.y"
{(yyval.pval) = (yyvsp[0].pval);;}
break;
- case 129:
-#line 584 "ael.y"
+ case 127:
+#line 591 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
- case 130:
-#line 587 "ael.y"
+ case 128:
+#line 594 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
- case 131:
-#line 588 "ael.y"
+ case 129:
+#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 594 "ael.y"
+ case 130:
+#line 601 "ael.y"
{
(yyval.pval) = npval2(PV_SWITCHES, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[0].pval); ;}
break;
- case 133:
-#line 599 "ael.y"
+ case 131:
+#line 606 "ael.y"
{
(yyval.pval) = npval2(PV_ESWITCHES, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[0].pval); ;}
break;
- case 134:
-#line 604 "ael.y"
+ case 132:
+#line 611 "ael.y"
{ (yyval.pval) = (yyvsp[-1].pval); ;}
break;
- case 135:
-#line 605 "ael.y"
+ case 133:
+#line 612 "ael.y"
{ (yyval.pval) = NULL; ;}
break;
- case 136:
-#line 608 "ael.y"
+ case 134:
+#line 615 "ael.y"
{ (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;}
break;
- case 137:
-#line 609 "ael.y"
+ case 135:
+#line 616 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[-1].str), &(yylsp[-1]))); ;}
break;
- case 138:
-#line 610 "ael.y"
+ case 136:
+#line 617 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
- case 139:
-#line 613 "ael.y"
+ case 137:
+#line 620 "ael.y"
{ (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;}
break;
- case 140:
-#line 614 "ael.y"
+ case 138:
+#line 621 "ael.y"
{
(yyval.pval) = nword((yyvsp[-3].str), &(yylsp[-3]));
(yyval.pval)->u2.arglist = (yyvsp[-1].pval);
prev_word=0; /* XXX sure ? */ ;}
break;
- case 141:
-#line 621 "ael.y"
+ case 139:
+#line 628 "ael.y"
{ (yyval.pval) = (yyvsp[0].pval); ;}
break;
- case 142:
-#line 622 "ael.y"
+ case 140:
+#line 629 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
- case 143:
-#line 623 "ael.y"
+ case 141:
+#line 630 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
- case 144:
-#line 626 "ael.y"
+ case 142:
+#line 633 "ael.y"
{
(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
break;
- case 145:
-#line 629 "ael.y"
+ case 143:
+#line 636 "ael.y"
{
(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;}
break;
@@ -2820,7 +2809,7 @@ yyreduce:
}
/* Line 1126 of yacc.c. */
-#line 2824 "ael.tab.c"
+#line 2813 "ael.tab.c"
yyvsp -= yylen;
yyssp -= yylen;
@@ -3095,7 +3084,7 @@ yyreturn:
}
-#line 634 "ael.y"
+#line 641 "ael.y"
static char *token_equivs1[] =
diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y
index 3123fe0dd9..a8b2b99fdd 100644
--- a/pbx/ael/ael.y
+++ b/pbx/ael/ael.y
@@ -129,6 +129,7 @@ static pval *update_last(pval *, YYLTYPE *);
%type <str>goto_word
%type <str>word_list
%type <str>word3_list
+%type <str>test_expr
%type <intval>opt_abstract
@@ -171,6 +172,7 @@ static pval *update_last(pval *, YYLTYPE *);
%destructor { free($$);} word word_list goto_word word3_list opt_word context_name
timerange
+ test_expr
%%
@@ -309,13 +311,18 @@ timespec : timerange BAR word3_list BAR word3_list BAR word3_list {
$$->u1.list->next->next = nword($7, &@7); }
;
+/* expression used in if, random, while, switch */
+test_expr : LP { reset_parencount(parseio->scanner); } word_list RP {
+ $$ = $3; }
+ ;
+
/* 'if' like statements: if, iftime, random */
-if_like_head : KW_IF LP { reset_parencount(parseio->scanner); } word_list RP {
- $$= npval2(PV_IF, &@1, &@5);
- $$->u1.str = $4; }
- | KW_RANDOM LP { reset_parencount(parseio->scanner); } word_list RP {
- $$ = npval2(PV_RANDOM, &@1, &@5);
- $$->u1.str=$4;}
+if_like_head : KW_IF test_expr {
+ $$= npval2(PV_IF, &@1, &@2);
+ $$->u1.str = $2; }
+ | KW_RANDOM test_expr {
+ $$ = npval2(PV_RANDOM, &@1, &@2);
+ $$->u1.str=$2;}
| KW_IFTIME LP timespec RP {
$$ = npval2(PV_IFTIME, &@1, &@4);
$$->u1.list = $3;
@@ -360,9 +367,9 @@ goto_word : word { $$ = $1;}
free($3);}
;
-switch_head : KW_SWITCH LP { reset_parencount(parseio->scanner); } word RP LC {
- $$ = npval2(PV_SWITCH, &@1, &@6);
- $$->u1.str = $4; }
+switch_head : KW_SWITCH test_expr LC {
+ $$ = npval2(PV_SWITCH, &@1, &@3);
+ $$->u1.str = $2; }
;
/*
@@ -386,16 +393,16 @@ statement : LC statements RC {
$$->u1.str = $1; }
| KW_FOR LP {reset_semicount(parseio->scanner);} word SEMI
{reset_semicount(parseio->scanner);} word SEMI
- {reset_parencount(parseio->scanner);} word RP statement {
+ {reset_parencount(parseio->scanner);} word RP statement { /* XXX word_list maybe ? */
$$ = npval2(PV_FOR, &@1, &@12);
$$->u1.for_init = $4;
$$->u2.for_test=$7;
$$->u3.for_inc = $10;
$$->u4.for_statements = $12;}
- | KW_WHILE LP {reset_parencount(parseio->scanner);} word RP statement {
- $$ = npval2(PV_WHILE, &@1, &@6);
- $$->u1.str = $4;
- $$->u2.statements = $6; }
+ | KW_WHILE test_expr statement {
+ $$ = npval2(PV_WHILE, &@1, &@3);
+ $$->u1.str = $2;
+ $$->u2.statements = $3; }
| switch_head RC /* empty list OK */ {
$$ = update_last($1, &@2); }
| switch_head case_statements RC {
--
GitLab