Reflect.callMethod should accept Function only.

andyli · andyli · commit 6cb1e40b4150 · 2014-08-20T00:10:06.000+08:00
diff --git a/std/Reflect.hx b/std/Reflect.hx
@@ -89,7 +89,7 @@ extern class Reflect {
 	/**
 		Call a method with the given object and arguments.
 	**/
-	public static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic;
+	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic;
 
 	/**
 		Returns the fields of structure `o`.
diff --git a/std/cpp/_std/Reflect.hx b/std/cpp/_std/Reflect.hx
@@ -43,7 +43,7 @@
 			o.__SetField(field,value,true);
 	}
 
-	public static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic untyped {
+	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {
 			if (func!=null && func.__GetType()==__global__.vtString)
 				func = o.__Field(func,true);
 			untyped func.__SetThis(o);
diff --git a/std/cs/_std/Reflect.hx b/std/cs/_std/Reflect.hx
@@ -110,7 +110,7 @@ import cs.internal.Function;
 	@:functionCode('
 		return ((haxe.lang.Function) func).__hx_invokeDynamic(args);
 	')
-	public static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic
+	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic
 	{
 		return null;
 	}
diff --git a/std/flash/_std/Reflect.hx b/std/flash/_std/Reflect.hx
@@ -52,7 +52,7 @@
 		}
 	}
 
-	public inline static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic untyped {
+	public inline static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {
 		return func.apply(o,args);
 	}
 
diff --git a/std/flash/_std/Type.hx b/std/flash/_std/Type.hx
@@ -162,7 +162,7 @@ enum ValueType {
 	}
 
 	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {
-		var f = untyped e[constr];
+		var f:Dynamic = untyped e[constr];
 		if( f == null ) throw "No such constructor "+constr;
 		if( Reflect.isFunction(f) ) {
 			if( params == null ) throw "Constructor "+constr+" need parameters";
diff --git a/std/flash8/_std/Reflect.hx b/std/flash8/_std/Reflect.hx
@@ -59,7 +59,7 @@
 			Reflect.setField(o, field, value);
 	}
 
-	public inline static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic untyped {
+	public inline static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {
 		return func["apply"](o,args);
 	}
 
diff --git a/std/flash8/_std/Type.hx b/std/flash8/_std/Type.hx
@@ -92,7 +92,7 @@ enum ValueType {
 	}
 
 	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {
-		var f = Reflect.field(e,constr);
+		var f:Dynamic = Reflect.field(e,constr);
 		if( f == null ) throw "No such constructor "+constr;
 		if( Reflect.isFunction(f) ) {
 			if( params == null ) throw "Constructor "+constr+" need parameters";
diff --git a/std/java/_std/Reflect.hx b/std/java/_std/Reflect.hx
@@ -88,7 +88,7 @@ import java.Boot;
 	@:functionCode('
 		return ((haxe.lang.Function) func).__hx_invokeDynamic(args);
 	')
-	public static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic
+	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic
 	{
 		return null;
 	}
diff --git a/std/js/_std/Reflect.hx b/std/js/_std/Reflect.hx
@@ -43,7 +43,7 @@
 		if( o.__properties__ && (tmp=o.__properties__["set_"+field]) ) o[tmp](value) else o[field] = __define_feature__("Reflect.setProperty",value);
 	}
 
-	public inline static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic untyped {
+	public inline static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {
 		return func.apply(o,args);
 	}
 
diff --git a/std/js/_std/Type.hx b/std/js/_std/Type.hx
@@ -110,7 +110,7 @@ enum ValueType {
 	}
 
 	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {
-		var f = Reflect.field(e,constr);
+		var f:Dynamic = Reflect.field(e,constr);
 		if( f == null ) throw "No such constructor "+constr;
 		if( Reflect.isFunction(f) ) {
 			if( params == null ) throw "Constructor "+constr+" need parameters";
diff --git a/std/neko/_std/Reflect.hx b/std/neko/_std/Reflect.hx
@@ -46,7 +46,7 @@
 		}
 	}
 
-	public static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic untyped {
+	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {
 		var a = args.__neko();
 		// pad missing args with null's
 		var n = $nargs(func);
diff --git a/std/neko/_std/Type.hx b/std/neko/_std/Type.hx
@@ -115,7 +115,7 @@ enum ValueType {
 	}
 
 	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {
-		var f = Reflect.field(e,constr);
+		var f:Dynamic = Reflect.field(e,constr);
 		if( f == null ) throw "No such constructor "+constr;
 		if( Reflect.isFunction(f) ) {
 			if( params == null ) throw "Constructor "+constr+" need parameters";
diff --git a/std/php/_std/Reflect.hx b/std/php/_std/Reflect.hx
@@ -53,10 +53,7 @@
 			return untyped __php__("$o->$field = $value");
 	}
 
-	public static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic untyped {
-		if (__call__("is_string", o) && !__call__("is_array", func)) {
-			return __call__("call_user_func_array", field(o, func), __field__(args, "a"));
-		}
+	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {
 		return __call__("call_user_func_array", __call__("is_callable", func) ? func : __call__("array", o, func), (null == args ? __call__("array") : __field__(args, "a")));
 	}
 
diff --git a/std/php/_std/Type.hx b/std/php/_std/Type.hx
@@ -128,7 +128,7 @@ enum ValueType {
 	}
 
 	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {
-		var f = Reflect.field(e,constr);
+		var f:Dynamic = Reflect.field(e,constr);
 		if( f == null ) throw "No such constructor "+constr;
 		if( Reflect.isFunction(f) ) {
 			if( params == null ) throw "Constructor "+constr+" need parameters";
diff --git a/std/python/_std/Reflect.hx b/std/python/_std/Reflect.hx
@@ -93,7 +93,7 @@ class Reflect {
 		else Builtin.setattr(o,field, value);
 	}
 
-	public static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic
+	public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic
 	{
 		var args:VarArgs = args;
 		return if (Builtin.callable(func)) func(python.Syntax.varArgs(args)) else null;
diff --git a/std/python/_std/Type.hx b/std/python/_std/Type.hx
@@ -160,7 +160,7 @@ enum ValueType {
 
 	public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T
 	{
-		var f = Reflect.field(e,constr);
+		var f:Dynamic = Reflect.field(e,constr);
 		if( f == null ) throw "No such constructor "+constr;
 		if( Reflect.isFunction(f) ) {
 			if( params == null ) throw "Constructor "+constr+" need parameters";

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`o.__SetField(field,value,true);`
`44`	`44`	`}`
`45`	`45`
`46`		`- public static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic untyped {`
	`46`	`+ public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {`
`47`	`47`	`if (func!=null && func.__GetType()==__global__.vtString)`
`48`	`48`	`func = o.__Field(func,true);`
`49`	`49`	`untyped func.__SetThis(o);`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ import cs.internal.Function;`
`110`	`110`	`@:functionCode('`
`111`	`111`	`return ((haxe.lang.Function) func).__hx_invokeDynamic(args);`
`112`	`112`	`')`
`113`		`- public static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic`
	`113`	`+ public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic`
`114`	`114`	`{`
`115`	`115`	`return null;`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- public inline static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic untyped {`
	`55`	`+ public inline static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {`
`56`	`56`	`return func.apply(o,args);`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ enum ValueType {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {`
`165`		`- var f = untyped e[constr];`
	`165`	`+ var f:Dynamic = untyped e[constr];`
`166`	`166`	`if( f == null ) throw "No such constructor "+constr;`
`167`	`167`	`if( Reflect.isFunction(f) ) {`
`168`	`168`	`if( params == null ) throw "Constructor "+constr+" need parameters";`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@`
`59`	`59`	`Reflect.setField(o, field, value);`
`60`	`60`	`}`
`61`	`61`
`62`		`- public inline static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic untyped {`
	`62`	`+ public inline static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {`
`63`	`63`	`return func["apply"](o,args);`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ enum ValueType {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {`
`95`		`- var f = Reflect.field(e,constr);`
	`95`	`+ var f:Dynamic = Reflect.field(e,constr);`
`96`	`96`	`if( f == null ) throw "No such constructor "+constr;`
`97`	`97`	`if( Reflect.isFunction(f) ) {`
`98`	`98`	`if( params == null ) throw "Constructor "+constr+" need parameters";`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ import java.Boot;`
`88`	`88`	`@:functionCode('`
`89`	`89`	`return ((haxe.lang.Function) func).__hx_invokeDynamic(args);`
`90`	`90`	`')`
`91`		`- public static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic`
	`91`	`+ public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic`
`92`	`92`	`{`
`93`	`93`	`return null;`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ enum ValueType {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {`
`113`		`- var f = Reflect.field(e,constr);`
	`113`	`+ var f:Dynamic = Reflect.field(e,constr);`
`114`	`114`	`if( f == null ) throw "No such constructor "+constr;`
`115`	`115`	`if( Reflect.isFunction(f) ) {`
`116`	`116`	`if( params == null ) throw "Constructor "+constr+" need parameters";`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`- public static function callMethod( o : Dynamic, func : Dynamic, args : Array<Dynamic> ) : Dynamic untyped {`
	`49`	`+ public static function callMethod( o : Dynamic, func : haxe.Constraints.Function, args : Array<Dynamic> ) : Dynamic untyped {`
`50`	`50`	`var a = args.__neko();`
`51`	`51`	`// pad missing args with null's`
`52`	`52`	`var n = $nargs(func);`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ enum ValueType {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`public static function createEnum<T>( e : Enum<T>, constr : String, ?params : Array<Dynamic> ) : T {`
`118`		`- var f = Reflect.field(e,constr);`
	`118`	`+ var f:Dynamic = Reflect.field(e,constr);`
`119`	`119`	`if( f == null ) throw "No such constructor "+constr;`
`120`	`120`	`if( Reflect.isFunction(f) ) {`
`121`	`121`	`if( params == null ) throw "Constructor "+constr+" need parameters";`