Fixed AS3: try..catch in do..while vs do..while in try..catch

libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/as3_assembled-0.main.asasm

@@ -17,5 +17,7 @@ program
  #include "tests/TestSwitchDefault.script.asasm"
  #include "tests/TestSwitch.script.asasm"
  #include "tests/TestDeclareReg.script.asasm"
+ #include "tests/TestTryDoWhile.script.asasm"
+ #include "tests/TestTryDoWhile2.script.asasm"
  ; place to add next
 end ; program

libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestTryDoWhile.class.asasm

@@ -0,0 +1,93 @@
+class
+ refid "tests:TestTryDoWhile"
+ instance QName(PackageNamespace("tests"), "TestTryDoWhile")
+  extends QName(PackageNamespace(""), "Object")
+  flag SEALED
+  flag PROTECTEDNS
+  protectedns ProtectedNamespace("tests:TestTryDoWhile")
+  iinit
+   refid "tests:TestTryDoWhile/instance/init"
+   body
+    maxstack 1
+    localcount 1
+    initscopedepth 4
+    maxscopedepth 5
+    code
+     getlocal0
+     pushscope
+
+     getlocal0
+     constructsuper      0
+
+     returnvoid
+    end ; code
+   end ; body
+  end ; method
+  trait method QName(PackageNamespace(""), "run")
+   method
+    refid "tests:TestTryDoWhile/instance/run"
+    returns QName(PackageNamespace(""), "void")
+    body
+     maxstack 2
+     localcount 4
+     initscopedepth 4
+     maxscopedepth 5                     
+         code
+            getlocal0
+            pushscope
+            findproperty QName(PackageNamespace(""),"trace")
+            pushstring "first"
+            callpropvoid QName(PackageNamespace(""),"trace"), 1
+            findproperty QName(PackageNamespace(""),"rnd")
+            callproperty QName(PackageNamespace(""),"rnd"), 0
+            setlocal 5
+   ofs0010:
+            jump ofs0029
+   ofs0014:
+            label
+            findproperty QName(PackageNamespace(""),"trace")
+            pushstring "second"
+            callpropvoid QName(PackageNamespace(""),"trace"), 1
+            getlocal 5
+            pushbyte 100
+            ifngt ofs0029
+            jump ofs002d
+   ofs0029:
+            jump ofs0014
+   ofs002d:
+            jump ofs0035
+   ofs0031:
+            getlocal0
+            pushscope
+            setlocal 6
+            findproperty QName(PackageNamespace(""),"trace")            
+            pushstring "in catch"
+            callpropvoid QName(PackageNamespace(""),"trace"), 1
+   ofs0035:
+            findproperty QName(PackageNamespace(""),"trace")            
+            pushstring "after"
+            callpropvoid QName(PackageNamespace(""),"trace"), 1
+            returnvoid
+        end ; code
+        try from ofs0010 to ofs002d target ofs0031 type QName(PackageNamespace(""),"Error") name QName(PackageNamespace(""),"e") end 
+        
+    end ; body
+   end ; method
+  end ; trait
+ end ; instance
+ cinit
+  refid "tests:TestTryDoWhile/class/init"
+  body
+   maxstack 1
+   localcount 1
+   initscopedepth 3
+   maxscopedepth 4
+   code
+    getlocal0
+    pushscope
+
+    returnvoid
+   end ; code
+  end ; body
+ end ; method
+end ; class

libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestTryDoWhile.script.asasm

@@ -0,0 +1,29 @@
+script
+ sinit
+  refid "tests:TestTryDoWhile/init"
+  body
+   maxstack 2
+   localcount 1
+   initscopedepth 1
+   maxscopedepth 3
+   code
+    getlocal0
+    pushscope
+
+    findpropstrict      Multiname("TestTryDoWhile", [PackageNamespace("tests")])
+    getlex              QName(PackageNamespace(""), "Object")
+    pushscope
+
+    getlex              Multiname("Object", [PrivateNamespace(null, "tests:TestTryDoWhile"), PackageNamespace(""), PackageNamespace("tests"), PackageInternalNs("tests"), Namespace("http://adobe.com/AS3/2006/builtin")])
+    newclass            "tests:TestTryDoWhile"
+    popscope
+    initproperty        QName(PackageNamespace("tests"), "TestTryDoWhile")
+
+    returnvoid
+   end ; code
+  end ; body
+ end ; method
+ trait class QName(PackageNamespace("tests"), "TestTryDoWhile")
+  #include "TestTryDoWhile.class.asasm"
+ end ; trait
+end ; script

libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestTryDoWhile2.class.asasm

