OK, here is everything I changed to fix 7474:

1. ael/ael.flex -- the "fix" is here. In short, I modified the
   pattern for the chars that break args, to exclude those chars that
   would normally break args if they are preceded by a backslash. I did
   this to 3 patterns where really, this kind of exclusion should be placed.

2. ael_lex.c is an updated output from lex.

3. the ael-test stuff -- instituted a regression test for this condition.
   as ael_ntest9. The "n" in the name means that instead of just getting
   the syntax/semantic errors and high-level output from aelparse, we
   also want the compilation results to be in the comparison file.
   (remove the -n option). 



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37255 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 3 insertions, 3 deletions

diff --git a/pbx/ael/ael.flex b/pbx/ael/ael.flex
index e66ce1287..f773dd4e9 100644
--- a/pbx/ael/ael.flex
+++ b/pbx/ael/ael.flex
@@ -164,11 +164,11 @@ static void pbcwhere(const char *text, int *line, int *col )
 %}
 
 
-NOPARENS	[^()\[\]\{\}]*
+NOPARENS	([^()\[\]\{\}]|\\[()\[\]\{\}])*
 
-NOARGG		[^(),\{\}\[\]]*
+NOARGG		([^(),\{\}\[\]]|\\[,()\[\]\{\}])*
 
-NOSEMIC		[^;()\{\}\[\]]*
+NOSEMIC		([^;()\{\}\[\]]|\\[;()\[\]\{\}])*
 
 %%