[jvm] Assign dynamic method only if it's null (#11530)

* [jvm] assign dynamic method only if it's null

* finalize ctor args

src/generators/genjvm.ml

@@ -2392,6 +2392,7 @@ class tclass_to_jvm gctx c = object(self)
 		let jsig_empty = method_sig [haxe_empty_constructor_sig] None in
 		let jm_empty_ctor = jc#spawn_method "<init>" jsig_empty [MPublic;MSynthetic] in
 		let _,load,_ = jm_empty_ctor#add_local "_" haxe_empty_constructor_sig VarArgument in
+		jm_empty_ctor#finalize_arguments;
 		jm_empty_ctor#load_this;
 		if c.cl_constructor = None then begin
 			let handler = new texpr_to_jvm gctx None jc jm_empty_ctor None in
@@ -2432,6 +2433,7 @@ class tclass_to_jvm gctx c = object(self)
 					let _,load,_ = jm#add_local n (jsignature_of_type gctx t) VarArgument in
 					load();
 				) tl;
+				jm#finalize_arguments;
 				jm#call_super_ctor cmode jm#get_jsig;
 				DynArray.iter (fun e ->
 					handler#texpr RVoid e;
@@ -2548,7 +2550,15 @@ class tclass_to_jvm gctx c = object(self)
 				let ethis = mk (TConst TThis) (TInst(c,tl)) null_pos in
 				let efield = mk (TField(ethis,FInstance(c,tl,cf))) cf.cf_type null_pos in
 				let eop = mk (TBinop(OpAssign,efield,e)) cf.cf_type null_pos in
-				DynArray.add (match cf.cf_kind with Method MethDynamic -> delayed_field_inits | _ -> field_inits) eop;
+				begin match cf.cf_kind with
+					| Method MethDynamic ->
+						let enull = Texpr.Builder.make_null efield.etype null_pos in
+						let echeck = Texpr.Builder.binop OpEq efield enull gctx.com.basic.tbool null_pos in
+						let eif = mk (TIf(echeck,eop,None)) gctx.com.basic.tvoid null_pos in
+						DynArray.add delayed_field_inits eif
+					| _ ->
+						DynArray.add field_inits eop
+				end
 			| Some e ->
 				match e.eexpr with
 				| TConst ct ->

tests/unit/src/unit/TestMisc.hx

@@ -1,9 +1,9 @@
 package unit;
+
 import unit.MyClass;
 
 class MyDynamicClass {
-
-	var v : Int;
+	var v:Int;
 
 	public function new(v) {
 		this.v = v;
@@ -13,74 +13,74 @@ class MyDynamicClass {
 		return v;
 	}
 
-	public dynamic function add(x,y) {
+	public dynamic function add(x, y) {
 		return v + x + y;
 	}
 
-	public inline function iadd(x,y) {
+	public inline function iadd(x, y) {
 		return v + x + y;
 	}
 
 	static var Z = 10;
 
-	public dynamic static function staticDynamic(x,y) {
+	public dynamic static function staticDynamic(x, y) {
 		return Z + x + y;
 	}
 
-	@:isVar public static var W(get, set) : Int = 55;
-	static function get_W() return W + 2;
-	static function set_W(v) { W = v; return v; }
+	@:isVar public static var W(get, set):Int = 55;
+
+	static function get_W()
+		return W + 2;
 
+	static function set_W(v) {
+		W = v;
+		return v;
+	}
 }
 
 class MyDynamicSubClass extends MyDynamicClass {
-
-	override function add(x,y) {
+	override function add(x, y) {
 		return (v + x + y) * 2;
 	}
-
 }
 
 class MyDynamicSubClass2 extends MyDynamicClass {
-
-	override dynamic function add(x,y) {
+	override dynamic function add(x, y) {
 		return (v + x + y) * 2;
 	}
-
 }
 
 class MyOtherDynamicClass extends MyDynamicClass {
-
 	public function new(v) {
-		add = function(x,y) return x + y + 10;
+		add = function(x, y) return x + y + 10;
 		super(v);
 	}
-
 }
 
 interface IDefArgs {
-	public function get( x : Int = 5 ) : Int;
+	public function get(x:Int = 5):Int;
 }
 
 class BaseDefArgs {
-	public function get( x = 3 ) {
+	public function get(x = 3) {
 		return x;
 	}
 }
 
 class ExtDefArgs extends BaseDefArgs implements IDefArgs {
-	public function new() {
-	}
-	override function get( x = 7 ) {
+	public function new() {}
+
+	override function get(x = 7) {
 		return x;
 	}
 }
 
 class BaseConstrOpt {
-	public var s : String;
-	public var i : Int;
-	public var b : Bool;
-	public function new( s = "test", i = -5, b = true ) {
+	public var s:String;
+	public var i:Int;
+	public var b:Bool;
+
+	public function new(s = "test", i = -5, b = true) {
 		this.s = s;
 		this.i = i;
 		this.b = b;
@@ -98,8 +98,8 @@ class SubConstrOpt2 extends BaseConstrOpt {
 }
 
 class SubConstrOpt3 extends BaseConstrOpt {
-	public function new( s = "test2", i = -6 ) {
-		super(s,i);
+	public function new(s = "test2", i = -6) {
+		super(s, i);
 	}
 }
 
@@ -110,127 +110,125 @@ enum abstract MyEnumAbstract(Int) {
 }
 
 class TestMisc extends Test {
-
 	static var unit = "testing package conflict";
 
-	function testPackageConflict()
-	{
-		eq( unit, "testing package conflict" );
+	function testPackageConflict() {
+		eq(unit, "testing package conflict");
 		var unit = unit;
-		eq( unit, TestMisc.unit );
+		eq(unit, TestMisc.unit);
 	}
 
 	function testDate() {
 		var d = new Date(2012, 7, 17, 1, 2, 3);
-		eq( d.getDay(), 5 );
+		eq(d.getDay(), 5);
 
-		eq( d.getDate(), 17 );
-		eq( d.getMonth(), 7 );
-		eq( d.getFullYear(), 2012 );
+		eq(d.getDate(), 17);
+		eq(d.getMonth(), 7);
+		eq(d.getFullYear(), 2012);
 
-		eq( d.getHours(), 1 );
-		eq( d.getMinutes(), 2 );
-		eq( d.getSeconds(), 3 );
+		eq(d.getHours(), 1);
+		eq(d.getMinutes(), 2);
+		eq(d.getSeconds(), 3);
 
-		//seems to be system-dependent?
-		//eq( d.getTime(), 1345158123000 );
-		eq( d.toString(), "2012-08-17 01:02:03" );
+		// seems to be system-dependent?
+		// eq( d.getTime(), 1345158123000 );
+		eq(d.toString(), "2012-08-17 01:02:03");
 	}
 
 	function testClosure() {
 		var c = new MyClass(100);
 		var add = c.add;
-		eq( c.add(1,2), 103 );
-		eq( c.add.bind(1)(2), 103 );
-		eq( add(1,2), 103 );
+		eq(c.add(1, 2), 103);
+		eq(c.add.bind(1)(2), 103);
+		eq(add(1, 2), 103);
 
 		var x = 4;
 		var f = function() return x;
-		eq( f(), 4 );
+		eq(f(), 4);
 		x++;
-		eq( f(), 5 );
+		eq(f(), 5);
 
-		var o = { f : f };
-		eq( o.f(), 5 );
-		eq( o.f, o.f ); // we shouldn't create a new closure here
+		var o = {f: f};
+		eq(o.f(), 5);
+		eq(o.f, o.f); // we shouldn't create a new closure here
 
-		var o = { add : c.add };
-		eq( o.add(1,2), 103 );
-		eq( o.add, o.add ); // we shouldn't create a new closure here
+		var o = {add: c.add};
+		eq(o.add(1, 2), 103);
+		eq(o.add, o.add); // we shouldn't create a new closure here
 
-		var o = { cos : Math.cos };
-		eq( o.cos(0), 1. );
+		var o = {cos: Math.cos};
+		eq(o.cos(0), 1.);
 
 		// check enum
 		var c = MyEnum.C;
-		t( Type.enumEq(MyEnum.C(1,"hello"), c(1,"hello")) );
+		t(Type.enumEq(MyEnum.C(1, "hello"), c(1, "hello")));
 	}
 
 	// make sure that captured variables does not overlap each others even if in different scopes
 	function testCaptureUnique() {
 		var foo = null, bar = null;
 		var flag = true;
-		if( flag ) {
+		if (flag) {
 			var x = 1;
 			foo = function() return x;
 		}
-		if( flag ) {
+		if (flag) {
 			var x = 2;
 			bar = function() return x;
 		}
-		eq( foo(), 1);
-		eq( bar(), 2);
+		eq(foo(), 1);
+		eq(bar(), 2);
 	}
 
 	function testCaptureUnique2() {
 		// another more specialized test (was actually the original broken code - but not reproducible when optimization is off)
 		var foo = id.bind(3);
 		var bar = sq.bind(5);
-		eq( foo(), 3 );
-		eq( bar(), 25 );
+		eq(foo(), 3);
+		eq(bar(), 25);
 	}
 
 	function testSelfRef() {
 		// check for self-name binding
 		var bla = 55;
 		var bla = function() return bla;
-		eq( bla(), 55);
+		eq(bla(), 55);
 	}
 
 	function testHiddenType() {
 		var haxe = 20;
-		eq( std.haxe.crypto.Md5.encode(""), "d41d8cd98f00b204e9800998ecf8427e");
-		eq( haxe, 20);
+		eq(std.haxe.crypto.Md5.encode(""), "d41d8cd98f00b204e9800998ecf8427e");
+		eq(haxe, 20);
 		var Std = 50;
-		eq( std.Std.int(45.3), 45);
-		eq( Std, 50);
+		eq(std.Std.int(45.3), 45);
+		eq(Std, 50);
 	}
 
 	function testHiddenTypeScope() {
 		var flag = true;
-		if( flag ) {
+		if (flag) {
 			var haxe = 20;
 			var Std = 50;
-			eq( haxe, 20);
-			eq( Std, 50);
+			eq(haxe, 20);
+			eq(Std, 50);
 		}
-		eq( std.haxe.crypto.Md5.encode(""), "d41d8cd98f00b204e9800998ecf8427e");
-		eq( std.Std.int(45.3), 45);
+		eq(std.haxe.crypto.Md5.encode(""), "d41d8cd98f00b204e9800998ecf8427e");
+		eq(std.Std.int(45.3), 45);
 	}
 
 	function testHiddenTypeCapture() {
 		var flag = true;
 		var foo = null, bar = null;
-		if( flag ) {
+		if (flag) {
 			var haxe = 20;
 			var Std = 50;
 			foo = function() return haxe;
 			bar = function() return Std;
 		}
-		eq( std.haxe.crypto.Md5.encode(""), "d41d8cd98f00b204e9800998ecf8427e");
-		eq( std.Std.int(45.3), 45);
-		eq( foo(), 20);
-		eq( bar(), 50);
+		eq(std.haxe.crypto.Md5.encode(""), "d41d8cd98f00b204e9800998ecf8427e");
+		eq(std.Std.int(45.3), 45);
+		eq(foo(), 20);
+		eq(bar(), 50);
 	}
 
 	function id<T>(x:T) {
@@ -248,80 +246,83 @@ class TestMisc extends Test {
 	function testInlineClosure() {
 		var inst = new MyDynamicClass(100);
 		var add = inst.iadd;
-		eq( inst.iadd(1,2), 103 );
-		eq( add(1,2), 103 );
+		eq(inst.iadd(1, 2), 103);
+		eq(add(1, 2), 103);
 	}
 
 	function testDynamicClosure() {
 		var inst = new MyDynamicClass(100);
 		var add = inst.add;
-		eq( inst.add(1,2), 103 );
-		eq( inst.add.bind(1)(2), 103 );
-		eq( add(1,2), 103 );
+		eq(inst.add(1, 2), 103);
+		eq(inst.add.bind(1)(2), 103);
+		eq(add(1, 2), 103);
 
 		// check overridden dynamic method
 		var inst = new MyDynamicSubClass(100);
 		var add = inst.add;
-		eq( inst.add(1,2), 206 );
-		eq( inst.add.bind(1)(2), 206 );
-		eq( add(1,2), 206 );
+		eq(inst.add(1, 2), 206);
+		eq(inst.add.bind(1)(2), 206);
+		eq(add(1, 2), 206);
 
 		// check overridden dynamic method
 		var inst = new MyDynamicSubClass2(100);
 		var add = inst.add;
-		eq( inst.add(1,2), 206 );
-		eq( inst.add.bind(1)(2), 206 );
-		eq( add(1,2), 206 );
+		eq(inst.add(1, 2), 206);
+		eq(inst.add.bind(1)(2), 206);
+		eq(add(1, 2), 206);
 
 		// check redefined dynamic method
-		inst.add = function(x,y) return inst.get() * 2 + x + y;
+		inst.add = function(x, y) return inst.get() * 2 + x + y;
 		var add = inst.add;
-		eq( inst.add(1,2), 203 );
-		eq( inst.add.bind(1)(2), 203 );
-		eq( add(1,2), 203 );
+		eq(inst.add(1, 2), 203);
+		eq(inst.add.bind(1)(2), 203);
+		eq(add(1, 2), 203);
 
 		// check inherited dynamic method
 		var inst = new MyOtherDynamicClass(0);
 		var add = inst.add;
-		#if (!cs && !java) //see https://groups.google.com/d/msg/haxedev/TUaUykoTpq8/Q4XwcL4UyNUJ
-		eq( inst.add(1,2), 13 );
-		eq( inst.add.bind(1)(2), 13 );
-		eq( add(1,2), 13 );
+		#if (!cs && (!java || jvm)) // see https://groups.google.com/d/msg/haxedev/TUaUykoTpq8/Q4XwcL4UyNUJ
+		eq(inst.add(1, 2), 13);
+		eq(inst.add.bind(1)(2), 13);
+		eq(add(1, 2), 13);
 		#end
 
 		// check static dynamic
-		eq( MyDynamicClass.staticDynamic(1,2), 13 );
-		MyDynamicClass.staticDynamic = function(x,y) return x + y + 100;
-		eq( MyDynamicClass.staticDynamic(1,2), 103 );
+		eq(MyDynamicClass.staticDynamic(1, 2), 13);
+		MyDynamicClass.staticDynamic = function(x, y) return x + y + 100;
+		eq(MyDynamicClass.staticDynamic(1, 2), 103);
 	}
 
-	function testMakeVarArgs () {
-		var f = function (a:Array<Dynamic>) {
+	function testMakeVarArgs() {
+		var f = function(a:Array<Dynamic>) {
 			eq(a.length, 2);
 			return a[0] + a[1];
 		}
 		var g = Reflect.makeVarArgs(f);
-		var res = g(1,2);
+		var res = g(1, 2);
 		eq(3, res);
 	}
 
 	function testMD5() {
-		eq( haxe.crypto.Md5.encode(""), "d41d8cd98f00b204e9800998ecf8427e" );
-		eq( haxe.crypto.Md5.encode("hello"), "5d41402abc4b2a76b9719d911017c592" );
+		eq(haxe.crypto.Md5.encode(""), "d41d8cd98f00b204e9800998ecf8427e");
+		eq(haxe.crypto.Md5.encode("hello"), "5d41402abc4b2a76b9719d911017c592");
 		// depending of ISO/UTF8 native
-		allow( haxe.crypto.Md5.encode("héllo"), ["1a722f7e6c801d9e470a10cb91ba406d", "be50e8478cf24ff3595bc7307fb91b50"] );
+		allow(haxe.crypto.Md5.encode("héllo"), ["1a722f7e6c801d9e470a10cb91ba406d", "be50e8478cf24ff3595bc7307fb91b50"]);
 
-		eq( haxe.io.Bytes.ofString("héllo").toHex(), "68c3a96c6c6f");
-		eq( haxe.crypto.Md5.make(haxe.io.Bytes.ofString("héllo")).toHex(), "be50e8478cf24ff3595bc7307fb91b50" );
+		eq(haxe.io.Bytes.ofString("héllo").toHex(), "68c3a96c6c6f");
+		eq(haxe.crypto.Md5.make(haxe.io.Bytes.ofString("héllo")).toHex(), "be50e8478cf24ff3595bc7307fb91b50");
 	}
 
 	function testSHA1() {
-		eq( haxe.crypto.Sha1.encode(""), "da39a3ee5e6b4b0d3255bfef95601890afd80709" );
-		eq( haxe.crypto.Sha1.encode("hello"), "aaf4c61ddcc5e8a2dabede0f3b482cd9aea9434d" );
+		eq(haxe.crypto.Sha1.encode(""), "da39a3ee5e6b4b0d3255bfef95601890afd80709");
+		eq(haxe.crypto.Sha1.encode("hello"), "aaf4c61ddcc5e8a2dabede0f3b482cd9aea9434d");
 		// depending of ISO/UTF8 native
-		allow( haxe.crypto.Sha1.encode("héllo"), ["028db752c14604d624e8b1c121d600c427b8a3ba","35b5ea45c5e41f78b46a937cc74d41dfea920890"] );
+		allow(haxe.crypto.Sha1.encode("héllo"), [
+			"028db752c14604d624e8b1c121d600c427b8a3ba",
+			"35b5ea45c5e41f78b46a937cc74d41dfea920890"
+		]);
 
-		eq( haxe.crypto.Sha1.make(haxe.io.Bytes.ofString("héllo")).toHex(), "35b5ea45c5e41f78b46a937cc74d41dfea920890" );
+		eq(haxe.crypto.Sha1.make(haxe.io.Bytes.ofString("héllo")).toHex(), "35b5ea45c5e41f78b46a937cc74d41dfea920890");
 	}
 
 	function testBaseCode() {
@@ -338,84 +339,84 @@ class TestMisc extends Test {
 
 		// alternative base64
 		var b = new haxe.crypto.BaseCode(haxe.io.Bytes.ofString("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-"));
-		eq( b.encodeString("Héllow"), "iceFr6NLtM" );
-		eq( b.decodeString("iceFr6NLtM"), "Héllow" );
+		eq(b.encodeString("Héllow"), "iceFr6NLtM");
+		eq(b.decodeString("iceFr6NLtM"), "Héllow");
 
 		// base32-hex
 		var b = new haxe.crypto.BaseCode(haxe.io.Bytes.ofString("0123456789ABCDEFGHIJKLMNOPQRSTUV"));
-		eq( b.encodeString("foo"), "CPNMU" );
-		eq( b.decodeString("CPNMU"), "foo" );
+		eq(b.encodeString("foo"), "CPNMU");
+		eq(b.decodeString("CPNMU"), "foo");
 	}
 
 	function testUrlEncode() {
-		eq( StringTools.urlEncode("é"), "%C3%A9" );
-		eq( StringTools.urlDecode("%C3%A9"), "é" );
+		eq(StringTools.urlEncode("é"), "%C3%A9");
+		eq(StringTools.urlDecode("%C3%A9"), "é");
 
-		eq( StringTools.urlEncode("a/b+c"), "a%2Fb%2Bc");
-		eq( StringTools.urlDecode("a%2Fb%2Bc"), "a/b+c");
+		eq(StringTools.urlEncode("a/b+c"), "a%2Fb%2Bc");
+		eq(StringTools.urlDecode("a%2Fb%2Bc"), "a/b+c");
 	}
 
-	function opt1( ?x : Int, ?y : String ) {
-		return { x : x, y : y };
+	function opt1(?x:Int, ?y:String) {
+		return {x: x, y: y};
 	}
 
-	function opt2( ?x = 5, ?y = "hello" ) {
-		return { x : x, y : y };
+	function opt2(?x = 5, ?y = "hello") {
+		return {x: x, y: y};
 	}
 
-	function opt3( ?x : Null<Int> = 5, ?y : Null<Float> = 6 ) {
-		return { x : x, y : y };
+	function opt3(?x:Null<Int> = 5, ?y:Null<Float> = 6) {
+		return {x: x, y: y};
 	}
 
-	function opt4( x = 10 ) : Null<Int> {
+	function opt4(x = 10):Null<Int> {
 		return x + 1;
 	}
 
 	function testOptionalParams() {
-		eq( opt1().x, null );
-		eq( opt1().y, null );
-		eq( opt1(55).x, 55 );
-		eq( opt1(55).y, null );
-		eq( opt1("str").x, null );
-		eq( opt1("str").y, "str" );
-		eq( opt1(66,"hello").x, 66 );
-		eq( opt1(66, "hello").y, "hello" );
-
-		eq( opt2().x, 5 );
-		eq( opt2().y, "hello" );
+		eq(opt1().x, null);
+		eq(opt1().y, null);
+		eq(opt1(55).x, 55);
+		eq(opt1(55).y, null);
+		eq(opt1("str").x, null);
+		eq(opt1("str").y, "str");
+		eq(opt1(66, "hello").x, 66);
+		eq(opt1(66, "hello").y, "hello");
+
+		eq(opt2().x, 5);
+		eq(opt2().y, "hello");
 
 		#if !(flash || cpp || cs || java)
-		eq( opt2(null, null).x, 5 );
+		eq(opt2(null, null).x, 5);
 		#end
-		eq( opt2(0, null).y, "hello" );
-
-		eq( opt3().x, 5 );
-		eq( opt3().y, 6 );
-		eq( opt3(9).x, 9 );
-		eq( opt3(9).y, 6 );
-		eq( opt3(9,10).x, 9 );
-		eq( opt3(9,10).y, 10 );
-		eq( opt3(null,null).x, 5 );
-		eq( opt3(null,null).y, 6 );
-		eq( opt3(null).x, 5 );
-		eq( opt3(null).y, 6 );
-		eq( opt3(null,7).x, 5 );
-		eq( opt3(null, 7).y, 7 );
+		eq(opt2(0, null).y, "hello");
+
+		eq(opt3().x, 5);
+		eq(opt3().y, 6);
+		eq(opt3(9).x, 9);
+		eq(opt3(9).y, 6);
+		eq(opt3(9, 10).x, 9);
+		eq(opt3(9, 10).y, 10);
+		eq(opt3(null, null).x, 5);
+		eq(opt3(null, null).y, 6);
+		eq(opt3(null).x, 5);
+		eq(opt3(null).y, 6);
+		eq(opt3(null, 7).x, 5);
+		eq(opt3(null, 7).y, 7);
 
 		// skipping
-		eq( opt3(7.4).x, 5 );
-		eq( opt3(7.4).y, 7.4 );
+		eq(opt3(7.4).x, 5);
+		eq(opt3(7.4).y, 7.4);
 
-		eq( opt4(), 11 );
+		eq(opt4(), 11);
 		#if !static
-		eq( opt4(null), 11 );
+		eq(opt4(null), 11);
 		#end
 
-		var opt4b : ?Int -> Null<Int> = opt4;
-		eq( opt4b(), 11 );
-		eq( opt4b(3), 4 );
+		var opt4b:?Int->Null<Int> = opt4;
+		eq(opt4b(), 11);
+		eq(opt4b(3), 4);
 		#if !static
-		eq( opt4b(null), 11 );
+		eq(opt4b(null), 11);
 		#end
 
 		// don't compile because we restrict nullability of function param or return type
@@ -430,107 +431,108 @@ class TestMisc extends Test {
 
 	function testIncr() {
 		var z = 0;
-		eq( z++, 0 );
-		eq( z, 1 );
-		eq( ++z, 2 );
-		eq( z, 2 );
+		eq(z++, 0);
+		eq(z, 1);
+		eq(++z, 2);
+		eq(z, 2);
 		z++;
-		eq( z, 3 );
+		eq(z, 3);
 		++z;
-		eq( z, 4 );
+		eq(z, 4);
 
-		eq( z += 3, 7 );
+		eq(z += 3, 7);
 
 		var x = 0;
 		var arr = [3];
-		eq( arr[x++]++, 3 );
-		eq( x, 1 );
-		eq( arr[0], 4 );
+		eq(arr[x++]++, 3);
+		eq(x, 1);
+		eq(arr[0], 4);
 		x = 0;
-		eq( arr[x++] += 3, 7 );
-		eq( arr[0], 7 );
+		eq(arr[x++] += 3, 7);
+		eq(arr[0], 7);
 
 		var x = 0;
-		var arr = [{ v : 3 }];
-		eq( arr[x++].v++, 3 );
-		eq( x, 1 );
-		eq( arr[0].v, 4 );
+		var arr = [{v: 3}];
+		eq(arr[x++].v++, 3);
+		eq(x, 1);
+		eq(arr[0].v, 4);
 
 		x = 0;
-		eq( arr[x++].v += 3, 7 );
-		eq( arr[0].v, 7 );
+		eq(arr[x++].v += 3, 7);
+		eq(arr[0].v, 7);
 
 		x = 0;
-		var arr:Dynamic = [{ v : 3 }];
-		eq( arr[x++].v++, 3 );
-		eq( x, 1 );
-		eq( arr[0].v, 4 );
+		var arr:Dynamic = [{v: 3}];
+		eq(arr[x++].v++, 3);
+		eq(x, 1);
+		eq(arr[0].v, 4);
 
 		x = 0;
-		eq( arr[x++].v += 3, 7 );
-		eq( arr[0].v, 7 );
+		eq(arr[x++].v += 3, 7);
+		eq(arr[0].v, 7);
 	}
 
 	function testInitOrder() {
 		var i = 0;
 		var o = {
-			y : i++,
-			x : i++,
-			z : i++,
-			blabla : i++,
+			y: i++,
+			x: i++,
+			z: i++,
+			blabla: i++,
 		};
-		eq(o.y,0);
-		eq(o.x,1);
-		eq(o.z,2);
-		eq(o.blabla,3);
+		eq(o.y, 0);
+		eq(o.x, 1);
+		eq(o.z, 2);
+		eq(o.blabla, 3);
 	}
 
-	static inline function foo(x) return x + 5;
+	static inline function foo(x)
+		return x + 5;
 
 	function testInline() {
 		// check that operations are correctly generated
 		var x = 3; // prevent optimization
-		eq( 2 * foo(x), 16 );
-		eq( -foo(x), -8 );
+		eq(2 * foo(x), 16);
+		eq(-foo(x), -8);
 	}
 
 	function testEvalAccessOrder() {
-		var a = [0,0];
+		var a = [0, 0];
 		var x = 0;
 		a[x++]++;
-		eq(a[0],1);
-		eq(a[1],0);
+		eq(a[0], 1);
+		eq(a[1], 0);
 
 		var x = 0;
 		var a = new Array();
 		a[x++] = x++;
-		eq(a[0],1);
+		eq(a[0], 1);
 
 		var x = 0;
 		var foo = function() return x++;
 		a[foo()] = foo();
-		eq(a[0],1);
+		eq(a[0], 1);
 	}
 
-	static var add = function (x, y) return x + y;
+	static var add = function(x, y) return x + y;
 
 	function testStaticVarFun() {
-		eq( add(2,3), 5);
+		eq(add(2, 3), 5);
 	}
 
 	function testDefArgs() {
 		var e = new ExtDefArgs();
-		eq( e.get(), 7 );
-		var b : BaseDefArgs = e;
-		eq( b.get(), 7 );
-		var i : IDefArgs = e;
-		eq( i.get(), 7 );
+		eq(e.get(), 7);
+		var b:BaseDefArgs = e;
+		eq(b.get(), 7);
+		var i:IDefArgs = e;
+		eq(i.get(), 7);
 	}
 
 	function testStringBuf() {
 		var b = new StringBuf();
 		eq(b.length, 0);
-		b.add( -45);
+		b.add(-45);
 		b.add(1.456);
 		b.add(null);
 		b.add(true);
@@ -542,26 +544,23 @@ class TestMisc extends Test {
 		eq(b.length, 30);
 	}
 
-	function testToString():Void
-	{
-		var x = { toString : function() return "foo" };
-		eq( Std.string(x), "foo" );
-
-		//var x1:Dynamic = new MyDynamicChildWithToString();
-		//eq( Std.string(x1), "Custom toString" );
-//
-		//var x2:Dynamic = new MyDynamicChildWithoutToString();
-		//x2.toString = function() return "foo";
-		//eq( Std.string(x2), "foo" );
+	function testToString():Void {
+		var x = {toString: function() return "foo"};
+		eq(Std.string(x), "foo");
 
+		// var x1:Dynamic = new MyDynamicChildWithToString();
+		// eq( Std.string(x1), "Custom toString" );
+		//
+		// var x2:Dynamic = new MyDynamicChildWithoutToString();
+		// x2.toString = function() return "foo";
+		// eq( Std.string(x2), "foo" );
 	}
 
 	#if !macro
-	function testFormat()
-	{
+	function testFormat() {
 		var x = 5;
 		var y = 6;
-		eq('$x${x+y}', "511");
+		eq('$x${x + y}', "511");
 	}
 	#end
 
@@ -596,16 +595,18 @@ class TestMisc extends Test {
 		function test():String {
 			throw "never call me";
 		};
-		var s = try test() catch(e:String) e;
-		eq(s,"never call me");
+		var s = try test() catch (e:String) e;
+		eq(s, "never call me");
 
-		function test():String throw "never call me";
-		var s = try test() catch(e:String) e;
-		eq(s,"never call me");
+		function test():String
+			throw "never call me";
+		var s = try test() catch (e:String) e;
+		eq(s, "never call me");
 	}
 
 	static var nf1:Base = null;
 	static var nf2:{s:String} = null;
+
 	function testNullFieldAccess() {
 		eq("NPE", try nf1.s catch (e:Any) "NPE");
 		eq("NPE", try nf2.s catch (e:Any) "NPE");