Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

more npval -> npval2 conversions

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23066 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Luigi Rizzo 20 years ago
parent 9a77832583
commit c9816d135d
2 changed files with 75 additions and 43 deletions
Show Stats Download Patch File Download Diff File

82
pbx/ael/ael.tab.c
Unescape View File

@ -574,9 +574,9 @@ static const unsigned short int yyrline[] =
531, 536, 543, 550, 557, 566, 571, 576, 583, 590, 531, 536, 543, 550, 557, 566, 571, 576, 583, 590,
597, 606, 606, 611, 616, 616, 626, 632, 635, 638, 597, 606, 606, 611, 616, 616, 626, 632, 635, 638,
641, 646, 653, 654, 659, 663, 667, 671, 674, 677, 641, 646, 653, 654, 659, 663, 667, 671, 674, 677,
682, 683, 688, 689, 692, 693, 696, 697, 700, 701, 682, 683, 688, 689, 695, 698, 702, 703, 706, 709,
702, 705, 706, 722, 735, 736, 751, 764, 767, 768, 714, 717, 718, 734, 747, 752, 767, 780, 783, 784,
771, 774 787, 790
}; };
#endif #endif
@ -2409,14 +2409,14 @@ yyreduce:
case 73: case 73:
#line 412 "ael.y" #line 412 "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) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval);;} (yyval.pval)->u1.list = (yyvsp[-1].pval);;}
break; break;
case 74: case 74:
#line 415 "ael.y" #line 415 "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) = npval2(PV_LABEL, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str); ;} (yyval.pval)->u1.str = (yyvsp[-1].str); ;}
break; break;
@ -2438,7 +2438,7 @@ yyreduce:
case 78: case 78:
#line 420 "ael.y" #line 420 "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) = npval2(PV_FOR, &(yylsp[-11]), &(yylsp[0]));
(yyval.pval)->u1.for_init = (yyvsp[-8].str); (yyval.pval)->u1.for_init = (yyvsp[-8].str);
(yyval.pval)->u2.for_test=(yyvsp[-5].str); (yyval.pval)->u2.for_test=(yyvsp[-5].str);
(yyval.pval)->u3.for_inc = (yyvsp[-2].str); (yyval.pval)->u3.for_inc = (yyvsp[-2].str);
@ -2453,7 +2453,7 @@ yyreduce:
case 80: case 80:
#line 426 "ael.y" #line 426 "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) = npval2(PV_WHILE, &(yylsp[-5]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str); (yyval.pval)->u1.str = (yyvsp[-2].str);
(yyval.pval)->u2.statements = (yyvsp[0].pval); ;} (yyval.pval)->u2.statements = (yyvsp[0].pval); ;}
break; break;
@ -2910,51 +2910,63 @@ yyreduce:
case 133: case 133:
#line 689 "ael.y" #line 689 "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) = npval2(PV_CATCH, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-3].str);
(yyval.pval)->u2.statements = (yyvsp[-1].pval);;}
break; break;
case 134: case 134:
#line 692 "ael.y" #line 695 "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) = npval2(PV_SWITCHES, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval); ;}
break; break;
case 135: case 135:
#line 693 "ael.y" #line 698 "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) = npval2(PV_SWITCHES, &(yylsp[-2]), &(yylsp[0])); ;}
break; break;
case 136: case 136:
#line 696 "ael.y" #line 702 "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 697 "ael.y" #line 703 "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 700 "ael.y" #line 706 "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) = npval2(PV_WORD, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break; break;
case 139: case 139:
#line 701 "ael.y" #line 709 "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 = npval2(PV_WORD, &(yylsp[-1]), &(yylsp[0]));
z->u1.str = (yyvsp[-1].str);
(yyval.pval)=(yyvsp[-2].pval);
linku1((yyval.pval),z); ;}
break; break;
case 140: case 140:
#line 702 "ael.y" #line 714 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;} {(yyval.pval)=(yyvsp[-1].pval);;}
break; break;
case 141: case 141:
#line 705 "ael.y" #line 717 "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 706 "ael.y" #line 718 "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);
@ -2974,7 +2986,7 @@ yyreduce:
break; break;
case 143: case 143:
#line 722 "ael.y" #line 734 "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);
@ -2991,12 +3003,16 @@ yyreduce:
break; break;
case 144: case 144:
#line 735 "ael.y" #line 747 "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 = npval2(PV_WORD, &(yylsp[-1]), &(yylsp[0])); /* XXX don't we need @1-@4 ?*/
(yyval.pval)=(yyvsp[-2].pval);
z->u1.str = (yyvsp[-1].str);
linku1((yyval.pval),z); ;}
break; break;
case 145: case 145:
#line 736 "ael.y" #line 752 "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);
@ -3015,7 +3031,7 @@ yyreduce:
break; break;
case 146: case 146:
#line 752 "ael.y" #line 768 "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);
@ -3031,29 +3047,29 @@ yyreduce:
break; break;
case 147: case 147:
#line 764 "ael.y" #line 780 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;} {(yyval.pval)=(yyvsp[-1].pval);;}
break; break;
case 148: case 148:
#line 767 "ael.y" #line 783 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;} { (yyval.str) = (yyvsp[0].str);;}
break; break;
case 149: case 149:
#line 768 "ael.y" #line 784 "ael.y"
{(yyval.str)=strdup("default");;} {(yyval.str)=strdup("default");;}
break; break;
case 150: case 150:
#line 771 "ael.y" #line 787 "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 774 "ael.y" #line 790 "ael.y"
{ {
(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;} (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;}
break; break;
@ -3063,7 +3079,7 @@ yyreduce:
} }
/* Line 1126 of yacc.c. */ /* Line 1126 of yacc.c. */
#line 3067 "ael.tab.c" #line 3083 "ael.tab.c"
yyvsp -= yylen; yyvsp -= yylen;
yyssp -= yylen; yyssp -= yylen;
@ -3338,7 +3354,7 @@ yyreturn:
} }
#line 779 "ael.y" #line 795 "ael.y"
static char *token_equivs1[] = static char *token_equivs1[] =

