2
0
Эх сурвалжийг харах

monormorph/Dynamic fixes.

Nicolas Cannasse 19 жил өмнө
parent
commit
8615c3029e

+ 1 - 1
std/flash/FlashXml__.hx

@@ -114,7 +114,7 @@ class FlashXml__ {
 	}
 
 	public function firstElement(){
-		var e = __x.firstChild;
+		var e : Dynamic = __x.firstChild;
 		while( e != null && e.nodeType != 1 )
 			e = e.nextSibling;
 		return convert(e);

+ 3 - 3
std/haxe/Serializer.hx

@@ -171,7 +171,7 @@ class Serializer {
 				return;
 			#if neko
 			#else true
-			var e = v.__enum__;
+			var e : Dynamic = v.__enum__;
 			if( e != null && e.__ename__ != null ) {
 				serializeEnum(v);
 				return;
@@ -214,13 +214,13 @@ class Serializer {
 			return;
 		if( Reflect.isFunction(v) )
 			throw "Cannot serialize function";
-		var c = v.__class__;
+		var c : Dynamic = v.__class__;
 		if( c != null && c.__name__ != null ) {
 			buf.add("c");
 			serialize(c.__name__);
 		} else {
 			#if neko
-			var e = v.__enum__;
+			var e : Dynamic = v.__enum__;
 			if( e != null && e.__ename__ != null ) {
 				serializeEnum(v);
 				return;

+ 14 - 14
std/haxe/Template.hx

@@ -228,18 +228,18 @@ class Template {
 			if( p2 == null || p2.p != ")" )
 				throw p2.p;
 			return switch( p.p ) {
-			case "+": function() { return e1() + e2(); };
-			case "-": function() { return e1() - e2(); };
-			case "*": function() { return e1() * e2(); };
-			case "/": function() { return e1() / e2(); };
-			case ">": function() { return e1() > e2(); };
-			case "<": function() { return e1() < e2(); };
-			case ">=": function() { return e1() >= e2(); };
-			case "<=": function() { return e1() <= e2(); };
-			case "==": function() { return e1() == e2(); };
-			case "!=": function() { return e1() != e2(); };
-			case "&&": function() { return e1() && e2(); };
-			case "||": function() { return e1() || e2(); };
+			case "+": function() { return untyped e1() + e2(); };
+			case "-": function() { return untyped e1() - e2(); };
+			case "*": function() { return untyped e1() * e2(); };
+			case "/": function() { return untyped e1() / e2(); };
+			case ">": function() { return untyped e1() > e2(); };
+			case "<": function() { return untyped e1() < e2(); };
+			case ">=": function() { return untyped e1() >= e2(); };
+			case "<=": function() { return untyped e1() <= e2(); };
+			case "==": function() { return untyped e1() == e2(); };
+			case "!=": function() { return untyped e1() != e2(); };
+			case "&&": function() { return untyped e1() && e2(); };
+			case "||": function() { return untyped e1() || e2(); };
 			default: throw "operation "+p.p;
 			}
 		case "!":
@@ -273,10 +273,10 @@ class Template {
 			for( e in l )
 				run(e);
 		case OpForeach(e,loop):
-			var v = e();
+			var v : Dynamic = e();
 			try {
 				if( v.hasNext == null ) {
-					var x = v.iterator();
+					var x : Dynamic = v.iterator();
 					if( x.hasNext == null ) throw null;
 					v = x;
 				}

+ 1 - 1
std/haxe/remoting/AsyncConnection.hx

@@ -29,7 +29,7 @@ class AsyncConnection implements Dynamic<AsyncConnection> {
 	var __data : Dynamic;
 	var __path : Array<String>;
 
-	function new( data, path ) {
+	function new( data : Dynamic, path ) {
 		__data = data;
 		__path = path;
 	}

+ 1 - 1
std/haxe/remoting/AsyncDebugConnection.hx

@@ -30,7 +30,7 @@ class AsyncDebugConnection implements AsyncConnection, implements Dynamic<AsyncD
 	var __path : Array<String>; // not used there
 	var lastCalls : List<{ path : Array<String>, params : Array<Dynamic> }>;
 
-	public function new(cnx) {
+	public function new(cnx : AsyncConnection) {
 		__data = cnx;
 		lastCalls = new List();
 		onError = cnx.onError;

+ 2 - 2
std/haxe/remoting/Server.hx

@@ -64,8 +64,8 @@ class Server {
 			if( v == null )
 				throw "Missing remoting data";
 			var u = new haxe.Unserializer(v);
-			var path = u.unserialize();
-			var args = u.unserialize();
+			var path : Array<String> = u.unserialize();
+			var args : Array<Dynamic> = u.unserialize();
 			var f = path.pop();
 			var obj = resolvePath(path);
 			var funptr = Reflect.field(obj,f);

+ 2 - 2
std/js/Boot.hx

@@ -139,11 +139,11 @@ class Boot {
 			return false;
 		if( cc == cl )
 			return true;
-		var intf = cc.__interfaces__;
+		var intf : Dynamic = cc.__interfaces__;
 		if( intf == null )
 			return false;
 		for( i in 0...intf.length ) {
-			var i = intf[i];
+			var i : Dynamic = intf[i];
 			if( i == cl || __interfLoop(i,cl) )
 				return true;
 		}

+ 1 - 1
std/neko/Boot.hx

@@ -58,7 +58,7 @@ class Boot {
 			return false;
 		if( cc == cl )
 			return true;
-		var intf = cc.__interfaces__;
+		var intf : Dynamic = cc.__interfaces__;
 		if( intf == null )
 			return false;
 		for( i in 0...intf.length ) {

+ 1 - 1
std/neko/FileSystem.hx

@@ -91,7 +91,7 @@ class FileSystem {
 	}
 
 	public static function readDir( path : String ) : Array<String> {
-		var l = sys_read_dir(untyped path.__s);
+		var l : Array<Dynamic> = sys_read_dir(untyped path.__s);
 		var a = new Array();
 		while( l != null ) {
 			a.push(new String(l[0]));

+ 2 - 2
std/neko/Socket.hx

@@ -90,12 +90,12 @@ class Socket {
 	}
 
 	public function peer() : { host : Host, port : Int } {
-		var a = socket_peer(__s);
+		var a : Dynamic = socket_peer(__s);
 		return { host : a[0], port : a[1] };
 	}
 
 	public function host() : { host : Host, port : Int } {
-		var a = socket_host(__s);
+		var a : Dynamic = socket_host(__s);
 		return { host : a[0], port : a[1] };
 	}
 

+ 1 - 1
std/neko/Sys.hx

@@ -89,7 +89,7 @@ class Sys {
 	}
 
 	public static function environment() : Hash<String> {
-		var l = sys_env();
+		var l : Array<Dynamic> = sys_env();
 		var h = new Hash();
 		while( l != null ) {
 			h.set(new String(l[0]),new String(l[1]));

+ 1 - 1
std/neko/db/Manager.hx

@@ -58,7 +58,7 @@ class Manager<T : Object> {
 
 		// get the proto fields not marked private (excluding methods)
 		table_fields = new List();
-		var proto = class_proto.prototype;
+		var proto : Dynamic = class_proto.prototype;
 		for( f in Reflect.fields(proto) ) {
 			var isfield = !Reflect.isFunction(Reflect.field(proto,f));
 			if( isfield )