diff options
author | Luigi Rizzo <rizzo@icir.org> | 2006-05-03 16:33:00 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2006-05-03 16:33:00 +0000 |
commit | 820ef229517d62f852c3f6c9d963e3391073f47a (patch) | |
tree | 42d1fe9985c114b0b6002fc6c5b786de9a7fe6eb /pbx/ael/ael.y | |
parent | 673607f87a0e66b02062afce6c2ffd4ce8e86786 (diff) |
remove a redundant rule
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24426 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx/ael/ael.y')
-rw-r--r-- | pbx/ael/ael.y | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y index 2b4108b90..f9b543594 100644 --- a/pbx/ael/ael.y +++ b/pbx/ael/ael.y @@ -121,7 +121,6 @@ static pval *update_last(pval *, YYLTYPE *); %type <pval>switchlist_block %type <pval>timespec %type <pval>included_entry -%type <pval>opt_statements %type <str>opt_word %type <str>context_name @@ -170,7 +169,6 @@ static pval *update_last(pval *, YYLTYPE *); opt_else elements_block switchlist_block timespec included_entry - opt_statements %destructor { free($$);} word word_list goto_word word3_list opt_word context_name timerange @@ -282,8 +280,9 @@ extension : word EXTENMARK statement { ; -statements : statement {$$=$1;} - | statements statement { $$ = linku1($1, $2); } +/* list of statements in a block or after a case label - can be empty */ +statements : /* empty */ { $$ = NULL; } + | statement statements { $$ = linku1($1, $2); } | statements error {$$=$1;} ; @@ -541,24 +540,18 @@ eval_arglist : word_list { $$ = nword($1, &@1); } ; case_statements: /* empty */ { $$ = NULL; } - | case_statement {$$=$1;} - | case_statements case_statement { $$ = linku1($1, $2); } + | case_statement case_statements { $$ = linku1($1, $2); } ; -/* statement in a switch body after a label */ -opt_statements : { $$ = NULL; } - | statements { $$ = $1; } - ; - -case_statement: KW_CASE word COLON opt_statements { +case_statement: KW_CASE word COLON statements { $$ = npval2(PV_CASE, &@1, &@3); /* XXX 3 or 4 ? */ $$->u1.str = $2; $$->u2.statements = $4;} - | KW_DEFAULT COLON opt_statements { + | KW_DEFAULT COLON statements { $$ = npval2(PV_DEFAULT, &@1, &@3); $$->u1.str = NULL; $$->u2.statements = $3;} - | KW_PATTERN word COLON opt_statements { + | KW_PATTERN word COLON statements { $$ = npval2(PV_PATTERN, &@1, &@4); /* XXX@3 or @4 ? */ $$->u1.str = $2; $$->u2.statements = $4;} |