diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-18 21:36:24 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-18 21:36:24 +0000 |
| commit | 0851906c8321505334fdabd23e87812547dfe0ab (patch) | |
| tree | 8c013c06f433598c8319a154dce0cade99d7145a /pbx/ael/ael.y | |
| parent | 6c9e5a30c9759983b8f39d04a516269343f913e2 (diff) | |
merge changes from team/murf/AEL-trunk-fixesonly
- fix callerid matching for extensions
- fix nested switch statements
- fix compilation with bison 2.1a or higher
(issue #7309)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@34665 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx/ael/ael.y')
| -rw-r--r-- | pbx/ael/ael.y | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y index 8ce3e7711..35be10c6b 100644 --- a/pbx/ael/ael.y +++ b/pbx/ael/ael.y @@ -153,7 +153,7 @@ static pval *update_last(pval *, YYLTYPE *); /* there will be two shift/reduce conflicts, they involve the if statement, where a single statement occurs not wrapped in curlies in the "true" section the default action to shift will attach the else to the preceeding if. */ -%expect 5 +%expect 7 %error-verbose /* @@ -449,8 +449,6 @@ statement : LC statements RC { opt_else : KW_ELSE statement { $$ = $2; } | { $$ = NULL ; } -/* XXX unused */ -bar_or_comma: BAR | COMMA ; target : goto_word { $$ = nword($1, &@1); } | goto_word BAR goto_word { |