diff options
author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-28 10:06:10 +0000 |
---|---|---|
committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-28 10:06:10 +0000 |
commit | 37f396a2c111e3bec116618c8835ed35ccc33f38 (patch) | |
tree | c15833267be9b318c9245f05c5c09b9cb9d5130e /pbx | |
parent | 6149076261148d1bad7613044e561ed3955122b6 (diff) |
more npval -> npval2 changes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@23088 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
-rw-r--r-- | pbx/ael/ael.tab.c | 28 | ||||
-rw-r--r-- | pbx/ael/ael.y | 20 |
2 files changed, 24 insertions, 24 deletions
diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c index 500ca039e..303267207 100644 --- a/pbx/ael/ael.tab.c +++ b/pbx/ael/ael.tab.c @@ -563,7 +563,7 @@ static const unsigned short int yyrline[] = { 0, 157, 157, 160, 161, 172, 175, 176, 177, 178, 181, 185, 188, 192, 195, 200, 204, 209, 215, 218, - 221, 224, 229, 232, 237, 238, 239, 242, 242, 248, + 221, 225, 230, 233, 237, 238, 239, 242, 242, 248, 251, 256, 259, 260, 261, 264, 267, 268, 269, 270, 271, 272, 272, 276, 277, 280, 285, 289, 294, 299, 308, 309, 312, 315, 315, 320, 320, 325, 341, 361, @@ -2038,36 +2038,36 @@ yyreduce: case 19: #line 218 "ael.y" { - (yyval.pval)=npval(PV_MACRO,(yylsp[-6]).first_line,(yylsp[0]).last_line, (yylsp[-6]).first_column, (yylsp[0]).last_column); + (yyval.pval) = npval2(PV_MACRO, &(yylsp[-6]), &(yylsp[0])); (yyval.pval)->u1.str = (yyvsp[-5].str); (yyval.pval)->u2.arglist = (yyvsp[-3].pval); ;} break; case 20: #line 221 "ael.y" { - (yyval.pval)=npval(PV_MACRO,(yylsp[-6]).first_line,(yylsp[0]).last_line, (yylsp[-6]).first_column, (yylsp[0]).last_column); - (yyval.pval)->u1.str = (yyvsp[-5].str); (yyval.pval)->u3.macro_statements = (yyvsp[-1].pval); ;} + (yyval.pval) = npval2(PV_MACRO, &(yylsp[-6]), &(yylsp[0])); + (yyval.pval)->u1.str = (yyvsp[-5].str); + (yyval.pval)->u3.macro_statements = (yyvsp[-1].pval); ;} break; case 21: -#line 224 "ael.y" +#line 225 "ael.y" { - (yyval.pval)=npval(PV_MACRO,(yylsp[-5]).first_line,(yylsp[0]).last_line, (yylsp[-5]).first_column, (yylsp[0]).last_column); - (yyval.pval)->u1.str = (yyvsp[-4].str); /* pretty empty! */ ;} + (yyval.pval) = npval2(PV_MACRO, &(yylsp[-5]), &(yylsp[0])); + (yyval.pval)->u1.str = (yyvsp[-4].str); ;} break; case 22: -#line 229 "ael.y" +#line 230 "ael.y" { - (yyval.pval)=npval(PV_GLOBALS,(yylsp[-3]).first_line,(yylsp[0]).last_line, (yylsp[-3]).first_column, (yylsp[0]).last_column); + (yyval.pval) = npval2(PV_GLOBALS, &(yylsp[-3]), &(yylsp[0])); (yyval.pval)->u1.statements = (yyvsp[-1].pval);;} break; case 23: -#line 232 "ael.y" - { - (yyval.pval)=npval(PV_GLOBALS,(yylsp[-2]).first_line,(yylsp[0]).last_line, (yylsp[-2]).first_column, (yylsp[0]).last_column); - /* and that's all */ ;} +#line 233 "ael.y" + { /* empty globals is OK */ + (yyval.pval) = npval2(PV_GLOBALS, &(yylsp[-2]), &(yylsp[0])); ;} break; case 24: @@ -2093,7 +2093,7 @@ yyreduce: case 28: #line 242 "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)->u2.val = (yyvsp[-1].str); ;} break; diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y index 62ec4ebaa..2e974dcf8 100644 --- a/pbx/ael/ael.y +++ b/pbx/ael/ael.y @@ -216,22 +216,22 @@ macro : KW_MACRO word LP arglist RP LC macro_statements RC { $$ = npval2(PV_MACRO, &@1, &@8); $$->u1.str = $2; $$->u2.arglist = $4; $$->u3.macro_statements = $7; } | KW_MACRO word LP arglist RP LC RC { - $$=npval(PV_MACRO,@1.first_line,@7.last_line, @1.first_column, @7.last_column); + $$ = npval2(PV_MACRO, &@1, &@7); $$->u1.str = $2; $$->u2.arglist = $4; } | KW_MACRO word LP RP LC macro_statements RC { - $$=npval(PV_MACRO,@1.first_line,@7.last_line, @1.first_column, @7.last_column); - $$->u1.str = $2; $$->u3.macro_statements = $6; } + $$ = npval2(PV_MACRO, &@1, &@7); + $$->u1.str = $2; + $$->u3.macro_statements = $6; } | KW_MACRO word LP RP LC RC { - $$=npval(PV_MACRO,@1.first_line,@6.last_line, @1.first_column, @6.last_column); - $$->u1.str = $2; /* pretty empty! */ } + $$ = npval2(PV_MACRO, &@1, &@6); + $$->u1.str = $2; } ; globals : KW_GLOBALS LC global_statements RC { - $$=npval(PV_GLOBALS,@1.first_line,@4.last_line, @1.first_column, @4.last_column); + $$ = npval2(PV_GLOBALS, &@1, &@4); $$->u1.statements = $3;} - | KW_GLOBALS LC RC /* empty global is OK */ { - $$=npval(PV_GLOBALS,@1.first_line,@3.last_line, @1.first_column, @3.last_column); - /* and that's all */ } + | KW_GLOBALS LC RC { /* empty globals is OK */ + $$ = npval2(PV_GLOBALS, &@1, &@3); } ; global_statements : global_statement {$$=$1;} @@ -240,7 +240,7 @@ global_statements : global_statement {$$=$1;} ; global_statement : 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; $$->u2.val = $4; } ; |