From eaff46c5d7015bc3b28d1630f5555a97e7fe6f30 Mon Sep 17 00:00:00 2001 From: murf Date: Wed, 24 Oct 2007 04:44:27 +0000 Subject: Merged revisions 86936 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r86936 | murf | 2007-10-23 22:14:28 -0600 (Tue, 23 Oct 2007) | 1 line closes issue #11037 -- unable to specify app:spec in hint arguments ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@86954 f38db490-d61c-443f-a65b-d21fe96a405b --- res/ael/ael.tab.c | 817 +++++++++++++++++++++++++++--------------------------- res/ael/ael.y | 4 + 2 files changed, 420 insertions(+), 401 deletions(-) (limited to 'res') diff --git a/res/ael/ael.tab.c b/res/ael/ael.tab.c index 1864c184f..995032238 100644 --- a/res/ael/ael.tab.c +++ b/res/ael/ael.tab.c @@ -492,16 +492,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 14 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 315 +#define YYLAST 331 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 43 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 56 /* YYNRULES -- Number of rules. */ -#define YYNRULES 137 +#define YYNRULES 138 /* YYNRULES -- Number of states. */ -#define YYNSTATES 279 +#define YYNSTATES 281 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -556,14 +556,14 @@ static const yytype_uint16 yyprhs[] = 85, 88, 90, 92, 94, 96, 98, 100, 102, 105, 107, 112, 116, 121, 129, 138, 139, 142, 145, 151, 153, 161, 162, 167, 170, 173, 178, 180, 183, 185, - 188, 192, 194, 197, 201, 203, 206, 210, 216, 220, - 222, 224, 228, 232, 235, 236, 237, 238, 251, 255, - 257, 261, 264, 267, 268, 274, 277, 280, 283, 287, - 289, 292, 293, 295, 299, 303, 309, 315, 321, 327, - 328, 331, 334, 339, 340, 346, 350, 351, 355, 359, - 362, 364, 365, 367, 368, 372, 373, 376, 381, 385, - 390, 391, 394, 396, 398, 404, 409, 414, 415, 419, - 425, 428, 430, 434, 437, 441, 444, 449 + 188, 192, 196, 198, 201, 205, 207, 210, 214, 220, + 224, 226, 228, 232, 236, 239, 240, 241, 242, 255, + 259, 261, 265, 268, 271, 272, 278, 281, 284, 287, + 291, 293, 296, 297, 299, 303, 307, 313, 319, 325, + 331, 332, 335, 338, 343, 344, 350, 354, 355, 359, + 363, 366, 368, 369, 371, 372, 376, 377, 380, 385, + 389, 394, 395, 398, 400, 402, 408, 413, 418, 419, + 423, 429, 432, 434, 438, 441, 445, 448, 453 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -587,34 +587,34 @@ static const yytype_int8 yyrhs[] = -1, 42, -1, 63, 13, 70, 13, 70, 13, 70, -1, -1, 6, 66, 68, 7, -1, 19, 65, -1, 22, 65, -1, 20, 6, 64, 7, -1, 42, -1, - 42, 42, -1, 42, -1, 69, 42, -1, 69, 12, - 42, -1, 42, -1, 42, 42, -1, 42, 42, 42, - -1, 42, -1, 42, 42, -1, 71, 11, 42, -1, - 18, 65, 4, 89, 5, -1, 4, 62, 5, -1, - 53, -1, 55, -1, 25, 79, 8, -1, 26, 81, - 8, -1, 42, 11, -1, -1, -1, -1, 32, 6, - 74, 42, 8, 75, 42, 8, 76, 42, 7, 73, - -1, 33, 65, 73, -1, 72, -1, 12, 82, 8, - -1, 86, 8, -1, 42, 8, -1, -1, 86, 9, - 77, 42, 8, -1, 28, 8, -1, 27, 8, -1, - 29, 8, -1, 67, 73, 78, -1, 8, -1, 21, - 73, -1, -1, 71, -1, 71, 13, 71, -1, 71, - 10, 71, -1, 71, 13, 71, 13, 71, -1, 71, - 10, 71, 10, 71, -1, 36, 13, 71, 13, 71, - -1, 36, 10, 71, 10, 71, -1, -1, 10, 42, - -1, 71, 80, -1, 71, 80, 14, 47, -1, -1, - 42, 6, 83, 88, 7, -1, 42, 6, 7, -1, - -1, 42, 6, 85, -1, 84, 88, 7, -1, 84, - 7, -1, 42, -1, -1, 68, -1, -1, 88, 10, - 87, -1, -1, 90, 89, -1, 34, 42, 11, 62, - -1, 36, 11, 62, -1, 35, 42, 11, 62, -1, - -1, 92, 91, -1, 73, -1, 98, -1, 37, 42, - 4, 62, 5, -1, 38, 4, 95, 5, -1, 39, - 4, 95, 5, -1, -1, 42, 8, 95, -1, 42, - 14, 42, 8, 95, -1, 1, 95, -1, 47, -1, - 47, 13, 64, -1, 96, 8, -1, 97, 96, 8, - -1, 97, 1, -1, 40, 4, 97, 5, -1, 40, - 4, 5, -1 + 42, 42, -1, 42, -1, 69, 42, -1, 69, 11, + 42, -1, 69, 12, 42, -1, 42, -1, 42, 42, + -1, 42, 42, 42, -1, 42, -1, 42, 42, -1, + 71, 11, 42, -1, 18, 65, 4, 89, 5, -1, + 4, 62, 5, -1, 53, -1, 55, -1, 25, 79, + 8, -1, 26, 81, 8, -1, 42, 11, -1, -1, + -1, -1, 32, 6, 74, 42, 8, 75, 42, 8, + 76, 42, 7, 73, -1, 33, 65, 73, -1, 72, + -1, 12, 82, 8, -1, 86, 8, -1, 42, 8, + -1, -1, 86, 9, 77, 42, 8, -1, 28, 8, + -1, 27, 8, -1, 29, 8, -1, 67, 73, 78, + -1, 8, -1, 21, 73, -1, -1, 71, -1, 71, + 13, 71, -1, 71, 10, 71, -1, 71, 13, 71, + 13, 71, -1, 71, 10, 71, 10, 71, -1, 36, + 13, 71, 13, 71, -1, 36, 10, 71, 10, 71, + -1, -1, 10, 42, -1, 71, 80, -1, 71, 80, + 14, 47, -1, -1, 42, 6, 83, 88, 7, -1, + 42, 6, 7, -1, -1, 42, 6, 85, -1, 84, + 88, 7, -1, 84, 7, -1, 42, -1, -1, 68, + -1, -1, 88, 10, 87, -1, -1, 90, 89, -1, + 34, 42, 11, 62, -1, 36, 11, 62, -1, 35, + 42, 11, 62, -1, -1, 92, 91, -1, 73, -1, + 98, -1, 37, 42, 4, 62, 5, -1, 38, 4, + 95, 5, -1, 39, 4, 95, 5, -1, -1, 42, + 8, 95, -1, 42, 14, 42, 8, 95, -1, 1, + 95, -1, 47, -1, 47, 13, 64, -1, 96, 8, + -1, 97, 96, 8, -1, 97, 1, -1, 40, 4, + 97, 5, -1, 40, 4, 5, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -626,14 +626,14 @@ static const yytype_uint16 yyrline[] = 261, 264, 265, 266, 267, 268, 269, 270, 271, 272, 275, 280, 284, 289, 294, 304, 305, 306, 312, 317, 321, 329, 329, 333, 336, 339, 350, 351, 358, 359, - 363, 369, 370, 375, 383, 384, 388, 394, 403, 406, - 407, 408, 411, 414, 417, 418, 419, 417, 425, 429, - 430, 431, 432, 435, 435, 468, 469, 470, 471, 475, - 478, 479, 482, 483, 486, 489, 493, 497, 501, 507, - 508, 512, 515, 521, 521, 526, 534, 534, 545, 552, - 555, 556, 559, 560, 563, 566, 567, 570, 574, 578, - 584, 585, 588, 589, 590, 596, 601, 606, 607, 608, - 610, 613, 614, 621, 622, 623, 626, 629 + 363, 367, 373, 374, 379, 387, 388, 392, 398, 407, + 410, 411, 412, 415, 418, 421, 422, 423, 421, 429, + 433, 434, 435, 436, 439, 439, 472, 473, 474, 475, + 479, 482, 483, 486, 487, 490, 493, 497, 501, 505, + 511, 512, 516, 519, 525, 525, 530, 538, 538, 549, + 556, 559, 560, 563, 564, 567, 570, 571, 574, 578, + 582, 588, 589, 592, 593, 594, 600, 605, 610, 611, + 612, 614, 617, 618, 625, 626, 627, 630, 633 }; #endif @@ -685,14 +685,14 @@ static const yytype_uint8 yyr1[] = 58, 59, 59, 59, 59, 59, 59, 59, 59, 59, 60, 61, 61, 61, 61, 62, 62, 62, 63, 63, 64, 66, 65, 67, 67, 67, 68, 68, 69, 69, - 69, 70, 70, 70, 71, 71, 71, 72, 73, 73, - 73, 73, 73, 73, 74, 75, 76, 73, 73, 73, - 73, 73, 73, 77, 73, 73, 73, 73, 73, 73, - 78, 78, 79, 79, 79, 79, 79, 79, 79, 80, - 80, 81, 81, 83, 82, 82, 85, 84, 86, 86, - 87, 87, 88, 88, 88, 89, 89, 90, 90, 90, - 91, 91, 92, 92, 92, 93, 94, 95, 95, 95, - 95, 96, 96, 97, 97, 97, 98, 98 + 69, 69, 70, 70, 70, 71, 71, 71, 72, 73, + 73, 73, 73, 73, 73, 74, 75, 76, 73, 73, + 73, 73, 73, 73, 77, 73, 73, 73, 73, 73, + 73, 78, 78, 79, 79, 79, 79, 79, 79, 79, + 80, 80, 81, 81, 83, 82, 82, 85, 84, 86, + 86, 87, 87, 88, 88, 88, 89, 89, 90, 90, + 90, 91, 91, 92, 92, 92, 93, 94, 95, 95, + 95, 95, 96, 96, 97, 97, 97, 98, 98 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -704,14 +704,14 @@ static const yytype_uint8 yyr2[] = 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 4, 3, 4, 7, 8, 0, 2, 2, 5, 1, 7, 0, 4, 2, 2, 4, 1, 2, 1, 2, - 3, 1, 2, 3, 1, 2, 3, 5, 3, 1, - 1, 3, 3, 2, 0, 0, 0, 12, 3, 1, - 3, 2, 2, 0, 5, 2, 2, 2, 3, 1, - 2, 0, 1, 3, 3, 5, 5, 5, 5, 0, - 2, 2, 4, 0, 5, 3, 0, 3, 3, 2, - 1, 0, 1, 0, 3, 0, 2, 4, 3, 4, - 0, 2, 1, 1, 5, 4, 4, 0, 3, 5, - 2, 1, 3, 2, 3, 2, 4, 3 + 3, 3, 1, 2, 3, 1, 2, 3, 5, 3, + 1, 1, 3, 3, 2, 0, 0, 0, 12, 3, + 1, 3, 2, 2, 0, 5, 2, 2, 2, 3, + 1, 2, 0, 1, 3, 3, 5, 5, 5, 5, + 0, 2, 2, 4, 0, 5, 3, 0, 3, 3, + 2, 1, 0, 1, 0, 3, 0, 2, 4, 3, + 4, 0, 2, 1, 1, 5, 4, 4, 0, 3, + 5, 2, 1, 3, 2, 3, 2, 4, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -724,163 +724,169 @@ static const yytype_uint8 yydefact[] = 0, 0, 0, 11, 10, 0, 25, 0, 19, 20, 16, 18, 0, 27, 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 36, 37, 0, - 0, 35, 31, 33, 34, 32, 120, 26, 0, 30, + 0, 35, 31, 33, 34, 32, 121, 26, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, - 12, 29, 0, 89, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 69, 70, - 0, 79, 122, 113, 0, 0, 120, 123, 21, 0, - 0, 0, 58, 0, 0, 0, 0, 0, 137, 131, + 12, 29, 0, 90, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 70, 71, + 0, 80, 123, 114, 0, 0, 121, 124, 21, 0, + 0, 0, 58, 0, 0, 0, 0, 0, 138, 132, 0, 0, 22, 41, 0, 0, 0, 0, 0, 51, - 0, 53, 0, 54, 0, 64, 92, 0, 99, 0, - 86, 85, 87, 74, 0, 0, 106, 82, 73, 91, - 109, 56, 112, 0, 81, 83, 15, 121, 40, 0, - 42, 0, 0, 59, 130, 0, 0, 125, 126, 0, - 133, 135, 136, 0, 0, 47, 68, 46, 103, 80, - 0, 115, 49, 0, 0, 0, 0, 0, 65, 0, - 0, 0, 71, 0, 101, 72, 0, 78, 0, 107, - 0, 88, 57, 108, 111, 0, 0, 0, 60, 128, - 0, 132, 134, 0, 105, 113, 0, 0, 0, 0, - 0, 115, 62, 0, 55, 0, 0, 0, 94, 66, - 93, 100, 0, 0, 0, 90, 110, 114, 0, 0, - 0, 0, 23, 0, 52, 0, 0, 0, 67, 116, - 63, 61, 0, 0, 0, 0, 0, 0, 102, 75, - 124, 84, 0, 43, 129, 104, 0, 0, 118, 0, - 0, 98, 97, 96, 95, 0, 44, 117, 119, 0, - 48, 0, 0, 76, 50, 0, 0, 0, 77 + 0, 53, 0, 54, 0, 65, 93, 0, 100, 0, + 87, 86, 88, 75, 0, 0, 107, 83, 74, 92, + 110, 56, 113, 0, 82, 84, 15, 122, 40, 0, + 42, 0, 0, 0, 59, 131, 0, 0, 126, 127, + 0, 134, 136, 137, 0, 0, 47, 69, 46, 104, + 81, 0, 116, 49, 0, 0, 0, 0, 0, 66, + 0, 0, 0, 72, 0, 102, 73, 0, 79, 0, + 108, 0, 89, 57, 109, 112, 0, 0, 0, 60, + 61, 129, 0, 133, 135, 0, 106, 114, 0, 0, + 0, 0, 0, 116, 63, 0, 55, 0, 0, 0, + 95, 67, 94, 101, 0, 0, 0, 91, 111, 115, + 0, 0, 0, 0, 23, 0, 52, 0, 0, 0, + 68, 117, 64, 62, 0, 0, 0, 0, 0, 0, + 103, 76, 125, 85, 0, 43, 130, 105, 0, 0, + 119, 0, 0, 99, 98, 97, 96, 0, 44, 118, + 120, 0, 48, 0, 0, 77, 50, 0, 0, 0, + 78 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { -1, 5, 6, 7, 109, 8, 9, 10, 11, 21, - 88, 36, 89, 164, 27, 49, 50, 51, 52, 115, - 173, 174, 120, 170, 90, 142, 103, 175, 126, 91, - 116, 186, 265, 275, 195, 191, 127, 184, 129, 118, - 205, 93, 189, 94, 227, 143, 210, 211, 95, 96, + 88, 36, 89, 165, 27, 49, 50, 51, 52, 115, + 174, 175, 120, 171, 90, 142, 103, 176, 126, 91, + 116, 187, 267, 277, 196, 192, 127, 185, 129, 118, + 207, 93, 190, 94, 229, 143, 212, 213, 95, 96, 53, 54, 106, 110, 111, 55 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -208 +#define YYPACT_NINF -210 static const yytype_int16 yypact[] = { - 16, -208, -26, 31, -208, 44, 104, -208, -208, 43, - -208, -208, 64, 9, -208, -208, -208, 74, 42, 9, - 83, 97, 9, -208, -208, 109, -208, 90, -208, -208, - -208, -208, 148, -208, 121, 102, 106, 148, -208, 126, - 33, 158, 178, 191, 193, 112, 84, -208, -208, 171, - 148, -208, -208, -208, -208, -208, 190, -208, 177, -208, - 151, 195, 179, 162, 14, 14, 25, 196, -208, 216, - -208, -208, 110, -208, 165, 205, 205, 207, 205, 81, - 183, 206, 218, 221, 227, 205, 197, 149, -208, -208, - 216, -208, -208, 5, 172, 232, 190, -208, -208, 238, - 162, 216, -208, 15, 14, 133, 235, 242, -208, 237, - 243, 6, -208, -208, 54, 247, 54, 248, 245, -208, - 251, -208, 214, -208, 8, 217, 58, 252, 173, 253, - -208, -208, -208, -208, 216, 258, -208, -208, -208, 244, - -208, 222, -208, 99, -208, -208, -208, -208, -208, 21, - -208, 224, 225, -208, -208, 14, 226, -208, -208, 214, - -208, -208, -208, 255, 228, -208, -208, -208, 262, -208, - 229, 137, 18, 259, 266, 263, 183, 183, -208, 183, - 233, 183, -208, 234, 264, -208, 239, -208, 110, -208, - 216, -208, -208, -208, 240, 241, 246, 256, -208, -208, - 269, -208, -208, 271, -208, 229, 277, 249, 250, 274, - 281, 137, 254, 257, -208, 257, 181, 150, 189, -208, - 164, -208, 74, 279, 284, -208, -208, -208, 282, 270, - 216, 14, -208, 114, -208, 286, 287, 54, -208, -208, - -208, 260, 280, 289, 183, 183, 183, 183, -208, -208, - -208, -208, 216, -208, -208, -208, 54, 54, -208, 257, - 257, 290, 290, 290, 290, 261, -208, -208, -208, 291, - -208, 297, 257, -208, -208, 265, 288, 216, -208 + 66, -210, -26, 64, -210, 88, 110, -210, -210, 93, + -210, -210, 95, 9, -210, -210, -210, 72, 30, 9, + 96, 137, 9, -210, -210, 124, -210, 102, -210, -210, + -210, -210, 16, -210, 154, 120, 144, 16, -210, 169, + 33, 208, 197, 212, 216, 187, 62, -210, -210, 225, + 16, -210, -210, -210, -210, -210, 155, -210, 226, -210, + 191, 229, 213, 194, 17, 17, 6, 230, -210, 199, + -210, -210, 65, -210, 196, 236, 236, 237, 236, 79, + 202, 238, 239, 240, 243, 236, 203, 204, -210, -210, + 199, -210, -210, -4, 148, 245, 155, -210, -210, 244, + 194, 199, -210, 8, 17, 108, 246, 248, -210, 241, + 247, 25, -210, -210, 119, 251, 119, 252, 249, -210, + 255, -210, 218, -210, 26, 219, 189, 254, 168, 256, + -210, -210, -210, -210, 199, 259, -210, -210, -210, 250, + -210, 223, -210, 69, -210, -210, -210, -210, -210, 20, + -210, 224, 227, 228, -210, -210, 17, 231, -210, -210, + 218, -210, -210, -210, 260, 232, -210, -210, -210, 265, + -210, 233, 130, 18, 263, 270, 267, 202, 202, -210, + 202, 242, 202, -210, 253, 266, -210, 257, -210, 65, + -210, 199, -210, -210, -210, 258, 261, 262, 264, -210, + -210, -210, 271, -210, -210, 273, -210, 233, 275, 268, + 269, 272, 280, 130, 274, 276, -210, 276, 179, 106, + 195, -210, 123, -210, 72, 278, 282, -210, -210, -210, + 281, 277, 199, 17, -210, 122, -210, 279, 283, 119, + -210, -210, -210, 284, 285, 286, 202, 202, 202, 202, + -210, -210, -210, -210, 199, -210, -210, -210, 119, 119, + -210, 276, 276, 291, 291, 291, 291, 287, -210, -210, + -210, 292, -210, 288, 276, -210, -210, 289, 299, 199, + -210 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -208, -208, -208, 300, -16, -208, -208, -208, -208, 140, - 4, -208, -12, -208, -208, 0, -208, -208, -208, -111, - -208, 152, 55, -208, -208, 138, 209, -207, -78, -208, - -56, -208, -208, -208, -208, -208, -208, -208, -208, -208, - -208, -208, -208, -208, -208, 105, 101, -208, 219, -208, - -208, -208, -61, 202, -208, -47 + -210, -210, -210, 301, -16, -210, -210, -210, -210, 121, + 172, -210, -9, -210, -210, -25, -210, -210, -210, -109, + -210, 107, -41, -210, -210, 138, 192, -209, -78, -210, + -56, -210, -210, -210, -210, -210, -210, -210, -210, -210, + -210, -210, -210, -210, -210, 84, 80, -210, 217, -210, + -210, -210, -61, 201, -210, -47 }; /* 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 -128 +#define YYTABLE_NINF -129 static const yytype_int16 yytable[] = { - 92, 25, 128, 165, 107, 167, 242, 161, 243, 97, - 19, 162, 140, 113, -17, 104, 12, 22, 176, -127, - 48, 177, 151, 22, 1, 48, 22, 152, 196, -61, - 108, 2, 3, 152, 139, 13, 47, 59, 48, 4, - 92, 47, 23, 154, 14, 150, 17, 141, 24, 97, - 71, 20, 269, 270, 47, 114, 105, 153, 72, -45, - 212, 23, 73, 153, 61, 274, 74, 24, 179, 180, - 18, 181, 75, 76, 77, 62, 78, 224, 187, 79, - 80, 81, 82, 83, 26, 68, 84, 85, -45, -45, - -45, 33, 29, 29, 199, 45, 87, 34, 216, 217, - 35, 218, 30, 220, -2, 15, 193, -14, 69, 194, - 23, 114, 1, 32, 72, -45, 24, 124, 73, 2, - 3, 255, 74, 125, 194, 56, 258, 4, 75, 76, - 77, 121, 78, 123, 225, 79, 80, 81, 82, 83, - 134, 155, 84, 85, 57, 267, 268, 156, 58, 37, - 60, 45, 87, -28, 67, 136, 38, 137, 29, 28, - 138, 180, 31, 245, 63, 39, 261, 262, 263, 264, - 254, 207, 208, 209, 253, 180, 70, 247, 40, 41, - 144, 145, 64, 183, 180, 98, 42, 43, 44, 45, - 46, 244, 180, 99, 72, 65, 266, 66, 73, 246, - 180, 100, 74, 101, 102, 112, 248, 117, 75, 76, - 77, 119, 78, 122, 130, 79, 80, 81, 82, 83, - 72, 278, 84, 85, 73, 125, 131, 86, 74, 132, - 44, 45, 87, 133, 75, 76, 77, 146, 78, 135, - 157, 79, 80, 81, 82, 83, 148, 158, 84, 85, - 159, 160, 166, 169, 168, 171, 172, 45, 87, 178, - 182, 185, 188, 202, 192, 190, 197, 198, 200, 204, - 203, 141, 213, 214, 215, 219, 221, 231, 222, 232, - 230, 223, 226, 228, 234, 237, 238, 249, 229, 250, - 251, 235, 236, 259, 252, 277, 240, 256, 257, 241, - 260, 180, 212, 271, 272, 273, 16, 276, 206, 149, - 233, 201, 239, 163, 0, 147 + 92, 25, 128, 140, 107, 166, 244, 168, 245, 97, + 19, 108, 59, 113, -17, 151, 12, 37, 104, 152, + 153, -28, -128, 48, 38, 71, 162, 197, 48, -62, + 163, 152, 153, 39, 139, 121, 177, 123, 141, 178, + 92, 48, 23, 155, 134, 150, 40, 41, 24, 97, + 154, 20, 271, 272, 42, 43, 44, 45, 46, 105, + 214, 23, 154, 68, 61, 276, 114, 24, 13, 72, + -45, 29, 26, 73, 1, 62, 194, 74, 188, 195, + 226, 2, 3, 75, 76, 77, 69, 78, 14, 4, + 79, 80, 81, 82, 83, 201, 17, 84, 85, 218, + 219, 18, 220, 33, 222, 29, 45, 87, 23, 34, + -2, 15, 35, -14, 24, 124, 156, 181, 1, 247, + 114, 125, 157, 72, -45, 2, 3, 73, 32, 257, + 260, 74, 195, 4, 181, 227, 249, 75, 76, 77, + 28, 78, 30, 31, 79, 80, 81, 82, 83, 269, + 270, 84, 85, -45, -45, -45, 144, 145, 56, 72, + 45, 87, 57, 73, 209, 210, 211, 74, 263, 264, + 265, 266, 256, 75, 76, 77, 255, 78, 184, 181, + 79, 80, 81, 82, 83, 22, 58, 84, 85, 246, + 181, 22, 86, 60, 22, 44, 45, 87, 268, 180, + 181, 64, 182, 72, 47, 248, 181, 73, 250, 47, + 136, 74, 137, 29, 63, 138, 65, 75, 76, 77, + 66, 78, 47, 280, 79, 80, 81, 82, 83, 67, + 70, 84, 85, 99, 98, 100, 102, 101, 117, 112, + 45, 87, 119, 122, 125, 135, 130, 131, 132, 133, + 146, 158, 148, 159, 160, 161, 167, 170, 169, 172, + 173, 179, 183, 189, 186, 193, 198, 203, 204, 199, + 200, 191, 206, 202, 205, 141, 215, 216, 217, 233, + 224, 234, 236, 239, 221, 240, 251, 252, 232, 253, + 258, 235, 149, 241, 259, 223, 275, 262, 261, 225, + 228, 254, 181, 230, 231, 274, 279, 16, 0, 208, + 237, 238, 164, 147, 0, 0, 242, 0, 243, 0, + 0, 0, 0, 0, 0, 0, 214, 0, 0, 273, + 0, 278 }; static const yytype_int16 yycheck[] = { - 56, 17, 80, 114, 65, 116, 213, 1, 215, 56, - 1, 5, 7, 69, 5, 1, 42, 13, 10, 5, - 32, 13, 7, 19, 8, 37, 22, 12, 7, 11, - 5, 15, 16, 12, 90, 4, 32, 37, 50, 23, - 96, 37, 36, 104, 0, 101, 3, 42, 42, 96, - 50, 42, 259, 260, 50, 1, 42, 42, 4, 5, - 42, 36, 8, 42, 31, 272, 12, 42, 10, 11, - 6, 13, 18, 19, 20, 42, 22, 188, 134, 25, - 26, 27, 28, 29, 42, 1, 32, 33, 34, 35, - 36, 1, 9, 9, 155, 41, 42, 7, 176, 177, - 10, 179, 5, 181, 0, 1, 7, 3, 24, 10, - 36, 1, 8, 4, 4, 5, 42, 36, 8, 15, - 16, 7, 12, 42, 10, 4, 237, 23, 18, 19, - 20, 76, 22, 78, 190, 25, 26, 27, 28, 29, - 85, 8, 32, 33, 42, 256, 257, 14, 42, 1, - 24, 41, 42, 5, 42, 6, 8, 8, 9, 19, - 11, 11, 22, 13, 6, 17, 244, 245, 246, 247, - 231, 34, 35, 36, 230, 11, 5, 13, 30, 31, - 8, 9, 4, 10, 11, 8, 38, 39, 40, 41, - 42, 10, 11, 42, 4, 4, 252, 4, 8, 10, - 11, 6, 12, 24, 42, 9, 222, 42, 18, 19, - 20, 6, 22, 6, 8, 25, 26, 27, 28, 29, - 4, 277, 32, 33, 8, 42, 8, 37, 12, 8, - 40, 41, 42, 6, 18, 19, 20, 5, 22, 42, - 5, 25, 26, 27, 28, 29, 8, 5, 32, 33, - 13, 8, 5, 8, 6, 4, 42, 41, 42, 42, - 8, 8, 4, 8, 42, 21, 42, 42, 42, 7, - 42, 42, 13, 7, 11, 42, 42, 8, 14, 8, - 24, 42, 42, 42, 7, 11, 5, 8, 42, 5, - 8, 42, 42, 13, 24, 7, 42, 11, 11, 42, - 11, 11, 42, 42, 13, 8, 6, 42, 170, 100, - 205, 159, 211, 111, -1, 96 + 56, 17, 80, 7, 65, 114, 215, 116, 217, 56, + 1, 5, 37, 69, 5, 7, 42, 1, 1, 11, + 12, 5, 5, 32, 8, 50, 1, 7, 37, 11, + 5, 11, 12, 17, 90, 76, 10, 78, 42, 13, + 96, 50, 36, 104, 85, 101, 30, 31, 42, 96, + 42, 42, 261, 262, 38, 39, 40, 41, 42, 42, + 42, 36, 42, 1, 31, 274, 1, 42, 4, 4, + 5, 9, 42, 8, 8, 42, 7, 12, 134, 10, + 189, 15, 16, 18, 19, 20, 24, 22, 0, 23, + 25, 26, 27, 28, 29, 156, 3, 32, 33, 177, + 178, 6, 180, 1, 182, 9, 41, 42, 36, 7, + 0, 1, 10, 3, 42, 36, 8, 11, 8, 13, + 1, 42, 14, 4, 5, 15, 16, 8, 4, 7, + 239, 12, 10, 23, 11, 191, 13, 18, 19, 20, + 19, 22, 5, 22, 25, 26, 27, 28, 29, 258, + 259, 32, 33, 34, 35, 36, 8, 9, 4, 4, + 41, 42, 42, 8, 34, 35, 36, 12, 246, 247, + 248, 249, 233, 18, 19, 20, 232, 22, 10, 11, + 25, 26, 27, 28, 29, 13, 42, 32, 33, 10, + 11, 19, 37, 24, 22, 40, 41, 42, 254, 10, + 11, 4, 13, 4, 32, 10, 11, 8, 224, 37, + 6, 12, 8, 9, 6, 11, 4, 18, 19, 20, + 4, 22, 50, 279, 25, 26, 27, 28, 29, 42, + 5, 32, 33, 42, 8, 6, 42, 24, 42, 9, + 41, 42, 6, 6, 42, 42, 8, 8, 8, 6, + 5, 5, 8, 5, 13, 8, 5, 8, 6, 4, + 42, 42, 8, 4, 8, 42, 42, 160, 8, 42, + 42, 21, 7, 42, 42, 42, 13, 7, 11, 8, + 14, 8, 7, 11, 42, 5, 8, 5, 24, 8, + 11, 207, 100, 213, 11, 42, 8, 11, 13, 42, + 42, 24, 11, 42, 42, 13, 7, 6, -1, 171, + 42, 42, 111, 96, -1, -1, 42, -1, 42, -1, + -1, -1, -1, -1, -1, -1, 42, -1, -1, 42, + -1, 42 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -902,19 +908,20 @@ static const yytype_uint8 yystos[] = 65, 65, 6, 65, 36, 42, 71, 79, 71, 81, 8, 8, 8, 6, 65, 42, 6, 8, 11, 73, 7, 42, 68, 88, 8, 9, 5, 91, 8, 69, - 73, 7, 12, 42, 95, 8, 14, 5, 5, 13, - 8, 1, 5, 96, 56, 62, 5, 62, 6, 8, - 66, 4, 42, 63, 64, 70, 10, 13, 42, 10, - 11, 13, 8, 10, 80, 8, 74, 73, 4, 85, - 21, 78, 42, 7, 10, 77, 7, 42, 42, 95, - 42, 64, 8, 42, 7, 83, 68, 34, 35, 36, - 89, 90, 42, 13, 7, 11, 71, 71, 71, 42, - 71, 42, 14, 42, 62, 73, 42, 87, 42, 42, - 24, 8, 8, 88, 7, 42, 42, 11, 5, 89, - 42, 42, 70, 70, 10, 13, 10, 13, 47, 8, - 5, 8, 24, 73, 95, 7, 11, 11, 62, 13, - 11, 71, 71, 71, 71, 75, 73, 62, 62, 70, - 70, 42, 13, 8, 70, 76, 42, 7, 73 + 73, 7, 11, 12, 42, 95, 8, 14, 5, 5, + 13, 8, 1, 5, 96, 56, 62, 5, 62, 6, + 8, 66, 4, 42, 63, 64, 70, 10, 13, 42, + 10, 11, 13, 8, 10, 80, 8, 74, 73, 4, + 85, 21, 78, 42, 7, 10, 77, 7, 42, 42, + 42, 95, 42, 64, 8, 42, 7, 83, 68, 34, + 35, 36, 89, 90, 42, 13, 7, 11, 71, 71, + 71, 42, 71, 42, 14, 42, 62, 73, 42, 87, + 42, 42, 24, 8, 8, 88, 7, 42, 42, 11, + 5, 89, 42, 42, 70, 70, 10, 13, 10, 13, + 47, 8, 5, 8, 24, 73, 95, 7, 11, 11, + 62, 13, 11, 71, 71, 71, 71, 75, 73, 62, + 62, 70, 70, 42, 13, 8, 70, 76, 42, 7, + 73 }; #define yyerrok (yyerrstatus = 0) @@ -1439,7 +1446,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) case 42: /* "word" */ #line 178 "ael.y" { free((yyvaluep->str));}; -#line 1443 "ael.tab.c" +#line 1450 "ael.tab.c" break; case 45: /* "objects" */ #line 165 "ael.y" @@ -1447,7 +1454,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1451 "ael.tab.c" +#line 1458 "ael.tab.c" break; case 46: /* "object" */ #line 165 "ael.y" @@ -1455,12 +1462,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1459 "ael.tab.c" +#line 1466 "ael.tab.c" break; case 47: /* "context_name" */ #line 178 "ael.y" { free((yyvaluep->str));}; -#line 1464 "ael.tab.c" +#line 1471 "ael.tab.c" break; case 48: /* "context" */ #line 165 "ael.y" @@ -1468,7 +1475,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1472 "ael.tab.c" +#line 1479 "ael.tab.c" break; case 50: /* "macro" */ #line 165 "ael.y" @@ -1476,7 +1483,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1480 "ael.tab.c" +#line 1487 "ael.tab.c" break; case 51: /* "globals" */ #line 165 "ael.y" @@ -1484,7 +1491,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1488 "ael.tab.c" +#line 1495 "ael.tab.c" break; case 52: /* "global_statements" */ #line 165 "ael.y" @@ -1492,7 +1499,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1496 "ael.tab.c" +#line 1503 "ael.tab.c" break; case 53: /* "assignment" */ #line 165 "ael.y" @@ -1500,7 +1507,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1504 "ael.tab.c" +#line 1511 "ael.tab.c" break; case 55: /* "local_assignment" */ #line 165 "ael.y" @@ -1508,7 +1515,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1512 "ael.tab.c" +#line 1519 "ael.tab.c" break; case 57: /* "arglist" */ #line 165 "ael.y" @@ -1516,7 +1523,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1520 "ael.tab.c" +#line 1527 "ael.tab.c" break; case 58: /* "elements" */ #line 165 "ael.y" @@ -1524,7 +1531,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1528 "ael.tab.c" +#line 1535 "ael.tab.c" break; case 59: /* "element" */ #line 165 "ael.y" @@ -1532,7 +1539,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1536 "ael.tab.c" +#line 1543 "ael.tab.c" break; case 60: /* "ignorepat" */ #line 165 "ael.y" @@ -1540,7 +1547,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1544 "ael.tab.c" +#line 1551 "ael.tab.c" break; case 61: /* "extension" */ #line 165 "ael.y" @@ -1548,7 +1555,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1552 "ael.tab.c" +#line 1559 "ael.tab.c" break; case 62: /* "statements" */ #line 165 "ael.y" @@ -1556,12 +1563,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1560 "ael.tab.c" +#line 1567 "ael.tab.c" break; case 63: /* "timerange" */ #line 178 "ael.y" { free((yyvaluep->str));}; -#line 1565 "ael.tab.c" +#line 1572 "ael.tab.c" break; case 64: /* "timespec" */ #line 165 "ael.y" @@ -1569,12 +1576,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1573 "ael.tab.c" +#line 1580 "ael.tab.c" break; case 65: /* "test_expr" */ #line 178 "ael.y" { free((yyvaluep->str));}; -#line 1578 "ael.tab.c" +#line 1585 "ael.tab.c" break; case 67: /* "if_like_head" */ #line 165 "ael.y" @@ -1582,22 +1589,22 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1586 "ael.tab.c" +#line 1593 "ael.tab.c" break; case 68: /* "word_list" */ #line 178 "ael.y" { free((yyvaluep->str));}; -#line 1591 "ael.tab.c" +#line 1598 "ael.tab.c" break; case 70: /* "word3_list" */ #line 178 "ael.y" { free((yyvaluep->str));}; -#line 1596 "ael.tab.c" +#line 1603 "ael.tab.c" break; case 71: /* "goto_word" */ #line 178 "ael.y" { free((yyvaluep->str));}; -#line 1601 "ael.tab.c" +#line 1608 "ael.tab.c" break; case 72: /* "switch_statement" */ #line 165 "ael.y" @@ -1605,7 +1612,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1609 "ael.tab.c" +#line 1616 "ael.tab.c" break; case 73: /* "statement" */ #line 165 "ael.y" @@ -1613,7 +1620,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1617 "ael.tab.c" +#line 1624 "ael.tab.c" break; case 78: /* "opt_else" */ #line 165 "ael.y" @@ -1621,7 +1628,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1625 "ael.tab.c" +#line 1632 "ael.tab.c" break; case 79: /* "target" */ #line 165 "ael.y" @@ -1629,12 +1636,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1633 "ael.tab.c" +#line 1640 "ael.tab.c" break; case 80: /* "opt_pri" */ #line 178 "ael.y" { free((yyvaluep->str));}; -#line 1638 "ael.tab.c" +#line 1645 "ael.tab.c" break; case 81: /* "jumptarget" */ #line 165 "ael.y" @@ -1642,7 +1649,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1646 "ael.tab.c" +#line 1653 "ael.tab.c" break; case 82: /* "macro_call" */ #line 165 "ael.y" @@ -1650,7 +1657,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1654 "ael.tab.c" +#line 1661 "ael.tab.c" break; case 84: /* "application_call_head" */ #line 165 "ael.y" @@ -1658,7 +1665,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1662 "ael.tab.c" +#line 1669 "ael.tab.c" break; case 86: /* "application_call" */ #line 165 "ael.y" @@ -1666,12 +1673,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1670 "ael.tab.c" +#line 1677 "ael.tab.c" break; case 87: /* "opt_word" */ #line 178 "ael.y" { free((yyvaluep->str));}; -#line 1675 "ael.tab.c" +#line 1682 "ael.tab.c" break; case 88: /* "eval_arglist" */ #line 165 "ael.y" @@ -1679,7 +1686,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1683 "ael.tab.c" +#line 1690 "ael.tab.c" break; case 89: /* "case_statements" */ #line 165 "ael.y" @@ -1687,7 +1694,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1691 "ael.tab.c" +#line 1698 "ael.tab.c" break; case 90: /* "case_statement" */ #line 165 "ael.y" @@ -1695,7 +1702,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1699 "ael.tab.c" +#line 1706 "ael.tab.c" break; case 91: /* "macro_statements" */ #line 165 "ael.y" @@ -1703,7 +1710,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1707 "ael.tab.c" +#line 1714 "ael.tab.c" break; case 92: /* "macro_statement" */ #line 165 "ael.y" @@ -1711,7 +1718,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1715 "ael.tab.c" +#line 1722 "ael.tab.c" break; case 93: /* "switches" */ #line 165 "ael.y" @@ -1719,7 +1726,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1723 "ael.tab.c" +#line 1730 "ael.tab.c" break; case 94: /* "eswitches" */ #line 165 "ael.y" @@ -1727,7 +1734,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1731 "ael.tab.c" +#line 1738 "ael.tab.c" break; case 95: /* "switchlist" */ #line 165 "ael.y" @@ -1735,7 +1742,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1739 "ael.tab.c" +#line 1746 "ael.tab.c" break; case 96: /* "included_entry" */ #line 165 "ael.y" @@ -1743,7 +1750,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1747 "ael.tab.c" +#line 1754 "ael.tab.c" break; case 97: /* "includeslist" */ #line 165 "ael.y" @@ -1751,7 +1758,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1755 "ael.tab.c" +#line 1762 "ael.tab.c" break; case 98: /* "includes" */ #line 165 "ael.y" @@ -1759,7 +1766,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1763 "ael.tab.c" +#line 1770 "ael.tab.c" break; default: @@ -2436,19 +2443,27 @@ yyreduce: case 60: #line 363 "ael.y" + { + asprintf(&((yyval.str)), "%s:%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)); + free((yyvsp[(1) - (3)].str)); + free((yyvsp[(3) - (3)].str)); ;} + break; + + case 61: +#line 367 "ael.y" { /* there are often '&' in hints */ asprintf(&((yyval.str)), "%s&%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)); free((yyvsp[(1) - (3)].str)); free((yyvsp[(3) - (3)].str));;} break; - case 61: -#line 369 "ael.y" + case 62: +#line 373 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str);;} break; - case 62: -#line 370 "ael.y" + case 63: +#line 374 "ael.y" { asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)); free((yyvsp[(1) - (2)].str)); @@ -2456,8 +2471,8 @@ yyreduce: prev_word = (yyval.str);;} break; - case 63: -#line 375 "ael.y" + case 64: +#line 379 "ael.y" { asprintf(&((yyval.str)), "%s%s%s", (yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)); free((yyvsp[(1) - (3)].str)); @@ -2466,90 +2481,90 @@ yyreduce: prev_word=(yyval.str);;} break; - case 64: -#line 383 "ael.y" + case 65: +#line 387 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str);;} break; - case 65: -#line 384 "ael.y" + case 66: +#line 388 "ael.y" { asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)); free((yyvsp[(1) - (2)].str)); free((yyvsp[(2) - (2)].str));;} break; - case 66: -#line 388 "ael.y" + case 67: +#line 392 "ael.y" { asprintf(&((yyval.str)), "%s:%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)); free((yyvsp[(1) - (3)].str)); free((yyvsp[(3) - (3)].str));;} break; - case 67: -#line 394 "ael.y" + case 68: +#line 398 "ael.y" { (yyval.pval) = npval2(PV_SWITCH, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)])); (yyval.pval)->u1.str = (yyvsp[(2) - (5)].str); (yyval.pval)->u2.statements = (yyvsp[(4) - (5)].pval); set_dads((yyval.pval),(yyvsp[(4) - (5)].pval));;} break; - case 68: -#line 403 "ael.y" + case 69: +#line 407 "ael.y" { (yyval.pval) = npval2(PV_STATEMENTBLOCK, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); (yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval); set_dads((yyval.pval),(yyvsp[(2) - (3)].pval));;} break; - case 69: -#line 406 "ael.y" + case 70: +#line 410 "ael.y" { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;} break; - case 70: -#line 407 "ael.y" + case 71: +#line 411 "ael.y" { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;} break; - case 71: -#line 408 "ael.y" + case 72: +#line 412 "ael.y" { (yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); (yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval);;} break; - case 72: -#line 411 "ael.y" + case 73: +#line 415 "ael.y" { (yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); (yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval);;} break; - case 73: -#line 414 "ael.y" + case 74: +#line 418 "ael.y" { (yyval.pval) = npval2(PV_LABEL, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); (yyval.pval)->u1.str = (yyvsp[(1) - (2)].str); ;} break; - case 74: -#line 417 "ael.y" + case 75: +#line 421 "ael.y" {reset_semicount(parseio->scanner);;} break; - case 75: -#line 418 "ael.y" + case 76: +#line 422 "ael.y" {reset_semicount(parseio->scanner);;} break; - case 76: -#line 419 "ael.y" + case 77: +#line 423 "ael.y" {reset_parencount(parseio->scanner);;} break; - case 77: -#line 419 "ael.y" + case 78: +#line 423 "ael.y" { /* XXX word_list maybe ? */ (yyval.pval) = npval2(PV_FOR, &(yylsp[(1) - (12)]), &(yylsp[(12) - (12)])); (yyval.pval)->u1.for_init = (yyvsp[(4) - (12)].str); @@ -2558,43 +2573,43 @@ yyreduce: (yyval.pval)->u4.for_statements = (yyvsp[(12) - (12)].pval); set_dads((yyval.pval),(yyvsp[(12) - (12)].pval));;} break; - case 78: -#line 425 "ael.y" + case 79: +#line 429 "ael.y" { (yyval.pval) = npval2(PV_WHILE, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); (yyval.pval)->u1.str = (yyvsp[(2) - (3)].str); (yyval.pval)->u2.statements = (yyvsp[(3) - (3)].pval); set_dads((yyval.pval),(yyvsp[(3) - (3)].pval));;} break; - case 79: -#line 429 "ael.y" + case 80: +#line 433 "ael.y" { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;} break; - case 80: -#line 430 "ael.y" + case 81: +#line 434 "ael.y" { (yyval.pval) = update_last((yyvsp[(2) - (3)].pval), &(yylsp[(2) - (3)])); ;} break; - case 81: -#line 431 "ael.y" + case 82: +#line 435 "ael.y" { (yyval.pval) = update_last((yyvsp[(1) - (2)].pval), &(yylsp[(2) - (2)])); ;} break; - case 82: -#line 432 "ael.y" + case 83: +#line 436 "ael.y" { (yyval.pval)= npval2(PV_APPLICATION_CALL, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); (yyval.pval)->u1.str = (yyvsp[(1) - (2)].str);;} break; - case 83: -#line 435 "ael.y" + case 84: +#line 439 "ael.y" {reset_semicount(parseio->scanner);;} break; - case 84: -#line 435 "ael.y" + case 85: +#line 439 "ael.y" { char *bufx; int tot=0; @@ -2630,69 +2645,61 @@ yyreduce: ;} break; - case 85: -#line 468 "ael.y" + case 86: +#line 472 "ael.y" { (yyval.pval) = npval2(PV_BREAK, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;} break; - case 86: -#line 469 "ael.y" + case 87: +#line 473 "ael.y" { (yyval.pval) = npval2(PV_RETURN, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;} break; - case 87: -#line 470 "ael.y" + case 88: +#line 474 "ael.y" { (yyval.pval) = npval2(PV_CONTINUE, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;} break; - case 88: -#line 471 "ael.y" + case 89: +#line 475 "ael.y" { (yyval.pval) = update_last((yyvsp[(1) - (3)].pval), &(yylsp[(2) - (3)])); (yyval.pval)->u2.statements = (yyvsp[(2) - (3)].pval); set_dads((yyval.pval),(yyvsp[(2) - (3)].pval)); (yyval.pval)->u3.else_statements = (yyvsp[(3) - (3)].pval);set_dads((yyval.pval),(yyvsp[(3) - (3)].pval));;} break; - case 89: -#line 475 "ael.y" - { (yyval.pval)=0; ;} - break; - case 90: -#line 478 "ael.y" - { (yyval.pval) = (yyvsp[(2) - (2)].pval); ;} +#line 479 "ael.y" + { (yyval.pval)=0; ;} break; case 91: -#line 479 "ael.y" - { (yyval.pval) = NULL ; ;} +#line 482 "ael.y" + { (yyval.pval) = (yyvsp[(2) - (2)].pval); ;} break; case 92: -#line 482 "ael.y" - { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;} +#line 483 "ael.y" + { (yyval.pval) = NULL ; ;} break; case 93: -#line 483 "ael.y" - { - (yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)])); - (yyval.pval)->next = nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)])); ;} +#line 486 "ael.y" + { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;} break; case 94: -#line 486 "ael.y" +#line 487 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)])); (yyval.pval)->next = nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)])); ;} break; case 95: -#line 489 "ael.y" +#line 490 "ael.y" { - (yyval.pval) = nword((yyvsp[(1) - (5)].str), &(yylsp[(1) - (5)])); - (yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)])); - (yyval.pval)->next->next = nword((yyvsp[(5) - (5)].str), &(yylsp[(5) - (5)])); ;} + (yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)])); + (yyval.pval)->next = nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)])); ;} break; case 96: @@ -2706,7 +2713,7 @@ yyreduce: case 97: #line 497 "ael.y" { - (yyval.pval) = nword(strdup("default"), &(yylsp[(1) - (5)])); + (yyval.pval) = nword((yyvsp[(1) - (5)].str), &(yylsp[(1) - (5)])); (yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)])); (yyval.pval)->next->next = nword((yyvsp[(5) - (5)].str), &(yylsp[(5) - (5)])); ;} break; @@ -2720,37 +2727,45 @@ yyreduce: break; case 99: -#line 507 "ael.y" - { (yyval.str) = strdup("1"); ;} +#line 505 "ael.y" + { + (yyval.pval) = nword(strdup("default"), &(yylsp[(1) - (5)])); + (yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)])); + (yyval.pval)->next->next = nword((yyvsp[(5) - (5)].str), &(yylsp[(5) - (5)])); ;} break; case 100: -#line 508 "ael.y" - { (yyval.str) = (yyvsp[(2) - (2)].str); ;} +#line 511 "ael.y" + { (yyval.str) = strdup("1"); ;} break; case 101: #line 512 "ael.y" + { (yyval.str) = (yyvsp[(2) - (2)].str); ;} + break; + + case 102: +#line 516 "ael.y" { /* ext[, pri] default 1 */ (yyval.pval) = nword((yyvsp[(1) - (2)].str), &(yylsp[(1) - (2)])); (yyval.pval)->next = nword((yyvsp[(2) - (2)].str), &(yylsp[(2) - (2)])); ;} break; - case 102: -#line 515 "ael.y" + case 103: +#line 519 "ael.y" { /* context, ext, pri */ (yyval.pval) = nword((yyvsp[(4) - (4)].str), &(yylsp[(4) - (4)])); (yyval.pval)->next = nword((yyvsp[(1) - (4)].str), &(yylsp[(1) - (4)])); (yyval.pval)->next->next = nword((yyvsp[(2) - (4)].str), &(yylsp[(2) - (4)])); ;} break; - case 103: -#line 521 "ael.y" + case 104: +#line 525 "ael.y" {reset_argcount(parseio->scanner);;} break; - case 104: -#line 521 "ael.y" + case 105: +#line 525 "ael.y" { /* XXX original code had @2 but i think we need @5 */ (yyval.pval) = npval2(PV_MACRO_CALL, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)])); @@ -2758,20 +2773,20 @@ yyreduce: (yyval.pval)->u2.arglist = (yyvsp[(4) - (5)].pval);;} break; - case 105: -#line 526 "ael.y" + case 106: +#line 530 "ael.y" { (yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); (yyval.pval)->u1.str = (yyvsp[(1) - (3)].str); ;} break; - case 106: -#line 534 "ael.y" + case 107: +#line 538 "ael.y" {reset_argcount(parseio->scanner);;} break; - case 107: -#line 534 "ael.y" + case 108: +#line 538 "ael.y" { if (strcasecmp((yyvsp[(1) - (3)].str),"goto") == 0) { (yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(2) - (3)])); @@ -2783,8 +2798,8 @@ yyreduce: } ;} break; - case 108: -#line 545 "ael.y" + case 109: +#line 549 "ael.y" { (yyval.pval) = update_last((yyvsp[(1) - (3)].pval), &(yylsp[(3) - (3)])); if( (yyval.pval)->type == PV_GOTO ) @@ -2794,179 +2809,179 @@ yyreduce: ;} break; - case 109: -#line 552 "ael.y" + case 110: +#line 556 "ael.y" { (yyval.pval) = update_last((yyvsp[(1) - (2)].pval), &(yylsp[(2) - (2)])); ;} break; - case 110: -#line 555 "ael.y" + case 111: +#line 559 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str) ;} break; - case 111: -#line 556 "ael.y" + case 112: +#line 560 "ael.y" { (yyval.str) = strdup(""); ;} break; - case 112: -#line 559 "ael.y" + case 113: +#line 563 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;} break; - case 113: -#line 560 "ael.y" + case 114: +#line 564 "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 114: -#line 563 "ael.y" + case 115: +#line 567 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)]))); ;} break; - case 115: -#line 566 "ael.y" + case 116: +#line 570 "ael.y" { (yyval.pval) = NULL; ;} break; - case 116: -#line 567 "ael.y" + case 117: +#line 571 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;} break; - case 117: -#line 570 "ael.y" + case 118: +#line 574 "ael.y" { (yyval.pval) = npval2(PV_CASE, &(yylsp[(1) - (4)]), &(yylsp[(3) - (4)])); /* XXX 3 or 4 ? */ (yyval.pval)->u1.str = (yyvsp[(2) - (4)].str); (yyval.pval)->u2.statements = (yyvsp[(4) - (4)].pval); set_dads((yyval.pval),(yyvsp[(4) - (4)].pval));;} break; - case 118: -#line 574 "ael.y" + case 119: +#line 578 "ael.y" { (yyval.pval) = npval2(PV_DEFAULT, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); (yyval.pval)->u1.str = NULL; (yyval.pval)->u2.statements = (yyvsp[(3) - (3)].pval);set_dads((yyval.pval),(yyvsp[(3) - (3)].pval));;} break; - case 119: -#line 578 "ael.y" + case 120: +#line 582 "ael.y" { (yyval.pval) = npval2(PV_PATTERN, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); /* XXX@3 or @4 ? */ (yyval.pval)->u1.str = (yyvsp[(2) - (4)].str); (yyval.pval)->u2.statements = (yyvsp[(4) - (4)].pval);set_dads((yyval.pval),(yyvsp[(4) - (4)].pval));;} break; - case 120: -#line 584 "ael.y" + case 121: +#line 588 "ael.y" { (yyval.pval) = NULL; ;} break; - case 121: -#line 585 "ael.y" + case 122: +#line 589 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;} break; - case 122: -#line 588 "ael.y" + case 123: +#line 592 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; - case 123: -#line 589 "ael.y" + case 124: +#line 593 "ael.y" { (yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; - case 124: -#line 590 "ael.y" + case 125: +#line 594 "ael.y" { (yyval.pval) = npval2(PV_CATCH, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)])); (yyval.pval)->u1.str = (yyvsp[(2) - (5)].str); (yyval.pval)->u2.statements = (yyvsp[(4) - (5)].pval); set_dads((yyval.pval),(yyvsp[(4) - (5)].pval));;} break; - case 125: -#line 596 "ael.y" + case 126: +#line 600 "ael.y" { (yyval.pval) = npval2(PV_SWITCHES, &(yylsp[(1) - (4)]), &(yylsp[(2) - (4)])); (yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval); set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));;} break; - case 126: -#line 601 "ael.y" + case 127: +#line 605 "ael.y" { (yyval.pval) = npval2(PV_ESWITCHES, &(yylsp[(1) - (4)]), &(yylsp[(2) - (4)])); (yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval); set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));;} break; - case 127: -#line 606 "ael.y" + case 128: +#line 610 "ael.y" { (yyval.pval) = NULL; ;} break; - case 128: -#line 607 "ael.y" + case 129: +#line 611 "ael.y" { (yyval.pval) = linku1(nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)])), (yyvsp[(3) - (3)].pval)); ;} break; - case 129: -#line 608 "ael.y" + case 130: +#line 612 "ael.y" { char *x; asprintf(&x,"%s@%s", (yyvsp[(1) - (5)].str),(yyvsp[(3) - (5)].str)); free((yyvsp[(1) - (5)].str)); free((yyvsp[(3) - (5)].str)); (yyval.pval) = linku1(nword(x, &(yylsp[(1) - (5)])), (yyvsp[(5) - (5)].pval));;} break; - case 130: -#line 610 "ael.y" + case 131: +#line 614 "ael.y" {(yyval.pval)=(yyvsp[(2) - (2)].pval);;} break; - case 131: -#line 613 "ael.y" + case 132: +#line 617 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;} break; - case 132: -#line 614 "ael.y" + case 133: +#line 618 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)])); (yyval.pval)->u2.arglist = (yyvsp[(3) - (3)].pval); prev_word=0; /* XXX sure ? */ ;} break; - case 133: -#line 621 "ael.y" + case 134: +#line 625 "ael.y" { (yyval.pval) = (yyvsp[(1) - (2)].pval); ;} break; - case 134: -#line 622 "ael.y" + case 135: +#line 626 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), (yyvsp[(2) - (3)].pval)); ;} break; - case 135: -#line 623 "ael.y" + case 136: +#line 627 "ael.y" {(yyval.pval)=(yyvsp[(1) - (2)].pval);;} break; - case 136: -#line 626 "ael.y" + case 137: +#line 630 "ael.y" { (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); (yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval);set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));;} break; - case 137: -#line 629 "ael.y" + case 138: +#line 633 "ael.y" { (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));;} break; /* Line 1270 of yacc.c. */ -#line 2970 "ael.tab.c" +#line 2985 "ael.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3185,7 +3200,7 @@ yyreturn: } -#line 634 "ael.y" +#line 638 "ael.y" static char *token_equivs1[] = @@ -3314,7 +3329,7 @@ static char *ael_token_subst(const char *mess) void yyerror(YYLTYPE *locp, struct parse_io *parseio, char const *s) { - char *s2 = ael_token_subst(s); + char *s2 = ael_token_subst((char *)s); if (locp->first_line == locp->last_line) { ast_log(LOG_ERROR, "==== File: %s, Line %d, Cols: %d-%d: Error: %s\n", my_file, locp->first_line, locp->first_column, locp->last_column, s2); } else { diff --git a/res/ael/ael.y b/res/ael/ael.y index 42d86c008..dc5309005 100644 --- a/res/ael/ael.y +++ b/res/ael/ael.y @@ -360,6 +360,10 @@ hint_word : word { $$ = $1; } asprintf(&($$), "%s %s", $1, $2); free($1); free($2); } + | hint_word COLON word { + asprintf(&($$), "%s:%s", $1, $3); + free($1); + free($3); } | hint_word AMPER word { /* there are often '&' in hints */ asprintf(&($$), "%s&%s", $1, $3); free($1); -- cgit v1.2.3