X-Git-Url: http://nitlanguage.org

diff --git a/lib/core/math.nit b/lib/core/math.nit
index 537271c..c8842fd 100644
--- a/lib/core/math.nit
+++ b/lib/core/math.nit
@@ -67,16 +67,12 @@ redef class Int
 	# Returns the result of a binary AND operation on `self` and `i`
 	#
 	#     assert 0x10 & 0x01 == 0
-	fun &(i: Int): Int is intern do return band(i)
-
-	private fun band(i: Int): Int `{ return self & i; `}
+	fun &(i: Int): Int is intern `{ return self & i; `}
 
 	# Returns the result of a binary OR operation on `self` and `i`
 	#
 	#     assert 0x10 | 0x01 == 0x11
-	fun |(i: Int): Int is intern do return bor(i)
-
-	private fun bor(i: Int): Int `{ return self | i; `}
+	fun |(i: Int): Int is intern `{ return self | i; `}
 
 	# Returns the result of a binary XOR operation on `self` and `i`
 	#
@@ -132,7 +128,7 @@ redef class Int
 	#
 	# assert 3.is_prime
 	# assert not 1.is_prime
-	# assert not 12.is_prime
+	# assert not 15.is_prime
 	fun is_prime: Bool
 	do
 		if self == 2 then
@@ -140,7 +136,7 @@ redef class Int
 		else if self <= 1 or self.is_even then
 			return false
 		end
-		for i in [3..self.sqrt[ do
+		for i in [3..self.sqrt] do
 			if self % i == 0 then return false
 		end
 		return true
@@ -173,15 +169,23 @@ redef class Int
 		end
 		return res
 	end
+
+	# Is `self` a power of two ?
+	#
+	# ~~~nit
+	# assert not 3.is_pow2
+	# assert 2.is_pow2
+	# assert 1.is_pow2
+	# assert not 0.is_pow2
+	# ~~~
+	fun is_pow2: Bool do return self != 0 and (self & self - 1) == 0
 end
 
 redef class Byte
 	# Returns the result of a binary AND operation on `self` and `i`
 	#
 	#     assert 0x10u8 & 0x01u8 == 0u8
-	fun &(i: Byte): Byte is intern do return band(i)
-
-	private fun band(i: Byte): Byte `{ return self & i; `}
+	fun &(i: Byte): Byte is intern `{ return self & i; `}
 
 	# Returns the result of a binary OR operation on `self` and `i`
 	#
@@ -416,6 +420,17 @@ fun inf: Float do return 1.0 / 0.0
 # ~~~
 fun nan: Float do return 0.0 / 0.0
 
+redef class Comparable
+	# Constraint `self` within `[min..max]`
+	#
+	#     assert 1.clamp(5, 10) == 5
+	#     assert 7.clamp(5, 10) == 7
+	#     assert 15.clamp(5, 10) == 10
+	#     assert 1.5.clamp(1.0, 2.0) == 1.5
+	#     assert "a".clamp("b", "c") == "b"
+	fun clamp(min, max: OTHER): OTHER do return self.max(min).min(max)
+end
+
 redef class Collection[ E ]
 	# Return a random element form the collection
 	# There must be at least one element in the collection
@@ -530,11 +545,11 @@ redef class Sys
 	end
 end
 
-# Computes the arc tangent given `x` and `y`.
+# Computes the arc tangent given `y` and `x`.
 #
 #     assert atan2(-0.0, 1.0) == -0.0
 #     assert atan2(0.0, 1.0) == 0.0
-fun atan2(x: Float, y: Float): Float `{ return atan2(x, y); `}
+fun atan2(y: Float, x: Float): Float `{ return atan2(y, x); `}
 
 # Approximate value of **pi**.
 fun pi: Float do return 3.14159265
@@ -551,9 +566,9 @@ fun pi: Float do return 3.14159265
 # assert 10.rand == a
 # assert 100.rand == b
 # ~~~~
-fun srand_from(x: Int) `{ nit_rand_seeded = 1; nit_rand_seed = x; `}
+fun srand_from(x: Int) `{ nit_rand_seeded = 1; nit_rand_seed = (unsigned int)x; `}
 
 # Reinitialize the pseudo-random generator used by the method `rand` and other.
 # This method is automatically invoked at the begin of the program, so usually, there is no need to manually invoke it.
 # The only exception is in conjunction with `srand_from` to reset the pseudo-random generator.
-fun srand `{ nit_rand_seeded = 0; srand(time(NULL)); `}
+fun srand `{ nit_rand_seeded = 0; srand((unsigned int)time(NULL)); `}