From bddb242d72a2bc8f0dce5fec6d7caeb3f52e2e1b Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 4 Oct 2010 23:23:57 +0000
Subject: Merged revisions 290255 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r290255 | tilghman | 2010-10-04 18:23:11 -0500 (Mon, 04 Oct 2010) | 18 lines

  Merged revisions 290254 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r290254 | tilghman | 2010-10-04 18:14:59 -0500 (Mon, 04 Oct 2010) | 11 lines

    Change new pattern matcher to regard dashes the same as the old pattern matcher -- as visual candy to be ignored.

    Also change the AEL parser to not generate dashes within extensions, as those
    dashes would be ignored.  Update the AEL tests to match this behavior.

    (closes issue #17366)
     Reported by: murf
     Patches:
           20100727__issue17366.diff.txt uploaded by tilghman (license 14)
     Tested by: tilghman
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@290256 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 pbx/ael/ael-test/ref.ael-vtest17 | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'pbx/ael/ael-test/ref.ael-vtest17')

diff --git a/pbx/ael/ael-test/ref.ael-vtest17 b/pbx/ael/ael-test/ref.ael-vtest17
index 353b2cc5a..44b3bd47d 100644
--- a/pbx/ael/ael-test/ref.ael-vtest17
+++ b/pbx/ael/ael-test/ref.ael-vtest17
@@ -35,7 +35,7 @@ exten => 81,4,GotoIf($[${i}<${iterations}]?5:8)
 exten => 81,5,NoOp(Hello)
 exten => 81,6,Set(i=$[${i}+1])
 exten => 81,7,Goto(4)
-exten => 81,8,NoOp(Finish for-extension-1)
+exten => 81,8,NoOp(Finish for_extension_1)
 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}) ])
@@ -43,16 +43,16 @@ exten => 81,12,SayNumber($[4 * ${iterations} / (${time2} - ${time1}) ])
 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,3,NoOp(Finish switch-extension-2)
-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-9X,10,Verbose(handle both 8x and 9x calls)
-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 => 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(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_9X,10,Verbose(handle both 8x and 9x calls)
+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)
 
 
 [ndeep]
@@ -60,7 +60,7 @@ exten => s,1,Set(LOCAL(level)=${ARG1})
 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,5,NoOp(Finish if_ndeep_3)
 exten => s,6,Gosub(ndeep,s,1($[${level}-1]))
 exten => s,7,Return()
 
-- 
cgit v1.2.3