Merged revisions 119966 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r119966 | murf | 2008-06-03 09:26:56 -0600 (Tue, 03 Jun 2008) | 8 lines

Updated the regressions on AEL. Hadn't updated
this for the changes I made to preserve ${EXTEN}
in switches, which affected several tests because
it adds extra priorities, and at least one needed to be updated
because of the removal of the empty extension warning
message.


........


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

pbx/ael/ael-test/ref.ael-ntest10

@@ -175,4 +175,4 @@ Executed ast_merge_contexts_and_delete();
 LOG: lev:2 file:pbx_ael.c  line:139 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:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:548 func: main  7 contexts, 37 extensions, 138 priorities
+LOG: lev:4 file:ael2_parse  line:518 func: main  7 contexts, 37 extensions, 138 priorities

pbx/ael/ael-test/ref.ael-test1

@@ -15,4 +15,4 @@ LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: che
 LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
 LOG: lev:2 file:pbx_ael.c  line:139 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
 LOG: lev:2 file:pbx_ael.c  line:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:548 func: main  5 contexts, 16 extensions, 159 priorities
+LOG: lev:4 file:ael2_parse  line:518 func: main  5 contexts, 16 extensions, 159 priorities

pbx/ael/ael-test/ref.ael-test15

@@ -2,11 +2,10 @@
 (If you find progress and other non-error messages irritating, you can use -q to suppress them)
 
 (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:pbx_ael.c  line:113 func: pbx_load_module  Starting AEL load process.
-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'.
-LOG: lev:3 file:pval.c  line:4070 func: ast_compile_ael2  Warning: file ./extensions.ael, line 8-13: Empty Extension!
-LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: compiled 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'.
-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  1 contexts, 0 extensions, 0 priorities
+LOG: lev:2 file:pbx_ael.c  line:115 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:128 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:139 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:518 func: main  1 contexts, 0 extensions, 0 priorities

pbx/ael/ael-test/ref.ael-test18

@@ -8,4 +8,4 @@ LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: che
 LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
 LOG: lev:2 file:pbx_ael.c  line:139 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
 LOG: lev:2 file:pbx_ael.c  line:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:548 func: main  1 contexts, 7 extensions, 29 priorities
+LOG: lev:4 file:ael2_parse  line:518 func: main  1 contexts, 7 extensions, 29 priorities

pbx/ael/ael-test/ref.ael-test3

@@ -96,4 +96,4 @@ LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: che
 LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
 LOG: lev:2 file:pbx_ael.c  line:139 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
 LOG: lev:2 file:pbx_ael.c  line:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:548 func: main  172 contexts, 934 extensions, 2558 priorities
+LOG: lev:4 file:ael2_parse  line:518 func: main  172 contexts, 934 extensions, 2558 priorities

pbx/ael/ael-test/ref.ael-test5

@@ -11,4 +11,4 @@ LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: che
 LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
 LOG: lev:2 file:pbx_ael.c  line:139 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
 LOG: lev:2 file:pbx_ael.c  line:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:548 func: main  38 contexts, 91 extensions, 494 priorities
+LOG: lev:4 file:ael2_parse  line:518 func: main  38 contexts, 91 extensions, 494 priorities

pbx/ael/ael-test/ref.ael-test8

@@ -8,4 +8,4 @@ LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: che
 LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
 LOG: lev:2 file:pbx_ael.c  line:139 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
 LOG: lev:2 file:pbx_ael.c  line:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:548 func: main  1 contexts, 7 extensions, 19 priorities
+LOG: lev:4 file:ael2_parse  line:518 func: main  1 contexts, 7 extensions, 19 priorities

pbx/ael/ael-test/ref.ael-vtest17

 
 
 [dialextens]
-exten => _10X,1,Dial(Zap/${EXTEN:2}\,30\,tw)
-exten => _1ZX,1,Dial(Zap/${EXTEN:1}\,30\,tw)
+exten => _10X,1,Dial(Zap/${EXTEN:2},30,tw)
+exten => _1ZX,1,Dial(Zap/${EXTEN:1},30,tw)
 
 
 [dialthrus]
-exten => _3XX,1,Dial(Zap/${EXTEN:1}\,30\,tw)
+exten => _3XX,1,Dial(Zap/${EXTEN:1},30,tw)
 
 
 [t1incoming]
@@ -40,19 +40,19 @@ exten => 81,9,Set(time2=${EPOCH})
 exten => 81,10,Verbose(The time diff is $[${time2} - ${time1} ] seconds)
 exten => 81,11,Verbose(Which means that the priorities/sec = $[4* ${iterations} / (${time2} - ${time1}) ])
 exten => 81,12,SayNumber($[4 * ${iterations} / (${time2} - ${time1}) ])
-exten => 82,1,Gosub(ndeep\,s\,1(100000))
+exten => 82,1,Gosub(ndeep,s,1(100000))
 exten => 82,2,Verbose(Finished 100000 levels deep call!)
 exten => 83,1,Set(~~EXTEN~~=${EXTEN})
-exten => 83,2,Goto(sw-2-${~~EXTEN~~}\,10)
+exten => 83,2,Goto(sw-2-${~~EXTEN~~},10)
 exten => 83,3,NoOp(Finish switch-extension-2)
-exten => _sw-2-.,10,Goto(83\,3)
+exten => _sw-2-.,10,Goto(83,3)
 exten => sw-2-,10,Goto(sw-2-.|10)
 exten => _sw-2-[4-7]X,10,Verbose(and this too!)
-exten => _sw-2-[4-7]X,11,Goto(sw-2-.\,10)
+exten => _sw-2-[4-7]X,11,Goto(sw-2-.,10)
 exten => _sw-2-9X,10,Verbose(handle both 8x and 9x calls)
-exten => _sw-2-9X,11,Goto(sw-2-49\,10)
+exten => _sw-2-9X,11,Goto(sw-2-49,10)
 exten => _sw-2-8X,10,Verbose(do something to prepare it)
-exten => _sw-2-8X,11,Goto(sw-2-99\,10)
+exten => _sw-2-8X,11,Goto(sw-2-99,10)
 
 
 [ndeep]
@@ -61,7 +61,7 @@ exten => s,2,GotoIf($[${level} == 0]?3:5)
 exten => s,3,Verbose(2|Got to Level 0)
 exten => s,4,Return()
 exten => s,5,NoOp(Finish if-ndeep-3)
-exten => s,6,Gosub(ndeep\,s\,1($[${level}-1]))
+exten => s,6,Gosub(ndeep,s,1($[${level}-1]))
 exten => s,7,Return()
 
 

pbx/ael/ael-test/ref.ael-vtest21

@@ -6,4 +6,4 @@ OFFICE_CODE=503
 
 [from-enum]
 exten => _${OFFICE_CODE}XXXX,1,Answer()
-exten => _${OFFICE_CODE}XXXX,2,Goto(${EXTEN:3}\,1)
+exten => _${OFFICE_CODE}XXXX,2,Goto(${EXTEN:3},1)