From 3231f4b085ab31d9bbc2339c63e4e2418c97cca6 Mon Sep 17 00:00:00 2001 From: murf Date: Tue, 19 Aug 2008 17:01:43 +0000 Subject: Merged revisions 138845 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r138845 | murf | 2008-08-19 10:31:24 -0600 (Tue, 19 Aug 2008) | 1 line Oops. put a decl in a generated file. My bad, but fixed now. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@138855 f38db490-d61c-443f-a65b-d21fe96a405b --- res/ael/ael.tab.c | 502 +++++++++++++++++++++++++++--------------------------- res/ael/ael.tab.h | 2 +- res/ael/ael.y | 2 + 3 files changed, 255 insertions(+), 251 deletions(-) (limited to 'res') diff --git a/res/ael/ael.tab.c b/res/ael/ael.tab.c index 330a68fac..f98e560ad 100644 --- a/res/ael/ael.tab.c +++ b/res/ael/ael.tab.c @@ -203,6 +203,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/ael_structs.h" #include "asterisk/utils.h" +extern struct ast_flags ast_compat; + pval * linku1(pval *head, pval *tail); static void set_dads(pval *dad, pval *child_list); void reset_parencount(yyscan_t yyscanner); @@ -241,14 +243,14 @@ static int only_one_app_set_warning = 0; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 58 "ael.y" +#line 60 "ael.y" { int intval; /* integer value, typically flags */ char *str; /* strings */ struct pval *pval; /* full objects */ } /* Line 187 of yacc.c. */ -#line 252 "ael.tab.c" +#line 254 "ael.tab.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -270,7 +272,7 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -#line 64 "ael.y" +#line 66 "ael.y" /* declaring these AFTER the union makes things a lot simpler! */ void yyerror(YYLTYPE *locp, struct parse_io *parseio, char const *s); @@ -293,7 +295,7 @@ static pval *update_last(pval *, YYLTYPE *); /* Line 216 of yacc.c. */ -#line 297 "ael.tab.c" +#line 299 "ael.tab.c" #ifdef short # undef short @@ -641,21 +643,21 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 190, 190, 193, 194, 195, 198, 199, 200, 201, - 204, 205, 208, 217, 218, 219, 220, 221, 224, 230, - 236, 237, 238, 241, 241, 251, 251, 258, 259, 260, - 261, 264, 265, 266, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 280, 285, 289, 297, 302, 307, 316, - 317, 318, 324, 329, 333, 341, 341, 345, 348, 351, - 362, 363, 370, 371, 375, 379, 385, 386, 391, 399, - 400, 404, 410, 419, 422, 423, 424, 427, 430, 433, - 434, 435, 433, 441, 445, 446, 447, 448, 451, 451, - 484, 485, 486, 487, 491, 494, 495, 498, 499, 502, - 505, 509, 513, 517, 523, 524, 528, 531, 537, 537, - 542, 550, 550, 561, 568, 571, 572, 575, 576, 579, - 582, 583, 586, 590, 594, 600, 601, 604, 605, 606, - 612, 617, 622, 623, 624, 626, 629, 630, 637, 638, - 639, 642, 645 + 0, 192, 192, 195, 196, 197, 200, 201, 202, 203, + 206, 207, 210, 219, 220, 221, 222, 223, 226, 232, + 238, 239, 240, 243, 243, 253, 253, 260, 261, 262, + 263, 266, 267, 268, 271, 272, 273, 274, 275, 276, + 277, 278, 279, 282, 287, 291, 299, 304, 309, 318, + 319, 320, 326, 331, 335, 343, 343, 347, 350, 353, + 364, 365, 372, 373, 377, 381, 387, 388, 393, 401, + 402, 406, 412, 421, 424, 425, 426, 429, 432, 435, + 436, 437, 435, 443, 447, 448, 449, 450, 453, 453, + 486, 487, 488, 489, 493, 496, 497, 500, 501, 504, + 507, 511, 515, 519, 525, 526, 530, 533, 539, 539, + 544, 552, 552, 563, 570, 573, 574, 577, 578, 581, + 584, 585, 588, 592, 596, 602, 603, 606, 607, 608, + 614, 619, 624, 625, 626, 628, 631, 632, 639, 640, + 641, 644, 647 }; #endif @@ -1466,329 +1468,329 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) switch (yytype) { case 43: /* "word" */ -#line 182 "ael.y" +#line 184 "ael.y" { free((yyvaluep->str));}; -#line 1472 "ael.tab.c" +#line 1474 "ael.tab.c" break; case 46: /* "objects" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1480 "ael.tab.c" +#line 1482 "ael.tab.c" break; case 47: /* "object" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1488 "ael.tab.c" +#line 1490 "ael.tab.c" break; case 48: /* "context_name" */ -#line 182 "ael.y" +#line 184 "ael.y" { free((yyvaluep->str));}; -#line 1493 "ael.tab.c" +#line 1495 "ael.tab.c" break; case 49: /* "context" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1501 "ael.tab.c" +#line 1503 "ael.tab.c" break; case 51: /* "macro" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1509 "ael.tab.c" +#line 1511 "ael.tab.c" break; case 52: /* "globals" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1517 "ael.tab.c" +#line 1519 "ael.tab.c" break; case 53: /* "global_statements" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1525 "ael.tab.c" +#line 1527 "ael.tab.c" break; case 54: /* "assignment" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1533 "ael.tab.c" +#line 1535 "ael.tab.c" break; case 56: /* "local_assignment" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1541 "ael.tab.c" +#line 1543 "ael.tab.c" break; case 58: /* "arglist" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1549 "ael.tab.c" +#line 1551 "ael.tab.c" break; case 59: /* "elements" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1557 "ael.tab.c" +#line 1559 "ael.tab.c" break; case 60: /* "element" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1565 "ael.tab.c" +#line 1567 "ael.tab.c" break; case 61: /* "ignorepat" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1573 "ael.tab.c" +#line 1575 "ael.tab.c" break; case 62: /* "extension" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1581 "ael.tab.c" +#line 1583 "ael.tab.c" break; case 63: /* "statements" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1589 "ael.tab.c" +#line 1591 "ael.tab.c" break; case 64: /* "timerange" */ -#line 182 "ael.y" +#line 184 "ael.y" { free((yyvaluep->str));}; -#line 1594 "ael.tab.c" +#line 1596 "ael.tab.c" break; case 65: /* "timespec" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1602 "ael.tab.c" +#line 1604 "ael.tab.c" break; case 66: /* "test_expr" */ -#line 182 "ael.y" +#line 184 "ael.y" { free((yyvaluep->str));}; -#line 1607 "ael.tab.c" +#line 1609 "ael.tab.c" break; case 68: /* "if_like_head" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1615 "ael.tab.c" +#line 1617 "ael.tab.c" break; case 69: /* "word_list" */ -#line 182 "ael.y" +#line 184 "ael.y" { free((yyvaluep->str));}; -#line 1620 "ael.tab.c" +#line 1622 "ael.tab.c" break; case 71: /* "word3_list" */ -#line 182 "ael.y" +#line 184 "ael.y" { free((yyvaluep->str));}; -#line 1625 "ael.tab.c" +#line 1627 "ael.tab.c" break; case 72: /* "goto_word" */ -#line 182 "ael.y" +#line 184 "ael.y" { free((yyvaluep->str));}; -#line 1630 "ael.tab.c" +#line 1632 "ael.tab.c" break; case 73: /* "switch_statement" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1638 "ael.tab.c" +#line 1640 "ael.tab.c" break; case 74: /* "statement" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1646 "ael.tab.c" +#line 1648 "ael.tab.c" break; case 79: /* "opt_else" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1654 "ael.tab.c" +#line 1656 "ael.tab.c" break; case 80: /* "target" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1662 "ael.tab.c" +#line 1664 "ael.tab.c" break; case 81: /* "opt_pri" */ -#line 182 "ael.y" +#line 184 "ael.y" { free((yyvaluep->str));}; -#line 1667 "ael.tab.c" +#line 1669 "ael.tab.c" break; case 82: /* "jumptarget" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1675 "ael.tab.c" +#line 1677 "ael.tab.c" break; case 83: /* "macro_call" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1683 "ael.tab.c" +#line 1685 "ael.tab.c" break; case 85: /* "application_call_head" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1691 "ael.tab.c" +#line 1693 "ael.tab.c" break; case 87: /* "application_call" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1699 "ael.tab.c" +#line 1701 "ael.tab.c" break; case 88: /* "opt_word" */ -#line 182 "ael.y" +#line 184 "ael.y" { free((yyvaluep->str));}; -#line 1704 "ael.tab.c" +#line 1706 "ael.tab.c" break; case 89: /* "eval_arglist" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1712 "ael.tab.c" +#line 1714 "ael.tab.c" break; case 90: /* "case_statements" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1720 "ael.tab.c" +#line 1722 "ael.tab.c" break; case 91: /* "case_statement" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1728 "ael.tab.c" +#line 1730 "ael.tab.c" break; case 92: /* "macro_statements" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1736 "ael.tab.c" +#line 1738 "ael.tab.c" break; case 93: /* "macro_statement" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1744 "ael.tab.c" +#line 1746 "ael.tab.c" break; case 94: /* "switches" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1752 "ael.tab.c" +#line 1754 "ael.tab.c" break; case 95: /* "eswitches" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1760 "ael.tab.c" +#line 1762 "ael.tab.c" break; case 96: /* "switchlist" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1768 "ael.tab.c" +#line 1770 "ael.tab.c" break; case 97: /* "included_entry" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1776 "ael.tab.c" +#line 1778 "ael.tab.c" break; case 98: /* "includeslist" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1784 "ael.tab.c" +#line 1786 "ael.tab.c" break; case 99: /* "includes" */ -#line 169 "ael.y" +#line 171 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1792 "ael.tab.c" +#line 1794 "ael.tab.c" break; default: @@ -2111,57 +2113,57 @@ yyreduce: switch (yyn) { case 2: -#line 190 "ael.y" +#line 192 "ael.y" { (yyval.pval) = parseio->pval = (yyvsp[(1) - (1)].pval); ;} break; case 3: -#line 193 "ael.y" +#line 195 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 4: -#line 194 "ael.y" +#line 196 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;} break; case 5: -#line 195 "ael.y" +#line 197 "ael.y" {(yyval.pval)=(yyvsp[(1) - (2)].pval);;} break; case 6: -#line 198 "ael.y" +#line 200 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 7: -#line 199 "ael.y" +#line 201 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 8: -#line 200 "ael.y" +#line 202 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 9: -#line 201 "ael.y" +#line 203 "ael.y" {(yyval.pval)=0;/* allow older docs to be read */;} break; case 10: -#line 204 "ael.y" +#line 206 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str); ;} break; case 11: -#line 205 "ael.y" +#line 207 "ael.y" { (yyval.str) = strdup("default"); ;} break; case 12: -#line 208 "ael.y" +#line 210 "ael.y" { (yyval.pval) = npval2(PV_CONTEXT, &(yylsp[(1) - (6)]), &(yylsp[(6) - (6)])); (yyval.pval)->u1.str = (yyvsp[(3) - (6)].str); @@ -2171,32 +2173,32 @@ yyreduce: break; case 13: -#line 217 "ael.y" +#line 219 "ael.y" { (yyval.intval) = 1; ;} break; case 14: -#line 218 "ael.y" +#line 220 "ael.y" { (yyval.intval) = 0; ;} break; case 15: -#line 219 "ael.y" +#line 221 "ael.y" { (yyval.intval) = 2; ;} break; case 16: -#line 220 "ael.y" +#line 222 "ael.y" { (yyval.intval)=3; ;} break; case 17: -#line 221 "ael.y" +#line 223 "ael.y" { (yyval.intval)=3; ;} break; case 18: -#line 224 "ael.y" +#line 226 "ael.y" { (yyval.pval) = npval2(PV_MACRO, &(yylsp[(1) - (8)]), &(yylsp[(8) - (8)])); (yyval.pval)->u1.str = (yyvsp[(2) - (8)].str); (yyval.pval)->u2.arglist = (yyvsp[(4) - (8)].pval); (yyval.pval)->u3.macro_statements = (yyvsp[(7) - (8)].pval); @@ -2204,7 +2206,7 @@ yyreduce: break; case 19: -#line 230 "ael.y" +#line 232 "ael.y" { (yyval.pval) = npval2(PV_GLOBALS, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); (yyval.pval)->u1.statements = (yyvsp[(3) - (4)].pval); @@ -2212,27 +2214,27 @@ yyreduce: break; case 20: -#line 236 "ael.y" +#line 238 "ael.y" { (yyval.pval) = NULL; ;} break; case 21: -#line 237 "ael.y" +#line 239 "ael.y" {(yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;} break; case 22: -#line 238 "ael.y" +#line 240 "ael.y" {(yyval.pval)=(yyvsp[(2) - (2)].pval);;} break; case 23: -#line 241 "ael.y" +#line 243 "ael.y" { reset_semicount(parseio->scanner); ;} break; case 24: -#line 241 "ael.y" +#line 243 "ael.y" { (yyval.pval) = npval2(PV_VARDEC, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)])); if (!ast_compat_app_set && !only_one_app_set_warning && strchr((yyvsp[(4) - (5)].str),'"')) { @@ -2244,12 +2246,12 @@ yyreduce: break; case 25: -#line 251 "ael.y" +#line 253 "ael.y" { reset_semicount(parseio->scanner); ;} break; case 26: -#line 251 "ael.y" +#line 253 "ael.y" { (yyval.pval) = npval2(PV_LOCALVARDEC, &(yylsp[(1) - (6)]), &(yylsp[(6) - (6)])); (yyval.pval)->u1.str = (yyvsp[(2) - (6)].str); @@ -2257,94 +2259,94 @@ yyreduce: break; case 27: -#line 258 "ael.y" +#line 260 "ael.y" { (yyval.pval) = NULL; ;} break; case 28: -#line 259 "ael.y" +#line 261 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;} break; case 29: -#line 260 "ael.y" +#line 262 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)]))); ;} break; case 30: -#line 261 "ael.y" +#line 263 "ael.y" {(yyval.pval)=(yyvsp[(1) - (2)].pval);;} break; case 31: -#line 264 "ael.y" +#line 266 "ael.y" {(yyval.pval)=0;;} break; case 32: -#line 265 "ael.y" +#line 267 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;} break; case 33: -#line 266 "ael.y" +#line 268 "ael.y" { (yyval.pval)=(yyvsp[(2) - (2)].pval);;} break; case 34: -#line 269 "ael.y" +#line 271 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 35: -#line 270 "ael.y" +#line 272 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 36: -#line 271 "ael.y" +#line 273 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 37: -#line 272 "ael.y" +#line 274 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 38: -#line 273 "ael.y" +#line 275 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 39: -#line 274 "ael.y" +#line 276 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 40: -#line 275 "ael.y" +#line 277 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 41: -#line 276 "ael.y" +#line 278 "ael.y" {free((yyvsp[(1) - (2)].str)); (yyval.pval)=0;;} break; case 42: -#line 277 "ael.y" +#line 279 "ael.y" {(yyval.pval)=0;/* allow older docs to be read */;} break; case 43: -#line 280 "ael.y" +#line 282 "ael.y" { (yyval.pval) = npval2(PV_IGNOREPAT, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); (yyval.pval)->u1.str = (yyvsp[(3) - (4)].str);;} break; case 44: -#line 285 "ael.y" +#line 287 "ael.y" { (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); (yyval.pval)->u1.str = (yyvsp[(1) - (3)].str); @@ -2352,7 +2354,7 @@ yyreduce: break; case 45: -#line 289 "ael.y" +#line 291 "ael.y" { (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (5)]), &(yylsp[(3) - (5)])); (yyval.pval)->u1.str = malloc(strlen((yyvsp[(1) - (5)].str))+strlen((yyvsp[(3) - (5)].str))+2); @@ -2364,7 +2366,7 @@ yyreduce: break; case 46: -#line 297 "ael.y" +#line 299 "ael.y" { (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); (yyval.pval)->u1.str = (yyvsp[(2) - (4)].str); @@ -2373,7 +2375,7 @@ yyreduce: break; case 47: -#line 302 "ael.y" +#line 304 "ael.y" { (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (7)]), &(yylsp[(7) - (7)])); (yyval.pval)->u1.str = (yyvsp[(5) - (7)].str); @@ -2382,7 +2384,7 @@ yyreduce: break; case 48: -#line 307 "ael.y" +#line 309 "ael.y" { (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (8)]), &(yylsp[(8) - (8)])); (yyval.pval)->u1.str = (yyvsp[(6) - (8)].str); @@ -2392,22 +2394,22 @@ yyreduce: break; case 49: -#line 316 "ael.y" +#line 318 "ael.y" { (yyval.pval) = NULL; ;} break; case 50: -#line 317 "ael.y" +#line 319 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;} break; case 51: -#line 318 "ael.y" +#line 320 "ael.y" {(yyval.pval)=(yyvsp[(2) - (2)].pval);;} break; case 52: -#line 324 "ael.y" +#line 326 "ael.y" { asprintf(&(yyval.str), "%s:%s:%s", (yyvsp[(1) - (5)].str), (yyvsp[(3) - (5)].str), (yyvsp[(5) - (5)].str)); free((yyvsp[(1) - (5)].str)); @@ -2416,12 +2418,12 @@ yyreduce: break; case 53: -#line 329 "ael.y" +#line 331 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str); ;} break; case 54: -#line 333 "ael.y" +#line 335 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (7)].str), &(yylsp[(1) - (7)])); (yyval.pval)->next = nword((yyvsp[(3) - (7)].str), &(yylsp[(3) - (7)])); @@ -2430,31 +2432,31 @@ yyreduce: break; case 55: -#line 341 "ael.y" +#line 343 "ael.y" { reset_parencount(parseio->scanner); ;} break; case 56: -#line 341 "ael.y" +#line 343 "ael.y" { (yyval.str) = (yyvsp[(3) - (4)].str); ;} break; case 57: -#line 345 "ael.y" +#line 347 "ael.y" { (yyval.pval)= npval2(PV_IF, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); (yyval.pval)->u1.str = (yyvsp[(2) - (2)].str); ;} break; case 58: -#line 348 "ael.y" +#line 350 "ael.y" { (yyval.pval) = npval2(PV_RANDOM, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); (yyval.pval)->u1.str=(yyvsp[(2) - (2)].str);;} break; case 59: -#line 351 "ael.y" +#line 353 "ael.y" { (yyval.pval) = npval2(PV_IFTIME, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); (yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval); @@ -2462,12 +2464,12 @@ yyreduce: break; case 60: -#line 362 "ael.y" +#line 364 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str);;} break; case 61: -#line 363 "ael.y" +#line 365 "ael.y" { asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)); free((yyvsp[(1) - (2)].str)); @@ -2476,12 +2478,12 @@ yyreduce: break; case 62: -#line 370 "ael.y" +#line 372 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str); ;} break; case 63: -#line 371 "ael.y" +#line 373 "ael.y" { asprintf(&((yyval.str)), "%s %s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)); free((yyvsp[(1) - (2)].str)); @@ -2489,7 +2491,7 @@ yyreduce: break; case 64: -#line 375 "ael.y" +#line 377 "ael.y" { asprintf(&((yyval.str)), "%s:%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)); free((yyvsp[(1) - (3)].str)); @@ -2497,7 +2499,7 @@ yyreduce: break; case 65: -#line 379 "ael.y" +#line 381 "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)); @@ -2505,12 +2507,12 @@ yyreduce: break; case 66: -#line 385 "ael.y" +#line 387 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str);;} break; case 67: -#line 386 "ael.y" +#line 388 "ael.y" { asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)); free((yyvsp[(1) - (2)].str)); @@ -2519,7 +2521,7 @@ yyreduce: break; case 68: -#line 391 "ael.y" +#line 393 "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)); @@ -2529,12 +2531,12 @@ yyreduce: break; case 69: -#line 399 "ael.y" +#line 401 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str);;} break; case 70: -#line 400 "ael.y" +#line 402 "ael.y" { asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)); free((yyvsp[(1) - (2)].str)); @@ -2542,7 +2544,7 @@ yyreduce: break; case 71: -#line 404 "ael.y" +#line 406 "ael.y" { asprintf(&((yyval.str)), "%s:%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)); free((yyvsp[(1) - (3)].str)); @@ -2550,7 +2552,7 @@ yyreduce: break; case 72: -#line 410 "ael.y" +#line 412 "ael.y" { (yyval.pval) = npval2(PV_SWITCH, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)])); (yyval.pval)->u1.str = (yyvsp[(2) - (5)].str); @@ -2558,60 +2560,60 @@ yyreduce: break; case 73: -#line 419 "ael.y" +#line 421 "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 74: -#line 422 "ael.y" +#line 424 "ael.y" { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;} break; case 75: -#line 423 "ael.y" +#line 425 "ael.y" { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;} break; case 76: -#line 424 "ael.y" +#line 426 "ael.y" { (yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); (yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval);;} break; case 77: -#line 427 "ael.y" +#line 429 "ael.y" { (yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); (yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval);;} break; case 78: -#line 430 "ael.y" +#line 432 "ael.y" { (yyval.pval) = npval2(PV_LABEL, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); (yyval.pval)->u1.str = (yyvsp[(1) - (2)].str); ;} break; case 79: -#line 433 "ael.y" +#line 435 "ael.y" {reset_semicount(parseio->scanner);;} break; case 80: -#line 434 "ael.y" +#line 436 "ael.y" {reset_semicount(parseio->scanner);;} break; case 81: -#line 435 "ael.y" +#line 437 "ael.y" {reset_parencount(parseio->scanner);;} break; case 82: -#line 435 "ael.y" +#line 437 "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); @@ -2621,7 +2623,7 @@ yyreduce: break; case 83: -#line 441 "ael.y" +#line 443 "ael.y" { (yyval.pval) = npval2(PV_WHILE, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); (yyval.pval)->u1.str = (yyvsp[(2) - (3)].str); @@ -2629,34 +2631,34 @@ yyreduce: break; case 84: -#line 445 "ael.y" +#line 447 "ael.y" { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;} break; case 85: -#line 446 "ael.y" +#line 448 "ael.y" { (yyval.pval) = update_last((yyvsp[(2) - (3)].pval), &(yylsp[(2) - (3)])); ;} break; case 86: -#line 447 "ael.y" +#line 449 "ael.y" { (yyval.pval) = update_last((yyvsp[(1) - (2)].pval), &(yylsp[(2) - (2)])); ;} break; case 87: -#line 448 "ael.y" +#line 450 "ael.y" { (yyval.pval)= npval2(PV_APPLICATION_CALL, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); (yyval.pval)->u1.str = (yyvsp[(1) - (2)].str);;} break; case 88: -#line 451 "ael.y" +#line 453 "ael.y" {reset_semicount(parseio->scanner);;} break; case 89: -#line 451 "ael.y" +#line 453 "ael.y" { char *bufx; int tot=0; @@ -2693,22 +2695,22 @@ yyreduce: break; case 90: -#line 484 "ael.y" +#line 486 "ael.y" { (yyval.pval) = npval2(PV_BREAK, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;} break; case 91: -#line 485 "ael.y" +#line 487 "ael.y" { (yyval.pval) = npval2(PV_RETURN, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;} break; case 92: -#line 486 "ael.y" +#line 488 "ael.y" { (yyval.pval) = npval2(PV_CONTINUE, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;} break; case 93: -#line 487 "ael.y" +#line 489 "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)); @@ -2716,41 +2718,41 @@ yyreduce: break; case 94: -#line 491 "ael.y" +#line 493 "ael.y" { (yyval.pval)=0; ;} break; case 95: -#line 494 "ael.y" +#line 496 "ael.y" { (yyval.pval) = (yyvsp[(2) - (2)].pval); ;} break; case 96: -#line 495 "ael.y" +#line 497 "ael.y" { (yyval.pval) = NULL ; ;} break; case 97: -#line 498 "ael.y" +#line 500 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;} break; case 98: -#line 499 "ael.y" +#line 501 "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 99: -#line 502 "ael.y" +#line 504 "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 100: -#line 505 "ael.y" +#line 507 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (5)].str), &(yylsp[(1) - (5)])); (yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)])); @@ -2758,7 +2760,7 @@ yyreduce: break; case 101: -#line 509 "ael.y" +#line 511 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (5)].str), &(yylsp[(1) - (5)])); (yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)])); @@ -2766,7 +2768,7 @@ yyreduce: break; case 102: -#line 513 "ael.y" +#line 515 "ael.y" { (yyval.pval) = nword(strdup("default"), &(yylsp[(1) - (5)])); (yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)])); @@ -2774,7 +2776,7 @@ yyreduce: break; case 103: -#line 517 "ael.y" +#line 519 "ael.y" { (yyval.pval) = nword(strdup("default"), &(yylsp[(1) - (5)])); (yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)])); @@ -2782,24 +2784,24 @@ yyreduce: break; case 104: -#line 523 "ael.y" +#line 525 "ael.y" { (yyval.str) = strdup("1"); ;} break; case 105: -#line 524 "ael.y" +#line 526 "ael.y" { (yyval.str) = (yyvsp[(2) - (2)].str); ;} break; case 106: -#line 528 "ael.y" +#line 530 "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 107: -#line 531 "ael.y" +#line 533 "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)])); @@ -2807,12 +2809,12 @@ yyreduce: break; case 108: -#line 537 "ael.y" +#line 539 "ael.y" {reset_argcount(parseio->scanner);;} break; case 109: -#line 537 "ael.y" +#line 539 "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)])); @@ -2821,19 +2823,19 @@ yyreduce: break; case 110: -#line 542 "ael.y" +#line 544 "ael.y" { (yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); (yyval.pval)->u1.str = (yyvsp[(1) - (3)].str); ;} break; case 111: -#line 550 "ael.y" +#line 552 "ael.y" {reset_argcount(parseio->scanner);;} break; case 112: -#line 550 "ael.y" +#line 552 "ael.y" { if (strcasecmp((yyvsp[(1) - (3)].str),"goto") == 0) { (yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(2) - (3)])); @@ -2846,7 +2848,7 @@ yyreduce: break; case 113: -#line 561 "ael.y" +#line 563 "ael.y" { (yyval.pval) = update_last((yyvsp[(1) - (3)].pval), &(yylsp[(3) - (3)])); if( (yyval.pval)->type == PV_GOTO ) @@ -2857,49 +2859,49 @@ yyreduce: break; case 114: -#line 568 "ael.y" +#line 570 "ael.y" { (yyval.pval) = update_last((yyvsp[(1) - (2)].pval), &(yylsp[(2) - (2)])); ;} break; case 115: -#line 571 "ael.y" +#line 573 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str) ;} break; case 116: -#line 572 "ael.y" +#line 574 "ael.y" { (yyval.str) = strdup(""); ;} break; case 117: -#line 575 "ael.y" +#line 577 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;} break; case 118: -#line 576 "ael.y" +#line 578 "ael.y" { (yyval.pval)= npval(PV_WORD,0/*@1.first_line*/,0/*@1.last_line*/,0/* @1.first_column*/, 0/*@1.last_column*/); (yyval.pval)->u1.str = strdup(""); ;} break; case 119: -#line 579 "ael.y" +#line 581 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)]))); ;} break; case 120: -#line 582 "ael.y" +#line 584 "ael.y" { (yyval.pval) = NULL; ;} break; case 121: -#line 583 "ael.y" +#line 585 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;} break; case 122: -#line 586 "ael.y" +#line 588 "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); @@ -2907,7 +2909,7 @@ yyreduce: break; case 123: -#line 590 "ael.y" +#line 592 "ael.y" { (yyval.pval) = npval2(PV_DEFAULT, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); (yyval.pval)->u1.str = NULL; @@ -2915,7 +2917,7 @@ yyreduce: break; case 124: -#line 594 "ael.y" +#line 596 "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); @@ -2923,27 +2925,27 @@ yyreduce: break; case 125: -#line 600 "ael.y" +#line 602 "ael.y" { (yyval.pval) = NULL; ;} break; case 126: -#line 601 "ael.y" +#line 603 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;} break; case 127: -#line 604 "ael.y" +#line 606 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 128: -#line 605 "ael.y" +#line 607 "ael.y" { (yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 129: -#line 606 "ael.y" +#line 608 "ael.y" { (yyval.pval) = npval2(PV_CATCH, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)])); (yyval.pval)->u1.str = (yyvsp[(2) - (5)].str); @@ -2951,47 +2953,47 @@ yyreduce: break; case 130: -#line 612 "ael.y" +#line 614 "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 131: -#line 617 "ael.y" +#line 619 "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 132: -#line 622 "ael.y" +#line 624 "ael.y" { (yyval.pval) = NULL; ;} break; case 133: -#line 623 "ael.y" +#line 625 "ael.y" { (yyval.pval) = linku1(nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)])), (yyvsp[(3) - (3)].pval)); ;} break; case 134: -#line 624 "ael.y" +#line 626 "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 135: -#line 626 "ael.y" +#line 628 "ael.y" {(yyval.pval)=(yyvsp[(2) - (2)].pval);;} break; case 136: -#line 629 "ael.y" +#line 631 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;} break; case 137: -#line 630 "ael.y" +#line 632 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)])); (yyval.pval)->u2.arglist = (yyvsp[(3) - (3)].pval); @@ -2999,36 +3001,36 @@ yyreduce: break; case 138: -#line 637 "ael.y" +#line 639 "ael.y" { (yyval.pval) = (yyvsp[(1) - (2)].pval); ;} break; case 139: -#line 638 "ael.y" +#line 640 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), (yyvsp[(2) - (3)].pval)); ;} break; case 140: -#line 639 "ael.y" +#line 641 "ael.y" {(yyval.pval)=(yyvsp[(1) - (2)].pval);;} break; case 141: -#line 642 "ael.y" +#line 644 "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 142: -#line 645 "ael.y" +#line 647 "ael.y" { (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));;} break; /* Line 1267 of yacc.c. */ -#line 3032 "ael.tab.c" +#line 3034 "ael.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3248,7 +3250,7 @@ yyreturn: } -#line 650 "ael.y" +#line 652 "ael.y" static char *token_equivs1[] = diff --git a/res/ael/ael.tab.h b/res/ael/ael.tab.h index 703e3445f..10451e575 100644 --- a/res/ael/ael.tab.h +++ b/res/ael/ael.tab.h @@ -130,7 +130,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 58 "ael.y" +#line 60 "ael.y" { int intval; /* integer value, typically flags */ char *str; /* strings */ diff --git a/res/ael/ael.y b/res/ael/ael.y index bd5af447c..fbdcdcc46 100644 --- a/res/ael/ael.y +++ b/res/ael/ael.y @@ -36,6 +36,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/ael_structs.h" #include "asterisk/utils.h" +extern struct ast_flags ast_compat; + pval * linku1(pval *head, pval *tail); static void set_dads(pval *dad, pval *child_list); void reset_parencount(yyscan_t yyscanner); -- cgit v1.2.3