diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/as3decompile/ActionScript3ClassicAirDecompileTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/as3decompile/ActionScript3ClassicAirDecompileTest.java index 8c05867c6..556c39ce0 100644 --- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/as3decompile/ActionScript3ClassicAirDecompileTest.java +++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/as3decompile/ActionScript3ClassicAirDecompileTest.java @@ -1584,10 +1584,18 @@ public class ActionScript3ClassicAirDecompileTest extends ActionScript3Decompile @Test public void testRegExp() { - decompileMethod("classic_air", "testRegExp", "var a1:* = /[a-z\\r\\n0-9\\\\]+/i;\r\n" + decompileMethod("classic_air", "testRegExp", "var r:Number = NaN;\r\n" + + "var a1:* = /[a-z\\r\\n0-9\\\\]+/i;\r\n" + "var a2:* = /[a-z\\r\\n0-9\\\\]+/i;\r\n" + "var b1:* = /[0-9AB]+/;\r\n" - + "var b2:* = /[0-9AB]+/;\r\n", + + "var b2:* = /[0-9AB]+/;\r\n" + + "var n1:Number = 5;\r\n" + + "var n2:Number = 2;\r\n" + + "var n3:Number = 1;\r\n" + + "trace(\"not a regexp 1\");\r\n" + + "r = n1 / n2 / n3;\r\n" + + "trace(\"not a regexp 2\");\r\n" + + "r /= n1 / n2;\r\n", false); } diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/as3decompile/ActionScript3ClassicDecompileTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/as3decompile/ActionScript3ClassicDecompileTest.java index abef1bf30..f3666abfa 100644 --- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/as3decompile/ActionScript3ClassicDecompileTest.java +++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/as3decompile/ActionScript3ClassicDecompileTest.java @@ -1576,10 +1576,18 @@ public class ActionScript3ClassicDecompileTest extends ActionScript3DecompileTes @Test public void testRegExp() { - decompileMethod("classic", "testRegExp", "var a1:* = /[a-z\\r\\n0-9\\\\]+/i;\r\n" + decompileMethod("classic", "testRegExp", "var r:Number = NaN;\r\n" + + "var a1:* = /[a-z\\r\\n0-9\\\\]+/i;\r\n" + "var a2:* = /[a-z\\r\\n0-9\\\\]+/i;\r\n" + "var b1:* = /[0-9AB]+/;\r\n" - + "var b2:* = /[0-9AB]+/;\r\n", + + "var b2:* = /[0-9AB]+/;\r\n" + + "var n1:Number = 5;\r\n" + + "var n2:Number = 2;\r\n" + + "var n3:Number = 1;\r\n" + + "trace(\"not a regexp 1\");\r\n" + + "r = n1 / n2 / n3;\r\n" + + "trace(\"not a regexp 2\");\r\n" + + "r /= n1 / n2;\r\n", false); } diff --git a/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf index 344b12d8f..b0c7221f6 100644 Binary files a/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf and b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf differ diff --git a/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf index 05cecf0a4..3320455a7 100644 Binary files a/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf and b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf differ diff --git a/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestRegExp.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestRegExp.as index c50f46c3e..30f74f9ce 100644 --- a/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestRegExp.as +++ b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestRegExp.as @@ -9,6 +9,16 @@ package tests var a2:* = /[a-z\r\n0-9\\]+/i; var b1:* = /[0-9AB]+/; var b2:* = /[0-9AB]+/; + + var n1:Number = 5; + var n2:Number = 2; + var n3:Number = 1; + var r:Number; + + trace("not a regexp 1"); + r = n1 / n2 / n3; + trace("not a regexp 2") + r /= n1 / n2; } } }