diff options
author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-30 12:46:15 +0000 |
---|---|---|
committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-30 12:46:15 +0000 |
commit | 8dba0c2ad5594ace39331468df98791328d34cdd (patch) | |
tree | 78f3c04ea5f934e4fee0d33f9eddc56e20fc2ba7 /pbx/ael | |
parent | 68f13a13c7615d8d0ad47bec404a4e5abe656d61 (diff) |
another client for switchlist_block
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@23615 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx/ael')
-rw-r--r-- | pbx/ael/ael.tab.c | 506 | ||||
-rw-r--r-- | pbx/ael/ael.y | 8 |
2 files changed, 253 insertions, 261 deletions
diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c index 1f9eb1292..a2413c027 100644 --- a/pbx/ael/ael.tab.c +++ b/pbx/ael/ael.tab.c @@ -418,16 +418,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 14 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 489 +#define YYLAST 505 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 42 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 58 /* YYNRULES -- Number of rules. */ -#define YYNRULES 151 +#define YYNRULES 150 /* YYNRULES -- Number of states. */ -#define YYNSTATES 343 +#define YYNSTATES 340 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -489,9 +489,9 @@ static const unsigned short int yyprhs[] = 360, 366, 372, 378, 380, 384, 390, 394, 400, 404, 405, 411, 415, 416, 420, 424, 427, 429, 430, 432, 433, 437, 439, 442, 447, 451, 456, 460, 463, 467, - 469, 472, 474, 480, 485, 489, 492, 496, 499, 502, - 506, 509, 512, 527, 538, 542, 558, 570, 573, 575, - 577, 582 + 469, 472, 474, 480, 483, 486, 490, 493, 496, 500, + 503, 506, 521, 532, 536, 552, 564, 567, 569, 571, + 576 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -545,17 +545,16 @@ static const yysigned_char yyrhs[] = -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, 4, 96, 5, -1, 38, 4, 5, -1, 39, - 95, -1, 4, 96, 5, -1, 4, 5, -1, 41, - 8, -1, 96, 41, 8, -1, 96, 1, -1, 98, - 8, -1, 98, 13, 68, 11, 68, 11, 68, 13, - 68, 13, 68, 13, 68, 8, -1, 98, 13, 41, - 13, 68, 13, 68, 13, 68, 8, -1, 97, 98, - 8, -1, 97, 98, 13, 68, 11, 68, 11, 68, - 13, 68, 13, 68, 13, 68, 8, -1, 97, 98, - 13, 41, 13, 68, 13, 68, 13, 68, 8, -1, - 97, 1, -1, 41, -1, 36, -1, 40, 4, 97, - 5, -1, 40, 4, 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, 98, 8, -1, 98, 13, 68, 11, + 68, 11, 68, 13, 68, 13, 68, 13, 68, 8, + -1, 98, 13, 41, 13, 68, 13, 68, 13, 68, + 8, -1, 97, 98, 8, -1, 97, 98, 13, 68, + 11, 68, 11, 68, 13, 68, 13, 68, 13, 68, + 8, -1, 97, 98, 13, 41, 13, 68, 13, 68, + 13, 68, 8, -1, 97, 1, -1, 41, -1, 36, + -1, 40, 4, 97, 5, -1, 40, 4, 5, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -574,9 +573,9 @@ static const unsigned short int yyrline[] = 520, 527, 534, 543, 548, 553, 560, 567, 574, 583, 583, 588, 593, 593, 603, 610, 613, 614, 617, 620, 623, 630, 631, 636, 640, 644, 648, 651, 654, 659, - 660, 665, 666, 672, 675, 679, 684, 685, 688, 691, - 696, 699, 702, 719, 732, 737, 755, 770, 773, 774, - 777, 780 + 660, 665, 666, 672, 677, 682, 683, 686, 689, 694, + 697, 700, 717, 730, 735, 753, 768, 771, 772, 775, + 778 }; #endif @@ -635,9 +634,9 @@ static const unsigned char yyr1[] = 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, 93, 94, 95, 95, 96, 96, - 96, 97, 97, 97, 97, 97, 97, 97, 98, 98, - 99, 99 + 91, 92, 92, 93, 94, 95, 95, 96, 96, 96, + 97, 97, 97, 97, 97, 97, 97, 98, 98, 99, + 99 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -656,9 +655,9 @@ static const unsigned char yyr2[] = 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, 4, 3, 2, 3, 2, 2, 3, - 2, 2, 14, 10, 3, 15, 11, 2, 1, 1, - 4, 3 + 2, 1, 5, 2, 2, 3, 2, 2, 3, 2, + 2, 14, 10, 3, 15, 11, 2, 1, 1, 4, + 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -675,96 +674,94 @@ static const unsigned char yydefact[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 0, 0, 0, 0, 131, 119, 0, 0, 129, 0, 27, 0, 0, 0, 0, 0, - 0, 0, 135, 0, 42, 40, 0, 34, 30, 33, + 0, 133, 134, 0, 42, 40, 0, 34, 30, 33, 0, 49, 0, 0, 66, 52, 0, 54, 0, 63, 96, 0, 103, 0, 88, 87, 89, 74, 78, 0, 84, 69, 73, 0, 95, 95, 95, 80, 0, 0, 0, 0, 121, 115, 58, 118, 0, 83, 85, 17, - 130, 16, 0, 25, 0, 0, 0, 60, 0, 134, - 0, 0, 137, 0, 151, 149, 148, 0, 0, 0, - 45, 51, 68, 50, 109, 82, 0, 0, 60, 0, - 0, 0, 0, 0, 64, 0, 0, 71, 0, 0, - 72, 0, 0, 0, 0, 113, 0, 91, 90, 92, - 0, 0, 127, 81, 122, 59, 114, 117, 0, 15, - 44, 0, 46, 61, 0, 138, 140, 133, 0, 136, - 147, 150, 0, 141, 0, 0, 111, 119, 0, 0, - 0, 0, 0, 0, 0, 65, 98, 97, 63, 104, - 108, 106, 0, 0, 0, 0, 94, 126, 128, 0, - 116, 120, 0, 0, 62, 0, 139, 144, 0, 60, - 0, 41, 0, 0, 53, 0, 0, 55, 0, 0, - 0, 0, 0, 75, 0, 132, 70, 0, 0, 86, - 0, 0, 60, 0, 0, 0, 110, 67, 0, 0, - 102, 101, 100, 99, 107, 105, 0, 79, 0, 47, - 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, - 0, 0, 0, 0, 76, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 57, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 143, 0, 0, - 77, 146, 0, 0, 0, 0, 0, 56, 0, 0, - 0, 142, 145 + 130, 16, 0, 25, 0, 0, 0, 60, 0, 136, + 0, 0, 150, 148, 147, 0, 0, 0, 45, 51, + 68, 50, 109, 82, 0, 0, 60, 0, 0, 0, + 0, 0, 64, 0, 0, 71, 0, 0, 72, 0, + 0, 0, 0, 113, 0, 91, 90, 92, 0, 0, + 127, 81, 122, 59, 114, 117, 0, 15, 44, 0, + 46, 61, 0, 137, 139, 135, 0, 146, 149, 0, + 140, 0, 0, 111, 119, 0, 0, 0, 0, 0, + 0, 0, 65, 98, 97, 63, 104, 108, 106, 0, + 0, 0, 0, 94, 126, 128, 0, 116, 120, 0, + 0, 62, 0, 138, 143, 0, 60, 0, 41, 0, + 0, 53, 0, 0, 55, 0, 0, 0, 0, 0, + 75, 0, 132, 70, 0, 0, 86, 0, 0, 60, + 0, 0, 0, 110, 67, 0, 0, 102, 101, 100, + 99, 107, 105, 0, 79, 0, 47, 0, 0, 0, + 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, + 0, 76, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 57, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 142, 0, 0, 77, 145, 0, + 0, 0, 0, 0, 56, 0, 0, 0, 141, 144 }; /* YYDEFGOTO[NTERM-NUM]. */ static const short int yydefgoto[] = { -1, 5, 6, 7, 25, 8, 9, 10, 11, 21, - 22, 39, 28, 34, 50, 51, 159, 52, 53, 100, - 74, 167, 75, 170, 76, 135, 148, 110, 77, 166, - 101, 184, 181, 286, 311, 182, 198, 187, 111, 113, - 103, 217, 79, 123, 80, 241, 136, 131, 132, 81, - 82, 54, 55, 92, 151, 157, 158, 56 + 22, 39, 28, 34, 50, 51, 157, 52, 53, 100, + 74, 165, 75, 168, 76, 135, 148, 110, 77, 164, + 101, 182, 179, 283, 308, 180, 196, 185, 111, 113, + 103, 214, 79, 123, 80, 238, 136, 131, 132, 81, + 82, 54, 55, 91, 151, 155, 156, 56 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -182 +#define YYPACT_NINF -180 static const short int yypact[] = { - 145, -182, -23, 22, -182, 58, 187, -182, -182, 70, - -182, -182, 92, 12, -182, -182, -182, 82, 1, -182, - 105, 14, -182, -182, -182, 117, 126, -182, 112, -182, - -182, -182, -182, 301, -182, 344, -182, 133, 74, 109, - -182, -182, -182, 122, 68, 152, 163, 171, 172, 107, - 306, -182, -182, -182, -182, -182, -182, 448, -182, -182, - 148, 194, 199, 207, 208, 98, 189, 185, 229, 231, - 234, 235, 204, 183, 448, 448, 448, 40, -182, 18, - -4, 370, -182, 396, -182, 240, 210, 243, 228, 214, - 27, 28, -182, 11, -182, -182, 448, -182, -182, -182, - 242, -182, 250, 249, -182, -182, 218, -182, 173, 71, - 188, 255, 130, 257, -182, -182, -182, -182, -182, 254, - -182, -182, -182, 260, 251, 251, 251, -182, 237, 238, - 270, 67, -182, -182, 241, -182, 212, -182, -182, -182, - -182, -182, 422, -182, 277, 214, 448, 245, 280, -182, - 285, 49, -182, 65, -182, -182, -182, 8, 135, 247, - -182, -182, -182, -182, 288, -182, 262, 267, 76, 299, - 267, 189, 189, 271, -182, 189, 189, -182, 274, 111, - -182, 275, 276, 448, 278, -182, 448, -182, -182, -182, - 309, 310, 448, -182, -182, -182, -182, 281, 283, -182, - -182, 289, -182, 284, 286, -182, -182, -182, 318, -182, - -182, -182, 166, -182, 287, 321, -182, 267, 323, 326, - 214, 214, 327, 325, 330, -182, 328, 337, 69, -182, - -182, -182, 343, 346, 272, 347, -182, 448, 448, 2, - -182, -182, 349, 313, -182, 334, -182, -182, 319, 83, - 348, -182, 217, 357, -182, 352, 356, -182, 189, 189, - 189, 189, 141, -182, 448, -182, -182, 59, 137, -182, - 355, 448, 84, 369, 214, 214, -182, -182, 214, 214, - -182, -182, -182, -182, -182, -182, 342, -182, 448, -182, - 214, 214, 371, 375, 374, 378, 360, -182, 380, 383, - 214, 214, 214, 214, -182, 214, 214, 392, 393, 402, - 397, 372, 399, 404, 214, 214, -182, 214, 412, 214, - 214, 423, 407, 419, 448, 427, 425, -182, 214, 214, - -182, -182, 214, 426, 429, 430, 214, -182, 214, 437, - 438, -182, -182 + 132, -180, -31, 19, -180, 16, 105, -180, -180, 30, + -180, -180, 29, 8, -180, -180, -180, -10, 11, -180, + 67, 3, -180, -180, -180, 66, 68, -180, 20, -180, + -180, -180, -180, 283, -180, 360, -180, 78, 71, 75, + -180, -180, -180, 94, -16, 131, 141, 141, 146, 95, + 336, -180, -180, -180, -180, -180, -180, 464, -180, -180, + 116, 152, 158, 159, 173, -7, 143, 177, 178, 179, + 182, 183, 149, 163, 464, 464, 464, 23, -180, 12, + 81, 386, -180, 412, -180, 184, 150, 189, 174, 156, + 9, -180, -180, 1, -180, -180, 464, -180, -180, -180, + 277, -180, 193, 192, -180, -180, 161, -180, 56, 13, + 70, 199, 22, 202, -180, -180, -180, -180, -180, 211, + -180, -180, -180, 210, 198, 198, 198, -180, 180, 186, + 213, 63, -180, -180, 187, -180, 124, -180, -180, -180, + -180, -180, 438, -180, 217, 156, 464, 195, 227, -180, + 229, 4, -180, -180, -180, 2, 101, 197, -180, -180, + -180, -180, 235, -180, 204, 205, 60, 237, 205, 143, + 143, 208, -180, 143, 143, -180, 212, 74, -180, 214, + 215, 464, 219, -180, 464, -180, -180, -180, 241, 243, + 464, -180, -180, -180, -180, 221, 222, -180, -180, 262, + -180, 236, 238, -180, -180, -180, 268, -180, -180, 114, + -180, 242, 279, -180, 205, 263, 285, 156, 156, 286, + 280, 281, -180, 288, 294, 6, -180, -180, -180, 293, + 309, 307, 312, -180, 464, 464, 59, -180, -180, 320, + 276, -180, 306, -180, -180, 290, 61, 327, -180, 166, + 338, -180, 330, 334, -180, 143, 143, 143, 143, 100, + -180, 464, -180, -180, 134, 239, -180, 322, 464, 62, + 339, 156, 156, -180, -180, 156, 156, -180, -180, -180, + -180, -180, -180, 308, -180, 464, -180, 156, 156, 341, + 340, 342, 343, 344, -180, 345, 346, 156, 156, 156, + 156, -180, 156, 156, 347, 348, 352, 349, 328, 350, + 357, 156, 156, -180, 156, 364, 156, 156, 365, 368, + 370, 464, 376, 382, -180, 156, 156, -180, -180, 156, + 383, 392, 387, 156, -180, 156, 394, 395, -180, -180 }; /* YYPGOTO[NTERM-NUM]. */ static const short int yypgoto[] = { - -182, -182, -182, 447, -182, -182, -182, -182, -182, -182, - 436, -182, -182, -182, -182, 408, -182, -182, -182, -181, - -182, -182, -182, -182, -182, 61, -94, -43, -182, -182, - -35, -182, -182, -182, -182, -182, -182, -21, -182, -182, - -182, -182, -182, -182, -182, -182, 244, -182, 331, 381, - -80, -182, -182, -182, 387, -182, 308, -182 + -180, -180, -180, 401, -180, -180, -180, -180, -180, -180, + 326, -180, -180, -180, -180, 359, -180, -180, -180, -179, + -180, -180, -180, -180, -180, 15, -94, -44, -180, -180, + -35, -180, -180, -180, -180, -180, -180, 18, -180, -180, + -180, -180, -180, -180, -180, -180, 196, -180, 291, 353, + -80, -180, -180, 374, -180, -180, 270, -180 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -774,108 +771,112 @@ static const short int yypgoto[] = #define YYTABLE_NINF -126 static const short int yytable[] = { - 78, 140, 234, 161, 137, 138, 57, -124, 26, 210, - 59, 239, 169, 211, 60, 30, 154, 19, 12, 31, - 61, 62, 63, 112, 64, 133, 13, 65, 66, 67, - 68, 69, 149, 152, 70, 71, -124, -124, -124, 124, - 125, 126, 27, 73, 155, 127, 78, 155, 78, 156, - 206, 201, 156, 20, 207, 20, 267, 268, 14, 134, - 161, 160, 140, 57, -123, 163, 206, 59, 150, 150, - 209, 60, 193, 17, 128, 129, 130, 61, 62, 63, - 173, 64, 173, 262, 65, 66, 67, 68, 69, 220, - 208, 70, 71, -123, -123, -123, 274, 290, 18, 87, - 73, 128, 129, 130, 188, 189, 208, 78, 94, 88, - 174, 202, 174, 36, 29, 84, 95, 203, 23, 37, - 250, 33, 38, 24, 203, 203, 255, 256, 223, 224, - 35, 96, 226, 227, 108, 229, 231, 83, 161, 109, - 178, 57, -125, 213, 179, 59, 86, 230, 214, 60, - 85, 236, 109, 1, 273, 61, 62, 63, 89, 64, - 2, 3, 65, 66, 67, 68, 69, 90, 4, 70, - 71, -125, -125, -125, 247, 91, 93, 284, 73, 248, - 292, 293, 285, 171, 294, 295, 172, -2, 15, 102, - -14, 120, 121, 114, 122, 1, 298, 299, 175, 163, - 104, 176, 2, 3, 163, 105, 307, 308, 309, 310, - 4, 312, 313, 106, 107, 280, 281, 282, 283, 196, - 321, 322, 197, 323, 276, 325, 326, 197, 219, 287, - 109, 222, 163, 163, 333, 334, 289, 115, 335, 116, - 117, 118, 339, 161, 340, 119, 57, 162, 143, 145, - 59, 144, 146, 297, 60, 147, 164, 165, 183, 168, - 61, 62, 63, 177, 64, 180, 185, 65, 66, 67, - 68, 69, 186, 161, 70, 71, 57, 265, 190, 191, - 59, 192, 195, 73, 60, 200, 203, 204, 215, 330, - 61, 62, 63, 205, 64, 216, 243, 65, 66, 67, - 68, 69, 40, 218, 70, 71, 41, 97, 134, 42, - 221, 98, 225, 73, 42, 228, 232, 233, 43, 235, - 237, 238, 240, 43, 242, 244, 246, 245, 249, 251, - 253, 44, 45, 254, 257, 258, 44, 45, 260, 46, - 47, 48, 49, 259, 46, 47, 48, 49, 57, 58, - 261, 263, 59, 264, 270, 266, 60, 269, 271, 275, - 272, 277, 61, 62, 63, 278, 64, 279, 304, 65, - 66, 67, 68, 69, 57, 139, 70, 71, 59, 288, - 291, 72, 60, 296, 300, 73, 301, 302, 61, 62, - 63, 303, 64, 305, 306, 65, 66, 67, 68, 69, - 57, 141, 70, 71, 59, 314, 315, 72, 60, 316, - 317, 73, 319, 318, 61, 62, 63, 320, 64, 324, - 328, 65, 66, 67, 68, 69, 57, 199, 70, 71, - 59, 327, 329, 72, 60, 331, 337, 73, 332, 336, - 61, 62, 63, 338, 64, 341, 342, 65, 66, 67, - 68, 69, 57, 16, 70, 71, 59, 32, 99, 72, - 60, 252, 194, 73, 142, 212, 61, 62, 63, 0, - 64, 0, 0, 65, 66, 67, 68, 69, 153, 0, - 70, 71, 0, 0, 0, 0, 0, 0, 0, 73 + 78, 140, 231, 207, 30, 204, 152, 208, 31, 205, + 12, 236, 167, 19, 149, 87, 14, 171, 26, 133, + 259, 36, 112, 13, 171, 88, 23, 37, 127, 108, + 38, 24, 176, 17, 109, 18, 177, 153, 153, 124, + 125, 126, 154, 154, 20, 206, 78, 172, 78, 20, + 150, 199, 27, 134, 172, 264, 265, 128, 129, 130, + 159, 158, 140, 57, -124, 161, 169, 59, 191, 170, + 33, 60, 35, 217, 271, 287, 29, 61, 62, 63, + 173, 64, 83, 174, 65, 66, 67, 68, 69, 137, + 138, 70, 71, -124, -124, -124, 94, 128, 129, 130, + 73, 201, 201, 201, 95, -2, 15, 78, -14, 210, + 227, 200, 84, 1, 211, 109, 85, 247, 86, 96, + 2, 3, 244, 252, 253, 220, 221, 245, 4, 223, + 224, 194, 226, 228, 195, 159, 281, 89, 57, -123, + 1, 282, 59, 186, 187, 90, 60, 2, 3, 233, + 93, 270, 61, 62, 63, 4, 64, 102, 104, 65, + 66, 67, 68, 69, 105, 106, 70, 71, -123, -123, + -123, 120, 121, 273, 122, 73, 195, 289, 290, 107, + 216, 291, 292, 219, 109, 114, 115, 116, 117, 118, + 119, 144, 143, 295, 296, 145, 161, 147, 146, 162, + 163, 161, 166, 304, 305, 306, 307, 175, 309, 310, + 178, 277, 278, 279, 280, 181, 183, 318, 319, 184, + 320, 188, 322, 323, 190, 198, 284, 189, 193, 161, + 161, 330, 331, 286, 202, 332, 201, 203, 212, 336, + 159, 337, 213, 57, -125, 215, 134, 59, 218, 222, + 294, 60, 234, 225, 235, 229, 230, 61, 62, 63, + 232, 64, 237, 239, 65, 66, 67, 68, 69, 240, + 250, 70, 71, -125, -125, -125, 243, 241, 159, 242, + 73, 57, 160, 246, 40, 59, 327, 248, 41, 60, + 255, 42, 251, 254, 256, 61, 62, 63, 257, 64, + 43, 260, 65, 66, 67, 68, 69, 258, 159, 70, + 71, 57, 262, 44, 45, 59, 261, 267, 73, 60, + 263, 46, 47, 48, 49, 61, 62, 63, 266, 64, + 268, 269, 65, 66, 67, 68, 69, 97, 272, 70, + 71, 98, 274, 275, 42, 276, 285, 32, 73, 293, + 288, 298, 301, 43, 297, 299, 300, 303, 302, 313, + 311, 312, 314, 316, 57, 58, 44, 45, 59, 315, + 317, 321, 60, 324, 46, 47, 48, 49, 61, 62, + 63, 325, 64, 326, 328, 65, 66, 67, 68, 69, + 57, 139, 70, 71, 59, 329, 333, 72, 60, 334, + 335, 73, 338, 339, 61, 62, 63, 16, 64, 99, + 249, 65, 66, 67, 68, 69, 57, 141, 70, 71, + 59, 92, 192, 72, 60, 209, 0, 73, 0, 0, + 61, 62, 63, 0, 64, 0, 142, 65, 66, 67, + 68, 69, 57, 197, 70, 71, 59, 0, 0, 72, + 60, 0, 0, 73, 0, 0, 61, 62, 63, 0, + 64, 0, 0, 65, 66, 67, 68, 69, 57, 0, + 70, 71, 59, 0, 0, 72, 60, 0, 0, 73, + 0, 0, 61, 62, 63, 0, 64, 0, 0, 65, + 66, 67, 68, 69, 0, 0, 70, 71, 0, 0, + 0, 0, 0, 0, 0, 73 }; static const short int yycheck[] = { - 35, 81, 183, 1, 8, 9, 4, 5, 7, 1, - 8, 192, 106, 5, 12, 1, 5, 5, 41, 5, - 18, 19, 20, 66, 22, 7, 4, 25, 26, 27, - 28, 29, 5, 5, 32, 33, 34, 35, 36, 74, - 75, 76, 41, 41, 36, 5, 81, 36, 83, 41, - 1, 145, 41, 41, 5, 41, 237, 238, 0, 41, - 1, 96, 142, 4, 5, 100, 1, 8, 41, 41, - 5, 12, 5, 3, 34, 35, 36, 18, 19, 20, - 11, 22, 11, 14, 25, 26, 27, 28, 29, 13, - 41, 32, 33, 34, 35, 36, 13, 13, 6, 31, - 41, 34, 35, 36, 125, 126, 41, 142, 1, 41, - 41, 146, 41, 1, 9, 41, 9, 41, 36, 7, - 214, 4, 10, 41, 41, 41, 220, 221, 171, 172, - 4, 24, 175, 176, 36, 178, 179, 4, 1, 41, - 10, 4, 5, 8, 14, 8, 24, 36, 13, 12, - 41, 186, 41, 8, 248, 18, 19, 20, 6, 22, - 15, 16, 25, 26, 27, 28, 29, 4, 23, 32, - 33, 34, 35, 36, 8, 4, 4, 36, 41, 13, - 274, 275, 41, 10, 278, 279, 13, 0, 1, 41, - 3, 8, 9, 8, 11, 8, 290, 291, 10, 234, - 6, 13, 15, 16, 239, 6, 300, 301, 302, 303, - 23, 305, 306, 6, 6, 258, 259, 260, 261, 7, - 314, 315, 10, 317, 7, 319, 320, 10, 167, 264, - 41, 170, 267, 268, 328, 329, 271, 8, 332, 8, - 6, 6, 336, 1, 338, 41, 4, 5, 8, 6, - 8, 41, 24, 288, 12, 41, 6, 8, 4, 41, - 18, 19, 20, 8, 22, 8, 6, 25, 26, 27, - 28, 29, 21, 1, 32, 33, 4, 5, 41, 41, - 8, 11, 41, 41, 12, 8, 41, 7, 41, 324, - 18, 19, 20, 8, 22, 7, 7, 25, 26, 27, - 28, 29, 1, 41, 32, 33, 5, 1, 41, 8, - 11, 5, 41, 41, 8, 41, 41, 41, 17, 41, - 11, 11, 41, 17, 41, 41, 8, 41, 41, 8, - 7, 30, 31, 7, 7, 10, 30, 31, 10, 38, - 39, 40, 41, 13, 38, 39, 40, 41, 4, 5, - 13, 8, 8, 7, 41, 8, 12, 8, 24, 11, - 41, 4, 18, 19, 20, 13, 22, 11, 8, 25, - 26, 27, 28, 29, 4, 5, 32, 33, 8, 24, - 11, 37, 12, 41, 13, 41, 11, 13, 18, 19, - 20, 13, 22, 13, 11, 25, 26, 27, 28, 29, + 35, 81, 181, 1, 1, 1, 5, 5, 5, 5, + 41, 190, 106, 5, 5, 31, 0, 11, 7, 7, + 14, 1, 66, 4, 11, 41, 36, 7, 5, 36, + 10, 41, 10, 3, 41, 6, 14, 36, 36, 74, + 75, 76, 41, 41, 41, 41, 81, 41, 83, 41, + 41, 145, 41, 41, 41, 234, 235, 34, 35, 36, + 1, 96, 142, 4, 5, 100, 10, 8, 5, 13, + 4, 12, 4, 13, 13, 13, 9, 18, 19, 20, + 10, 22, 4, 13, 25, 26, 27, 28, 29, 8, + 9, 32, 33, 34, 35, 36, 1, 34, 35, 36, + 41, 41, 41, 41, 9, 0, 1, 142, 3, 8, + 36, 146, 41, 8, 13, 41, 41, 211, 24, 24, + 15, 16, 8, 217, 218, 169, 170, 13, 23, 173, + 174, 7, 176, 177, 10, 1, 36, 6, 4, 5, + 8, 41, 8, 125, 126, 4, 12, 15, 16, 184, + 4, 245, 18, 19, 20, 23, 22, 41, 6, 25, + 26, 27, 28, 29, 6, 6, 32, 33, 34, 35, + 36, 8, 9, 7, 11, 41, 10, 271, 272, 6, + 165, 275, 276, 168, 41, 8, 8, 8, 6, 6, + 41, 41, 8, 287, 288, 6, 231, 41, 24, 6, + 8, 236, 41, 297, 298, 299, 300, 8, 302, 303, + 8, 255, 256, 257, 258, 4, 6, 311, 312, 21, + 314, 41, 316, 317, 11, 8, 261, 41, 41, 264, + 265, 325, 326, 268, 7, 329, 41, 8, 41, 333, + 1, 335, 7, 4, 5, 41, 41, 8, 11, 41, + 285, 12, 11, 41, 11, 41, 41, 18, 19, 20, + 41, 22, 41, 41, 25, 26, 27, 28, 29, 7, + 7, 32, 33, 34, 35, 36, 8, 41, 1, 41, + 41, 4, 5, 41, 1, 8, 321, 8, 5, 12, + 10, 8, 7, 7, 13, 18, 19, 20, 10, 22, + 17, 8, 25, 26, 27, 28, 29, 13, 1, 32, + 33, 4, 5, 30, 31, 8, 7, 41, 41, 12, + 8, 38, 39, 40, 41, 18, 19, 20, 8, 22, + 24, 41, 25, 26, 27, 28, 29, 1, 11, 32, + 33, 5, 4, 13, 8, 11, 24, 21, 41, 41, + 11, 11, 8, 17, 13, 13, 13, 11, 13, 7, + 13, 13, 13, 13, 4, 5, 30, 31, 8, 41, + 13, 7, 12, 8, 38, 39, 40, 41, 18, 19, + 20, 13, 22, 13, 8, 25, 26, 27, 28, 29, 4, 5, 32, 33, 8, 13, 13, 37, 12, 7, - 13, 41, 13, 41, 18, 19, 20, 13, 22, 7, - 13, 25, 26, 27, 28, 29, 4, 5, 32, 33, - 8, 8, 13, 37, 12, 8, 7, 41, 13, 13, - 18, 19, 20, 13, 22, 8, 8, 25, 26, 27, - 28, 29, 4, 6, 32, 33, 8, 21, 50, 37, - 12, 217, 131, 41, 83, 157, 18, 19, 20, -1, - 22, -1, -1, 25, 26, 27, 28, 29, 91, -1, - 32, 33, -1, -1, -1, -1, -1, -1, -1, 41 + 13, 41, 8, 8, 18, 19, 20, 6, 22, 50, + 214, 25, 26, 27, 28, 29, 4, 5, 32, 33, + 8, 47, 131, 37, 12, 155, -1, 41, -1, -1, + 18, 19, 20, -1, 22, -1, 83, 25, 26, 27, + 28, 29, 4, 5, 32, 33, 8, -1, -1, 37, + 12, -1, -1, 41, -1, -1, 18, 19, 20, -1, + 22, -1, -1, 25, 26, 27, 28, 29, 4, -1, + 32, 33, 8, -1, -1, 37, 12, -1, -1, 41, + -1, -1, 18, 19, 20, -1, 22, -1, -1, 25, + 26, 27, 28, 29, -1, -1, 32, 33, -1, -1, + -1, -1, -1, -1, -1, 41 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -891,32 +892,31 @@ static const unsigned char yystos[] = 12, 18, 19, 20, 22, 25, 26, 27, 28, 29, 32, 33, 37, 41, 62, 64, 66, 70, 72, 84, 86, 91, 92, 4, 41, 41, 24, 31, 41, 6, - 4, 4, 95, 4, 1, 9, 24, 1, 5, 57, + 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, 8, 9, 11, 85, 72, 72, 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, 96, 5, 36, 41, 97, 98, 58, - 72, 1, 5, 72, 6, 8, 71, 63, 41, 68, - 65, 10, 13, 11, 41, 10, 13, 8, 10, 14, - 8, 74, 77, 4, 73, 6, 21, 79, 79, 79, - 41, 41, 11, 5, 90, 41, 7, 10, 78, 5, - 8, 68, 72, 41, 7, 8, 1, 5, 41, 5, - 1, 5, 98, 8, 13, 41, 7, 83, 41, 67, - 13, 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, 8, 13, 41, - 68, 8, 88, 7, 7, 68, 68, 7, 10, 13, - 10, 13, 14, 8, 7, 5, 8, 61, 61, 8, - 41, 24, 41, 68, 13, 11, 7, 4, 13, 11, - 69, 69, 69, 69, 36, 41, 75, 72, 24, 72, - 13, 11, 68, 68, 68, 68, 41, 72, 68, 68, - 13, 11, 13, 13, 8, 13, 11, 68, 68, 68, - 68, 76, 68, 68, 13, 13, 7, 13, 41, 13, - 13, 68, 68, 68, 7, 68, 68, 8, 13, 13, - 72, 8, 13, 68, 68, 68, 13, 7, 13, 68, - 68, 8, 8 + 41, 96, 5, 36, 41, 97, 98, 58, 72, 1, + 5, 72, 6, 8, 71, 63, 41, 68, 65, 10, + 13, 11, 41, 10, 13, 8, 10, 14, 8, 74, + 77, 4, 73, 6, 21, 79, 79, 79, 41, 41, + 11, 5, 90, 41, 7, 10, 78, 5, 8, 68, + 72, 41, 7, 8, 1, 5, 41, 1, 5, 98, + 8, 13, 41, 7, 83, 41, 67, 13, 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, 8, 13, 41, 68, 8, 88, + 7, 7, 68, 68, 7, 10, 13, 10, 13, 14, + 8, 7, 5, 8, 61, 61, 8, 41, 24, 41, + 68, 13, 11, 7, 4, 13, 11, 69, 69, 69, + 69, 36, 41, 75, 72, 24, 72, 13, 11, 68, + 68, 68, 68, 41, 72, 68, 68, 13, 11, 13, + 13, 8, 13, 11, 68, 68, 68, 68, 76, 68, + 68, 13, 13, 7, 13, 41, 13, 13, 68, 68, + 68, 7, 68, 68, 8, 13, 13, 72, 8, 13, + 68, 68, 68, 13, 7, 13, 68, 68, 8, 8 }; #define yyerrok (yyerrstatus = 0) @@ -2875,42 +2875,36 @@ yyreduce: case 133: #line 672 "ael.y" { - (yyval.pval) = npval2(PV_SWITCHES, &(yylsp[-3]), &(yylsp[0])); - (yyval.pval)->u1.list = (yyvsp[-1].pval); ;} + (yyval.pval) = npval2(PV_SWITCHES, &(yylsp[-1]), &(yylsp[0])); + (yyval.pval)->u1.list = (yyvsp[0].pval); ;} break; case 134: -#line 675 "ael.y" - { - (yyval.pval) = npval2(PV_SWITCHES, &(yylsp[-2]), &(yylsp[0])); ;} - break; - - case 135: -#line 679 "ael.y" +#line 677 "ael.y" { (yyval.pval) = npval2(PV_ESWITCHES, &(yylsp[-1]), &(yylsp[0])); (yyval.pval)->u1.list = (yyvsp[0].pval); ;} break; - case 136: -#line 684 "ael.y" + case 135: +#line 682 "ael.y" { (yyval.pval) = (yyvsp[-1].pval); ;} break; - case 137: -#line 685 "ael.y" + case 136: +#line 683 "ael.y" { (yyval.pval) = NULL; ;} break; - case 138: -#line 688 "ael.y" + case 137: +#line 686 "ael.y" { (yyval.pval) = npval2(PV_WORD, &(yylsp[-1]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-1].str);;} break; - case 139: -#line 691 "ael.y" + case 138: +#line 689 "ael.y" { pval *z = npval2(PV_WORD, &(yylsp[-1]), &(yylsp[0])); z->u1.str = (yyvsp[-1].str); @@ -2918,20 +2912,20 @@ yyreduce: linku1((yyval.pval),z); ;} break; - case 140: -#line 696 "ael.y" + case 139: +#line 694 "ael.y" {(yyval.pval)=(yyvsp[-1].pval);;} break; - case 141: -#line 699 "ael.y" + case 140: +#line 697 "ael.y" { (yyval.pval) = npval2(PV_WORD, &(yylsp[-1]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-1].str);;} break; - case 142: -#line 703 "ael.y" + case 141: +#line 701 "ael.y" { (yyval.pval) = npval2(PV_WORD, &(yylsp[-13]), &(yylsp[-12])); (yyval.pval)->u1.str = (yyvsp[-13].str); @@ -2950,8 +2944,8 @@ yyreduce: ;} break; - case 143: -#line 719 "ael.y" + case 142: +#line 717 "ael.y" { (yyval.pval) = npval2(PV_WORD, &(yylsp[-9]), &(yylsp[-8])); (yyval.pval)->u1.str = (yyvsp[-9].str); @@ -2967,8 +2961,8 @@ yyreduce: ;} break; - case 144: -#line 732 "ael.y" + case 143: +#line 730 "ael.y" { pval *z = npval2(PV_WORD, &(yylsp[-1]), &(yylsp[0])); /* XXX don't we need @1-@3 ?*/ (yyval.pval)=(yyvsp[-2].pval); @@ -2976,8 +2970,8 @@ yyreduce: linku1((yyval.pval),z); ;} break; - case 145: -#line 738 "ael.y" + case 144: +#line 736 "ael.y" { pval *z = npval2(PV_WORD, &(yylsp[-13]), &(yylsp[-12])); (yyval.pval)=(yyvsp[-14].pval); z->u1.str = (yyvsp[-13].str); @@ -2997,8 +2991,8 @@ yyreduce: ;} break; - case 146: -#line 755 "ael.y" + case 145: +#line 753 "ael.y" { pval *z = npval2(PV_WORD, &(yylsp[-9]), &(yylsp[-8])); (yyval.pval)=(yyvsp[-10].pval); @@ -3016,30 +3010,30 @@ yyreduce: ;} break; - case 147: -#line 770 "ael.y" + case 146: +#line 768 "ael.y" {(yyval.pval)=(yyvsp[-1].pval);;} break; - case 148: -#line 773 "ael.y" + case 147: +#line 771 "ael.y" { (yyval.str) = (yyvsp[0].str);;} break; - case 149: -#line 774 "ael.y" + case 148: +#line 772 "ael.y" {(yyval.str)=strdup("default");;} break; - case 150: -#line 777 "ael.y" + case 149: +#line 775 "ael.y" { (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-3]), &(yylsp[0])); (yyval.pval)->u1.list = (yyvsp[-1].pval);;} break; - case 151: -#line 780 "ael.y" + case 150: +#line 778 "ael.y" { (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;} break; @@ -3049,7 +3043,7 @@ yyreduce: } /* Line 1126 of yacc.c. */ -#line 3053 "ael.tab.c" +#line 3047 "ael.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -3324,7 +3318,7 @@ yyreturn: } -#line 785 "ael.y" +#line 783 "ael.y" static char *token_equivs1[] = diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y index f1d20a3de..57f857fd1 100644 --- a/pbx/ael/ael.y +++ b/pbx/ael/ael.y @@ -669,11 +669,9 @@ macro_statement : statement {$$=$1;} $$->u2.statements = $4;} ; -switches : KW_SWITCHES LC switchlist RC { - $$ = npval2(PV_SWITCHES, &@1, &@4); - $$->u1.list = $3; } - | KW_SWITCHES LC RC /* empty switch list OK */ { - $$ = npval2(PV_SWITCHES, &@1, &@3); } +switches : KW_SWITCHES switchlist_block { + $$ = npval2(PV_SWITCHES, &@1, &@2); + $$->u1.list = $2; } ; eswitches : KW_ESWITCHES switchlist_block { |