kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

more npval2 replacement, mark XXX dubious arguments

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22930 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-27 18:26:37 +00:00
parent 5c34366afc
commit cbbcc2047c
2 changed files with 130 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

234
pbx/ael/ael.tab.c
View File

@@ -567,16 +567,16 @@ static const unsigned short int yyrline[] =
230, 235, 238, 239, 240, 243, 246, 247, 248, 249, 230, 235, 238, 239, 240, 243, 246, 247, 248, 249,
250, 251, 251, 255, 256, 259, 264, 268, 273, 278, 250, 251, 251, 255, 256, 259, 264, 268, 273, 278,
287, 288, 291, 294, 294, 299, 299, 304, 320, 340, 287, 288, 291, 294, 294, 299, 299, 304, 320, 340,
341, 347, 348, 353, 361, 362, 366, 372, 372, 380, 341, 348, 349, 354, 362, 363, 367, 373, 373, 381,
383, 383, 387, 390, 393, 396, 397, 398, 396, 404, 384, 384, 388, 391, 394, 397, 398, 399, 397, 405,
404, 408, 412, 417, 421, 425, 428, 428, 461, 463, 405, 409, 413, 418, 422, 426, 429, 429, 462, 464,
465, 467, 472, 478, 483, 489, 494, 500, 503, 504, 466, 468, 473, 479, 484, 490, 495, 501, 504, 505,
509, 514, 521, 528, 535, 544, 549, 554, 561, 568, 510, 515, 522, 529, 536, 545, 550, 555, 562, 569,
575, 584, 584, 589, 594, 594, 604, 610, 613, 616, 576, 585, 585, 590, 595, 595, 605, 611, 614, 617,
619, 624, 631, 632, 637, 639, 640, 641, 642, 643, 620, 625, 632, 633, 638, 640, 641, 642, 643, 644,
646, 647, 652, 653, 656, 657, 660, 661, 664, 665, 647, 648, 653, 654, 657, 658, 661, 662, 665, 666,
666, 669, 670, 686, 699, 700, 715, 728, 731, 732, 667, 670, 671, 687, 700, 701, 716, 729, 732, 733,
735, 738 736, 739
}; };
#endif #endif
@@ -2075,7 +2075,7 @@ yyreduce:
case 42: case 42:
#line 251 "ael.y" #line 251 "ael.y"
{ {
(yyval.pval)=npval(PV_VARDEC,(yylsp[-4]).first_line,(yylsp[0]).last_line, (yylsp[-4]).first_column, (yylsp[0]).last_column); (yyval.pval) = npval2(PV_VARDEC, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-4].str); (yyval.pval)->u1.str = (yyvsp[-4].str);
(yyval.pval)->u2.val = (yyvsp[-1].str); ;} (yyval.pval)->u2.val = (yyvsp[-1].str); ;}
break; break;
@@ -2093,7 +2093,7 @@ yyreduce:
case 45: case 45:
#line 259 "ael.y" #line 259 "ael.y"
{ {
(yyval.pval)=npval(PV_IGNOREPAT,(yylsp[-3]).first_line,(yylsp[0]).last_line, (yylsp[-3]).first_column, (yylsp[0]).last_column); (yyval.pval) = npval2(PV_IGNOREPAT, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;} (yyval.pval)->u1.str = (yyvsp[-1].str);;}
break; break;
@@ -2177,17 +2177,17 @@ yyreduce:
case 57: case 57:
#line 305 "ael.y" #line 305 "ael.y"
{ {
(yyval.pval)= npval(PV_IFTIME,(yylsp[-13]).first_line,(yylsp[-9]).last_line, (yylsp[-13]).first_column, (yylsp[-9]).last_column); (yyval.pval) = npval2(PV_IFTIME, &(yylsp[-13]), &(yylsp[-9])); /* XXX really @5 or more ? */
(yyval.pval)->u1.list = npval(PV_WORD,(yylsp[-11]).first_line,(yylsp[-11]).last_line, (yylsp[-11]).first_column, (yylsp[-11]).last_column); (yyval.pval)->u1.list = npval2(PV_WORD, &(yylsp[-11]), &(yylsp[-11]));
asprintf(&((yyval.pval)->u1.list->u1.str), "%s:%s:%s", (yyvsp[-11].str), (yyvsp[-9].str), (yyvsp[-7].str)); asprintf(&((yyval.pval)->u1.list->u1.str), "%s:%s:%s", (yyvsp[-11].str), (yyvsp[-9].str), (yyvsp[-7].str));
free((yyvsp[-11].str)); free((yyvsp[-11].str));
free((yyvsp[-9].str)); free((yyvsp[-9].str));
free((yyvsp[-7].str)); free((yyvsp[-7].str));
(yyval.pval)->u1.list->next = npval(PV_WORD,(yylsp[-5]).first_line,(yylsp[-5]).last_line, (yylsp[-5]).first_column, (yylsp[-5]).last_column); (yyval.pval)->u1.list->next = npval2(PV_WORD, &(yylsp[-5]), &(yylsp[-5]));
(yyval.pval)->u1.list->next->u1.str = (yyvsp[-5].str); (yyval.pval)->u1.list->next->u1.str = (yyvsp[-5].str);
(yyval.pval)->u1.list->next->next = npval(PV_WORD,(yylsp[-3]).first_line,(yylsp[-3]).last_line, (yylsp[-3]).first_column, (yylsp[-3]).last_column); (yyval.pval)->u1.list->next->next = npval2(PV_WORD, &(yylsp[-3]), &(yylsp[-3]));
(yyval.pval)->u1.list->next->next->u1.str = (yyvsp[-3].str); (yyval.pval)->u1.list->next->next->u1.str = (yyvsp[-3].str);
(yyval.pval)->u1.list->next->next->next = npval(PV_WORD,(yylsp[-1]).first_line,(yylsp[-1]).last_line, (yylsp[-1]).first_column, (yylsp[-1]).last_column); (yyval.pval)->u1.list->next->next->next = npval2(PV_WORD, &(yylsp[-1]), &(yylsp[-1]));
(yyval.pval)->u1.list->next->next->next->u1.str = (yyvsp[-1].str); (yyval.pval)->u1.list->next->next->next->u1.str = (yyvsp[-1].str);
prev_word = 0; prev_word = 0;
;} ;}
@@ -2196,14 +2196,14 @@ yyreduce:
case 58: case 58:
#line 320 "ael.y" #line 320 "ael.y"
{ {
(yyval.pval)= npval(PV_IFTIME,(yylsp[-9]).first_line,(yylsp[-5]).last_line, (yylsp[-9]).first_column, (yylsp[-5]).last_column); (yyval.pval) = npval2(PV_IFTIME, &(yylsp[-9]), &(yylsp[-5])); /* XXX @5 or greater ? */
(yyval.pval)->u1.list = npval(PV_WORD,(yylsp[-7]).first_line,(yylsp[-7]).last_line, (yylsp[-7]).first_column, (yylsp[-7]).last_column); (yyval.pval)->u1.list = npval2(PV_WORD, &(yylsp[-7]), &(yylsp[-7]));
(yyval.pval)->u1.list->u1.str = (yyvsp[-7].str); (yyval.pval)->u1.list->u1.str = (yyvsp[-7].str);
(yyval.pval)->u1.list->next = npval(PV_WORD,(yylsp[-5]).first_line,(yylsp[-5]).last_line, (yylsp[-5]).first_column, (yylsp[-5]).last_column); (yyval.pval)->u1.list->next = npval2(PV_WORD, &(yylsp[-5]), &(yylsp[-5]));
(yyval.pval)->u1.list->next->u1.str = (yyvsp[-5].str); (yyval.pval)->u1.list->next->u1.str = (yyvsp[-5].str);
(yyval.pval)->u1.list->next->next = npval(PV_WORD,(yylsp[-3]).first_line,(yylsp[-3]).last_line, (yylsp[-3]).first_column, (yylsp[-3]).last_column); (yyval.pval)->u1.list->next->next = npval2(PV_WORD, &(yylsp[-3]), &(yylsp[-3]));
(yyval.pval)->u1.list->next->next->u1.str = (yyvsp[-3].str); (yyval.pval)->u1.list->next->next->u1.str = (yyvsp[-3].str);
(yyval.pval)->u1.list->next->next->next = npval(PV_WORD,(yylsp[-1]).first_line,(yylsp[-1]).last_line, (yylsp[-1]).first_column, (yylsp[-1]).last_column); (yyval.pval)->u1.list->next->next->next = npval2(PV_WORD, &(yylsp[-1]), &(yylsp[-1]));
(yyval.pval)->u1.list->next->next->next->u1.str = (yyvsp[-1].str); (yyval.pval)->u1.list->next->next->next->u1.str = (yyvsp[-1].str);
prev_word = 0; prev_word = 0;
;} ;}
@@ -2224,12 +2224,12 @@ yyreduce:
break; break;
case 61: case 61:
#line 347 "ael.y" #line 348 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;} { (yyval.str) = (yyvsp[0].str);;}
break; break;
case 62: case 62:
#line 348 "ael.y" #line 349 "ael.y"
{ {
asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str)); asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-1].str)); free((yyvsp[-1].str));
@@ -2238,7 +2238,7 @@ yyreduce:
break; break;
case 63: case 63:
#line 353 "ael.y" #line 354 "ael.y"
{ {
asprintf(&((yyval.str)), "%s%s%s", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)); asprintf(&((yyval.str)), "%s%s%s", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-2].str)); free((yyvsp[-2].str));
@@ -2248,12 +2248,12 @@ yyreduce:
break; break;
case 64: case 64:
#line 361 "ael.y" #line 362 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;} { (yyval.str) = (yyvsp[0].str);;}
break; break;
case 65: case 65:
#line 362 "ael.y" #line 363 "ael.y"
{ {
asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str)); asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-1].str)); free((yyvsp[-1].str));
@@ -2261,7 +2261,7 @@ yyreduce:
break; break;
case 66: case 66:
#line 366 "ael.y" #line 367 "ael.y"
{ {
asprintf(&((yyval.str)), "%s:%s", (yyvsp[-2].str), (yyvsp[0].str)); asprintf(&((yyval.str)), "%s:%s", (yyvsp[-2].str), (yyvsp[0].str));
free((yyvsp[-2].str)); free((yyvsp[-2].str));
@@ -2269,31 +2269,31 @@ yyreduce:
break; break;
case 67: case 67:
#line 372 "ael.y" #line 373 "ael.y"
{ reset_parencount(parseio->scanner); ;} { reset_parencount(parseio->scanner); ;}
break; break;
case 68: case 68:
#line 372 "ael.y" #line 373 "ael.y"
{ {
(yyval.pval)=npval(PV_SWITCH,(yylsp[-5]).first_line,(yylsp[0]).last_line, (yylsp[-5]).first_column, (yylsp[0]).last_column); (yyval.pval)=npval(PV_SWITCH,(yylsp[-5]).first_line,(yylsp[0]).last_line, (yylsp[-5]).first_column, (yylsp[0]).last_column);
(yyval.pval)->u1.str = (yyvsp[-2].str); ;} (yyval.pval)->u1.str = (yyvsp[-2].str); ;}
break; break;
case 69: case 69:
#line 380 "ael.y" #line 381 "ael.y"
{ {
(yyval.pval) = npval2(PV_STATEMENTBLOCK, &(yylsp[-2]), &(yylsp[0])); (yyval.pval) = npval2(PV_STATEMENTBLOCK, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval); ;} (yyval.pval)->u1.list = (yyvsp[-1].pval); ;}
break; break;
case 70: case 70:
#line 383 "ael.y" #line 384 "ael.y"
{reset_semicount(parseio->scanner);;} {reset_semicount(parseio->scanner);;}
break; break;
case 71: case 71:
#line 383 "ael.y" #line 384 "ael.y"
{ {
(yyval.pval)=npval(PV_VARDEC,(yylsp[-4]).first_line,(yylsp[0]).last_line, (yylsp[-4]).first_column, (yylsp[0]).last_column); (yyval.pval)=npval(PV_VARDEC,(yylsp[-4]).first_line,(yylsp[0]).last_line, (yylsp[-4]).first_column, (yylsp[0]).last_column);
(yyval.pval)->u1.str = (yyvsp[-4].str); (yyval.pval)->u1.str = (yyvsp[-4].str);
@@ -2301,43 +2301,43 @@ yyreduce:
break; break;
case 72: case 72:
#line 387 "ael.y" #line 388 "ael.y"
{ {
(yyval.pval)=npval(PV_GOTO,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column); (yyval.pval)=npval(PV_GOTO,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column);
(yyval.pval)->u1.list = (yyvsp[-1].pval);;} (yyval.pval)->u1.list = (yyvsp[-1].pval);;}
break; break;
case 73: case 73:
#line 390 "ael.y" #line 391 "ael.y"
{ {
(yyval.pval)=npval(PV_GOTO,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column); (yyval.pval)=npval(PV_GOTO,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column);
(yyval.pval)->u1.list = (yyvsp[-1].pval);;} (yyval.pval)->u1.list = (yyvsp[-1].pval);;}
break; break;
case 74: case 74:
#line 393 "ael.y" #line 394 "ael.y"
{ {
(yyval.pval)=npval(PV_LABEL,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column); (yyval.pval)=npval(PV_LABEL,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column);
(yyval.pval)->u1.str = (yyvsp[-1].str); ;} (yyval.pval)->u1.str = (yyvsp[-1].str); ;}
break; break;
case 75: case 75:
#line 396 "ael.y"
{reset_semicount(parseio->scanner);;}
break;
case 76:
#line 397 "ael.y" #line 397 "ael.y"
{reset_semicount(parseio->scanner);;} {reset_semicount(parseio->scanner);;}
break; break;
case 77: case 76:
#line 398 "ael.y" #line 398 "ael.y"
{reset_semicount(parseio->scanner);;}
break;
case 77:
#line 399 "ael.y"
{reset_parencount(parseio->scanner);;} {reset_parencount(parseio->scanner);;}
break; break;
case 78: case 78:
#line 398 "ael.y" #line 399 "ael.y"
{ {
(yyval.pval)=npval(PV_FOR,(yylsp[-11]).first_line,(yylsp[0]).last_line, (yylsp[-11]).first_column, (yylsp[0]).last_column); (yyval.pval)=npval(PV_FOR,(yylsp[-11]).first_line,(yylsp[0]).last_line, (yylsp[-11]).first_column, (yylsp[0]).last_column);
(yyval.pval)->u1.for_init = (yyvsp[-8].str); (yyval.pval)->u1.for_init = (yyvsp[-8].str);
@@ -2347,12 +2347,12 @@ yyreduce:
break; break;
case 79: case 79:
#line 404 "ael.y" #line 405 "ael.y"
{reset_parencount(parseio->scanner);;} {reset_parencount(parseio->scanner);;}
break; break;
case 80: case 80:
#line 404 "ael.y" #line 405 "ael.y"
{ {
(yyval.pval)=npval(PV_WHILE,(yylsp[-5]).first_line,(yylsp[0]).last_line, (yylsp[-5]).first_column, (yylsp[0]).last_column); (yyval.pval)=npval(PV_WHILE,(yylsp[-5]).first_line,(yylsp[0]).last_line, (yylsp[-5]).first_column, (yylsp[0]).last_column);
(yyval.pval)->u1.str = (yyvsp[-2].str); (yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2360,7 +2360,7 @@ yyreduce:
break; break;
case 81: case 81:
#line 408 "ael.y" #line 409 "ael.y"
{ {
(yyval.pval)=(yyvsp[-1].pval); (yyval.pval)=(yyvsp[-1].pval);
(yyval.pval)->endline = (yylsp[0]).last_line; (yyval.pval)->endline = (yylsp[0]).last_line;
@@ -2368,7 +2368,7 @@ yyreduce:
break; break;
case 82: case 82:
#line 412 "ael.y" #line 413 "ael.y"
{ {
(yyval.pval)=(yyvsp[-2].pval); (yyval.pval)=(yyvsp[-2].pval);
(yyval.pval)->u2.statements = (yyvsp[-1].pval); (yyval.pval)->u2.statements = (yyvsp[-1].pval);
@@ -2377,7 +2377,7 @@ yyreduce:
break; break;
case 83: case 83:
#line 417 "ael.y" #line 418 "ael.y"
{ {
(yyval.pval) = (yyvsp[-1].pval); (yyval.pval) = (yyvsp[-1].pval);
(yyval.pval)->endline = (yylsp[-1]).last_line; (yyval.pval)->endline = (yylsp[-1]).last_line;
@@ -2385,7 +2385,7 @@ yyreduce:
break; break;
case 84: case 84:
#line 421 "ael.y" #line 422 "ael.y"
{ {
(yyval.pval) = (yyvsp[-1].pval); (yyval.pval) = (yyvsp[-1].pval);
(yyval.pval)->endline = (yylsp[0]).last_line; (yyval.pval)->endline = (yylsp[0]).last_line;
@@ -2393,19 +2393,19 @@ yyreduce:
break; break;
case 85: case 85:
#line 425 "ael.y" #line 426 "ael.y"
{ {
(yyval.pval)= npval(PV_APPLICATION_CALL,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column); (yyval.pval)= npval(PV_APPLICATION_CALL,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column);
(yyval.pval)->u1.str = (yyvsp[-1].str);;} (yyval.pval)->u1.str = (yyvsp[-1].str);;}
break; break;
case 86: case 86:
#line 428 "ael.y" #line 429 "ael.y"
{reset_semicount(parseio->scanner);;} {reset_semicount(parseio->scanner);;}
break; break;
case 87: case 87:
#line 428 "ael.y" #line 429 "ael.y"
{ {
char *bufx; char *bufx;
int tot=0; int tot=0;
@@ -2442,25 +2442,25 @@ yyreduce:
break; break;
case 88: case 88:
#line 461 "ael.y" #line 462 "ael.y"
{ {
(yyval.pval) = npval(PV_BREAK,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column);;} (yyval.pval) = npval(PV_BREAK,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column);;}
break; break;
case 89: case 89:
#line 463 "ael.y" #line 464 "ael.y"
{ {
(yyval.pval) = npval(PV_RETURN,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column);;} (yyval.pval) = npval(PV_RETURN,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column);;}
break; break;
case 90: case 90:
#line 465 "ael.y" #line 466 "ael.y"
{ {
(yyval.pval) = npval(PV_CONTINUE,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column);;} (yyval.pval) = npval(PV_CONTINUE,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column);;}
break; break;
case 91: case 91:
#line 467 "ael.y" #line 468 "ael.y"
{ {
(yyval.pval)=(yyvsp[-1].pval); (yyval.pval)=(yyvsp[-1].pval);
(yyval.pval)->u2.statements = (yyvsp[0].pval); (yyval.pval)->u2.statements = (yyvsp[0].pval);
@@ -2469,7 +2469,7 @@ yyreduce:
break; break;
case 92: case 92:
#line 472 "ael.y" #line 473 "ael.y"
{ {
(yyval.pval)=(yyvsp[-3].pval); (yyval.pval)=(yyvsp[-3].pval);
(yyval.pval)->u2.statements = (yyvsp[-2].pval); (yyval.pval)->u2.statements = (yyvsp[-2].pval);
@@ -2479,7 +2479,7 @@ yyreduce:
break; break;
case 93: case 93:
#line 478 "ael.y" #line 479 "ael.y"
{ {
(yyval.pval)=(yyvsp[-1].pval); (yyval.pval)=(yyvsp[-1].pval);
(yyval.pval)->u2.statements = (yyvsp[0].pval); (yyval.pval)->u2.statements = (yyvsp[0].pval);
@@ -2488,7 +2488,7 @@ yyreduce:
break; break;
case 94: case 94:
#line 483 "ael.y" #line 484 "ael.y"
{ {
(yyval.pval)=(yyvsp[-3].pval); (yyval.pval)=(yyvsp[-3].pval);
(yyval.pval)->u2.statements = (yyvsp[-2].pval); (yyval.pval)->u2.statements = (yyvsp[-2].pval);
@@ -2498,7 +2498,7 @@ yyreduce:
break; break;
case 95: case 95:
#line 489 "ael.y" #line 490 "ael.y"
{ {
(yyval.pval)=(yyvsp[-1].pval); (yyval.pval)=(yyvsp[-1].pval);
(yyval.pval)->u2.statements = (yyvsp[0].pval); (yyval.pval)->u2.statements = (yyvsp[0].pval);
@@ -2507,7 +2507,7 @@ yyreduce:
break; break;
case 96: case 96:
#line 494 "ael.y" #line 495 "ael.y"
{ {
(yyval.pval)=(yyvsp[-3].pval); (yyval.pval)=(yyvsp[-3].pval);
(yyval.pval)->u2.statements = (yyvsp[-2].pval); (yyval.pval)->u2.statements = (yyvsp[-2].pval);
@@ -2517,17 +2517,17 @@ yyreduce:
break; break;
case 97: case 97:
#line 500 "ael.y" #line 501 "ael.y"
{ (yyval.pval)=0; ;} { (yyval.pval)=0; ;}
break; break;
case 98: case 98:
#line 503 "ael.y" #line 504 "ael.y"
{ (yyval.pval) = npval(PV_WORD,(yylsp[0]).first_line,(yylsp[0]).last_line, (yylsp[0]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = (yyvsp[0].str);;} { (yyval.pval) = npval(PV_WORD,(yylsp[0]).first_line,(yylsp[0]).last_line, (yylsp[0]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = (yyvsp[0].str);;}
break; break;
case 99: case 99:
#line 504 "ael.y" #line 505 "ael.y"
{ {
(yyval.pval)=npval(PV_WORD,(yylsp[-2]).first_line,(yylsp[-2]).last_line, (yylsp[-2]).first_column, (yylsp[-2]).last_column); (yyval.pval)=npval(PV_WORD,(yylsp[-2]).first_line,(yylsp[-2]).last_line, (yylsp[-2]).first_column, (yylsp[-2]).last_column);
(yyval.pval)->u1.str = (yyvsp[-2].str); (yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2536,7 +2536,7 @@ yyreduce:
break; break;
case 100: case 100:
#line 509 "ael.y" #line 510 "ael.y"
{ {
(yyval.pval)=npval(PV_WORD,(yylsp[-2]).first_line,(yylsp[-2]).last_line, (yylsp[-2]).first_column, (yylsp[-2]).last_column); (yyval.pval)=npval(PV_WORD,(yylsp[-2]).first_line,(yylsp[-2]).last_line, (yylsp[-2]).first_column, (yylsp[-2]).last_column);
(yyval.pval)->u1.str = (yyvsp[-2].str); (yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2545,7 +2545,7 @@ yyreduce:
break; break;
case 101: case 101:
#line 514 "ael.y" #line 515 "ael.y"
{ {
(yyval.pval)=npval(PV_WORD,(yylsp[-4]).first_line,(yylsp[-4]).last_line, (yylsp[-4]).first_column, (yylsp[-4]).last_column); (yyval.pval)=npval(PV_WORD,(yylsp[-4]).first_line,(yylsp[-4]).last_line, (yylsp[-4]).first_column, (yylsp[-4]).last_column);
(yyval.pval)->u1.str = (yyvsp[-4].str); (yyval.pval)->u1.str = (yyvsp[-4].str);
@@ -2556,7 +2556,7 @@ yyreduce:
break; break;
case 102: case 102:
#line 521 "ael.y" #line 522 "ael.y"
{ {
(yyval.pval)=npval(PV_WORD,(yylsp[-4]).first_line,(yylsp[-4]).last_line, (yylsp[-4]).first_column, (yylsp[-4]).last_column); (yyval.pval)=npval(PV_WORD,(yylsp[-4]).first_line,(yylsp[-4]).last_line, (yylsp[-4]).first_column, (yylsp[-4]).last_column);
(yyval.pval)->u1.str = (yyvsp[-4].str); (yyval.pval)->u1.str = (yyvsp[-4].str);
@@ -2567,7 +2567,7 @@ yyreduce:
break; break;
case 103: case 103:
#line 528 "ael.y" #line 529 "ael.y"
{ {
(yyval.pval)=npval(PV_WORD,(yylsp[-4]).first_line,(yylsp[-4]).last_line, (yylsp[-4]).first_column, (yylsp[-4]).last_column); (yyval.pval)=npval(PV_WORD,(yylsp[-4]).first_line,(yylsp[-4]).last_line, (yylsp[-4]).first_column, (yylsp[-4]).last_column);
(yyval.pval)->u1.str = strdup("default"); (yyval.pval)->u1.str = strdup("default");
@@ -2578,7 +2578,7 @@ yyreduce:
break; break;
case 104: case 104:
#line 535 "ael.y" #line 536 "ael.y"
{ {
(yyval.pval)=npval(PV_WORD,(yylsp[-4]).first_line,(yylsp[-4]).last_line, (yylsp[-4]).first_column, (yylsp[-4]).last_column); (yyval.pval)=npval(PV_WORD,(yylsp[-4]).first_line,(yylsp[-4]).last_line, (yylsp[-4]).first_column, (yylsp[-4]).last_column);
(yyval.pval)->u1.str = strdup("default"); (yyval.pval)->u1.str = strdup("default");
@@ -2589,7 +2589,7 @@ yyreduce:
break; break;
case 105: case 105:
#line 544 "ael.y" #line 545 "ael.y"
{ {
(yyval.pval)=npval(PV_WORD,(yylsp[0]).first_line,(yylsp[0]).last_line, (yylsp[0]).first_column, (yylsp[0]).last_column); (yyval.pval)=npval(PV_WORD,(yylsp[0]).first_line,(yylsp[0]).last_line, (yylsp[0]).first_column, (yylsp[0]).last_column);
(yyval.pval)->u1.str = (yyvsp[0].str); (yyval.pval)->u1.str = (yyvsp[0].str);
@@ -2598,7 +2598,7 @@ yyreduce:
break; break;
case 106: case 106:
#line 549 "ael.y" #line 550 "ael.y"
{ {
(yyval.pval)=npval(PV_WORD,(yylsp[-2]).first_line,(yylsp[-2]).last_line, (yylsp[-2]).first_column, (yylsp[-2]).last_column); (yyval.pval)=npval(PV_WORD,(yylsp[-2]).first_line,(yylsp[-2]).last_line, (yylsp[-2]).first_column, (yylsp[-2]).last_column);
(yyval.pval)->u1.str = (yyvsp[-2].str); (yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2607,7 +2607,7 @@ yyreduce:
break; break;
case 107: case 107:
#line 554 "ael.y" #line 555 "ael.y"
{ {
(yyval.pval)=npval(PV_WORD,(yylsp[-4]).first_line,(yylsp[-4]).last_line, (yylsp[-4]).first_column, (yylsp[-4]).last_column); (yyval.pval)=npval(PV_WORD,(yylsp[-4]).first_line,(yylsp[-4]).last_line, (yylsp[-4]).first_column, (yylsp[-4]).last_column);
(yyval.pval)->u1.str = (yyvsp[0].str); (yyval.pval)->u1.str = (yyvsp[0].str);
@@ -2618,7 +2618,7 @@ yyreduce:
break; break;
case 108: case 108:
#line 561 "ael.y" #line 562 "ael.y"
{ {
(yyval.pval)=npval(PV_WORD,(yylsp[-2]).first_line,(yylsp[-2]).last_line, (yylsp[-2]).first_column, (yylsp[-2]).last_column); (yyval.pval)=npval(PV_WORD,(yylsp[-2]).first_line,(yylsp[-2]).last_line, (yylsp[-2]).first_column, (yylsp[-2]).last_column);
(yyval.pval)->u1.str = (yyvsp[0].str); (yyval.pval)->u1.str = (yyvsp[0].str);
@@ -2629,7 +2629,7 @@ yyreduce:
break; break;
case 109: case 109:
#line 568 "ael.y" #line 569 "ael.y"
{ {
(yyval.pval)=npval(PV_WORD,(yylsp[-4]).first_line,(yylsp[-4]).last_line, (yylsp[-4]).first_column, (yylsp[-4]).last_column); (yyval.pval)=npval(PV_WORD,(yylsp[-4]).first_line,(yylsp[-4]).last_line, (yylsp[-4]).first_column, (yylsp[-4]).last_column);
(yyval.pval)->u1.str = strdup("default"); (yyval.pval)->u1.str = strdup("default");
@@ -2640,7 +2640,7 @@ yyreduce:
break; break;
case 110: case 110:
#line 575 "ael.y" #line 576 "ael.y"
{ {
(yyval.pval)=npval(PV_WORD,(yylsp[-2]).first_line,(yylsp[-2]).last_line, (yylsp[-2]).first_column, (yylsp[-2]).last_column); (yyval.pval)=npval(PV_WORD,(yylsp[-2]).first_line,(yylsp[-2]).last_line, (yylsp[-2]).first_column, (yylsp[-2]).last_column);
(yyval.pval)->u1.str = strdup("default"); (yyval.pval)->u1.str = strdup("default");
@@ -2651,12 +2651,12 @@ yyreduce:
break; break;
case 111: case 111:
#line 584 "ael.y" #line 585 "ael.y"
{reset_argcount(parseio->scanner);;} {reset_argcount(parseio->scanner);;}
break; break;
case 112: case 112:
#line 584 "ael.y" #line 585 "ael.y"
{ {
/* XXX original code had @2 but i think we need @5 */ /* XXX original code had @2 but i think we need @5 */
(yyval.pval) = npval2(PV_MACRO_CALL, &(yylsp[-4]), &(yylsp[0])); (yyval.pval) = npval2(PV_MACRO_CALL, &(yylsp[-4]), &(yylsp[0]));
@@ -2665,19 +2665,19 @@ yyreduce:
break; break;
case 113: case 113:
#line 589 "ael.y" #line 590 "ael.y"
{ {
(yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[-2]), &(yylsp[0])); (yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str); ;} (yyval.pval)->u1.str = (yyvsp[-2].str); ;}
break; break;
case 114: case 114:
#line 594 "ael.y" #line 595 "ael.y"
{reset_argcount(parseio->scanner);;} {reset_argcount(parseio->scanner);;}
break; break;
case 115: case 115:
#line 594 "ael.y" #line 595 "ael.y"
{ {
if (strcasecmp((yyvsp[-2].str),"goto") == 0) { if (strcasecmp((yyvsp[-2].str),"goto") == 0) {
(yyval.pval)= npval(PV_GOTO,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column); (yyval.pval)= npval(PV_GOTO,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column);
@@ -2689,7 +2689,7 @@ yyreduce:
break; break;
case 116: case 116:
#line 604 "ael.y" #line 605 "ael.y"
{(yyval.pval) = (yyvsp[-2].pval); {(yyval.pval) = (yyvsp[-2].pval);
if( (yyval.pval)->type == PV_GOTO ) if( (yyval.pval)->type == PV_GOTO )
(yyval.pval)->u1.list = (yyvsp[-1].pval); (yyval.pval)->u1.list = (yyvsp[-1].pval);
@@ -2699,26 +2699,26 @@ yyreduce:
break; break;
case 117: case 117:
#line 610 "ael.y" #line 611 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);(yyval.pval)->endline = (yylsp[0]).last_line; (yyval.pval)->endcol = (yylsp[0]).last_column;;} {(yyval.pval)=(yyvsp[-1].pval);(yyval.pval)->endline = (yylsp[0]).last_line; (yyval.pval)->endcol = (yylsp[0]).last_column;;}
break; break;
case 118: case 118:
#line 613 "ael.y" #line 614 "ael.y"
{ {
(yyval.pval)= npval(PV_WORD,(yylsp[0]).first_line,(yylsp[0]).last_line, (yylsp[0]).first_column, (yylsp[0]).last_column); (yyval.pval)= npval(PV_WORD,(yylsp[0]).first_line,(yylsp[0]).last_line, (yylsp[0]).first_column, (yylsp[0]).last_column);
(yyval.pval)->u1.str = (yyvsp[0].str);;} (yyval.pval)->u1.str = (yyvsp[0].str);;}
break; break;
case 119: case 119:
#line 616 "ael.y" #line 617 "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)= npval(PV_WORD,0/*@1.first_line*/,0/*@1.last_line*/,0/* @1.first_column*/, 0/*@1.last_column*/);
(yyval.pval)->u1.str = strdup(""); ;} (yyval.pval)->u1.str = strdup(""); ;}
break; break;
case 120: case 120:
#line 619 "ael.y" #line 620 "ael.y"
{ {
pval *z = npval(PV_WORD,(yylsp[0]).first_line,(yylsp[0]).last_line, (yylsp[0]).first_column, (yylsp[0]).last_column); pval *z = npval(PV_WORD,(yylsp[0]).first_line,(yylsp[0]).last_line, (yylsp[0]).first_column, (yylsp[0]).last_column);
(yyval.pval) = (yyvsp[-2].pval); (yyval.pval) = (yyvsp[-2].pval);
@@ -2727,7 +2727,7 @@ yyreduce:
break; break;
case 121: case 121:
#line 624 "ael.y" #line 625 "ael.y"
{ {
pval *z = npval(PV_WORD,(yylsp[0]).first_line,(yylsp[0]).last_line, (yylsp[0]).first_column, (yylsp[0]).last_column); pval *z = npval(PV_WORD,(yylsp[0]).first_line,(yylsp[0]).last_line, (yylsp[0]).first_column, (yylsp[0]).last_column);
(yyval.pval) = (yyvsp[-1].pval); (yyval.pval) = (yyvsp[-1].pval);
@@ -2736,112 +2736,112 @@ yyreduce:
break; break;
case 122: case 122:
#line 631 "ael.y" #line 632 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;} {(yyval.pval)=(yyvsp[0].pval);;}
break; break;
case 123: case 123:
#line 632 "ael.y" #line 633 "ael.y"
{ if ( (yyvsp[-1].pval) && (yyvsp[0].pval) ) {(yyval.pval)=(yyvsp[-1].pval); linku1((yyval.pval),(yyvsp[0].pval));} { if ( (yyvsp[-1].pval) && (yyvsp[0].pval) ) {(yyval.pval)=(yyvsp[-1].pval); linku1((yyval.pval),(yyvsp[0].pval));}
else if ( (yyvsp[-1].pval) ) {(yyval.pval)=(yyvsp[-1].pval);} else if ( (yyvsp[-1].pval) ) {(yyval.pval)=(yyvsp[-1].pval);}
else if ( (yyvsp[0].pval) ) {(yyval.pval)=(yyvsp[0].pval);} ;} else if ( (yyvsp[0].pval) ) {(yyval.pval)=(yyvsp[0].pval);} ;}
break; break;
case 124: case 124:
#line 637 "ael.y" #line 638 "ael.y"
{ {
(yyval.pval) = npval(PV_CASE,(yylsp[-3]).first_line,(yylsp[-1]).last_line, (yylsp[-3]).first_column, (yylsp[-1]).last_column); (yyval.pval)->u1.str = (yyvsp[-2].str); (yyval.pval)->u2.statements = (yyvsp[0].pval);;} (yyval.pval) = npval(PV_CASE,(yylsp[-3]).first_line,(yylsp[-1]).last_line, (yylsp[-3]).first_column, (yylsp[-1]).last_column); (yyval.pval)->u1.str = (yyvsp[-2].str); (yyval.pval)->u2.statements = (yyvsp[0].pval);;}
break; break;
case 125: case 125:
#line 639 "ael.y" #line 640 "ael.y"
{(yyval.pval) = npval(PV_DEFAULT,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = 0; (yyval.pval)->u2.statements = (yyvsp[0].pval);;} {(yyval.pval) = npval(PV_DEFAULT,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = 0; (yyval.pval)->u2.statements = (yyvsp[0].pval);;}
break; break;
case 126: case 126:
#line 640 "ael.y" #line 641 "ael.y"
{(yyval.pval) = npval(PV_PATTERN,(yylsp[-3]).first_line,(yylsp[-1]).last_line, (yylsp[-3]).first_column, (yylsp[-1]).last_column); (yyval.pval)->u1.str = (yyvsp[-2].str); (yyval.pval)->u2.statements = (yyvsp[0].pval);;} {(yyval.pval) = npval(PV_PATTERN,(yylsp[-3]).first_line,(yylsp[-1]).last_line, (yylsp[-3]).first_column, (yylsp[-1]).last_column); (yyval.pval)->u1.str = (yyvsp[-2].str); (yyval.pval)->u2.statements = (yyvsp[0].pval);;}
break; break;
case 127: case 127:
#line 641 "ael.y" #line 642 "ael.y"
{(yyval.pval) = npval(PV_CASE,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = (yyvsp[-1].str);;} {(yyval.pval) = npval(PV_CASE,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = (yyvsp[-1].str);;}
break; break;
case 128: case 128:
#line 642 "ael.y" #line 643 "ael.y"
{(yyval.pval) = npval(PV_DEFAULT,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = 0;;} {(yyval.pval) = npval(PV_DEFAULT,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = 0;;}
break; break;
case 129: case 129:
#line 643 "ael.y" #line 644 "ael.y"
{(yyval.pval) = npval(PV_PATTERN,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = (yyvsp[-1].str);;} {(yyval.pval) = npval(PV_PATTERN,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = (yyvsp[-1].str);;}
break; break;
case 130: case 130:
#line 646 "ael.y" #line 647 "ael.y"
{(yyval.pval) = (yyvsp[0].pval);;} {(yyval.pval) = (yyvsp[0].pval);;}
break; break;
case 131: case 131:
#line 647 "ael.y" #line 648 "ael.y"
{ if ( (yyvsp[-1].pval) && (yyvsp[0].pval) ) {(yyval.pval)=(yyvsp[-1].pval); linku1((yyval.pval),(yyvsp[0].pval));} { if ( (yyvsp[-1].pval) && (yyvsp[0].pval) ) {(yyval.pval)=(yyvsp[-1].pval); linku1((yyval.pval),(yyvsp[0].pval));}
else if ( (yyvsp[-1].pval) ) {(yyval.pval)=(yyvsp[-1].pval);} else if ( (yyvsp[-1].pval) ) {(yyval.pval)=(yyvsp[-1].pval);}
else if ( (yyvsp[0].pval) ) {(yyval.pval)=(yyvsp[0].pval);} ;} else if ( (yyvsp[0].pval) ) {(yyval.pval)=(yyvsp[0].pval);} ;}
break; break;
case 132: case 132:
#line 652 "ael.y" #line 653 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;} {(yyval.pval)=(yyvsp[0].pval);;}
break; break;
case 133: case 133:
#line 653 "ael.y" #line 654 "ael.y"
{(yyval.pval)=npval(PV_CATCH,(yylsp[-4]).first_line,(yylsp[0]).last_line, (yylsp[-4]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = (yyvsp[-3].str); (yyval.pval)->u2.statements = (yyvsp[-1].pval);;} {(yyval.pval)=npval(PV_CATCH,(yylsp[-4]).first_line,(yylsp[0]).last_line, (yylsp[-4]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = (yyvsp[-3].str); (yyval.pval)->u2.statements = (yyvsp[-1].pval);;}
break; break;
case 134: case 134:
#line 656 "ael.y" #line 657 "ael.y"
{(yyval.pval)= npval(PV_SWITCHES,(yylsp[-3]).first_line,(yylsp[0]).last_line, (yylsp[-3]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.list = (yyvsp[-1].pval); ;} {(yyval.pval)= npval(PV_SWITCHES,(yylsp[-3]).first_line,(yylsp[0]).last_line, (yylsp[-3]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.list = (yyvsp[-1].pval); ;}
break; break;
case 135: case 135:
#line 657 "ael.y" #line 658 "ael.y"
{(yyval.pval)= npval(PV_SWITCHES,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column);;} {(yyval.pval)= npval(PV_SWITCHES,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column);;}
break; break;
case 136: case 136:
#line 660 "ael.y" #line 661 "ael.y"
{(yyval.pval)= npval(PV_ESWITCHES,(yylsp[-3]).first_line,(yylsp[0]).last_line, (yylsp[-3]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.list = (yyvsp[-1].pval); ;} {(yyval.pval)= npval(PV_ESWITCHES,(yylsp[-3]).first_line,(yylsp[0]).last_line, (yylsp[-3]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.list = (yyvsp[-1].pval); ;}
break; break;
case 137: case 137:
#line 661 "ael.y" #line 662 "ael.y"
{(yyval.pval)= npval(PV_ESWITCHES,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column); ;} {(yyval.pval)= npval(PV_ESWITCHES,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column); ;}
break; break;
case 138: case 138:
#line 664 "ael.y" #line 665 "ael.y"
{(yyval.pval)=npval(PV_WORD,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = (yyvsp[-1].str);;} {(yyval.pval)=npval(PV_WORD,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = (yyvsp[-1].str);;}
break; break;
case 139: case 139:
#line 665 "ael.y" #line 666 "ael.y"
{pval *z = npval(PV_WORD,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column); (yyval.pval)=(yyvsp[-2].pval); z->u1.str = (yyvsp[-1].str); linku1((yyval.pval),z); ;} {pval *z = npval(PV_WORD,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column); (yyval.pval)=(yyvsp[-2].pval); z->u1.str = (yyvsp[-1].str); linku1((yyval.pval),z); ;}
break; break;
case 140: case 140:
#line 666 "ael.y" #line 667 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;} {(yyval.pval)=(yyvsp[-1].pval);;}
break; break;
case 141: case 141:
#line 669 "ael.y" #line 670 "ael.y"
{(yyval.pval)=npval(PV_WORD,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = (yyvsp[-1].str);;} {(yyval.pval)=npval(PV_WORD,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = (yyvsp[-1].str);;}
break; break;
case 142: case 142:
#line 670 "ael.y" #line 671 "ael.y"
{ {
(yyval.pval)=npval(PV_WORD,(yylsp[-13]).first_line,(yylsp[-12]).last_line, (yylsp[-13]).first_column, (yylsp[-12]).last_column); (yyval.pval)=npval(PV_WORD,(yylsp[-13]).first_line,(yylsp[-12]).last_line, (yylsp[-13]).first_column, (yylsp[-12]).last_column);
(yyval.pval)->u1.str = (yyvsp[-13].str); (yyval.pval)->u1.str = (yyvsp[-13].str);
@@ -2861,7 +2861,7 @@ yyreduce:
break; break;
case 143: case 143:
#line 686 "ael.y" #line 687 "ael.y"
{ {
(yyval.pval)=npval(PV_WORD,(yylsp[-9]).first_line,(yylsp[-8]).last_line, (yylsp[-9]).first_column, (yylsp[-8]).last_column); (yyval.pval)=npval(PV_WORD,(yylsp[-9]).first_line,(yylsp[-8]).last_line, (yylsp[-9]).first_column, (yylsp[-8]).last_column);
(yyval.pval)->u1.str = (yyvsp[-9].str); (yyval.pval)->u1.str = (yyvsp[-9].str);
@@ -2878,12 +2878,12 @@ yyreduce:
break; break;
case 144: case 144:
#line 699 "ael.y" #line 700 "ael.y"
{pval *z = npval(PV_WORD,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column); (yyval.pval)=(yyvsp[-2].pval); z->u1.str = (yyvsp[-1].str); linku1((yyval.pval),z); ;} {pval *z = npval(PV_WORD,(yylsp[-1]).first_line,(yylsp[0]).last_line, (yylsp[-1]).first_column, (yylsp[0]).last_column); (yyval.pval)=(yyvsp[-2].pval); z->u1.str = (yyvsp[-1].str); linku1((yyval.pval),z); ;}
break; break;
case 145: case 145:
#line 700 "ael.y" #line 701 "ael.y"
{pval *z = npval(PV_WORD,(yylsp[-13]).first_line,(yylsp[-12]).last_line, (yylsp[-13]).first_column, (yylsp[-12]).last_column); {pval *z = npval(PV_WORD,(yylsp[-13]).first_line,(yylsp[-12]).last_line, (yylsp[-13]).first_column, (yylsp[-12]).last_column);
(yyval.pval)=(yyvsp[-14].pval); z->u1.str = (yyvsp[-13].str); linku1((yyval.pval),z); (yyval.pval)=(yyvsp[-14].pval); z->u1.str = (yyvsp[-13].str); linku1((yyval.pval),z);
z->u2.arglist = npval(PV_WORD,(yylsp[-11]).first_line,(yylsp[-11]).last_line, (yylsp[-11]).first_column, (yylsp[-11]).last_column); z->u2.arglist = npval(PV_WORD,(yylsp[-11]).first_line,(yylsp[-11]).last_line, (yylsp[-11]).first_column, (yylsp[-11]).last_column);
@@ -2902,7 +2902,7 @@ yyreduce:
break; break;
case 146: case 146:
#line 716 "ael.y" #line 717 "ael.y"
{pval *z = npval(PV_WORD,(yylsp[-9]).first_line,(yylsp[-9]).last_line, (yylsp[-9]).first_column, (yylsp[-8]).last_column); {pval *z = npval(PV_WORD,(yylsp[-9]).first_line,(yylsp[-9]).last_line, (yylsp[-9]).first_column, (yylsp[-8]).last_column);
(yyval.pval)=(yyvsp[-10].pval); z->u1.str = (yyvsp[-9].str); linku1((yyval.pval),z); (yyval.pval)=(yyvsp[-10].pval); z->u1.str = (yyvsp[-9].str); linku1((yyval.pval),z);
z->u2.arglist = npval(PV_WORD,(yylsp[-7]).first_line,(yylsp[-7]).last_line, (yylsp[-7]).first_column, (yylsp[-7]).last_column); z->u2.arglist = npval(PV_WORD,(yylsp[-7]).first_line,(yylsp[-7]).last_line, (yylsp[-7]).first_column, (yylsp[-7]).last_column);
@@ -2918,29 +2918,29 @@ yyreduce:
break; break;
case 147: case 147:
#line 728 "ael.y" #line 729 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;} {(yyval.pval)=(yyvsp[-1].pval);;}
break; break;
case 148: case 148:
#line 731 "ael.y" #line 732 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;} { (yyval.str) = (yyvsp[0].str);;}
break; break;
case 149: case 149:
#line 732 "ael.y" #line 733 "ael.y"
{(yyval.str)=strdup("default");;} {(yyval.str)=strdup("default");;}
break; break;
case 150: case 150:
#line 735 "ael.y" #line 736 "ael.y"
{ {
(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-3]), &(yylsp[0])); (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval);;} (yyval.pval)->u1.list = (yyvsp[-1].pval);;}
break; break;
case 151: case 151:
#line 738 "ael.y" #line 739 "ael.y"
{ {
(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;} (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;}
break; break;
@@ -3225,7 +3225,7 @@ yyreturn:
} }
#line 743 "ael.y" #line 744 "ael.y"
static char *token_equivs1[] = static char *token_equivs1[] =

25
pbx/ael/ael.y
View File

@@ -249,7 +249,7 @@ element : extension {$$=$1;}
| eswitches {$$=$1;} | eswitches {$$=$1;}
| ignorepat {$$=$1;} | ignorepat {$$=$1;}
| word EQ { reset_semicount(parseio->scanner); } word SEMI { | word EQ { reset_semicount(parseio->scanner); } word SEMI {
$$=npval(PV_VARDEC,@1.first_line,@5.last_line, @1.first_column, @5.last_column); $$ = npval2(PV_VARDEC, &@1, &@5);
$$->u1.str = $1; $$->u1.str = $1;
$$->u2.val = $4; } $$->u2.val = $4; }
| word error {free($1); $$=0;} | word error {free($1); $$=0;}
@@ -257,7 +257,7 @@ element : extension {$$=$1;}
; ;
ignorepat : KW_IGNOREPAT EXTENMARK word SEMI { ignorepat : KW_IGNOREPAT EXTENMARK word SEMI {
$$=npval(PV_IGNOREPAT,@1.first_line,@4.last_line, @1.first_column, @4.last_column); $$ = npval2(PV_IGNOREPAT, &@1, &@4);
$$->u1.str = $3;} $$->u1.str = $3;}
; ;
@@ -303,29 +303,29 @@ random_head : KW_RANDOM LP { reset_parencount(parseio->scanner); } word_list RP
iftime_head : KW_IFTIME LP word3_list COLON word3_list COLON word3_list iftime_head : KW_IFTIME LP word3_list COLON word3_list COLON word3_list
BAR word3_list BAR word3_list BAR word3_list RP { BAR word3_list BAR word3_list BAR word3_list RP {
$$= npval(PV_IFTIME,@1.first_line,@5.last_line, @1.first_column, @5.last_column); $$ = npval2(PV_IFTIME, &@1, &@5); /* XXX really @5 or more ? */
$$->u1.list = npval(PV_WORD,@3.first_line,@3.last_line, @3.first_column, @3.last_column); $$->u1.list = npval2(PV_WORD, &@3, &@3);
asprintf(&($$->u1.list->u1.str), "%s:%s:%s", $3, $5, $7); asprintf(&($$->u1.list->u1.str), "%s:%s:%s", $3, $5, $7);
free($3); free($3);
free($5); free($5);
free($7); free($7);
$$->u1.list->next = npval(PV_WORD,@9.first_line,@9.last_line, @9.first_column, @9.last_column); $$->u1.list->next = npval2(PV_WORD, &@9, &@9);
$$->u1.list->next->u1.str = $9; $$->u1.list->next->u1.str = $9;
$$->u1.list->next->next = npval(PV_WORD,@11.first_line,@11.last_line, @11.first_column, @11.last_column); $$->u1.list->next->next = npval2(PV_WORD, &@11, &@11);
$$->u1.list->next->next->u1.str = $11; $$->u1.list->next->next->u1.str = $11;
$$->u1.list->next->next->next = npval(PV_WORD,@13.first_line,@13.last_line, @13.first_column, @13.last_column); $$->u1.list->next->next->next = npval2(PV_WORD, &@13, &@13);
$$->u1.list->next->next->next->u1.str = $13; $$->u1.list->next->next->next->u1.str = $13;
prev_word = 0; prev_word = 0;
} }
| KW_IFTIME LP word BAR word3_list BAR word3_list BAR word3_list RP { | KW_IFTIME LP word BAR word3_list BAR word3_list BAR word3_list RP {
$$= npval(PV_IFTIME,@1.first_line,@5.last_line, @1.first_column, @5.last_column); $$ = npval2(PV_IFTIME, &@1, &@5); /* XXX @5 or greater ? */
$$->u1.list = npval(PV_WORD,@3.first_line,@3.last_line, @3.first_column, @3.last_column); $$->u1.list = npval2(PV_WORD, &@3, &@3);
$$->u1.list->u1.str = $3; $$->u1.list->u1.str = $3;
$$->u1.list->next = npval(PV_WORD,@5.first_line,@5.last_line, @5.first_column, @5.last_column); $$->u1.list->next = npval2(PV_WORD, &@5, &@5);
$$->u1.list->next->u1.str = $5; $$->u1.list->next->u1.str = $5;
$$->u1.list->next->next = npval(PV_WORD,@7.first_line,@7.last_line, @7.first_column, @7.last_column); $$->u1.list->next->next = npval2(PV_WORD, &@7, &@7);
$$->u1.list->next->next->u1.str = $7; $$->u1.list->next->next->u1.str = $7;
$$->u1.list->next->next->next = npval(PV_WORD,@9.first_line,@9.last_line, @9.first_column, @9.last_column); $$->u1.list->next->next->next = npval2(PV_WORD, &@9, &@9);
$$->u1.list->next->next->next->u1.str = $9; $$->u1.list->next->next->next->u1.str = $9;
prev_word = 0; prev_word = 0;
} }
@@ -344,6 +344,7 @@ word_list : word { $$ = $1;}
free($2); free($2);
prev_word = $$;} prev_word = $$;}
; ;
word3_list : word { $$ = $1;} word3_list : word { $$ = $1;}
| word word { | word word {
asprintf(&($$), "%s%s", $1, $2); asprintf(&($$), "%s%s", $1, $2);