Procházet zdrojové kódy

add @:coreApi to Math

Simon Krajewski před 11 roky
rodič
revize
713e5a52b4
1 změnil soubory, kde provedl 73 přidání a 73 odebrání
  1. 73 73
      std/python/_std/Math.hx

+ 73 - 73
std/python/_std/Math.hx

@@ -28,146 +28,142 @@ import python.lib.Builtin;
 	This class defines mathematical functions and constants.
 **/
 @:native("_hx_math")
+@:coreApi
 extern class Math
 {
-	static var PI(get,null) : Float;
+	static var PI(default,null) : Float;
 
-	static inline function get_PI():Float return untyped Math.pi;
 	/**
 		A special Float constant which denotes negative infinity.
-		
+
 		For example, this is the result of -1.0 / 0.0.
-		
+
 		Operations with NEGATIVE_INFINITY as an operand may result in
 		Operations with NEGATIVE_INFINITY as an operand may result in
 		NEGATIVE_INFINITY, POSITIVE_INFINITY or NaN. For detailed information,
 		see ...
-		
+
 		If this constant is converted to an Int, e.g. through Std.int(), the
 		result is unspecified.
 	**/
-	static var NEGATIVE_INFINITY(get, null) : Float;
+	static var NEGATIVE_INFINITY(default, null) : Float;
 
-	static inline function get_NEGATIVE_INFINITY():Float return untyped __python__("float")('-inf');
 	/**
 		A special Float constant which denotes negative infinity.
-		
+
 		For example, this is the result of 1.0 / 0.0.
-		
+
 		Operations with POSITIVE_INFINITY as an operand may result in
 		NEGATIVE_INFINITY, POSITIVE_INFINITY or NaN. For detailed information,
 		see ...
-	
+
 		If this constant is converted to an Int, e.g. through Std.int(), the
 		result is unspecified.
 	**/
-	static var POSITIVE_INFINITY(get,null) : Float;
+	static var POSITIVE_INFINITY(default,null) : Float;
 
-	static inline function get_POSITIVE_INFINITY():Float return untyped __python__("float")('inf');
 	/**
 		A special Float constant which denotes an invalid number.
-		
+
 		NaN stands for "Not a Number". It occurs when a mathematically incorrect
 		operation is executed, such as taking the square root of a negative
 		number: Math.sqrt(-1).
-		
+
 		All further operations with NaN as an operand will result in NaN.
-		
+
 		If this constant is converted to an Int, e.g. through Std.int(), the
 		result is unspecified.
-		
+
 		In order to test if a value is NaN, you should use Math.isNaN() function.
-		
+
 		(Php) In PHP versions prior to 5.3.1 VC 9 there may be unexpected
 		results when performing arithmetic operations with NaN on Windows, see:
 			https://bugs.php.net/bug.php?id=42143
 	**/
-	static var NaN(get, null) : Float;
-
-	static inline function get_NaN():Float return untyped __python__("float")('nan');
+	static var NaN(default, null) : Float;
 
 	/**
 		Returns the absolute value of `v`.
-		
+
 		If `v` is positive or 0, the result is unchanged. Otherwise the result
 		is -`v`.
-		
+
 		If `v` is NEGATIVE_INFINITY or POSITIVE_INFINITY, the result is
 		POSITIVE_INFINITY.
-		
+
 		If `v` is NaN, the result is NaN.
 	**/
 	public static inline function abs(v:Float):Float
 	{
 		return (Math:Dynamic).fabs(v);
 	}
-	
+
 	/**
 		Returns the smaller of values `a` and `b`.
-		
+
 		If `a` or `b` are NaN, the result is NaN.
-		
+
 		If `a` or `b` are NEGATIVE_INFINITY, the result is NEGATIVE_INFINITY.
-		
+
 		If `a` and `b` are POSITIVE_INFINITY, the result is POSITIVE_INFINITY.
 	**/
 
 	public static inline function min(a:Float, b:Float):Float {
 		return if (isNaN(a)) a else if (isNaN(b)) b else Builtin.min(a,b);
 	}
-	
+
 	/**
 		Returns the greater of values `a` and `b`.
-		
+
 		If `a` or `b` are NaN, the result is NaN.
-		
+
 		If `a` or `b` are POSITIVE_INFINITY, the result is POSITIVE_INFINITY.
-		
+
 		If `a` and `b` are NEGATIVE_INFINITY, the result is NEGATIVE_INFINITY.
 	**/
 	public static inline function max(a:Float, b:Float):Float
 	{
 		return if (isNaN(a)) a else if (isNaN(b)) b else Builtin.max(a,b);
 	}
-	
+
 	/**
 		Returns the trigonometric sine of `v`.
-		
+
 		The unit of `v` is radians.
-		
+
 		If `v` is NaN or infinite, the result is NaN.
 	**/
 	public static inline function sin(v:Float):Float {
 		return if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY) NaN else (Math:Dynamic).sin(v);
 	}
