kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 19:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

more npval -> npval2 replacement, and a fix for a likely

Browse Source 
bug (marked XXX)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22929 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-27 18:18:12 +00:00
parent dadafb65cf
commit 5c34366afc
2 changed files with 183 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

346
pbx/ael/ael.tab.c
View File

File diff suppressed because it is too large Load Diff

32
pbx/ael/ael.y
View File

@@ -162,44 +162,37 @@ context : KW_CONTEXT word LC elements RC {
$$->u1.str = $2;
$$->u2.statements = $4; }
| KW_CONTEXT word LC RC /* empty context OK */ {
$$ = npval(PV_CONTEXT, @1.first_line, @4.last_line,
@1.first_column, @4.last_column);
$$ = npval2(PV_CONTEXT, &@1, &@4);
$$->u1.str = $2; }
| KW_CONTEXT KW_DEFAULT LC elements RC {
$$ = npval(PV_CONTEXT, @1.first_line, @5.last_line,
@1.first_column, @5.last_column);
$$ = npval2(PV_CONTEXT, &@1, &@5);
$$->u1.str = strdup("default");
$$->u2.statements = $4; }
| KW_CONTEXT KW_DEFAULT LC RC /* empty context OK */ {
$$ = npval(PV_CONTEXT, @1.first_line, @4.last_line,
@1.first_column, @4.last_column);
$$ = npval2(PV_CONTEXT, &@1, &@4);
$$->u1.str = strdup("default"); }
| KW_ABSTRACT KW_CONTEXT word LC elements RC {
$$ = npval(PV_CONTEXT, @1.first_line, @6.last_line,
@1.first_column, @6.last_column);
$$ = npval2(PV_CONTEXT, &@1, &@6);
$$->u1.str = $3;
$$->u2.statements = $5;
$$->u3.abstract = 1; }
| KW_ABSTRACT KW_CONTEXT word LC RC /* empty context OK */ {
$$ = npval(PV_CONTEXT, @1.first_line, @5.last_line,
@1.first_column, @5.last_column);
$$ = npval2(PV_CONTEXT, &@1, &@5);
$$->u1.str = $3;
$$->u3.abstract = 1; }
| KW_ABSTRACT KW_CONTEXT KW_DEFAULT LC elements RC {
$$ = npval(PV_CONTEXT, @1.first_line, @6.last_line,
@1.first_column, @6.last_column);
$$ = npval2(PV_CONTEXT, &@1, &@6);
$$->u1.str = strdup("default");
$$->u2.statements = $5;
$$->u3.abstract = 1; }
| KW_ABSTRACT KW_CONTEXT KW_DEFAULT LC RC /* empty context OK */ {
$$ = npval(PV_CONTEXT, @1.first_line, @5.last_line,
@1.first_column, @5.last_column);
$$ = npval2(PV_CONTEXT, &@1, &@5);
$$->u1.str = strdup("default");
$$->u3.abstract = 1; }
;
macro : KW_MACRO word LP arglist RP LC macro_statements RC {
$$=npval(PV_MACRO,@1.first_line,@8.last_line, @1.first_column, @8.last_column);
$$ = 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);
@@ -589,11 +582,12 @@ jumptarget : goto_word {
;
macro_call : word LP {reset_argcount(parseio->scanner);} eval_arglist RP {
$$= npval(PV_MACRO_CALL,@1.first_line,@2.last_line, @1.first_column, @2.last_column);
/* XXX original code had @2 but i think we need @5 */
$$ = npval2(PV_MACRO_CALL, &@1, &@5);
$$->u1.str = $1;
$$->u2.arglist = $4;}
| word LP RP {
$$= npval(PV_MACRO_CALL,@1.first_line,@3.last_line, @1.first_column, @3.last_column);
$$= npval2(PV_MACRO_CALL, &@1, &@3);
$$->u1.str = $1; }
;
@@ -739,10 +733,10 @@ includedname : word { $$ = $1;}
;
includes : KW_INCLUDES LC includeslist RC {
$$= npval(PV_INCLUDES,@1.first_line,@4.last_line, @1.first_column, @4.last_column);
$$ = npval2(PV_INCLUDES, &@1, &@4);
$$->u1.list = $3;}
| KW_INCLUDES LC RC {
$$= npval(PV_INCLUDES,@1.first_line,@3.last_line, @1.first_column, @3.last_column);}
$$ = npval2(PV_INCLUDES, &@1, &@3);}
;