Ver código fonte

Improve Reflect hasField/field for js target, improve Math for js
target.

All unit tests bar 1 pass.

Failure requires change in genjs, compiles 1["foo"] as 1.foo
need to check that object (in printed js) is not a number before
using field access.

Luca Deltdesco 12 anos atrás
pai
commit
dcc5f2b0e7
2 arquivos alterados com 90 adições e 17 exclusões
  1. 78 0
      std/js/_std/Math.hx
  2. 12 17
      std/js/_std/Reflect.hx

+ 78 - 0
std/js/_std/Math.hx

@@ -0,0 +1,78 @@
+/*
+ * Copyright (C)2005-2012 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+@:native("Math")
+extern class Math
+{
+	static var PI(default,null) : Float;
+
+	static var POSITIVE_INFINITY(get, null) : Float;
+	static inline function get_POSITIVE_INFINITY() : Float
+		return untyped __js__("$Number").POSITIVE_INFINITY;
+
+	static var NEGATIVE_INFINITY(get, null) : Float;
+	static inline function get_NEGATIVE_INFINITY() : Float
+		return untyped __js__("$Number").NEGATIVE_INFINITY;
+
+	static var NaN(get, null) : Float;
+	static inline function get_NaN() : Float
+		return untyped __js__("$Number").NaN;
+
+	static function abs(v:Float):Float;
+	static function min(a:Float, b:Float):Float;
+	static function max(a:Float, b:Float):Float;
+	static function sin(v:Float):Float;
+	static function cos(v:Float):Float;
+	static function tan(v:Float):Float;
+	static function asin(v:Float):Float;
+	static function acos(v:Float):Float;
+	static function atan(v:Float):Float;
+	static function atan2(y:Float, x:Float):Float;
+	static function exp(v:Float):Float;
+	static function log(v:Float):Float;
+	static function pow(v:Float, exp:Float):Float;
+	static function sqrt(v:Float):Float;
+	static function round(v:Float):Int;
+	static function floor(v:Float):Int;
+	static function ceil(v:Float):Int;
+	static function random() : Float;
+
+	static inline function ffloor( v : Float ) : Float
+		return floor(v);
+	static inline function fceil( v : Float ) : Float
+		return ceil(v);
+	static inline function fround( v : Float ) : Float
+		return round(v);
+
+	static inline function isFinite( f : Float ) : Bool
+        return untyped __js__("$isFinite")(f);
+	static inline function isNaN( f : Float ) : Bool
+        return untyped __js__("$isNaN")(f);
+
+	static function __init__() : Void {
+        untyped __js__("var $Number = Number");
+		untyped __js__("var $isFinite = isFinite");
+		untyped __js__("var $isNaN = isNaN");
+	}
+
+}
+

+ 12 - 17
std/js/_std/Reflect.hx

@@ -19,24 +19,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-@:coreApi class Reflect {
+extern class Reflect {
 
-	public static function hasField( o : Dynamic, field : String ) : Bool {
-		return untyped __js__('Object').prototype.hasOwnProperty.call(o, field);
-	}
+	public static inline function hasField( o : Dynamic, field : String ) : Bool
+		return untyped __js__("$hasOwnProperty").call(o, field);
 
-	public inline static function field( o : Dynamic, field : String ) : Dynamic untyped {
-		var v = null;
-		try {
-			v = o[field];
-		} catch( e : Dynamic ) {
-		}
-		return v;
-	}
+	public static inline function field( o : Dynamic, field : String ) : Dynamic
+		return untyped o[field];
 
-	public inline static function setField( o : Dynamic, field : String, value : Dynamic ) : Void untyped {
-		o[field] = value;
-	}
+	public inline static function setField( o : Dynamic, field : String, value : Dynamic ) : Void
+		untyped o[field] = value;
 
 	public static inline function getProperty( o : Dynamic, field : String ) : Dynamic untyped {
 		var tmp;
@@ -55,7 +47,7 @@
 	public static function fields( o : Dynamic ) : Array<String> {
 		var a = [];
 		if (o != null) untyped {
-			var hasOwnProperty = __js__('Object').prototype.hasOwnProperty;
+			var hasOwnProperty = __js__("$hasOwnProperty");
 			__js__("for( var f in o ) {");
 			if( f != "__id__" && f != "hx__closures__" && hasOwnProperty.call(o, f) ) a.push(f);
 			__js__("}");
@@ -85,7 +77,7 @@
 		var t = __js__("typeof(v)");
 		return (t == "string" || (t == "object" && v.__enum__ == null)) || (t == "function" && (js.Boot.isClass(v) || js.Boot.isEnum(v)) != null);
 	}
-	
+
 	public static function isEnumValue( v : Dynamic ) : Bool {
 		return v != null && v.__enum__ != null;
 	}
@@ -111,4 +103,7 @@
 		};
 	}
 
+	static function __init__() : Void {
+		untyped __js__("var $hasOwnProperty = Object.prototype.hasOwnProperty");
+	}
 }