diff options
author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-02 18:45:18 +0000 |
---|---|---|
committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-02 18:45:18 +0000 |
commit | ffd1bcd9f3e20cfa8401e60ea05d39590480826a (patch) | |
tree | 4c6b5f18d6fabdba79d5858340c3d8cc92cdb37d /pbx/ael/ael.y | |
parent | 40d3c6b9b22ee54f4862e73f37deac2a3d5d53de (diff) |
rename the rule for context names properly
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@24256 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx/ael/ael.y')
-rw-r--r-- | pbx/ael/ael.y | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y index 2a58b732a..18e20484c 100644 --- a/pbx/ael/ael.y +++ b/pbx/ael/ael.y @@ -123,7 +123,7 @@ static pval *update_last(pval *, YYLTYPE *); %type <pval>included_entry %type <str>opt_word -%type <str>word_or_default +%type <str>context_name %type <str>timerange %type <str>goto_word @@ -169,7 +169,7 @@ static pval *update_last(pval *, YYLTYPE *); elements_block switchlist_block timespec included_entry -%destructor { free($$);} word word_list goto_word word3_list opt_word word_or_default +%destructor { free($$);} word word_list goto_word word3_list opt_word context_name timerange @@ -189,11 +189,11 @@ object : context {$$=$1;} | SEMI {$$=0;/* allow older docs to be read */} ; -word_or_default : word { $$ = $1; } +context_name : word { $$ = $1; } | KW_DEFAULT { $$ = strdup("default"); } ; -context : opt_abstract KW_CONTEXT word_or_default elements_block { +context : opt_abstract KW_CONTEXT context_name elements_block { $$ = npval2(PV_CONTEXT, &@1, &@4); $$->u1.str = $3; $$->u2.statements = $4; @@ -618,9 +618,8 @@ switchlist : word SEMI { $$ = nword($1, &@1); } | switchlist error {$$=$1;} ; - -included_entry : word_or_default SEMI { $$ = nword($1, &@1); } - | word_or_default BAR timespec SEMI { +included_entry : context_name SEMI { $$ = nword($1, &@1); } + | context_name BAR timespec SEMI { $$ = nword($1, &@1); $$->u2.arglist = $3; prev_word=0; /* XXX sure ? */ } |