@@ -0,0 +1,118 @@
+class
+ refid "tests:TestTryDoWhile2"
+ instance QName(PackageNamespace("tests"), "TestTryDoWhile2")
+  extends QName(PackageNamespace(""), "Object")
+  flag SEALED
+  flag PROTECTEDNS
+  protectedns ProtectedNamespace("tests:TestTryDoWhile2")
+  iinit
+   refid "tests:TestTryDoWhile2/instance/init"
+   body
+    maxstack 1
+    localcount 1
+    initscopedepth 4
+    maxscopedepth 5
+    code
+     getlocal0
+     pushscope
+
+     getlocal0
+     constructsuper      0
+
+     returnvoid
+    end ; code
+   end ; body
+  end ; method
+  trait method QName(PackageNamespace(""), "run")
+   method
+    refid "tests:TestTryDoWhile2/instance/run"
+    returns QName(PackageNamespace(""), "void")
+    body
+     maxstack 2
+     localcount 4
+     initscopedepth 4
+     maxscopedepth 5
+     maxstack 3
+         localcount 3
+         initscopedepth 5
+         maxscopedepth 10         
+         trait slot QName(PackageInternalNs("tests"),"_loc5_")
+            slotid 1
+            type null            
+         end ; trait
+         
+         code
+            getlocal0
+            pushscope
+            newactivation
+            dup
+            setlocal1
+            pushscope
+            findpropstrict QName(PackageNamespace(""),"trace")
+            pushstring "hello"
+            callproperty QName(PackageNamespace(""),"trace"), 1
+            pop
+            getscopeobject 1
+            findpropstrict QName(PackageNamespace(""),"Math")
+            getproperty QName(PackageNamespace(""),"Math")
+            callproperty QName(PackageNamespace(""),"random"), 0
+            coerce_a
+            setslot 1
+   xxx:           
+
+            findpropstrict QName(PackageNamespace(""),"trace")
+            pushstring "second"
+            callproperty QName(PackageNamespace(""),"trace"), 1
+            pop
+   ofs0036:
+            jump ofs0056
+   ofs003c:
+            getlocal0
+            pushscope
+            getlocal1
+            pushscope
+            newcatch 0
+            dup
+            setlocal2
+            dup
+            pushscope
+            swap
+            setslot 1
+            findpropstrict QName(PackageNamespace(""),"trace")
+            pushstring "in catch"
+            callproperty QName(PackageNamespace(""),"trace"), 1
+            pop
+            popscope
+            kill 2
+   ofs0056:
+            getscopeobject 1
+            getslot 1
+            pushbyte 100
+            ifle xxx
+            findpropstrict QName(PackageNamespace(""),"trace")
+            pushstring "after"
+            callproperty QName(PackageNamespace(""),"trace"), 1
+            pop
+            returnvoid
+     end ; code
+     try from xxx to ofs0036 target ofs003c type QName(PackageNamespace(""),"Error") name QName(PackageNamespace(""),"e") end
+    end ; body
+   end ; method
+  end ; trait
+ end ; instance
+ cinit
+  refid "tests:TestTryDoWhile2/class/init"
+  body
+   maxstack 1
+   localcount 1
+   initscopedepth 3
+   maxscopedepth 4
+   code
+    getlocal0
+    pushscope
+
+    returnvoid
+   end ; code
+  end ; body
+ end ; method
+end ; class

libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestTryDoWhile2.script.asasm

@@ -0,0 +1,29 @@
+script
+ sinit
+  refid "tests:TestTryDoWhile2/init"
+  body
+   maxstack 2
+   localcount 1
+   initscopedepth 1
+   maxscopedepth 3
+   code
+    getlocal0
+    pushscope
+
+    findpropstrict      Multiname("TestTryDoWhile2", [PackageNamespace("tests")])
+    getlex              QName(PackageNamespace(""), "Object")
+    pushscope
+
+    getlex              Multiname("Object", [PrivateNamespace(null, "tests:TestTryDoWhile2"), PackageNamespace(""), PackageNamespace("tests"), PackageInternalNs("tests"), Namespace("http://adobe.com/AS3/2006/builtin")])
+    newclass            "tests:TestTryDoWhile2"
+    popscope
+    initproperty        QName(PackageNamespace("tests"), "TestTryDoWhile2")
+
+    returnvoid
+   end ; code
+  end ; body
+ end ; method
+ trait class QName(PackageNamespace("tests"), "TestTryDoWhile2")
+  #include "TestTryDoWhile2.class.asasm"
+ end ; trait
+end ; script

libsrc/ffdec_lib/testdata/as3_new/obj/as3_newConfig.old

@@ -16,7 +16,7 @@
     </define>
     <define append="true">
       <name>CONFIG::timeStamp</name>
-      <value>'05.02.2021'</value>
+      <value>'06.02.2021'</value>
     </define>
     <define append="true">
       <name>CONFIG::air</name>

libsrc/ffdec_lib/testdata/as3_new/obj/as3_newConfig.xml

@@ -16,7 +16,7 @@
     </define>
     <define append="true">
       <name>CONFIG::timeStamp</name>
-      <value>'05.02.2021'</value>
+      <value>'06.02.2021'</value>
     </define>
     <define append="true">
       <name>CONFIG::air</name>