36
pbx/ael/ael.y
Unescape View File

@ -410,21 +410,21 @@ statement : LC statements RC {
$$ = npval2(PV_GOTO, &@1, &@3); $$ = npval2(PV_GOTO, &@1, &@3);
$$->u1.list = $2;} $$->u1.list = $2;}
| KW_JUMP jumptarget SEMI { | KW_JUMP jumptarget SEMI {
$$=npval(PV_GOTO,@1.first_line,@3.last_line, @1.first_column, @3.last_column); $$ = npval2(PV_GOTO, &@1, &@3);
$$->u1.list = $2;} $$->u1.list = $2;}
| word COLON { | word COLON {
$$=npval(PV_LABEL,@1.first_line,@2.last_line, @1.first_column, @2.last_column); $$ = npval2(PV_LABEL, &@1, &@2);
$$->u1.str = $1; } $$->u1.str = $1; }
| KW_FOR LP {reset_semicount(parseio->scanner);} word SEMI | KW_FOR LP {reset_semicount(parseio->scanner);} word SEMI
{reset_semicount(parseio->scanner);} word SEMI {reset_semicount(parseio->scanner);} word SEMI
{reset_parencount(parseio->scanner);} word RP statement { {reset_parencount(parseio->scanner);} word RP statement {
$$=npval(PV_FOR,@1.first_line,@12.last_line, @1.first_column, @12.last_column); $$ = npval2(PV_FOR, &@1, &@12);
$$->u1.for_init = $4; $$->u1.for_init = $4;
$$->u2.for_test=$7; $$->u2.for_test=$7;
$$->u3.for_inc = $10; $$->u3.for_inc = $10;
$$->u4.for_statements = $12;} $$->u4.for_statements = $12;}
| KW_WHILE LP {reset_parencount(parseio->scanner);} word RP statement { | KW_WHILE LP {reset_parencount(parseio->scanner);} word RP statement {
$$=npval(PV_WHILE,@1.first_line,@6.last_line, @1.first_column, @6.last_column); $$ = npval2(PV_WHILE, &@1, &@6);
$$->u1.str = $4; $$->u1.str = $4;
$$->u2.statements = $6; } $$->u2.statements = $6; }
| switch_head RC /* empty list OK */ { | switch_head RC /* empty list OK */ {
@ -686,19 +686,31 @@ macro_statements: macro_statement {$$ = $1;}
; ;
macro_statement : statement {$$=$1;} macro_statement : statement {$$=$1;}
| KW_CATCH word LC statements RC {$$=npval(PV_CATCH,@1.first_line,@5.last_line, @1.first_column, @5.last_column); $$->u1.str = $2; $$->u2.statements = $4;} | KW_CATCH word LC statements RC {
$$ = npval2(PV_CATCH, &@1, &@5);
$$->u1.str = $2;
$$->u2.statements = $4;}
; ;
switches : KW_SWITCHES LC switchlist RC {$$= npval(PV_SWITCHES,@1.first_line,@4.last_line, @1.first_column, @4.last_column); $$->u1.list = $3; } switches : KW_SWITCHES LC switchlist RC {
| KW_SWITCHES LC RC /* empty switch list OK */ {$$= npval(PV_SWITCHES,@1.first_line,@3.last_line, @1.first_column, @3.last_column);} $$ = npval2(PV_SWITCHES, &@1, &@4);
$$->u1.list = $3; }
| KW_SWITCHES LC RC /* empty switch list OK */ {
$$ = npval2(PV_SWITCHES, &@1, &@3); }
; ;
eswitches : KW_ESWITCHES LC switchlist RC {$$= npval(PV_ESWITCHES,@1.first_line,@4.last_line, @1.first_column, @4.last_column); $$->u1.list = $3; } eswitches : KW_ESWITCHES LC switchlist RC {$$= npval(PV_ESWITCHES,@1.first_line,@4.last_line, @1.first_column, @4.last_column); $$->u1.list = $3; }
| KW_ESWITCHES LC RC /* empty switch list OK */ {$$= npval(PV_ESWITCHES,@1.first_line,@3.last_line, @1.first_column, @3.last_column); } /* if there's nothing to declare, why include it? */ | KW_ESWITCHES LC RC /* empty switch list OK */ {$$= npval(PV_ESWITCHES,@1.first_line,@3.last_line, @1.first_column, @3.last_column); } /* if there's nothing to declare, why include it? */
; ;
switchlist : word SEMI {$$=npval(PV_WORD,@1.first_line,@2.last_line, @1.first_column, @2.last_column); $$->u1.str = $1;} switchlist : word SEMI {
| switchlist word SEMI {pval *z = npval(PV_WORD,@2.first_line,@3.last_line, @2.first_column, @3.last_column); $$=$1; z->u1.str = $2; linku1($$,z); } $$ = npval2(PV_WORD, &@1, &@2);
$$->u1.str = $1;}
| switchlist word SEMI {
pval *z = npval2(PV_WORD, &@2, &@3);
z->u1.str = $2;
$$=$1;
linku1($$,z); }
| switchlist error {$$=$1;} | switchlist error {$$=$1;}
; ;
@ -732,7 +744,11 @@ includeslist : includedname SEMI {$$=npval(PV_WORD,@1.first_line,@2.last_line, @
$$->u2.arglist->next->next->next->u1.str = $9; $$->u2.arglist->next->next->next->u1.str = $9;
prev_word=0; prev_word=0;
} }
| includeslist includedname SEMI {pval *z = npval(PV_WORD,@2.first_line,@3.last_line, @2.first_column, @3.last_column); $$=$1; z->u1.str = $2; linku1($$,z); } | includeslist includedname SEMI {
pval *z = npval2(PV_WORD, &@2, &@3); /* XXX don't we need @1-@4 ?*/
$$=$1;
z->u1.str = $2;
linku1($$,z); }
| includeslist includedname BAR word3_list COLON word3_list COLON word3_list BAR word3_list BAR word3_list BAR word3_list SEMI {pval *z = npval(PV_WORD,@2.first_line,@3.last_line, @2.first_column, @3.last_column); | includeslist includedname BAR word3_list COLON word3_list COLON word3_list BAR word3_list BAR word3_list BAR word3_list SEMI {pval *z = npval(PV_WORD,@2.first_line,@3.last_line, @2.first_column, @3.last_column);
$$=$1; z->u1.str = $2; linku1($$,z); $$=$1; z->u1.str = $2; linku1($$,z);
z->u2.arglist = npval(PV_WORD,@4.first_line,@4.last_line, @4.first_column, @4.last_column); z->u2.arglist = npval(PV_WORD,@4.first_line,@4.last_line, @4.first_column, @4.last_column);

Write Preview
Loading…
Cancel
Save