projects
/
asterisk/asterisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merged revisions 189462 via svnmerge from
[asterisk/asterisk.git]
/
res
/
ael
/
ael.y
diff --git
a/res/ael/ael.y
b/res/ael/ael.y
index
f8398dd
..
c8bc9c7
100644
(file)
--- a/
res/ael/ael.y
+++ b/
res/ael/ael.y
@@
-402,6
+402,15
@@
hint_word : word { $$ = $1; }
free($3);
}
}
+ | hint_word AT word {
+ if (asprintf(&($$), "%s@%s", $1, $3) < 0) {
+ ast_log(LOG_WARNING, "asprintf() failed\n");
+ $$ = NULL;
+ } else {
+ free($1);
+ free($3);
+ }
+ }
;
word3_list : word { $$ = $1;}