diff options
| author | Steve Murphy <murf@digium.com> | 2007-05-03 14:24:00 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2007-05-03 14:24:00 +0000 |
| commit | dc8f6a947338bfa6ce26fba2cba8f74c7f74f51e (patch) | |
| tree | 4fb53b144cefaee45df653da706b6846eee422af /pbx/ael/ael.y | |
| parent | f44a236d086acd2344aa9080ae7675d6e0dc0641 (diff) | |
Merged revisions 62883 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r62883 | murf | 2007-05-03 07:54:56 -0600 (Thu, 03 May 2007) | 1 line
These mods fix bug 9623, where an '@' in the eswitch contents causes a syntax error. I also updated the regressions.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62911 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx/ael/ael.y')
| -rw-r--r-- | pbx/ael/ael.y | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y index d32ded0a6..9c6effe0e 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 7 +%expect 8 %error-verbose /* @@ -595,6 +595,8 @@ eswitches : KW_ESWITCHES LC switchlist RC { switchlist : /* empty */ { $$ = NULL; } | word SEMI switchlist { $$ = linku1(nword($1, &@1), $3); } + | word AT word SEMI switchlist { char *x; asprintf(&x,"%s@%s", $1,$3); free($1); free($3); + $$ = linku1(nword(x, &@1), $5);} | switchlist error {$$=$1;} ; |