minor fixes

std/hl/_std/Reflect.hx

@@ -63,8 +63,11 @@ class Reflect {
 		if( ft.kind != HFun )
 			throw "Invalid function " + func;
 		var need = ft.getArgsCount();
-		var isClosure = hl.types.Api.getClosureValue(func) != null;
-		if( o != null && !isClosure && count == need )
+		var cval = hl.types.Api.getClosureValue(func);
+		var isClosure = cval != null;
+		if( o == null )
+			o = cval;
+		else if( !isClosure && count == need )
 			o = null;
 		var nargs = o == null ? count : count + 1;
 		if( isClosure ) need++;

std/hl/_std/Std.hx

@@ -85,12 +85,24 @@ class Std {
 			return (a : String) + b;
 		if( tb == hl.types.Type.get("") )
 			return a + (b : String);
-		switch( (cast ta.kind : Int) | ((cast tb.kind : Int) << 8) ) {
-		case 0x0303:
-			return (a:Int) + (b : Int);
-		case x:
-			throw "Can't add "+ta+" and "+tb+" ("+StringTools.hex(x)+")";
+		switch(ta.kind) {
+		case HI8, HI16, HI32:
+			var a : Int = a;
+			switch( tb.kind ) {
+			case HI8, HI16, HI32: return a + (b:Int);
+			case HF32, HF64: return a + (b:Float);
+			default:
+			}
+		case HF32, HF64:
+			var a : Float = a;
+			switch( tb.kind ) {
+			case HI8, HI16, HI32: return a + (b:Int);
+			case HF32, HF64: return a + (b:Float);
+			default:
+			}
+		default:
 		}
+		throw "Can't add "+a+"("+ta+") and "+b+"("+tb+")";
 		return null;
 	}