diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-02 18:48:47 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-02 18:48:47 +0000 |
| commit | ef483c5c9fa64b12fd3e84921750403b3561de25 (patch) | |
| tree | db1501246f92765fafc3fe2da39a2d21c58057c9 /pbx | |
| parent | ffd1bcd9f3e20cfa8401e60ea05d39590480826a (diff) | |
empty arglists are valid
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@24257 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/ael/ael.tab.c | 1185 | ||||
| -rw-r--r-- | pbx/ael/ael.y | 10 |
2 files changed, 583 insertions, 612 deletions
diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c index a672e28e7..7306c3814 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 442 +#define YYLAST 384 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 42 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 58 /* YYNRULES -- Number of rules. */ -#define YYNRULES 146 +#define YYNRULES 145 /* YYNRULES -- Number of states. */ -#define YYNSTATES 288 +#define YYNSTATES 283 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -479,20 +479,20 @@ static const unsigned char yytranslate[] = static const unsigned short int yyprhs[] = { 0, 0, 3, 5, 7, 10, 13, 15, 17, 19, - 21, 23, 25, 30, 32, 33, 42, 50, 58, 65, - 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, 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, 500, 503, 506, 511 + 21, 23, 25, 30, 32, 33, 42, 50, 55, 59, + 61, 64, 67, 68, 74, 75, 77, 81, 84, 87, + 91, 93, 95, 98, 101, 103, 105, 107, 109, 111, + 112, 118, 121, 123, 128, 132, 137, 145, 154, 156, + 159, 162, 168, 170, 178, 179, 185, 186, 192, 197, + 199, 202, 204, 207, 211, 213, 216, 220, 221, 228, + 232, 233, 239, 243, 247, 250, 251, 252, 253, 266, + 267, 274, 277, 281, 285, 288, 291, 292, 298, 301, + 304, 307, 311, 313, 316, 317, 319, 323, 327, 333, + 339, 345, 351, 353, 357, 363, 367, 373, 377, 378, + 384, 388, 389, 393, 397, 400, 402, 403, 405, 406, + 410, 412, 415, 420, 424, 429, 433, 436, 440, 442, + 445, 447, 453, 456, 459, 463, 466, 469, 473, 476, + 479, 484, 486, 489, 492, 497 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -503,73 +503,72 @@ static const yysigned_char yyrhs[] = -1, 41, -1, 36, -1, 48, 3, 46, 55, -1, 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, 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, 99, -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, 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, -1, - 98, 97, -1, 98, 1, -1, 40, 4, 98, 5, - -1, 40, 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, -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, -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, -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, -1, 98, 97, -1, 98, + 1, -1, 40, 4, 98, 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, 211, 214, 218, 223, - 226, 230, 231, 232, 235, 235, 241, 242, 243, 246, - 247, 250, 251, 252, 253, 256, 257, 258, 259, 260, - 261, 261, 265, 266, 269, 274, 278, 283, 288, 297, - 298, 299, 305, 310, 314, 322, 322, 325, 325, 328, - 339, 340, 347, 348, 353, 361, 362, 366, 372, 372, - 380, 383, 383, 387, 390, 393, 396, 397, 398, 396, - 404, 404, 408, 410, 413, 415, 417, 420, 420, 453, - 454, 455, 456, 460, 463, 464, 469, 470, 473, 476, - 480, 484, 488, 495, 498, 501, 505, 509, 513, 519, - 519, 524, 532, 532, 543, 550, 553, 554, 557, 558, - 561, 564, 565, 568, 572, 576, 580, 583, 586, 591, - 592, 595, 596, 602, 607, 612, 613, 616, 617, 618, - 621, 622, 629, 630, 631, 634, 637 + 192, 193, 196, 204, 205, 208, 211, 216, 219, 223, + 224, 225, 228, 228, 234, 235, 236, 237, 240, 241, + 244, 245, 246, 247, 250, 251, 252, 253, 254, 255, + 255, 259, 260, 263, 268, 272, 277, 282, 291, 292, + 293, 299, 304, 308, 316, 316, 319, 319, 322, 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, 623, 624, 625, 628, 631 }; #endif @@ -616,40 +615,40 @@ static const unsigned short int yytoknum[] = static const unsigned char yyr1[] = { 0, 42, 43, 44, 44, 44, 45, 45, 45, 45, - 46, 46, 47, 48, 48, 49, 49, 49, 49, 50, - 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, 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, 98, 98, 98, 99, 99 + 46, 46, 47, 48, 48, 49, 49, 50, 50, 51, + 51, 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, + 92, 92, 93, 94, 95, 95, 96, 96, 96, 97, + 97, 98, 98, 98, 99, 99 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const unsigned char yyr2[] = { 0, 2, 1, 1, 2, 2, 1, 1, 1, 1, - 1, 1, 4, 1, 0, 8, 7, 7, 6, 4, - 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, 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, 1, 2, 2, 4, 3 + 1, 1, 4, 1, 0, 8, 7, 4, 3, 1, + 2, 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, 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 @@ -658,195 +657,183 @@ static const unsigned char yyr2[] = static const unsigned char yydefact[] = { 14, 9, 0, 0, 13, 0, 0, 3, 6, 0, - 7, 8, 0, 0, 1, 5, 4, 0, 0, 20, - 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, 93, + 7, 8, 0, 0, 1, 5, 4, 0, 24, 18, + 0, 0, 19, 11, 10, 0, 25, 0, 22, 21, + 17, 20, 0, 12, 27, 0, 0, 0, 31, 28, + 42, 0, 0, 0, 0, 0, 0, 0, 0, 30, + 38, 34, 36, 37, 35, 0, 26, 0, 0, 0, + 0, 0, 0, 132, 133, 0, 41, 39, 0, 33, + 29, 32, 0, 16, 92, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 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, - 142, 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, 143, 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, 41, 0, 0, 56, 0, 0, 58, 0, 0, - 0, 0, 0, 77, 0, 132, 72, 0, 0, 88, - 0, 0, 141, 110, 69, 0, 0, 102, 101, 100, - 99, 107, 105, 0, 81, 0, 47, 0, 52, 0, - 48, 0, 78, 54, 0, 0, 0, 79 + 0, 130, 118, 0, 0, 128, 23, 0, 0, 0, + 61, 0, 135, 0, 0, 145, 0, 141, 0, 0, + 44, 0, 48, 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, 15, 129, + 43, 0, 45, 62, 0, 136, 138, 134, 0, 139, + 0, 143, 144, 142, 0, 50, 69, 49, 108, 83, + 0, 0, 52, 0, 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, 0, 63, 0, 137, 0, 40, 110, + 118, 0, 0, 0, 58, 0, 0, 0, 0, 66, + 97, 96, 64, 103, 107, 105, 0, 0, 0, 0, + 93, 125, 127, 0, 115, 119, 0, 0, 0, 140, + 0, 0, 55, 0, 0, 57, 0, 0, 0, 0, + 0, 76, 0, 131, 71, 0, 0, 87, 0, 46, + 109, 68, 0, 0, 101, 100, 99, 98, 106, 104, + 0, 80, 47, 0, 51, 0, 0, 77, 53, 0, + 0, 0, 78 }; /* YYDEFGOTO[NTERM-NUM]. */ static const short int yydefgoto[] = { - -1, 5, 6, 7, 149, 8, 9, 10, 11, 21, - 22, 39, 28, 34, 50, 51, 152, 52, 53, 98, - 162, 163, 74, 160, 165, 131, 164, 108, 75, 159, - 99, 180, 176, 273, 284, 177, 191, 182, 109, 111, - 101, 209, 77, 179, 78, 234, 132, 127, 128, 79, - 80, 54, 55, 89, 147, 150, 151, 56 + -1, 5, 6, 7, 106, 8, 9, 10, 11, 21, + 22, 37, 27, 33, 48, 49, 109, 50, 51, 111, + 173, 174, 89, 171, 176, 144, 175, 121, 90, 170, + 112, 191, 187, 270, 279, 188, 202, 193, 122, 124, + 114, 210, 92, 190, 93, 235, 145, 140, 141, 94, + 95, 52, 53, 63, 104, 107, 108, 54 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -174 +#define YYPACT_NINF -186 static const short int yypact[] = { - 155, -174, -16, 37, -174, 32, 159, -174, -174, 62, - -174, -174, 73, 21, -174, -174, -174, 56, 1, -174, - 63, 10, -174, -174, -174, 82, 95, -174, 86, -174, - -174, -174, -174, 160, -174, 297, -174, 110, 125, 131, - -174, -174, -174, 114, 47, 152, 169, 169, 179, 97, - 273, -174, -174, -174, -174, -174, -174, 401, -174, -174, - 143, 188, 197, 200, 202, 81, 144, 201, 203, 204, - 210, 212, 174, 196, 401, 66, -174, 6, 8, 323, - -174, 349, -174, 216, 184, 214, 206, 191, 28, -174, - -174, 4, -174, -174, 401, -174, -174, -174, 209, -174, - 227, 231, -174, -174, 205, -174, 100, 7, 126, 235, - 9, 236, -174, -174, -174, -174, -174, 243, -174, -174, - -174, -174, 232, -174, 213, 217, 246, 119, -174, -174, - 218, -174, 122, -174, -174, -174, -174, -174, 375, -174, - 247, 191, 401, 219, 254, -174, 257, 90, -174, 117, - -174, 49, 226, -174, -174, -174, -174, 261, -174, 234, - 238, 53, 267, 275, 272, 238, 144, 144, 245, -174, - 144, 144, -174, 248, 116, -174, 250, 251, 401, -174, - 252, 401, -174, 276, 277, 401, -174, -174, -174, -174, - 253, 255, -174, -174, 288, -174, 256, 258, -174, -174, - -174, 290, -174, 205, -174, -174, -174, 292, -174, 238, - 299, 300, 191, -174, 191, 301, 274, 305, -174, 310, - 308, 104, -174, -174, -174, 302, 325, 244, 328, -174, - 401, 401, 2, -174, -174, 329, 298, -174, 309, -174, - 332, -174, 186, 340, -174, 333, 336, -174, 144, 144, - 144, 144, 128, -174, 401, -174, -174, 48, 115, -174, - 334, 401, -174, -174, -174, 191, 191, -174, -174, -174, - -174, -174, -174, 318, -174, 401, -174, 350, -174, 354, - -174, 191, -174, -174, 324, 359, 401, -174 + 103, -186, -6, 56, -186, 41, 355, -186, -186, 68, + -186, -186, 71, 20, -186, -186, -186, -26, 23, -186, + 126, 1, -186, -186, -186, 108, -186, 143, -186, -186, + -186, -186, 141, -186, -186, 137, 102, 111, -186, -186, + -186, 166, 37, 159, 170, 170, 191, 61, 146, -186, + -186, -186, -186, -186, -186, 269, -186, 162, 155, 192, + 175, 161, 22, -186, -186, 2, -186, -186, 321, -186, + -186, -186, 321, -186, -186, 167, 201, 206, 208, 209, + 50, 178, 203, 212, 213, 210, 216, 187, 119, 321, + 98, -186, 12, 185, 295, -186, -186, 221, 161, 321, + 194, 229, -186, 234, 16, -186, 82, -186, 13, 202, + -186, 4, -186, 239, 241, -186, -186, 211, -186, 74, + 9, 149, 242, 150, 245, -186, -186, -186, -186, -186, + 250, -186, -186, -186, -186, 235, -186, 217, 218, 246, + 104, -186, -186, 219, -186, 181, -186, -186, -186, -186, + -186, 257, -186, 225, 226, -186, -186, -186, 270, -186, + 211, -186, -186, -186, 271, -186, -186, -186, 273, -186, + 244, 249, 17, 279, 275, 272, 249, 178, 178, 252, + -186, 178, 178, -186, 263, 58, -186, 264, 267, 321, + -186, 268, 321, -186, 300, 301, 321, -186, -186, -186, + -186, 277, 278, 285, -186, 262, -186, 308, -186, -186, + 249, 323, 324, 161, -186, 161, 327, 325, 329, -186, + 328, 331, 134, -186, -186, -186, 337, 330, 243, 343, + -186, 321, 321, 47, -186, -186, 344, 333, 321, -186, + 182, 356, -186, 346, 350, -186, 178, 178, 178, 178, + 95, -186, 321, -186, -186, 88, 205, -186, 321, -186, + -186, -186, 161, 161, -186, -186, -186, -186, -186, -186, + 326, -186, -186, 351, -186, 357, 161, -186, -186, 332, + 359, 321, -186 }; /* YYPGOTO[NTERM-NUM]. */ static const short int yypgoto[] = { - -174, -174, -174, 364, 355, -174, -174, -174, -174, -174, - 352, -174, -174, -174, -174, 335, -174, -174, -174, -173, - -174, 181, -174, -174, -174, 16, -86, -62, -174, -174, - -35, -174, -174, -174, -174, -174, -174, -174, -174, -174, - -174, -174, -174, -174, -174, -174, 180, -174, 264, 307, - -77, -174, -174, 345, -174, 259, -174, -174 + -186, -186, -186, 362, 352, -186, -186, -186, -186, -186, + 353, -186, -186, -186, -186, 334, -186, -186, -186, -185, + -186, 215, -186, -186, -186, -15, -58, -80, -186, -186, + -55, -186, -186, -186, -186, -186, -186, -186, -186, -186, + -186, -186, -186, -186, -186, -186, 169, -186, 232, -186, + 282, -186, -186, 335, -186, 276, -186, -186 }; /* 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 -126 +#define YYTABLE_NINF -125 static const short int yytable[] = { - 76, 144, 136, 154, 110, 227, 57, -124, 26, 148, - 59, 30, 232, 129, 60, 31, 133, 134, 168, 173, - 61, 62, 63, 174, 64, 12, 19, 65, 66, 67, - 68, 69, 14, 145, 70, 71, -124, -124, -124, 122, - 23, 13, 27, 73, 76, 24, 76, 130, 169, 154, - 204, 20, 57, -123, 205, 194, 59, 257, 258, 153, - 60, 136, 20, 156, -62, 17, 61, 62, 63, 146, - 64, 123, 29, 65, 66, 67, 68, 69, 85, 18, - 70, 71, -123, -123, -123, 23, 33, 36, 86, 73, - 24, 199, 23, 37, 196, 200, 38, 24, 92, 35, - 124, 125, 126, 76, 216, 217, 93, 195, 219, 220, - 166, 222, 224, 167, 81, 168, 154, 106, 252, 57, - -125, 94, 107, 59, 186, 202, 245, 60, 246, 189, - 203, 201, 190, 61, 62, 63, 170, 64, 84, 171, - 65, 66, 67, 68, 69, 169, 229, 70, 71, -125, - -125, -125, 223, 124, 125, 126, 73, 107, 87, -2, - 15, 40, -14, 1, 271, 41, 82, 1, 42, 272, - 2, 3, 83, 88, 2, 3, 211, 43, 4, 277, - 278, 215, 4, 91, 100, 107, 267, 268, 269, 270, - 44, 45, 156, 263, 102, 283, 190, 156, 46, 47, - 48, 49, 118, 103, 119, 120, 104, 121, 105, 112, - 154, 113, 114, 57, 155, 117, 115, 59, 116, 274, - 141, 60, 156, 156, 139, 140, 276, 61, 62, 63, - 142, 64, 143, 157, 65, 66, 67, 68, 69, 158, - 280, 70, 71, 172, 175, 154, 161, 178, 57, 255, - 73, 287, 59, 181, 183, 193, 60, 185, 184, 188, - 196, 197, 61, 62, 63, 198, 64, 207, 208, 65, - 66, 67, 68, 69, 95, 210, 70, 71, 96, 130, - 212, 42, 213, 214, 248, 73, 218, 230, 231, 221, - 43, 225, 226, 228, 233, 236, 235, 237, 239, 238, - 241, 57, 58, 44, 45, 59, 243, 244, 247, 60, - 253, 46, 47, 48, 49, 61, 62, 63, 249, 64, - 250, 251, 65, 66, 67, 68, 69, 57, 135, 70, - 71, 59, 254, 261, 72, 60, 256, 259, 73, 260, - 262, 61, 62, 63, 264, 64, 265, 266, 65, 66, - 67, 68, 69, 57, 137, 70, 71, 59, 275, 279, - 72, 60, 282, 281, 73, 285, 286, 61, 62, 63, - 16, 64, 25, 32, 65, 66, 67, 68, 69, 57, - 192, 70, 71, 59, 240, 97, 72, 60, 138, 242, - 73, 187, 90, 61, 62, 63, 0, 64, 0, 0, - 65, 66, 67, 68, 69, 57, 0, 70, 71, 59, - 206, 0, 72, 60, 0, 0, 73, 0, 0, 61, - 62, 63, 0, 64, 0, 0, 65, 66, 67, 68, - 69, 0, 0, 70, 71, 0, 0, 0, 0, 0, - 0, 0, 73 + 91, 123, 29, 101, 228, 165, 30, 105, 72, 166, + 23, 233, 74, 110, 161, 24, 75, 156, 162, 142, + 179, 157, 76, 77, 78, 19, 79, 102, -61, 80, + 81, 82, 83, 84, 135, 12, 85, 86, 23, 91, + 151, 14, 20, 24, 152, 88, 255, 256, 165, 23, + 180, 72, -123, 143, 24, 74, 167, 158, 153, 75, + 13, 20, 66, 103, 26, 76, 77, 78, 59, 79, + 67, 17, 80, 81, 82, 83, 84, 18, 60, 85, + 86, -123, -123, -123, 177, 68, 119, 178, 88, 165, + 159, 120, 72, -122, 224, 160, 74, 217, 218, 120, + 75, 220, 221, 136, 223, 225, 76, 77, 78, 197, + 79, 1, 32, 80, 81, 82, 83, 84, 2, 3, + 85, 86, -122, -122, -122, 131, 4, 132, 133, 88, + 134, 268, 137, 138, 139, 28, 269, 230, 137, 138, + 139, 55, 38, 56, 34, 179, 39, 69, 250, 40, + 35, 70, 57, 36, 40, 243, 212, 244, 41, 181, + 184, 216, 182, 41, 185, 61, 264, 265, 266, 267, + 96, 42, 43, 167, 62, 180, 42, 43, 167, 44, + 45, 46, 47, 259, 44, 45, 46, 47, 200, 260, + 58, 201, 201, 146, 147, 65, 97, 271, 98, 99, + 167, 167, 100, 272, 273, 274, 165, 115, 113, 72, + -124, 125, 116, 74, 117, 118, 128, 75, 278, 120, + 126, 127, 129, 76, 77, 78, 282, 79, 130, 150, + 80, 81, 82, 83, 84, 153, 154, 85, 86, -124, + -124, -124, 155, 164, 165, 168, 88, 72, 253, 169, + 183, 74, 172, 186, 189, 75, 192, 196, 194, 195, + 199, 76, 77, 78, 203, 79, 204, 205, 80, 81, + 82, 83, 84, 72, 73, 85, 86, 74, 206, 208, + 209, 75, 214, 215, 88, 211, 238, 76, 77, 78, + 143, 79, 213, 219, 80, 81, 82, 83, 84, 72, + 148, 85, 86, 74, 222, 226, 87, 75, 227, 229, + 88, 231, 232, 76, 77, 78, 239, 79, 234, 236, + 80, 81, 82, 83, 84, 72, 237, 85, 86, 74, + 241, 242, 87, 75, 245, 246, 88, 252, 248, 76, + 77, 78, 247, 79, 249, 251, 80, 81, 82, 83, + 84, 254, 257, 85, 86, -2, 15, 258, -14, 262, + 261, 263, 88, 1, 276, 277, 281, 275, 16, 25, + 2, 3, 198, 280, 31, 207, 149, 0, 4, 240, + 64, 0, 71, 0, 163 }; static const short int yycheck[] = { - 35, 87, 79, 1, 66, 178, 4, 5, 7, 5, - 8, 1, 185, 7, 12, 5, 8, 9, 11, 10, - 18, 19, 20, 14, 22, 41, 5, 25, 26, 27, - 28, 29, 0, 5, 32, 33, 34, 35, 36, 74, - 36, 4, 41, 41, 79, 41, 81, 41, 41, 1, - 1, 41, 4, 5, 5, 141, 8, 230, 231, 94, - 12, 138, 41, 98, 11, 3, 18, 19, 20, 41, - 22, 5, 9, 25, 26, 27, 28, 29, 31, 6, - 32, 33, 34, 35, 36, 36, 4, 1, 41, 41, - 41, 1, 36, 7, 41, 5, 10, 41, 1, 4, - 34, 35, 36, 138, 166, 167, 9, 142, 170, 171, - 10, 173, 174, 13, 4, 11, 1, 36, 14, 4, - 5, 24, 41, 8, 5, 8, 212, 12, 214, 7, - 13, 41, 10, 18, 19, 20, 10, 22, 24, 13, - 25, 26, 27, 28, 29, 41, 181, 32, 33, 34, - 35, 36, 36, 34, 35, 36, 41, 41, 6, 0, - 1, 1, 3, 8, 36, 5, 41, 8, 8, 41, - 15, 16, 41, 4, 15, 16, 160, 17, 23, 265, - 266, 165, 23, 4, 41, 41, 248, 249, 250, 251, - 30, 31, 227, 7, 6, 281, 10, 232, 38, 39, - 40, 41, 6, 6, 8, 9, 6, 11, 6, 8, - 1, 8, 8, 4, 5, 41, 6, 8, 6, 254, - 6, 12, 257, 258, 8, 41, 261, 18, 19, 20, - 24, 22, 41, 6, 25, 26, 27, 28, 29, 8, - 275, 32, 33, 8, 8, 1, 41, 4, 4, 5, - 41, 286, 8, 21, 41, 8, 12, 11, 41, 41, - 41, 7, 18, 19, 20, 8, 22, 41, 7, 25, - 26, 27, 28, 29, 1, 41, 32, 33, 5, 41, - 13, 8, 7, 11, 10, 41, 41, 11, 11, 41, - 17, 41, 41, 41, 41, 7, 41, 41, 8, 41, - 8, 4, 5, 30, 31, 8, 7, 7, 7, 12, - 8, 38, 39, 40, 41, 18, 19, 20, 13, 22, - 10, 13, 25, 26, 27, 28, 29, 4, 5, 32, - 33, 8, 7, 24, 37, 12, 8, 8, 41, 41, - 8, 18, 19, 20, 4, 22, 13, 11, 25, 26, - 27, 28, 29, 4, 5, 32, 33, 8, 24, 41, - 37, 12, 8, 13, 41, 41, 7, 18, 19, 20, - 6, 22, 17, 21, 25, 26, 27, 28, 29, 4, - 5, 32, 33, 8, 203, 50, 37, 12, 81, 209, - 41, 127, 47, 18, 19, 20, -1, 22, -1, -1, - 25, 26, 27, 28, 29, 4, -1, 32, 33, 8, - 151, -1, 37, 12, -1, -1, 41, -1, -1, 18, - 19, 20, -1, 22, -1, -1, 25, 26, 27, 28, - 29, -1, -1, 32, 33, -1, -1, -1, -1, -1, - -1, -1, 41 + 55, 81, 1, 61, 189, 1, 5, 5, 4, 5, + 36, 196, 8, 68, 1, 41, 12, 1, 5, 7, + 11, 5, 18, 19, 20, 5, 22, 5, 11, 25, + 26, 27, 28, 29, 89, 41, 32, 33, 36, 94, + 98, 0, 41, 41, 99, 41, 231, 232, 1, 36, + 41, 4, 5, 41, 41, 8, 111, 41, 41, 12, + 4, 41, 1, 41, 41, 18, 19, 20, 31, 22, + 9, 3, 25, 26, 27, 28, 29, 6, 41, 32, + 33, 34, 35, 36, 10, 24, 36, 13, 41, 1, + 8, 41, 4, 5, 36, 13, 8, 177, 178, 41, + 12, 181, 182, 5, 184, 185, 18, 19, 20, 5, + 22, 8, 4, 25, 26, 27, 28, 29, 15, 16, + 32, 33, 34, 35, 36, 6, 23, 8, 9, 41, + 11, 36, 34, 35, 36, 9, 41, 192, 34, 35, + 36, 4, 1, 41, 1, 11, 5, 1, 14, 8, + 7, 5, 41, 10, 8, 213, 171, 215, 17, 10, + 10, 176, 13, 17, 14, 6, 246, 247, 248, 249, + 8, 30, 31, 228, 4, 41, 30, 31, 233, 38, + 39, 40, 41, 238, 38, 39, 40, 41, 7, 7, + 24, 10, 10, 8, 9, 4, 41, 252, 6, 24, + 255, 256, 41, 258, 262, 263, 1, 6, 41, 4, + 5, 8, 6, 8, 6, 6, 6, 12, 276, 41, + 8, 8, 6, 18, 19, 20, 281, 22, 41, 8, + 25, 26, 27, 28, 29, 41, 7, 32, 33, 34, + 35, 36, 8, 41, 1, 6, 41, 4, 5, 8, + 8, 8, 41, 8, 4, 12, 21, 11, 41, 41, + 41, 18, 19, 20, 7, 22, 41, 41, 25, 26, + 27, 28, 29, 4, 5, 32, 33, 8, 8, 8, + 7, 12, 7, 11, 41, 41, 24, 18, 19, 20, + 41, 22, 13, 41, 25, 26, 27, 28, 29, 4, + 5, 32, 33, 8, 41, 41, 37, 12, 41, 41, + 41, 11, 11, 18, 19, 20, 8, 22, 41, 41, + 25, 26, 27, 28, 29, 4, 41, 32, 33, 8, + 7, 7, 37, 12, 7, 10, 41, 7, 10, 18, + 19, 20, 13, 22, 13, 8, 25, 26, 27, 28, + 29, 8, 8, 32, 33, 0, 1, 24, 3, 13, + 4, 11, 41, 8, 13, 8, 7, 41, 6, 17, + 15, 16, 140, 41, 21, 160, 94, -1, 23, 210, + 45, -1, 48, -1, 108 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -855,33 +842,33 @@ static const unsigned char yystos[] = { 0, 8, 15, 16, 23, 43, 44, 45, 47, 48, 49, 50, 41, 4, 0, 1, 45, 3, 6, 5, - 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, 93, 94, 99, 4, 5, 8, - 12, 18, 19, 20, 22, 25, 26, 27, 28, 29, - 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, 98, 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, 97, 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, 88, 7, 7, 68, 68, 7, 10, 13, - 10, 13, 14, 8, 7, 5, 8, 61, 61, 8, - 41, 24, 8, 7, 4, 13, 11, 69, 69, 69, - 69, 36, 41, 75, 72, 24, 72, 68, 68, 41, - 72, 13, 8, 68, 76, 41, 7, 72 + 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, + 5, 57, 4, 5, 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 }; #define yyerrok (yyerrstatus = 0) @@ -1259,7 +1246,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) case 41: /* "word" */ #line 172 "ael.y" { free((yyvaluep->str));}; -#line 1263 "ael.tab.c" +#line 1250 "ael.tab.c" break; case 44: /* "objects" */ #line 158 "ael.y" @@ -1267,7 +1254,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1271 "ael.tab.c" +#line 1258 "ael.tab.c" break; case 45: /* "object" */ #line 158 "ael.y" @@ -1275,12 +1262,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1279 "ael.tab.c" +#line 1266 "ael.tab.c" break; case 46: /* "context_name" */ #line 172 "ael.y" { free((yyvaluep->str));}; -#line 1284 "ael.tab.c" +#line 1271 "ael.tab.c" break; case 47: /* "context" */ #line 158 "ael.y" @@ -1288,7 +1275,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1292 "ael.tab.c" +#line 1279 "ael.tab.c" break; case 49: /* "macro" */ #line 158 "ael.y" @@ -1296,7 +1283,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1300 "ael.tab.c" +#line 1287 "ael.tab.c" break; case 50: /* "globals" */ #line 158 "ael.y" @@ -1304,7 +1291,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1308 "ael.tab.c" +#line 1295 "ael.tab.c" break; case 51: /* "global_statements" */ #line 158 "ael.y" @@ -1312,7 +1299,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1316 "ael.tab.c" +#line 1303 "ael.tab.c" break; case 52: /* "global_statement" */ #line 158 "ael.y" @@ -1320,7 +1307,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1324 "ael.tab.c" +#line 1311 "ael.tab.c" break; case 54: /* "arglist" */ #line 158 "ael.y" @@ -1328,7 +1315,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1332 "ael.tab.c" +#line 1319 "ael.tab.c" break; case 55: /* "elements_block" */ #line 158 "ael.y" @@ -1336,7 +1323,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1340 "ael.tab.c" +#line 1327 "ael.tab.c" break; case 56: /* "elements" */ #line 158 "ael.y" @@ -1344,7 +1331,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1348 "ael.tab.c" +#line 1335 "ael.tab.c" break; case 57: /* "element" */ #line 158 "ael.y" @@ -1352,7 +1339,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1356 "ael.tab.c" +#line 1343 "ael.tab.c" break; case 59: /* "ignorepat" */ #line 158 "ael.y" @@ -1360,7 +1347,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1364 "ael.tab.c" +#line 1351 "ael.tab.c" break; case 60: /* "extension" */ #line 158 "ael.y" @@ -1368,7 +1355,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1372 "ael.tab.c" +#line 1359 "ael.tab.c" break; case 61: /* "statements" */ #line 158 "ael.y" @@ -1376,12 +1363,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1380 "ael.tab.c" +#line 1367 "ael.tab.c" break; case 62: /* "timerange" */ #line 172 "ael.y" { free((yyvaluep->str));}; -#line 1385 "ael.tab.c" +#line 1372 "ael.tab.c" break; case 63: /* "timespec" */ #line 158 "ael.y" @@ -1389,7 +1376,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1393 "ael.tab.c" +#line 1380 "ael.tab.c" break; case 64: /* "if_like_head" */ #line 158 "ael.y" @@ -1397,22 +1384,22 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1401 "ael.tab.c" +#line 1388 "ael.tab.c" break; case 67: /* "word_list" */ #line 172 "ael.y" { free((yyvaluep->str));}; -#line 1406 "ael.tab.c" +#line 1393 "ael.tab.c" break; case 68: /* "word3_list" */ #line 172 "ael.y" { free((yyvaluep->str));}; -#line 1411 "ael.tab.c" +#line 1398 "ael.tab.c" break; case 69: /* "goto_word" */ #line 172 "ael.y" { free((yyvaluep->str));}; -#line 1416 "ael.tab.c" +#line 1403 "ael.tab.c" break; case 70: /* "switch_head" */ #line 158 "ael.y" @@ -1420,7 +1407,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1424 "ael.tab.c" +#line 1411 "ael.tab.c" break; case 72: /* "statement" */ #line 158 "ael.y" @@ -1428,7 +1415,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1432 "ael.tab.c" +#line 1419 "ael.tab.c" break; case 79: /* "opt_else" */ #line 158 "ael.y" @@ -1436,7 +1423,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1440 "ael.tab.c" +#line 1427 "ael.tab.c" break; case 80: /* "target" */ #line 158 "ael.y" @@ -1444,7 +1431,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1448 "ael.tab.c" +#line 1435 "ael.tab.c" break; case 81: /* "jumptarget" */ #line 158 "ael.y" @@ -1452,7 +1439,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1456 "ael.tab.c" +#line 1443 "ael.tab.c" break; case 82: /* "macro_call" */ #line 158 "ael.y" @@ -1460,7 +1447,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1464 "ael.tab.c" +#line 1451 "ael.tab.c" break; case 84: /* "application_call_head" */ #line 158 "ael.y" @@ -1468,7 +1455,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1472 "ael.tab.c" +#line 1459 "ael.tab.c" break; case 86: /* "application_call" */ #line 158 "ael.y" @@ -1476,12 +1463,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1480 "ael.tab.c" +#line 1467 "ael.tab.c" break; case 87: /* "opt_word" */ #line 172 "ael.y" { free((yyvaluep->str));}; -#line 1485 "ael.tab.c" +#line 1472 "ael.tab.c" break; case 88: /* "eval_arglist" */ #line 158 "ael.y" @@ -1489,7 +1476,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1493 "ael.tab.c" +#line 1480 "ael.tab.c" break; case 89: /* "case_statements" */ #line 158 "ael.y" @@ -1497,7 +1484,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1501 "ael.tab.c" +#line 1488 "ael.tab.c" break; case 90: /* "case_statement" */ #line 158 "ael.y" @@ -1505,7 +1492,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1509 "ael.tab.c" +#line 1496 "ael.tab.c" break; case 91: /* "macro_statements" */ #line 158 "ael.y" @@ -1513,7 +1500,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1517 "ael.tab.c" +#line 1504 "ael.tab.c" break; case 92: /* "macro_statement" */ #line 158 "ael.y" @@ -1521,7 +1508,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1525 "ael.tab.c" +#line 1512 "ael.tab.c" break; case 93: /* "switches" */ #line 158 "ael.y" @@ -1529,7 +1516,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1533 "ael.tab.c" +#line 1520 "ael.tab.c" break; case 94: /* "eswitches" */ #line 158 "ael.y" @@ -1537,7 +1524,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1541 "ael.tab.c" +#line 1528 "ael.tab.c" break; case 95: /* "switchlist_block" */ #line 158 "ael.y" @@ -1545,7 +1532,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1549 "ael.tab.c" +#line 1536 "ael.tab.c" break; case 96: /* "switchlist" */ #line 158 "ael.y" @@ -1553,7 +1540,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1557 "ael.tab.c" +#line 1544 "ael.tab.c" break; case 97: /* "included_entry" */ #line 158 "ael.y" @@ -1561,7 +1548,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1565 "ael.tab.c" +#line 1552 "ael.tab.c" break; case 98: /* "includeslist" */ #line 158 "ael.y" @@ -1569,7 +1556,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1573 "ael.tab.c" +#line 1560 "ael.tab.c" break; case 99: /* "includes" */ #line 158 "ael.y" @@ -1577,7 +1564,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1581 "ael.tab.c" +#line 1568 "ael.tab.c" break; default: @@ -1977,171 +1964,161 @@ yyreduce: break; case 17: -#line 214 "ael.y" +#line 216 "ael.y" { - (yyval.pval) = npval2(PV_MACRO, &(yylsp[-6]), &(yylsp[0])); - (yyval.pval)->u1.str = (yyvsp[-5].str); - (yyval.pval)->u3.macro_statements = (yyvsp[-1].pval); ;} + (yyval.pval) = npval2(PV_GLOBALS, &(yylsp[-3]), &(yylsp[0])); + (yyval.pval)->u1.statements = (yyvsp[-1].pval);;} break; case 18: -#line 218 "ael.y" - { - (yyval.pval) = npval2(PV_MACRO, &(yylsp[-5]), &(yylsp[0])); - (yyval.pval)->u1.str = (yyvsp[-4].str); ;} +#line 219 "ael.y" + { /* empty globals is OK */ + (yyval.pval) = npval2(PV_GLOBALS, &(yylsp[-2]), &(yylsp[0])); ;} break; case 19: #line 223 "ael.y" - { - (yyval.pval) = npval2(PV_GLOBALS, &(yylsp[-3]), &(yylsp[0])); - (yyval.pval)->u1.statements = (yyvsp[-1].pval);;} + {(yyval.pval)=(yyvsp[0].pval);;} break; case 20: -#line 226 "ael.y" - { /* empty globals is OK */ - (yyval.pval) = npval2(PV_GLOBALS, &(yylsp[-2]), &(yylsp[0])); ;} +#line 224 "ael.y" + {(yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;} break; case 21: -#line 230 "ael.y" - {(yyval.pval)=(yyvsp[0].pval);;} +#line 225 "ael.y" + {(yyval.pval)=(yyvsp[-1].pval);;} break; case 22: -#line 231 "ael.y" - {(yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;} +#line 228 "ael.y" + { reset_semicount(parseio->scanner); ;} break; case 23: -#line 232 "ael.y" - {(yyval.pval)=(yyvsp[-1].pval);;} +#line 228 "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 24: -#line 235 "ael.y" - { reset_semicount(parseio->scanner); ;} +#line 234 "ael.y" + { (yyval.pval) = NULL; ;} break; case 25: #line 235 "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); ;} + { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;} break; case 26: -#line 241 "ael.y" - { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;} +#line 236 "ael.y" + { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[0].str), &(yylsp[0]))); ;} break; case 27: -#line 242 "ael.y" - { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[0].str), &(yylsp[0]))); ;} +#line 237 "ael.y" + {(yyval.pval)=(yyvsp[-1].pval);;} break; case 28: -#line 243 "ael.y" - {(yyval.pval)=(yyvsp[-1].pval);;} +#line 240 "ael.y" + { (yyval.pval) = NULL; ;} break; case 29: -#line 246 "ael.y" - { (yyval.pval) = NULL; ;} +#line 241 "ael.y" + { (yyval.pval) = (yyvsp[-1].pval); ;} break; case 30: -#line 247 "ael.y" - { (yyval.pval) = (yyvsp[-1].pval); ;} +#line 244 "ael.y" + { (yyval.pval)=(yyvsp[0].pval);;} break; case 31: -#line 250 "ael.y" - { (yyval.pval)=(yyvsp[0].pval);;} +#line 245 "ael.y" + {(yyval.pval)=0;;} break; case 32: -#line 251 "ael.y" - {(yyval.pval)=0;;} +#line 246 "ael.y" + { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;} break; case 33: -#line 252 "ael.y" - { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;} +#line 247 "ael.y" + { (yyval.pval)=(yyvsp[-1].pval);;} break; case 34: -#line 253 "ael.y" - { (yyval.pval)=(yyvsp[-1].pval);;} +#line 250 "ael.y" + {(yyval.pval)=(yyvsp[0].pval);;} break; case 35: -#line 256 "ael.y" +#line 251 "ael.y" {(yyval.pval)=(yyvsp[0].pval);;} break; case 36: -#line 257 "ael.y" +#line 252 "ael.y" {(yyval.pval)=(yyvsp[0].pval);;} break; case 37: -#line 258 "ael.y" +#line 253 "ael.y" {(yyval.pval)=(yyvsp[0].pval);;} break; case 38: -#line 259 "ael.y" +#line 254 "ael.y" {(yyval.pval)=(yyvsp[0].pval);;} break; case 39: -#line 260 "ael.y" - {(yyval.pval)=(yyvsp[0].pval);;} - break; - - case 40: -#line 261 "ael.y" +#line 255 "ael.y" { reset_semicount(parseio->scanner); ;} break; - case 41: -#line 261 "ael.y" + case 40: +#line 255 "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 42: -#line 265 "ael.y" + case 41: +#line 259 "ael.y" {free((yyvsp[-1].str)); (yyval.pval)=0;;} break; - case 43: -#line 266 "ael.y" + case 42: +#line 260 "ael.y" {(yyval.pval)=0;/* allow older docs to be read */;} break; - case 44: -#line 269 "ael.y" + case 43: +#line 263 "ael.y" { (yyval.pval) = npval2(PV_IGNOREPAT, &(yylsp[-3]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-1].str);;} break; - case 45: -#line 274 "ael.y" + case 44: +#line 268 "ael.y" { (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-2]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-2].str); (yyval.pval)->u2.statements = (yyvsp[0].pval); ;} break; - case 46: -#line 278 "ael.y" + case 45: +#line 272 "ael.y" { (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-3]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-2].str); @@ -2149,8 +2126,8 @@ yyreduce: (yyval.pval)->u4.regexten=1;;} break; - case 47: -#line 283 "ael.y" + case 46: +#line 277 "ael.y" { (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-6]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-2].str); @@ -2158,8 +2135,8 @@ yyreduce: (yyval.pval)->u3.hints = (yyvsp[-4].str);;} break; - case 48: -#line 288 "ael.y" + case 47: +#line 282 "ael.y" { (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-7]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-2].str); @@ -2168,23 +2145,23 @@ yyreduce: (yyval.pval)->u3.hints = (yyvsp[-4].str);;} break; - case 49: -#line 297 "ael.y" + case 48: +#line 291 "ael.y" {(yyval.pval)=(yyvsp[0].pval);;} break; - case 50: -#line 298 "ael.y" + case 49: +#line 292 "ael.y" { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;} break; - case 51: -#line 299 "ael.y" + case 50: +#line 293 "ael.y" {(yyval.pval)=(yyvsp[-1].pval);;} break; - case 52: -#line 305 "ael.y" + case 51: +#line 299 "ael.y" { asprintf(&(yyval.str), "%s:%s:%s", (yyvsp[-4].str), (yyvsp[-2].str), (yyvsp[0].str)); free((yyvsp[-4].str)); @@ -2192,13 +2169,13 @@ yyreduce: free((yyvsp[0].str)); ;} break; - case 53: -#line 310 "ael.y" + case 52: +#line 304 "ael.y" { (yyval.str) = (yyvsp[0].str); ;} break; - case 54: -#line 314 "ael.y" + case 53: +#line 308 "ael.y" { (yyval.pval) = nword((yyvsp[-6].str), &(yylsp[-6])); (yyval.pval)->u1.list = nword((yyvsp[-4].str), &(yylsp[-4])); @@ -2206,45 +2183,45 @@ yyreduce: (yyval.pval)->u1.list->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;} break; - case 55: -#line 322 "ael.y" + case 54: +#line 316 "ael.y" { reset_parencount(parseio->scanner); ;} break; - case 56: -#line 322 "ael.y" + case 55: +#line 316 "ael.y" { (yyval.pval)= npval2(PV_IF, &(yylsp[-4]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-1].str); ;} break; - case 57: -#line 325 "ael.y" + case 56: +#line 319 "ael.y" { reset_parencount(parseio->scanner); ;} break; - case 58: -#line 325 "ael.y" + case 57: +#line 319 "ael.y" { (yyval.pval) = npval2(PV_RANDOM, &(yylsp[-4]), &(yylsp[0])); (yyval.pval)->u1.str=(yyvsp[-1].str);;} break; - case 59: -#line 328 "ael.y" + case 58: +#line 322 "ael.y" { (yyval.pval) = npval2(PV_IFTIME, &(yylsp[-3]), &(yylsp[0])); (yyval.pval)->u1.list = (yyvsp[-1].pval); prev_word = 0; ;} break; - case 60: -#line 339 "ael.y" + case 59: +#line 333 "ael.y" { (yyval.str) = (yyvsp[0].str);;} break; - case 61: -#line 340 "ael.y" + case 60: +#line 334 "ael.y" { asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str)); free((yyvsp[-1].str)); @@ -2252,13 +2229,13 @@ yyreduce: prev_word = (yyval.str);;} break; - case 62: -#line 347 "ael.y" + case 61: +#line 341 "ael.y" { (yyval.str) = (yyvsp[0].str);;} break; - case 63: -#line 348 "ael.y" + case 62: +#line 342 "ael.y" { asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str)); free((yyvsp[-1].str)); @@ -2266,8 +2243,8 @@ yyreduce: prev_word = (yyval.str);;} break; - case 64: -#line 353 "ael.y" + case 63: +#line 347 "ael.y" { asprintf(&((yyval.str)), "%s%s%s", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)); free((yyvsp[-2].str)); @@ -2276,97 +2253,97 @@ yyreduce: prev_word=(yyval.str);;} break; - case 65: -#line 361 "ael.y" + case 64: +#line 355 "ael.y" { (yyval.str) = (yyvsp[0].str);;} break; - case 66: -#line 362 "ael.y" + case 65: +#line 356 "ael.y" { asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str)); free((yyvsp[-1].str)); free((yyvsp[0].str));;} break; - case 67: -#line 366 "ael.y" + case 66: +#line 360 "ael.y" { asprintf(&((yyval.str)), "%s:%s", (yyvsp[-2].str), (yyvsp[0].str)); free((yyvsp[-2].str)); free((yyvsp[0].str));;} break; - case 68: -#line 372 "ael.y" + case 67: +#line 366 "ael.y" { reset_parencount(parseio->scanner); ;} break; - case 69: -#line 372 "ael.y" + case 68: +#line 366 "ael.y" { (yyval.pval) = npval2(PV_SWITCH, &(yylsp[-5]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-2].str); ;} break; - case 70: -#line 380 "ael.y" + case 69: +#line 374 "ael.y" { (yyval.pval) = npval2(PV_STATEMENTBLOCK, &(yylsp[-2]), &(yylsp[0])); (yyval.pval)->u1.list = (yyvsp[-1].pval); ;} break; - case 71: -#line 383 "ael.y" + case 70: +#line 377 "ael.y" {reset_semicount(parseio->scanner);;} break; - case 72: -#line 383 "ael.y" + case 71: +#line 377 "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 73: -#line 387 "ael.y" + case 72: +#line 381 "ael.y" { (yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[0])); (yyval.pval)->u1.list = (yyvsp[-1].pval);;} break; - case 74: -#line 390 "ael.y" + case 73: +#line 384 "ael.y" { (yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[0])); (yyval.pval)->u1.list = (yyvsp[-1].pval);;} break; - case 75: -#line 393 "ael.y" + case 74: +#line 387 "ael.y" { (yyval.pval) = npval2(PV_LABEL, &(yylsp[-1]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-1].str); ;} break; - case 76: -#line 396 "ael.y" + case 75: +#line 390 "ael.y" {reset_semicount(parseio->scanner);;} break; - case 77: -#line 397 "ael.y" + case 76: +#line 391 "ael.y" {reset_semicount(parseio->scanner);;} break; - case 78: -#line 398 "ael.y" + case 77: +#line 392 "ael.y" {reset_parencount(parseio->scanner);;} break; - case 79: -#line 398 "ael.y" + case 78: +#line 392 "ael.y" { (yyval.pval) = npval2(PV_FOR, &(yylsp[-11]), &(yylsp[0])); (yyval.pval)->u1.for_init = (yyvsp[-8].str); @@ -2375,58 +2352,58 @@ yyreduce: (yyval.pval)->u4.for_statements = (yyvsp[0].pval);;} break; - case 80: -#line 404 "ael.y" + case 79: +#line 398 "ael.y" {reset_parencount(parseio->scanner);;} break; - case 81: -#line 404 "ael.y" + case 80: +#line 398 "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 82: -#line 408 "ael.y" + case 81: +#line 402 "ael.y" { (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;} break; - case 83: -#line 410 "ael.y" + case 82: +#line 404 "ael.y" { (yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[0])); (yyval.pval)->u2.statements = (yyvsp[-1].pval);;} break; - case 84: -#line 413 "ael.y" + case 83: +#line 407 "ael.y" { (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[-1])); ;} break; - case 85: -#line 415 "ael.y" + case 84: +#line 409 "ael.y" { (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;} break; - case 86: -#line 417 "ael.y" + case 85: +#line 411 "ael.y" { (yyval.pval)= npval2(PV_APPLICATION_CALL, &(yylsp[-1]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-1].str);;} break; - case 87: -#line 420 "ael.y" + case 86: +#line 414 "ael.y" {reset_semicount(parseio->scanner);;} break; - case 88: -#line 420 "ael.y" + case 87: +#line 414 "ael.y" { char *bufx; int tot=0; @@ -2462,148 +2439,148 @@ yyreduce: ;} break; - case 89: -#line 453 "ael.y" + case 88: +#line 447 "ael.y" { (yyval.pval) = npval2(PV_BREAK, &(yylsp[-1]), &(yylsp[0])); ;} break; - case 90: -#line 454 "ael.y" + case 89: +#line 448 "ael.y" { (yyval.pval) = npval2(PV_RETURN, &(yylsp[-1]), &(yylsp[0])); ;} break; - case 91: -#line 455 "ael.y" + case 90: +#line 449 "ael.y" { (yyval.pval) = npval2(PV_CONTINUE, &(yylsp[-1]), &(yylsp[0])); ;} break; - case 92: -#line 456 "ael.y" + case 91: +#line 450 "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 93: -#line 460 "ael.y" + case 92: +#line 454 "ael.y" { (yyval.pval)=0; ;} break; - case 94: -#line 463 "ael.y" + case 93: +#line 457 "ael.y" { (yyval.pval) = (yyvsp[0].pval); ;} break; - case 95: -#line 464 "ael.y" + case 94: +#line 458 "ael.y" { (yyval.pval) = NULL ; ;} break; - case 96: -#line 469 "ael.y" + case 95: +#line 463 "ael.y" { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;} break; - case 97: -#line 470 "ael.y" + case 96: +#line 464 "ael.y" { (yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2])); (yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;} break; - case 98: -#line 473 "ael.y" + case 97: +#line 467 "ael.y" { (yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2])); (yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;} break; - case 99: -#line 476 "ael.y" + case 98: +#line 470 "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 480 "ael.y" + case 99: +#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 101: -#line 484 "ael.y" + case 100: +#line 478 "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 488 "ael.y" + case 101: +#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 103: -#line 495 "ael.y" + case 102: +#line 489 "ael.y" { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); (yyval.pval)->next = nword(strdup("1"), &(yylsp[0])); ;} break; - case 104: -#line 498 "ael.y" + case 103: +#line 492 "ael.y" { (yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2])); (yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;} break; - case 105: -#line 501 "ael.y" + case 104: +#line 495 "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 106: -#line 505 "ael.y" + case 105: +#line 499 "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 107: -#line 509 "ael.y" + case 106: +#line 503 "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 108: -#line 513 "ael.y" + case 107: +#line 507 "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 109: -#line 519 "ael.y" + case 108: +#line 513 "ael.y" {reset_argcount(parseio->scanner);;} break; - case 110: -#line 519 "ael.y" + case 109: +#line 513 "ael.y" { /* XXX original code had @2 but i think we need @5 */ (yyval.pval) = npval2(PV_MACRO_CALL, &(yylsp[-4]), &(yylsp[0])); @@ -2611,20 +2588,20 @@ yyreduce: (yyval.pval)->u2.arglist = (yyvsp[-1].pval);;} break; - case 111: -#line 524 "ael.y" + case 110: +#line 518 "ael.y" { (yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[-2]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-2].str); ;} break; - case 112: -#line 532 "ael.y" + case 111: +#line 526 "ael.y" {reset_argcount(parseio->scanner);;} break; - case 113: -#line 532 "ael.y" + case 112: +#line 526 "ael.y" { if (strcasecmp((yyvsp[-2].str),"goto") == 0) { (yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[-1])); @@ -2636,8 +2613,8 @@ yyreduce: } ;} break; - case 114: -#line 543 "ael.y" + case 113: +#line 537 "ael.y" { (yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[0])); if( (yyval.pval)->type == PV_GOTO ) @@ -2647,192 +2624,192 @@ yyreduce: ;} break; - case 115: -#line 550 "ael.y" + case 114: +#line 544 "ael.y" { (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;} break; - case 116: -#line 553 "ael.y" + case 115: +#line 547 "ael.y" { (yyval.str) = (yyvsp[0].str) ;} break; - case 117: -#line 554 "ael.y" + case 116: +#line 548 "ael.y" { (yyval.str) = strdup(""); ;} break; - case 118: -#line 557 "ael.y" + case 117: +#line 551 "ael.y" { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;} break; - case 119: -#line 558 "ael.y" + case 118: +#line 552 "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 120: -#line 561 "ael.y" + case 119: +#line 555 "ael.y" { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[0].str), &(yylsp[0]))); ;} break; - case 121: -#line 564 "ael.y" + case 120: +#line 558 "ael.y" {(yyval.pval)=(yyvsp[0].pval);;} break; - case 122: -#line 565 "ael.y" + case 121: +#line 559 "ael.y" { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;} break; - case 123: -#line 568 "ael.y" + case 122: +#line 562 "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 124: -#line 572 "ael.y" + case 123: +#line 566 "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 125: -#line 576 "ael.y" + case 124: +#line 570 "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 126: -#line 580 "ael.y" + case 125: +#line 574 "ael.y" { (yyval.pval) = npval2(PV_CASE, &(yylsp[-2]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-1].str);;} break; - case 127: -#line 583 "ael.y" + case 126: +#line 577 "ael.y" { (yyval.pval) = npval2(PV_DEFAULT, &(yylsp[-1]), &(yylsp[0])); (yyval.pval)->u1.str = NULL;;} break; - case 128: -#line 586 "ael.y" + case 127: +#line 580 "ael.y" { (yyval.pval) = npval2(PV_PATTERN, &(yylsp[-2]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-1].str);;} break; - case 129: -#line 591 "ael.y" + case 128: +#line 585 "ael.y" {(yyval.pval) = (yyvsp[0].pval);;} break; - case 130: -#line 592 "ael.y" + case 129: +#line 586 "ael.y" { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;} break; - case 131: -#line 595 "ael.y" + case 130: +#line 589 "ael.y" {(yyval.pval)=(yyvsp[0].pval);;} break; - case 132: -#line 596 "ael.y" + case 131: +#line 590 "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 133: -#line 602 "ael.y" + case 132: +#line 596 "ael.y" { (yyval.pval) = npval2(PV_SWITCHES, &(yylsp[-1]), &(yylsp[0])); (yyval.pval)->u1.list = (yyvsp[0].pval); ;} break; - case 134: -#line 607 "ael.y" + case 133: +#line 601 "ael.y" { (yyval.pval) = npval2(PV_ESWITCHES, &(yylsp[-1]), &(yylsp[0])); (yyval.pval)->u1.list = (yyvsp[0].pval); ;} break; - case 135: -#line 612 "ael.y" + case 134: +#line 606 "ael.y" { (yyval.pval) = (yyvsp[-1].pval); ;} break; - case 136: -#line 613 "ael.y" + case 135: +#line 607 "ael.y" { (yyval.pval) = NULL; ;} break; - case 137: -#line 616 "ael.y" + case 136: +#line 610 "ael.y" { (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;} break; - case 138: -#line 617 "ael.y" + case 137: +#line 611 "ael.y" { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[-1].str), &(yylsp[-1]))); ;} break; - case 139: -#line 618 "ael.y" + case 138: +#line 612 "ael.y" {(yyval.pval)=(yyvsp[-1].pval);;} break; - case 140: -#line 621 "ael.y" + case 139: +#line 615 "ael.y" { (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;} break; - case 141: -#line 622 "ael.y" + case 140: +#line 616 "ael.y" { (yyval.pval) = nword((yyvsp[-3].str), &(yylsp[-3])); (yyval.pval)->u2.arglist = (yyvsp[-1].pval); prev_word=0; /* XXX sure ? */ ;} break; - case 142: -#line 629 "ael.y" + case 141: +#line 623 "ael.y" { (yyval.pval) = (yyvsp[0].pval); ;} break; - case 143: -#line 630 "ael.y" + case 142: +#line 624 "ael.y" { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;} break; - case 144: -#line 631 "ael.y" + case 143: +#line 625 "ael.y" {(yyval.pval)=(yyvsp[-1].pval);;} break; - case 145: -#line 634 "ael.y" + case 144: +#line 628 "ael.y" { (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-3]), &(yylsp[0])); (yyval.pval)->u1.list = (yyvsp[-1].pval);;} break; - case 146: -#line 637 "ael.y" + case 145: +#line 631 "ael.y" { (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;} break; @@ -2842,7 +2819,7 @@ yyreduce: } /* Line 1126 of yacc.c. */ -#line 2846 "ael.tab.c" +#line 2823 "ael.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -3117,7 +3094,7 @@ yyreturn: } -#line 642 "ael.y" +#line 636 "ael.y" static char *token_equivs1[] = diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y index 18e20484c..65100eaa6 100644 --- a/pbx/ael/ael.y +++ b/pbx/ael/ael.y @@ -211,13 +211,6 @@ macro : KW_MACRO word LP arglist RP LC macro_statements RC { | KW_MACRO word LP arglist RP LC RC { $$ = npval2(PV_MACRO, &@1, &@7); $$->u1.str = $2; $$->u2.arglist = $4; } - | KW_MACRO word LP RP LC macro_statements RC { - $$ = npval2(PV_MACRO, &@1, &@7); - $$->u1.str = $2; - $$->u3.macro_statements = $6; } - | KW_MACRO word LP RP LC RC { - $$ = npval2(PV_MACRO, &@1, &@6); - $$->u1.str = $2; } ; globals : KW_GLOBALS LC global_statements RC { @@ -238,7 +231,8 @@ global_statement : word EQ { reset_semicount(parseio->scanner); } word SEMI { $$->u2.val = $4; } ; -arglist : word { $$ = nword($1, &@1); } +arglist : /* empty */ { $$ = NULL; } + | word { $$ = nword($1, &@1); } | arglist COMMA word { $$ = linku1($1, nword($3, &@3)); } | arglist error {$$=$1;} ; |