diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java index f0743fac3..4ded75018 100644 --- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java +++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java @@ -2208,6 +2208,17 @@ public class ActionScript2Test extends ActionScript2TestBase { + "var transient = 27;\r\n" + "var use = 28;\r\n" + "var volatile = 29;\r\n" + + "var false = 43;\r\n" + + "var get = 48;\r\n" + + "var null = 62;\r\n" + + "var set = 69;\r\n" + + "var undefined = 76;\r\n" + + "var true = 81;\r\n" + + "var false = 82;\r\n" + + "var NaN = 83;\r\n" + + "var newline = 84;\r\n" + + "var Infinity = 85;\r\n" + + "var each = 86;\r\n" ); } @@ -2260,4 +2271,44 @@ public class ActionScript2Test extends ActionScript2TestBase { + "trace(\"Q\");\r\n" ); } + + @Test + public void frame79_registersVsDefineLocalTest() { + compareSrc(79, "function x1(c)\r\n" + + "{\r\n" + + "var _loc2_ = 1;\r\n" + + "var _loc1_ = 2;\r\n" + + "return _loc2_ + _loc1_ * c;\r\n" + + "}\r\n" + + "function x2(c)\r\n" + + "{\r\n" + + "var a0 = 1;\r\n" + + "var a1 = 2;\r\n" + + "var r = Math.floor(Math.random() * 2);\r\n" + + "return eval(\"a\" + r) + b * c;\r\n" + + "}\r\n" + + "function x3(c)\r\n" + + "{\r\n" + + "var _loc2_ = 1;\r\n" + + "var _loc3_ = 2;\r\n" + + "var _loc1_ = Math.floor(Math.random() * 2);\r\n" + + "set(\"a\" + _loc1_,12);\r\n" + + "return _loc2_ + b * c;\r\n" + + "}\r\n" + + "trace(\"registersVsDefineLocalTest\");\r\n" + + "trace(x1(2) + x2(3) + x3(4));\r\n" + ); + } + + @Test + public void frame80_deleteEvalTest() { + compareSrc(80, "trace(\"deleteEvalTest\");\r\n" + + "var k0 = 1;\r\n" + + "var k1 = 2;\r\n" + + "var r = Math.floor(Math.random() * 2);\r\n" + + "trace(eval(\"k\" + r));\r\n" + + "delete (\"k\" + r);\r\n" + + "trace(eval(\"k\" + r));\r\n" + ); + } } diff --git a/libsrc/ffdec_lib/testdata/as2/as2.fla b/libsrc/ffdec_lib/testdata/as2/as2.fla index 571360110..aa5cfc2e4 100644 Binary files a/libsrc/ffdec_lib/testdata/as2/as2.fla and b/libsrc/ffdec_lib/testdata/as2/as2.fla differ diff --git a/libsrc/ffdec_lib/testdata/as2/as2.swf b/libsrc/ffdec_lib/testdata/as2/as2.swf index 98ce9642a..a4367ec0d 100644 Binary files a/libsrc/ffdec_lib/testdata/as2/as2.swf and b/libsrc/ffdec_lib/testdata/as2/as2.swf differ