diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-27 17:39:55 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-27 17:39:55 +0000 |
| commit | 6378d5405a4006e4de2f521e6668758489c03ff8 (patch) | |
| tree | ed07d698be9b8d27318b9c64c3656b0659105ad8 /pbx | |
| parent | f61c9a3779391d17a96cac5137ce49996ea43958 (diff) | |
fix a couple of bugs in arguments to npval
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@22902 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/ael/ael.tab.c | 7 | ||||
| -rw-r--r-- | pbx/ael/ael.y | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c index 03d49f9f1..0dc33d508 100644 --- a/pbx/ael/ael.tab.c +++ b/pbx/ael/ael.tab.c @@ -2109,7 +2109,7 @@ yyreduce: case 47: #line 269 "ael.y" { - (yyval.pval) = npval(PV_EXTENSION,(yylsp[-3]).first_line,(yylsp[-1]).last_line, (yylsp[-3]).first_column, (yylsp[0]).last_column); + (yyval.pval) = npval(PV_EXTENSION,(yylsp[-3]).first_line,(yylsp[0]).last_line, (yylsp[-3]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = (yyvsp[-2].str); (yyval.pval)->u2.statements = (yyvsp[0].pval); (yyval.pval)->u4.regexten=1;;} @@ -2127,7 +2127,7 @@ yyreduce: case 49: #line 279 "ael.y" { - (yyval.pval) = npval(PV_EXTENSION,(yylsp[-7]).first_line,(yylsp[-4]).last_line, (yylsp[-7]).first_column, (yylsp[0]).last_column); + (yyval.pval) = npval(PV_EXTENSION,(yylsp[-7]).first_line,(yylsp[0]).last_line, (yylsp[-7]).first_column, (yylsp[0]).last_column); (yyval.pval)->u1.str = (yyvsp[-2].str); (yyval.pval)->u2.statements = (yyvsp[0].pval); (yyval.pval)->u4.regexten=1; @@ -3327,7 +3327,8 @@ void yyerror(YYLTYPE *locp, struct parse_io *parseio, char const *s) parseio->syntax_error_count++; } -static struct pval *npval(pvaltype type,int first_line, int last_line, int first_column, int last_column) +static struct pval *npval(pvaltype type, int first_line, int last_line, + int first_column, int last_column) { extern char *my_file; pval *z = (pval *)calloc(sizeof(struct pval),1); diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y index d4529936d..281b5f832 100644 --- a/pbx/ael/ael.y +++ b/pbx/ael/ael.y @@ -267,7 +267,7 @@ extension : word EXTENMARK statement { $$->u1.str = $1; $$->u2.statements = $3; } | KW_REGEXTEN word EXTENMARK statement { - $$ = npval(PV_EXTENSION,@1.first_line,@3.last_line, @1.first_column, @4.last_column); + $$ = npval(PV_EXTENSION,@1.first_line,@4.last_line, @1.first_column, @4.last_column); $$->u1.str = $2; $$->u2.statements = $4; $$->u4.regexten=1;} @@ -277,7 +277,7 @@ extension : word EXTENMARK statement { $$->u2.statements = $7; $$->u3.hints = $3;} | KW_REGEXTEN KW_HINT LP word3_list RP word EXTENMARK statement { - $$ = npval(PV_EXTENSION,@1.first_line,@4.last_line, @1.first_column, @8.last_column); + $$ = npval(PV_EXTENSION,@1.first_line,@8.last_line, @1.first_column, @8.last_column); $$->u1.str = $6; $$->u2.statements = $8; $$->u4.regexten=1; @@ -839,7 +839,8 @@ void yyerror(YYLTYPE *locp, struct parse_io *parseio, char const *s) parseio->syntax_error_count++; } -static struct pval *npval(pvaltype type,int first_line, int last_line, int first_column, int last_column) +static struct pval *npval(pvaltype type, int first_line, int last_line, + int first_column, int last_column) { extern char *my_file; pval *z = (pval *)calloc(sizeof(struct pval),1); |