made AEL 8-bit transparent; mainly the lexer was tossing chars with the hi-order bit set. Not nice. Also, allow @ in extension names, and a backslash, also.

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

1 files changed, 31 insertions, 32 deletions

diff --git a/pbx/ael/ael-test/ref.ael-ntest22 b/pbx/ael/ael-test/ref.ael-ntest22
index fcebec18a..c9317f64e 100644
--- a/pbx/ael/ael-test/ref.ael-ntest22
+++ b/pbx/ael/ael-test/ref.ael-ntest22
@@ -5,34 +5,33 @@
 
 
 (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:pbx_ael.c  line:913 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:920 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:ael.flex  line:659 func: setup_filestack    --Read in included file ././t1/a.ael, 41 chars
-LOG: lev:2 file:ael.flex  line:659 func: setup_filestack    --Read in included file ././t1/b.ael, 42 chars
-LOG: lev:2 file:ael.flex  line:659 func: setup_filestack    --Read in included file ././t1/c.ael, 106 chars
-LOG: lev:2 file:ael.flex  line:659 func: setup_filestack    --Read in included file ././t2/d.ael, 41 chars
-LOG: lev:2 file:ael.flex  line:659 func: setup_filestack    --Read in included file ././t2/e.ael, 42 chars
-LOG: lev:2 file:ael.flex  line:659 func: setup_filestack    --Read in included file ././t2/f.ael, 82 chars
-LOG: lev:2 file:ael.flex  line:659 func: setup_filestack    --Read in included file ././qq.ael, 45 chars
-LOG: lev:2 file:ael.flex  line:659 func: setup_filestack    --Read in included file ././t3/g.ael, 41 chars
-LOG: lev:2 file:ael.flex  line:659 func: setup_filestack    --Read in included file ././t3/h.ael, 42 chars
-LOG: lev:2 file:ael.flex  line:659 func: setup_filestack    --Read in included file ././t3/i.ael, 41 chars
-LOG: lev:2 file:ael.flex  line:659 func: setup_filestack    --Read in included file ././t3/j.ael, 43 chars
-LOG: lev:2 file:pbx_ael.c  line:928 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:931 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-Executed ast_context_create(conts, name=a, registrar=pbx_ael);
-Executed ast_context_create(conts, name=b, registrar=pbx_ael);
-Executed ast_context_create(conts, name=c, registrar=pbx_ael);
-Executed ast_context_create(conts, name=d, registrar=pbx_ael);
-Executed ast_context_create(conts, name=e, registrar=pbx_ael);
-Executed ast_context_create(conts, name=qq, registrar=pbx_ael);
-Executed ast_context_create(conts, name=f, registrar=pbx_ael);
-Executed ast_context_create(conts, name=g, registrar=pbx_ael);
-Executed ast_context_create(conts, name=h, registrar=pbx_ael);
-Executed ast_context_create(conts, name=i, registrar=pbx_ael);
-Executed ast_context_create(conts, name=j, registrar=pbx_ael);
-Executed ast_context_create(conts, name=w, registrar=pbx_ael);
-Executed ast_context_create(conts, name=z, registrar=pbx_ael);
+LOG: lev:2 file:pbx_ael.c  line:113 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:ael.flex  line:662 func: setup_filestack    --Read in included file ././t1/a.ael, 41 chars
+LOG: lev:2 file:ael.flex  line:662 func: setup_filestack    --Read in included file ././t1/b.ael, 42 chars
+LOG: lev:2 file:ael.flex  line:662 func: setup_filestack    --Read in included file ././t1/c.ael, 106 chars
+LOG: lev:2 file:ael.flex  line:662 func: setup_filestack    --Read in included file ././t2/d.ael, 41 chars
+LOG: lev:2 file:ael.flex  line:662 func: setup_filestack    --Read in included file ././t2/e.ael, 42 chars
+LOG: lev:2 file:ael.flex  line:662 func: setup_filestack    --Read in included file ././t2/f.ael, 82 chars
+LOG: lev:2 file:ael.flex  line:662 func: setup_filestack    --Read in included file ././qq.ael, 45 chars
+LOG: lev:2 file:ael.flex  line:662 func: setup_filestack    --Read in included file ././t3/g.ael, 41 chars
+LOG: lev:2 file:ael.flex  line:662 func: setup_filestack    --Read in included file ././t3/h.ael, 42 chars
+LOG: lev:2 file:ael.flex  line:662 func: setup_filestack    --Read in included file ././t3/i.ael, 41 chars
+LOG: lev:2 file:ael.flex  line:662 func: setup_filestack    --Read in included file ././t3/j.ael, 43 chars
+LOG: lev:2 file:pbx_ael.c  line:126 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:129 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+Executed ast_context_find_or_create(conts, name=a, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=b, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=c, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=d, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=e, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=qq, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=f, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=g, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=h, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=i, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=j, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=w, registrar=pbx_ael);
+Executed ast_context_find_or_create(conts, name=z, registrar=pbx_ael);
 Executed ast_add_extension2(context=a, rep=0, exten=134, priority=1, label=(null), callerid=(null), appl=NoOp, data=hi there, a, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=b, rep=0, exten=456, priority=1, label=(null), callerid=(null), appl=NoOp, data=hithere, b, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=c, rep=0, exten=567, priority=1, label=(null), callerid=(null), appl=NoOp, data=hi there, c, FREE, registrar=pbx_ael);
@@ -47,9 +46,9 @@ Executed ast_add_extension2(context=j, rep=0, exten=567, priority=1, label=(null
 Executed ast_add_extension2(context=w, rep=0, exten=890, priority=1, label=(null), callerid=(null), appl=NoOp, data=hi there, w, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=z, rep=0, exten=123, priority=1, label=(null), callerid=(null), appl=NoOp, data=hi there, z, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=z, rep=0, exten=124, priority=1, label=(null), callerid=(null), appl=NoOp, data=hi there, z, FREE, registrar=pbx_ael);
-LOG: lev:2 file:pbx_ael.c  line:933 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
 Executed ast_merge_contexts_and_delete();
-LOG: lev:2 file:pbx_ael.c  line:936 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
 Executed ast_walk_contexts();
-LOG: lev:2 file:pbx_ael.c  line:939 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:527 func: main  13 contexts, 13 extensions, 14 priorities
+LOG: lev:2 file:pbx_ael.c  line:137 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:531 func: main  13 contexts, 13 extensions, 14 priorities