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

fix a couple of bugs in arguments to npval

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

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

@ -2109,7 +2109,7 @@ yyreduce:
case 47: case 47:
#line 269 "ael.y" #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)->u1.str = (yyvsp[-2].str);
(yyval.pval)->u2.statements = (yyvsp[0].pval); (yyval.pval)->u2.statements = (yyvsp[0].pval);
(yyval.pval)->u4.regexten=1;;} (yyval.pval)->u4.regexten=1;;}
@ -2127,7 +2127,7 @@ yyreduce:
case 49: case 49:
#line 279 "ael.y" #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)->u1.str = (yyvsp[-2].str);
(yyval.pval)->u2.statements = (yyvsp[0].pval); (yyval.pval)->u2.statements = (yyvsp[0].pval);
(yyval.pval)->u4.regexten=1; (yyval.pval)->u4.regexten=1;
@ -3327,7 +3327,8 @@ void yyerror(YYLTYPE *locp, struct parse_io *parseio, char const *s)
parseio->syntax_error_count++; 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; extern char *my_file;
pval *z = (pval *)calloc(sizeof(struct pval),1); pval *z = (pval *)calloc(sizeof(struct pval),1);

7
pbx/ael/ael.y
Unescape View File

@ -267,7 +267,7 @@ extension : word EXTENMARK statement {
$$->u1.str = $1; $$->u1.str = $1;
$$->u2.statements = $3; } $$->u2.statements = $3; }
| KW_REGEXTEN word EXTENMARK statement { | 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; $$->u1.str = $2;
$$->u2.statements = $4; $$->u2.statements = $4;
$$->u4.regexten=1;} $$->u4.regexten=1;}
@ -277,7 +277,7 @@ extension : word EXTENMARK statement {
$$->u2.statements = $7; $$->u2.statements = $7;
$$->u3.hints = $3;} $$->u3.hints = $3;}
| KW_REGEXTEN KW_HINT LP word3_list RP word EXTENMARK statement { | 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; $$->u1.str = $6;
$$->u2.statements = $8; $$->u2.statements = $8;
$$->u4.regexten=1; $$->u4.regexten=1;
@ -839,7 +839,8 @@ void yyerror(YYLTYPE *locp, struct parse_io *parseio, char const *s)
parseio->syntax_error_count++; 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; extern char *my_file;
pval *z = (pval *)calloc(sizeof(struct pval),1); pval *z = (pval *)calloc(sizeof(struct pval),1);

Write Preview
Loading…
Cancel
Save