merge Int64

std/haxe/Int64.hx

@@ -61,6 +61,8 @@ class Int64 {
 			return i | 0;
 		#elseif php
 			return i32php(i); // handle overflow of 32-bit integers correctly
+		#elseif python
+			return untyped __python__("(i + 2**31) % 2**32 - 2**31");
 		#else
 			return i;
 		#end

std/python/_std/haxe/Int64.hx

@@ -1,274 +0,0 @@
-/*
- * 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.
- */
-package haxe;
-
-class Int64 { 
-
-	var high : Int;
-	var low : Int;
-
-	inline function new(high, low) {
-		this.high = i32(high);
-		this.low = i32(low);
-	}
-
-	#if php
-	/*
-		private function to correctly handle 32-bit integer overflow on php 
-		see: http://stackoverflow.com/questions/300840/force-php-integer-overflow
-	*/
-	private static function i32php(value:Int):Int { 
-			value = (value & untyped __php__("0xFFFFFFFF"));
- 		    if ( (value & untyped __php__("0x80000000"))!=0 )
-		        value = -(((~value) & untyped __php__("0xFFFFFFFF")) + 1);
-		    return value;
-	}
-	#end
-
-	/*
-		private function to correctly handle 32-bit ushr on php
-		see: https://github.com/HaxeFoundation/haxe/commit/1a878aa90708040a41b0dd59f518d83b09ede209
-	*/
-	private static inline function ushr32(v:Int,n:Int):Int { 
-		#if php
-		 	return (v >> n) & (untyped __php__("0x7fffffff") >> (n-1));
-		#else
-			return v>>>n;
-		#end
-	}
-
-	static function i32(i) {
-		#if python
-			return untyped __python__("(i + 2**31) % 2**32 - 2**31");
-		#elseif (js || flash8)
-			return i | 0;
-		#elseif php
-			return i32php(i); // handle overflow of 32-bit integers correctly 
-		#else
-			return i;
-		#end
-	}
-
-	@:extern static inline function i32mul(a:Int,b:Int) {
-		#if (php || js || flash8)
-		/*
-			We can't simply use i32(a*b) since we might overflow (52 bits precision in doubles)
-		*/
-		return i32(i32((a * (b >>> 16)) << 16) + (a * (b&0xFFFF)));
-		#else
-		return a * b;
-		#end
-	}
-	
-	#if as3 public #end function toString() {
-		if ((high|low) == 0 )
-			return "0";
-		var str = "";
-		var neg = false;
-		var i = this;
-		if( isNeg(i) ) {
-			neg = true;
-			i = Int64.neg(i);
-		}
-		var ten = ofInt(10);
-		while( !isZero(i) ) {
-			var r = divMod(i, ten);
-			str = r.modulus.low + str; 
-			i = r.quotient; 
-		}
-		if( neg ) str = "-" + str;
-		return str;
-	}
-
-	public static inline function make( high : Int, low : Int ) : Int64 {
-		return new Int64(high, low); 
-	}
-
-	public static inline function ofInt( x : Int ) : Int64 {
-		return new Int64(x >> 31,x);
-	}
-
-	public static function toInt( x : Int64 ) : Int {
-		if( x.high != 0 ) {
-			if( x.high < 0 )
-				return -toInt(neg(x));
-			throw "Overflow";
-		}
-		return x.low; 
-	}
-
-	public static function getLow( x : Int64 ) : Int {
-		return x.low;
-	}
-
-	public static function getHigh( x : Int64 ) : Int {
-		return x.high;
-	}
-
-	public static function add( a : Int64, b : Int64 ) : Int64 {
-		var high = i32(a.high + b.high);
-		var low = i32(a.low + b.low);
-		if( uicompare(low,a.low) < 0 )
-			high++;
-		return new Int64(high, low);
-	}
-
-	public static function sub( a : Int64, b : Int64 ) : Int64 {
-		var high = i32(a.high - b.high); // i32() call required to match add
-		var low = i32(a.low - b.low); // i32() call required to match add
-		if( uicompare(a.low,b.low) < 0 )
-			high--;
-		return new Int64(high, low);
-	}
-
-	public static function mul( a : Int64, b : Int64 ) : Int64 {
-		var mask = 0xFFFF;
-		var al = a.low & mask, ah = ushr32(a.low , 16); 
-		var bl = b.low & mask, bh = ushr32(b.low , 16); 
-		var p00 = al * bl;
-		var p10 = ah * bl;
-		var p01 = al * bh;
-		var p11 = ah * bh;
-		var low = p00;
-		var high = i32(p11 + ushr32(p01 , 16) + ushr32(p10 , 16));
-		p01 = i32(p01 << 16); low = i32(low + p01); if( uicompare(low, p01) < 0 ) high = i32(high + 1);
-		p10 = i32(p10 << 16); low = i32(low + p10); if( uicompare(low, p10) < 0 ) high = i32(high + 1);
-		high = i32(high + i32mul(a.low,b.high));
-		high = i32(high + i32mul(a.high,b.low));
-		return new Int64(high, low);
-	}
-
-	static function divMod( modulus : Int64, divisor : Int64 ) {
-		var quotient = new Int64(0, 0);
-		var mask = new Int64(0, 1);
-		divisor = new Int64(divisor.high, divisor.low);
-		while( divisor.high >= 0 ) { 
-			var cmp = ucompare(divisor, modulus);
-			divisor.high = i32( i32(divisor.high << 1) | ushr32(divisor.low , 31) ); 
-			divisor.low = i32(divisor.low << 1); 
-			mask.high = i32( i32(mask.high << 1) | ushr32(mask.low , 31) ); 
-			mask.low = i32(mask.low << 1);
-			if( cmp >= 0 ) break;
-		}
-		while( i32(mask.low | mask.high) != 0 ) { 
-			if( ucompare(modulus, divisor) >= 0 ) {
-				quotient.high= i32(quotient.high | mask.high); 
-				quotient.low= i32(quotient.low | mask.low); 
-				modulus = sub(modulus,divisor);
-			}
-			mask.low = i32( ushr32(mask.low , 1) | i32(mask.high << 31) ); 
-			mask.high = ushr32(mask.high , 1); 
-
-			divisor.low = i32( ushr32(divisor.low , 1) | i32(divisor.high << 31) ); 
-			divisor.high = ushr32(divisor.high , 1); 
-		}
-		return { quotient : quotient, modulus : modulus };
-	}
-
-	public static function div( a : Int64, b : Int64 ) : Int64 { 
-		if(b.high==0) // handle special cases of 0 and 1
-			switch(b.low) {
-			case 0:	throw "divide by zero";
-			case 1: return new Int64(a.high,a.low);
-			} 
-		var sign = ((a.high<0) || (b.high<0)) && (!( (a.high<0) && (b.high<0))); // make sure we get the correct sign
-		if( a.high < 0 ) a = neg(a);
-		if( b.high < 0 ) b = neg(b);
-		var q = divMod(a, b).quotient;
-		return sign ? neg(q) : q;
-	}
-
-	public static function mod( a : Int64, b : Int64 ) : Int64 {
-		if(b.high==0) // handle special cases of 0 and 1
-			switch(b.low) {
-			case 0:	throw "modulus by zero";
-			case 1: return ofInt(0);
-			}
-		var sign = a.high<0; // the sign of a modulus is the sign of the value being mod'ed
-		if( a.high < 0 ) a = neg(a);
-		if( b.high < 0 ) b = neg(b);
-		var m = divMod(a, b).modulus;
-		return sign ? neg(m) : m;
-	}
-
-	public static inline function shl( a : Int64, b : Int ) : Int64 {
-		return if( b & 63 == 0 ) a else if( b & 63 < 32 ) new Int64( (a.high << b) | ushr32(a.low, i32(32-(b&63))), a.low << b ) else new Int64( a.low << i32(b - 32), 0 );
-	}
-
-	public static inline function shr( a : Int64, b : Int ) : Int64 {
-		return if( b & 63 == 0 ) a else if( b & 63 < 32 ) new Int64( a.high >> b, ushr32(a.low,b) | (a.high << i32(32 - (b&63))) ) else new Int64( a.high >> 31, a.high >> i32(b - 32) );
-	}
-
-	public static inline function ushr( a : Int64, b : Int ) : Int64 {
-		return if( b & 63 == 0 ) a else if( b & 63 < 32 ) new Int64( ushr32(a.high, b), ushr32(a.low, b) | (a.high << i32(32 - (b&63))) ) else new Int64( 0, ushr32(a.high, i32(b - 32)) );
-	}
-
-	public static inline function and( a : Int64, b : Int64 ) : Int64 {
-		return new Int64( a.high & b.high, a.low & b.low );
-	}
-
-	public static inline function or( a : Int64, b : Int64 ) : Int64 {
-		return new Int64( a.high | b.high, a.low | b.low );
-	}
-
-	public static inline function xor( a : Int64, b : Int64 ) : Int64 {
-		return new Int64( a.high ^ b.high, a.low ^ b.low );
-	}
-
-	public static inline function neg( a : Int64 ) : Int64 {
-		var high = i32(~a.high); 
-		var low = i32(-a.low); 
-		if( low == 0 )
-			high++;
-		return new Int64(high,low);
-	}
-
-	public static inline function isNeg( a : Int64 ) : Bool {
-		return a.high < 0;
-	}
-
-	public static inline function isZero( a : Int64 ) : Bool {
-		return (a.high | a.low) == 0;
-	}
-
-	static function uicompare( a : Int, b : Int ) {
-		return a < 0 ? (b < 0 ? i32(~b - ~a) : 1) : (b < 0 ? -1 : i32(a - b));
-	}
-
-	public static inline function compare( a : Int64, b : Int64 ) : Int {
-		var v = i32(a.high - b.high); 
-		return if( v != 0 ) v else uicompare(a.low,b.low);
-	}
-
-	/**
-		Compare two Int64 in unsigned mode.
-	**/
-	public static inline function ucompare( a : Int64, b : Int64 ) : Int {
-		var v = uicompare(a.high,b.high);
-		return if( v != 0 ) v else uicompare(a.low, b.low);
-	}
-
-	public static inline function toStr( a : Int64 ) : String {
-		return a.toString();
-	}
-
-}