From 5cbf333feee41893701c35bcef070931c00122a7 Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <rizzo@icir.org>
Date: Tue, 2 May 2006 14:27:19 +0000
Subject: [PATCH] remove some unneeded local variables.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24178 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
pbx/ael/ael.tab.c | 296 ++++++++++++++++++++++------------------------
pbx/ael/ael.y | 18 +--
2 files changed, 149 insertions(+), 165 deletions(-)
diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c
index 24c8167c5b..29e85acf3d 100644
--- a/pbx/ael/ael.tab.c
+++ b/pbx/ael/ael.tab.c
@@ -564,20 +564,20 @@ static const unsigned short int yyrline[] =
{
0, 176, 176, 179, 180, 181, 184, 185, 186, 187,
190, 191, 194, 202, 203, 206, 209, 212, 216, 221,
- 224, 228, 229, 230, 233, 233, 239, 240, 243, 246,
- 247, 250, 251, 252, 253, 256, 257, 258, 259, 260,
- 261, 261, 265, 266, 269, 274, 278, 283, 288, 297,
- 298, 299, 302, 302, 307, 307, 312, 325, 341, 342,
- 349, 350, 355, 363, 364, 368, 374, 374, 382, 385,
- 385, 389, 392, 395, 398, 399, 400, 398, 406, 406,
- 410, 412, 415, 417, 419, 422, 422, 455, 456, 457,
- 458, 462, 466, 470, 473, 474, 479, 480, 483, 486,
- 490, 494, 498, 505, 508, 511, 515, 519, 523, 529,
- 529, 534, 542, 542, 553, 560, 563, 564, 567, 568,
- 571, 576, 577, 580, 584, 588, 592, 595, 598, 603,
- 604, 607, 608, 614, 619, 624, 625, 628, 629, 632,
- 635, 636, 649, 657, 660, 674, 685, 688, 689, 692,
- 695
+ 224, 228, 229, 230, 233, 233, 239, 240, 241, 244,
+ 245, 248, 249, 250, 251, 254, 255, 256, 257, 258,
+ 259, 259, 263, 264, 267, 272, 276, 281, 286, 295,
+ 296, 297, 300, 300, 305, 305, 310, 323, 339, 340,
+ 347, 348, 353, 361, 362, 366, 372, 372, 380, 383,
+ 383, 387, 390, 393, 396, 397, 398, 396, 404, 404,
+ 408, 410, 413, 415, 417, 420, 420, 453, 454, 455,
+ 456, 460, 464, 468, 471, 472, 477, 478, 481, 484,
+ 488, 492, 496, 503, 506, 509, 513, 517, 521, 527,
+ 527, 532, 540, 540, 551, 558, 561, 562, 565, 566,
+ 569, 572, 573, 576, 580, 584, 588, 591, 594, 599,
+ 600, 603, 604, 610, 615, 620, 621, 624, 625, 626,
+ 629, 630, 643, 651, 652, 666, 677, 680, 681, 684,
+ 687
};
#endif
@@ -2071,83 +2071,81 @@ yyreduce:
case 26:
#line 239 "ael.y"
- { (yyval.pval)= nword((yyvsp[0].str), &(yylsp[0])); ;}
+ { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
case 27:
#line 240 "ael.y"
- {
- pval *z = nword((yyvsp[0].str), &(yylsp[0]));
- (yyval.pval) = linku1((yyvsp[-2].pval), z); ;}
+ { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[0].str), &(yylsp[0]))); ;}
break;
case 28:
-#line 243 "ael.y"
+#line 241 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
case 29:
-#line 246 "ael.y"
+#line 244 "ael.y"
{ (yyval.pval) = NULL; ;}
break;
case 30:
-#line 247 "ael.y"
+#line 245 "ael.y"
{ (yyval.pval) = (yyvsp[-1].pval); ;}
break;
case 31:
-#line 250 "ael.y"
+#line 248 "ael.y"
{ (yyval.pval)=(yyvsp[0].pval);;}
break;
case 32:
-#line 251 "ael.y"
+#line 249 "ael.y"
{(yyval.pval)=0;;}
break;
case 33:
-#line 252 "ael.y"
+#line 250 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
case 34:
-#line 253 "ael.y"
+#line 251 "ael.y"
{ (yyval.pval)=(yyvsp[-1].pval);;}
break;
case 35:
-#line 256 "ael.y"
+#line 254 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 36:
-#line 257 "ael.y"
+#line 255 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 37:
-#line 258 "ael.y"
+#line 256 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 38:
-#line 259 "ael.y"
+#line 257 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 39:
-#line 260 "ael.y"
+#line 258 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 40:
-#line 261 "ael.y"
+#line 259 "ael.y"
{ reset_semicount(parseio->scanner); ;}
break;
case 41:
-#line 261 "ael.y"
+#line 259 "ael.y"
{
(yyval.pval) = npval2(PV_VARDEC, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-4].str);
@@ -2155,24 +2153,24 @@ yyreduce:
break;
case 42:
-#line 265 "ael.y"
+#line 263 "ael.y"
{free((yyvsp[-1].str)); (yyval.pval)=0;;}
break;
case 43:
-#line 266 "ael.y"
+#line 264 "ael.y"
{(yyval.pval)=0;/* allow older docs to be read */;}
break;
case 44:
-#line 269 "ael.y"
+#line 267 "ael.y"
{
(yyval.pval) = npval2(PV_IGNOREPAT, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
case 45:
-#line 274 "ael.y"
+#line 272 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2180,7 +2178,7 @@ yyreduce:
break;
case 46:
-#line 278 "ael.y"
+#line 276 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2189,7 +2187,7 @@ yyreduce:
break;
case 47:
-#line 283 "ael.y"
+#line 281 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-6]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2198,7 +2196,7 @@ yyreduce:
break;
case 48:
-#line 288 "ael.y"
+#line 286 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-7]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2208,46 +2206,46 @@ yyreduce:
break;
case 49:
-#line 297 "ael.y"
+#line 295 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 50:
-#line 298 "ael.y"
+#line 296 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
case 51:
-#line 299 "ael.y"
+#line 297 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
case 52:
-#line 302 "ael.y"
+#line 300 "ael.y"
{ reset_parencount(parseio->scanner); ;}
break;
case 53:
-#line 302 "ael.y"
+#line 300 "ael.y"
{
(yyval.pval)= npval2(PV_IF, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str); ;}
break;
case 54:
-#line 307 "ael.y"
+#line 305 "ael.y"
{ reset_parencount(parseio->scanner); ;}
break;
case 55:
-#line 307 "ael.y"
+#line 305 "ael.y"
{
(yyval.pval) = npval2(PV_RANDOM, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str=(yyvsp[-1].str);;}
break;
case 56:
-#line 313 "ael.y"
+#line 311 "ael.y"
{
(yyval.pval) = npval2(PV_IFTIME, &(yylsp[-13]), &(yylsp[-13]));
(yyval.pval)->u1.list = npval2(PV_WORD, &(yylsp[-11]), &(yylsp[-7]));
@@ -2263,7 +2261,7 @@ yyreduce:
break;
case 57:
-#line 325 "ael.y"
+#line 323 "ael.y"
{
(yyval.pval) = npval2(PV_IFTIME, &(yylsp[-9]), &(yylsp[-5])); /* XXX @5 or greater ? */
(yyval.pval)->u1.list = nword((yyvsp[-7].str), &(yylsp[-7]));
@@ -2275,12 +2273,12 @@ yyreduce:
break;
case 58:
-#line 341 "ael.y"
+#line 339 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;}
break;
case 59:
-#line 342 "ael.y"
+#line 340 "ael.y"
{
asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-1].str));
@@ -2289,12 +2287,12 @@ yyreduce:
break;
case 60:
-#line 349 "ael.y"
+#line 347 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;}
break;
case 61:
-#line 350 "ael.y"
+#line 348 "ael.y"
{
asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-1].str));
@@ -2303,7 +2301,7 @@ yyreduce:
break;
case 62:
-#line 355 "ael.y"
+#line 353 "ael.y"
{
asprintf(&((yyval.str)), "%s%s%s", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-2].str));
@@ -2313,12 +2311,12 @@ yyreduce:
break;
case 63:
-#line 363 "ael.y"
+#line 361 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;}
break;
case 64:
-#line 364 "ael.y"
+#line 362 "ael.y"
{
asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str));
free((yyvsp[-1].str));
@@ -2326,7 +2324,7 @@ yyreduce:
break;
case 65:
-#line 368 "ael.y"
+#line 366 "ael.y"
{
asprintf(&((yyval.str)), "%s:%s", (yyvsp[-2].str), (yyvsp[0].str));
free((yyvsp[-2].str));
@@ -2334,31 +2332,31 @@ yyreduce:
break;
case 66:
-#line 374 "ael.y"
+#line 372 "ael.y"
{ reset_parencount(parseio->scanner); ;}
break;
case 67:
-#line 374 "ael.y"
+#line 372 "ael.y"
{
(yyval.pval) = npval2(PV_SWITCH, &(yylsp[-5]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str); ;}
break;
case 68:
-#line 382 "ael.y"
+#line 380 "ael.y"
{
(yyval.pval) = npval2(PV_STATEMENTBLOCK, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval); ;}
break;
case 69:
-#line 385 "ael.y"
+#line 383 "ael.y"
{reset_semicount(parseio->scanner);;}
break;
case 70:
-#line 385 "ael.y"
+#line 383 "ael.y"
{
(yyval.pval) = npval2(PV_VARDEC, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-4].str);
@@ -2366,43 +2364,43 @@ yyreduce:
break;
case 71:
-#line 389 "ael.y"
+#line 387 "ael.y"
{
(yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
break;
case 72:
-#line 392 "ael.y"
+#line 390 "ael.y"
{
(yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
break;
case 73:
-#line 395 "ael.y"
+#line 393 "ael.y"
{
(yyval.pval) = npval2(PV_LABEL, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str); ;}
break;
case 74:
-#line 398 "ael.y"
+#line 396 "ael.y"
{reset_semicount(parseio->scanner);;}
break;
case 75:
-#line 399 "ael.y"
+#line 397 "ael.y"
{reset_semicount(parseio->scanner);;}
break;
case 76:
-#line 400 "ael.y"
+#line 398 "ael.y"
{reset_parencount(parseio->scanner);;}
break;
case 77:
-#line 400 "ael.y"
+#line 398 "ael.y"
{
(yyval.pval) = npval2(PV_FOR, &(yylsp[-11]), &(yylsp[0]));
(yyval.pval)->u1.for_init = (yyvsp[-8].str);
@@ -2412,12 +2410,12 @@ yyreduce:
break;
case 78:
-#line 406 "ael.y"
+#line 404 "ael.y"
{reset_parencount(parseio->scanner);;}
break;
case 79:
-#line 406 "ael.y"
+#line 404 "ael.y"
{
(yyval.pval) = npval2(PV_WHILE, &(yylsp[-5]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2425,44 +2423,44 @@ yyreduce:
break;
case 80:
-#line 410 "ael.y"
+#line 408 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
break;
case 81:
-#line 412 "ael.y"
+#line 410 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[0]));
(yyval.pval)->u2.statements = (yyvsp[-1].pval);;}
break;
case 82:
-#line 415 "ael.y"
+#line 413 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[-1])); ;}
break;
case 83:
-#line 417 "ael.y"
+#line 415 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
break;
case 84:
-#line 419 "ael.y"
+#line 417 "ael.y"
{
(yyval.pval)= npval2(PV_APPLICATION_CALL, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
case 85:
-#line 422 "ael.y"
+#line 420 "ael.y"
{reset_semicount(parseio->scanner);;}
break;
case 86:
-#line 422 "ael.y"
+#line 420 "ael.y"
{
char *bufx;
int tot=0;
@@ -2499,22 +2497,22 @@ yyreduce:
break;
case 87:
-#line 455 "ael.y"
+#line 453 "ael.y"
{ (yyval.pval) = npval2(PV_BREAK, &(yylsp[-1]), &(yylsp[0])); ;}
break;
case 88:
-#line 456 "ael.y"
+#line 454 "ael.y"
{ (yyval.pval) = npval2(PV_RETURN, &(yylsp[-1]), &(yylsp[0])); ;}
break;
case 89:
-#line 457 "ael.y"
+#line 455 "ael.y"
{ (yyval.pval) = npval2(PV_CONTINUE, &(yylsp[-1]), &(yylsp[0])); ;}
break;
case 90:
-#line 458 "ael.y"
+#line 456 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[-1])); /* XXX probably @3... */
(yyval.pval)->u2.statements = (yyvsp[-1].pval);
@@ -2522,7 +2520,7 @@ yyreduce:
break;
case 91:
-#line 462 "ael.y"
+#line 460 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[-1])); /* XXX probably @3... */
(yyval.pval)->u2.statements = (yyvsp[-1].pval);
@@ -2530,7 +2528,7 @@ yyreduce:
break;
case 92:
-#line 466 "ael.y"
+#line 464 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[-1])); /* XXX probably @3... */
(yyval.pval)->u2.statements = (yyvsp[-1].pval);
@@ -2538,41 +2536,41 @@ yyreduce:
break;
case 93:
-#line 470 "ael.y"
+#line 468 "ael.y"
{ (yyval.pval)=0; ;}
break;
case 94:
-#line 473 "ael.y"
+#line 471 "ael.y"
{ (yyval.pval) = (yyvsp[0].pval); ;}
break;
case 95:
-#line 474 "ael.y"
+#line 472 "ael.y"
{ (yyval.pval) = NULL ; ;}
break;
case 96:
-#line 479 "ael.y"
+#line 477 "ael.y"
{ (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
case 97:
-#line 480 "ael.y"
+#line 478 "ael.y"
{
(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
case 98:
-#line 483 "ael.y"
+#line 481 "ael.y"
{
(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
case 99:
-#line 486 "ael.y"
+#line 484 "ael.y"
{
(yyval.pval) = nword((yyvsp[-4].str), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
@@ -2580,7 +2578,7 @@ yyreduce:
break;
case 100:
-#line 490 "ael.y"
+#line 488 "ael.y"
{
(yyval.pval) = nword((yyvsp[-4].str), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
@@ -2588,7 +2586,7 @@ yyreduce:
break;
case 101:
-#line 494 "ael.y"
+#line 492 "ael.y"
{
(yyval.pval) = nword(strdup("default"), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
@@ -2596,7 +2594,7 @@ yyreduce:
break;
case 102:
-#line 498 "ael.y"
+#line 496 "ael.y"
{
(yyval.pval) = nword(strdup("default"), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
@@ -2604,21 +2602,21 @@ yyreduce:
break;
case 103:
-#line 505 "ael.y"
+#line 503 "ael.y"
{
(yyval.pval) = nword((yyvsp[0].str), &(yylsp[0]));
(yyval.pval)->next = nword(strdup("1"), &(yylsp[0])); ;}
break;
case 104:
-#line 508 "ael.y"
+#line 506 "ael.y"
{
(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
case 105:
-#line 511 "ael.y"
+#line 509 "ael.y"
{ /* XXX they are stored in a different order */
(yyval.pval) = nword((yyvsp[0].str), &(yylsp[0]));
(yyval.pval)->next = nword((yyvsp[-4].str), &(yylsp[-4]));
@@ -2626,7 +2624,7 @@ yyreduce:
break;
case 106:
-#line 515 "ael.y"
+#line 513 "ael.y"
{
(yyval.pval) = nword((yyvsp[0].str), &(yylsp[0]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
@@ -2634,7 +2632,7 @@ yyreduce:
break;
case 107:
-#line 519 "ael.y"
+#line 517 "ael.y"
{
(yyval.pval) = nword(strdup("default"), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-4].str), &(yylsp[-4]));
@@ -2642,7 +2640,7 @@ yyreduce:
break;
case 108:
-#line 523 "ael.y"
+#line 521 "ael.y"
{
(yyval.pval) = nword(strdup("default"), &(yylsp[-2]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[0]));
@@ -2650,12 +2648,12 @@ yyreduce:
break;
case 109:
-#line 529 "ael.y"
+#line 527 "ael.y"
{reset_argcount(parseio->scanner);;}
break;
case 110:
-#line 529 "ael.y"
+#line 527 "ael.y"
{
/* XXX original code had @2 but i think we need @5 */
(yyval.pval) = npval2(PV_MACRO_CALL, &(yylsp[-4]), &(yylsp[0]));
@@ -2664,19 +2662,19 @@ yyreduce:
break;
case 111:
-#line 534 "ael.y"
+#line 532 "ael.y"
{
(yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str); ;}
break;
case 112:
-#line 542 "ael.y"
+#line 540 "ael.y"
{reset_argcount(parseio->scanner);;}
break;
case 113:
-#line 542 "ael.y"
+#line 540 "ael.y"
{
if (strcasecmp((yyvsp[-2].str),"goto") == 0) {
(yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[-1]));
@@ -2689,7 +2687,7 @@ yyreduce:
break;
case 114:
-#line 553 "ael.y"
+#line 551 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[0]));
if( (yyval.pval)->type == PV_GOTO )
@@ -2700,51 +2698,49 @@ yyreduce:
break;
case 115:
-#line 560 "ael.y"
+#line 558 "ael.y"
{ (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
break;
case 116:
-#line 563 "ael.y"
+#line 561 "ael.y"
{ (yyval.str) = (yyvsp[0].str) ;}
break;
case 117:
-#line 564 "ael.y"
+#line 562 "ael.y"
{ (yyval.str) = strdup(""); ;}
break;
case 118:
-#line 567 "ael.y"
+#line 565 "ael.y"
{ (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
case 119:
-#line 568 "ael.y"
+#line 566 "ael.y"
{
(yyval.pval)= npval(PV_WORD,0/*@1.first_line*/,0/*@1.last_line*/,0/* @1.first_column*/, 0/*@1.last_column*/);
(yyval.pval)->u1.str = strdup(""); ;}
break;
case 120:
-#line 571 "ael.y"
- {
- pval *z = nword((yyvsp[0].str), &(yylsp[0]));
- (yyval.pval) = linku1((yyvsp[-2].pval), z); ;}
+#line 569 "ael.y"
+ { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[0].str), &(yylsp[0]))); ;}
break;
case 121:
-#line 576 "ael.y"
+#line 572 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 122:
-#line 577 "ael.y"
+#line 573 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
case 123:
-#line 580 "ael.y"
+#line 576 "ael.y"
{
(yyval.pval) = npval2(PV_CASE, &(yylsp[-3]), &(yylsp[-1])); /* XXX 3 or 4 ? */
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2752,7 +2748,7 @@ yyreduce:
break;
case 124:
-#line 584 "ael.y"
+#line 580 "ael.y"
{
(yyval.pval) = npval2(PV_DEFAULT, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = NULL;
@@ -2760,7 +2756,7 @@ yyreduce:
break;
case 125:
-#line 588 "ael.y"
+#line 584 "ael.y"
{
(yyval.pval) = npval2(PV_PATTERN, &(yylsp[-3]), &(yylsp[0])); /* XXX@3 or @4 ? */
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2768,43 +2764,43 @@ yyreduce:
break;
case 126:
-#line 592 "ael.y"
+#line 588 "ael.y"
{
(yyval.pval) = npval2(PV_CASE, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
case 127:
-#line 595 "ael.y"
+#line 591 "ael.y"
{
(yyval.pval) = npval2(PV_DEFAULT, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = NULL;;}
break;
case 128:
-#line 598 "ael.y"
+#line 594 "ael.y"
{
(yyval.pval) = npval2(PV_PATTERN, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
case 129:
-#line 603 "ael.y"
+#line 599 "ael.y"
{(yyval.pval) = (yyvsp[0].pval);;}
break;
case 130:
-#line 604 "ael.y"
+#line 600 "ael.y"
{ (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
break;
case 131:
-#line 607 "ael.y"
+#line 603 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 132:
-#line 608 "ael.y"
+#line 604 "ael.y"
{
(yyval.pval) = npval2(PV_CATCH, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-3].str);
@@ -2812,53 +2808,51 @@ yyreduce:
break;
case 133:
-#line 614 "ael.y"
+#line 610 "ael.y"
{
(yyval.pval) = npval2(PV_SWITCHES, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[0].pval); ;}
break;
case 134:
-#line 619 "ael.y"
+#line 615 "ael.y"
{
(yyval.pval) = npval2(PV_ESWITCHES, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[0].pval); ;}
break;
case 135:
-#line 624 "ael.y"
+#line 620 "ael.y"
{ (yyval.pval) = (yyvsp[-1].pval); ;}
break;
case 136:
-#line 625 "ael.y"
+#line 621 "ael.y"
{ (yyval.pval) = NULL; ;}
break;
case 137:
-#line 628 "ael.y"
+#line 624 "ael.y"
{ (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;}
break;
case 138:
-#line 629 "ael.y"
- {
- pval *z = nword((yyvsp[-1].str), &(yylsp[-1]));
- (yyval.pval) = linku1((yyvsp[-2].pval), z); ;}
+#line 625 "ael.y"
+ { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[-1].str), &(yylsp[-1]))); ;}
break;
case 139:
-#line 632 "ael.y"
+#line 626 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
case 140:
-#line 635 "ael.y"
+#line 629 "ael.y"
{ (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;}
break;
case 141:
-#line 637 "ael.y"
+#line 631 "ael.y"
{
(yyval.pval) = nword((yyvsp[-13].str), &(yylsp[-13]));
(yyval.pval)->u2.arglist = npval2(PV_WORD, &(yylsp[-11]), &(yylsp[-7]));
@@ -2874,7 +2868,7 @@ yyreduce:
break;
case 142:
-#line 649 "ael.y"
+#line 643 "ael.y"
{
(yyval.pval) = nword((yyvsp[-9].str), &(yylsp[-9]));
(yyval.pval)->u2.arglist = nword((yyvsp[-7].str), &(yylsp[-7]));
@@ -2886,14 +2880,12 @@ yyreduce:
break;
case 143:
-#line 657 "ael.y"
- {
- pval *z = nword((yyvsp[-1].str), &(yylsp[-1]));
- (yyval.pval) = linku1((yyvsp[-2].pval), z); ;}
+#line 651 "ael.y"
+ { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[-1].str), &(yylsp[-1]))); ;}
break;
case 144:
-#line 661 "ael.y"
+#line 653 "ael.y"
{
pval *z = nword((yyvsp[-13].str), &(yylsp[-13]));
(yyval.pval) = linku1((yyvsp[-14].pval), z);
@@ -2910,7 +2902,7 @@ yyreduce:
break;
case 145:
-#line 674 "ael.y"
+#line 666 "ael.y"
{
pval *z = npval2(PV_WORD, &(yylsp[-9]), &(yylsp[-8]));
(yyval.pval) = linku1((yyvsp[-10].pval), z);
@@ -2925,29 +2917,29 @@ yyreduce:
break;
case 146:
-#line 685 "ael.y"
+#line 677 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
case 147:
-#line 688 "ael.y"
+#line 680 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;}
break;
case 148:
-#line 689 "ael.y"
+#line 681 "ael.y"
{(yyval.str)=strdup("default");;}
break;
case 149:
-#line 692 "ael.y"
+#line 684 "ael.y"
{
(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
break;
case 150:
-#line 695 "ael.y"
+#line 687 "ael.y"
{
(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;}
break;
@@ -2957,7 +2949,7 @@ yyreduce:
}
/* Line 1126 of yacc.c. */
-#line 2961 "ael.tab.c"
+#line 2953 "ael.tab.c"
yyvsp -= yylen;
yyssp -= yylen;
@@ -3232,7 +3224,7 @@ yyreturn:
}
-#line 700 "ael.y"
+#line 692 "ael.y"
static char *token_equivs1[] =
diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y
index bdf7663659..103a7e8e45 100644
--- a/pbx/ael/ael.y
+++ b/pbx/ael/ael.y
@@ -236,10 +236,8 @@ global_statement : word EQ { reset_semicount(parseio->scanner); } word SEMI {
$$->u2.val = $4; }
;
-arglist : word { $$= nword($1, &@1); }
- | arglist COMMA word {
- pval *z = nword($3, &@3);
- $$ = linku1($1, z); }
+arglist : word { $$ = nword($1, &@1); }
+ | arglist COMMA word { $$ = linku1($1, nword($3, &@3)); }
| arglist error {$$=$1;}
;
@@ -568,9 +566,7 @@ eval_arglist : word_list { $$ = nword($1, &@1); }
| /*nothing! */ {
$$= npval(PV_WORD,0/*@1.first_line*/,0/*@1.last_line*/,0/* @1.first_column*/, 0/*@1.last_column*/);
$$->u1.str = strdup(""); }
- | eval_arglist COMMA opt_word {
- pval *z = nword($3, &@3);
- $$ = linku1($1, z); }
+ | eval_arglist COMMA opt_word { $$ = linku1($1, nword($3, &@3)); }
;
case_statements: case_statement {$$=$1;}
@@ -626,9 +622,7 @@ switchlist_block : LC switchlist RC { $$ = $2; }
;
switchlist : word SEMI { $$ = nword($1, &@1); }
- | switchlist word SEMI {
- pval *z = nword($2, &@2);
- $$ = linku1($1, z); }
+ | switchlist word SEMI { $$ = linku1($1, nword($2, &@2)); }
| switchlist error {$$=$1;}
;
@@ -654,9 +648,7 @@ includeslist : includedname SEMI { $$ = nword($1, &@1); }
$$->u2.arglist->next->next->next = nword($9, &@9);
prev_word=0;
}
- | includeslist includedname SEMI {
- pval *z = nword($2, &@2);
- $$ = linku1($1, z); }
+ | includeslist includedname SEMI { $$ = linku1($1, nword($2, &@2)); }
| includeslist includedname BAR word3_list COLON word3_list COLON word3_list
BAR word3_list BAR word3_list BAR word3_list SEMI {
pval *z = nword($2, &@2);
--
GitLab