-	
+
 	/**
 		Returns the trigonometric cosine of `v`.
-		
+
 		The unit of `v` is radians.
-		
+
 		If `v` is NaN or infinite, the result is NaN.
 	**/
 	public static inline function cos(v:Float):Float {
 		return if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY) NaN else (Math:Dynamic).cos(v);
 	}
-	
+
 	// TODO
 	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;
-	
+
 	/**
 		Returns Euler's number, raised to the power of `v`.
-		
+
 		exp(1.0) is approximately 2.718281828459.
-		
+
 		If `v` is POSITIVE_INFINITY, the result is POSITIVE_INFINITY.
-		
+
 		If `v` is NEGATIVE_INFINITY, the result is 0.0.
-		
+
 		If `v` is NaN, the result is NaN.
 	**/
 	public static inline function exp(v:Float):Float
@@ -180,72 +176,72 @@ extern class Math
 			return (Math:Dynamic).exp(v);
 		}
 	}
-	
+
 	/**
 		Returns the natural logarithm of `v`.
-		
+
 		If `v` is negative (including NEGATIVE_INFINITY) or NaN, the result is
 		NaN.
-		
+
 		If `v` is POSITIVE_INFINITY, the result is POSITIVE_INFINITY.
-		
+
 		If `v` is 0.0, the result is NEGATIVE_INFINITY.
-		
+
 		This is the inverse operation of exp, i.e. log(exp(v)) == v always
 		holds.
 	**/
 	public static inline function log(v:Float):Float {
 		return if (v == 0.0) NEGATIVE_INFINITY else if (v < 0.0) NaN else (Math:Dynamic).log(v);
 	}
-	
+
 	// TODO
 	// http://docs.oracle.com/javase/1.4.2/docs/api/java/lang/Math.html#pow(double, double) <-- wtf?
 	static function pow(v:Float, exp:Float):Float;
-	
+
 	/**
 		Returns the square root of `v`.
-		
+
 		If `v` is negative (including NEGATIVE_INFINITY) or NaN, the result is
 		NaN.
-		
+
 		If `v` is POSITIVE_INFINITY, the result is POSITIVE_INFINITY.
-		
+
 		If `v` is 0.0, the result is 0.0.
 	**/
 	public static inline function sqrt(v:Float):Float
 	{
 		return if (v < 0) NaN else (Math:Dynamic).sqrt(v);
 	}
-	
+
 	/**
 		Rounds `v` to the nearest Int value.
 
 		If v is outside of the signed Int32 range, or is NaN, NEGATIVE_INFINITY or POSITIVE_INFINITY, the result is unspecified.
-		
+
 		TODO: need spec
 	**/
 	public static inline function round(v:Float):Int {
 		return Math.floor(v + 0.5);
 	}
-	
+
 	/**
 		Returns the largest Int value that is not greater than `v`.
-		
+
 		If v is outside of the signed Int32 range, or is NaN, NEGATIVE_INFINITY or POSITIVE_INFINITY, the result is unspecified.
-		
+
 		TODO: need spec
 	**/
 	static function floor(v:Float):Int;
-	
+
 	/**
 		Returns the smallest Int value that is not less than `v`.
 
 		If v is outside of the signed Int32 range, or is NaN, NEGATIVE_INFINITY or POSITIVE_INFINITY, the result is unspecified.
-		
+
 		TODO: need spec
 	**/
 	static function ceil(v:Float):Int;
-	
+
 	/**
 		Returns a pseudo-random number which is greater than or equal to 0.0,
 		and less than 1.0.
@@ -253,9 +249,9 @@ extern class Math
 	inline static function random() : Float {
 		return python.lib.Random.random();
 	}
-	
-	
-	
+
+
+
 	static inline function ffloor( v : Float ) : Float
 	{
 		if (v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY) return v;
@@ -276,25 +272,25 @@ extern class Math
 		if (isNaN(v)) return NaN;
 		return round(v);
 	}
-	
-	
-	
+
+
+
 
 	/**
 		Tells if `f` is a finite number.
-		
+
 		If `f` is POSITIVE_INFINITY, NEGATIVE_INFINITY or NaN, the result is
 		false.
-		
+
 		Otherwise the result is true.
 	**/
 	static inline function isFinite( f : Float ) : Bool return f != POSITIVE_INFINITY && f != NEGATIVE_INFINITY && !isNaN(f);
-	
+
 	/**
 		Tells if `f` is not a valid number.
-		
+
 		If `f` is NaN, the result is true.
-		
+
 		Otherwise the result is false. In particular, both POSITIVE_INFINITY and
 		NEGATIVE_INFINITY are not considered NaN.
 	**/
@@ -302,8 +298,12 @@ extern class Math
 		return untyped _hx_math.isnan(f);
 	}
 
-	static function __init__():Void {
+	static function __init__():Void untyped {
 		python.Macros.importAs("math", "_hx_math");
+		NEGATIVE_INFINITY = __python__("float")('-inf');
+		POSITIVE_INFINITY = __python__("float")('inf');
+		NaN = __python__("float")('nan');
+		PI = Math.pi;
 	}
 
 }