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

diff --git a/lib/standard/collection/array.nit b/lib/standard/collection/array.nit
index e8f7448..61e8700 100644
--- a/lib/standard/collection/array.nit
+++ b/lib/standard/collection/array.nit
@@ -13,15 +13,15 @@
 
 # This module introduces the standard array structure.
 # It also implements two other abstract collections : ArrayMap and ArraySet
-package array
+module array
 
 import abstract_collection
 
-# One dimention array of objects.
-class AbstractArrayRead[E]
+# One dimension array of objects.
+abstract class AbstractArrayRead[E]
 	super SequenceRead[E]
-	# The current length
-	redef readable var _length: Int = 0
+
+	redef var length = 0
 
 	redef fun is_empty do return _length == 0
 
@@ -61,9 +61,9 @@ class AbstractArrayRead[E]
 
 	redef fun index_of(item) do return index_of_from(item, 0)
 
-	fun last_index_of(item: E): Int do return last_index_of_from(item, length-1)
+	redef fun last_index_of(item: E): Int do return last_index_of_from(item, length-1)
 
-	fun index_of_from(item: E, pos: Int): Int
+	redef fun index_of_from(item: E, pos: Int): Int
 	do
 		var i = pos
 		var len = length
@@ -76,7 +76,7 @@ class AbstractArrayRead[E]
 		return -1
 	end
 
-	fun last_index_of_from(item: E, pos: Int): Int
+	redef fun last_index_of_from(item: E, pos: Int): Int
 	do
 		var i = pos
 		while i >= 0 do
@@ -89,6 +89,9 @@ class AbstractArrayRead[E]
 		return -1
 	end
 
+	# Return a new array that is the reverse of `self`
+	#
+	#     assert [1,2,3].reversed      ==  [3, 2, 1]
 	fun reversed: Array[E]
 	do
 		var cmp = _length
@@ -100,6 +103,12 @@ class AbstractArrayRead[E]
 		return result
 	end
 
+	# Copy a portion of `self` to an other array.
+	#
+	#     var a = [1, 2, 3, 4]
+	#     var b = [10, 20, 30, 40, 50]
+	#     a.copy_to(1, 2, b, 2)
+	#     assert b      ==  [10, 20, 2, 3, 50]
 	protected fun copy_to(start: Int, len: Int, dest: AbstractArray[E], new_start: Int)
 	do
 		# TODO native one
@@ -122,26 +131,17 @@ class AbstractArrayRead[E]
 	end
 
 	redef fun iterator: ArrayIterator[E] do return new ArrayIterator[E](self)
-
-	# Two arrays are equals if they have the same items in the same order.
-	redef fun ==(o)
-	do
-		if not o isa AbstractArray[E] or o is null then return false
-		var l = length
-		if o.length != l then return false
-		var i = 0
-		while i < l do
-			if self[i] != o[i] then return false
-			i += 1
-		end
-		return true
-	end
+	redef fun reverse_iterator do return new ArrayReverseIterator[E](self)
 end
 
-# Resizeable one dimention array of objects.
-class AbstractArray[E]
+# Resizable one dimension array of objects.
+abstract class AbstractArray[E]
 	super AbstractArrayRead[E]
 	super Sequence[E]
+
+	# Force the capacity to be at least `cap`.
+	# The capacity of the array is an internal information.
+	# However, this method can be used to prepare a large amount of add
 	fun enlarge(cap: Int) is abstract
 
 	redef fun push(item) do add(item)
@@ -171,20 +171,33 @@ class AbstractArray[E]
 	redef fun unshift(item)
 	do
 		var i = length - 1
-		while i > 0 do
+		while i >= 0 do
 			self[i+1] = self[i]
 			i -= 1
 		end
 		self[0] = item
 	end
 
-	fun insert(item: E, pos: Int)
+	redef fun insert(item: E, pos: Int)
 	do
 		enlarge(length + 1)
 		copy_to(pos, length-pos, self, pos + 1)
 		self[pos] = item
 	end
 
+	redef fun insert_all(coll, pos)
+	do
+		var l = coll.length
+		if l == 0 then return
+		enlarge(length + l)
+		_length += l
+		copy_to(pos, length-pos-l, self, pos + l)
+		for c in coll do
+			self[pos] = c
+			pos += 1
+		end
+	end
+
 	redef fun add(item) do self[length] = item
 
 	redef fun clear do _length = 0
@@ -213,37 +226,32 @@ class AbstractArray[E]
 		end
 	end
 
-	fun swap_at( a : Int, b : Int )
+	# Invert two elements in the array
+	#
+	#     var a = [10, 20, 30, 40]
+	#     a.swap_at(1, 3)
+	#     assert a      ==  [10, 40, 30, 20]
+	fun swap_at(a: Int,b: Int)
 	do
 	    var e = self[a]
-	    self[a] = b
+	    self[a] = self[b]
 	    self[b] = e
 	end
 end
 
-# Resizeable one dimention array of objects.
+# Resizable one dimension array of objects.
 #
 # Arrays have a literal representation.
-#     a = [12, 32, 8]
-# is equivalent with:
-#     a = new Array[Int]
-#     a.push(12)
-#     a.push(32)
-#     a.push(8)
+#     var a = [12, 32, 8]
+#     # is equivalent with:
+#     var b = new Array[Int]
+#     b.push(12)
+#     b.push(32)
+#     b.push(8)
+#     assert a == b
 class Array[E]
 	super AbstractArray[E]
 	super ArrayCapable[E]
-	redef fun iterate
-		!each(e: E)
-	do
-		var i = 0
-		var l = _length
-		var items = _items
-		while i < length do
-			each(items[i])
-			i += 1
-		end
-	end
 
 	redef fun [](index)
 	do
@@ -291,7 +299,13 @@ class Array[E]
 		_length = 0
 	end
 
-	# Create an array with some `items'.
+	# Create an array from a collection.
+	init from(items: Collection[E]) do
+		with_capacity(items.length)
+		self.add_all(items)
+	end
+
+	# Create an array with some `objects`.
 	init with_items(objects: E...)
 	do
 		_items = objects._items
@@ -308,7 +322,7 @@ class Array[E]
 		_length = 0
 	end
 
-	# Create an array of `count' elements
+	# Create an array of `count` elements
 	init filled_with(value: E, count: Int)
 	do
 		assert positive: count >= 0
@@ -332,71 +346,36 @@ class Array[E]
 	end
 
 	# The internal storage.
-	var _items: nullable NativeArray[E] = null
+	private var items: nullable NativeArray[E] = null
 
 	# Do not use this method
 	# FIXME: Remove it once modules can intrude non local modules
 	fun intern_items: NativeArray[E] do return _items.as(not null)
 
-	# The size of `_items'.
-	var _capacity: Int = 0
-
-	# Sort the array using the !cmp function.
-	fun sort
-		!cmp(e1,e2: E): Int
-	do
-		sub_sort(0, length-1) !cmp(x,y) = cmp(x, y)
-	end
-
-	# Sort `array' between `from' and `to' indices
-	private fun sub_sort(from: Int, to: Int)
-		!cmp(e1,e2: E): Int
-	do
-		if from >= to then
-			return
-		else if from + 7 < to then
-			var pivot = self[from]
-			var i = from
-			var j = to
-			while j > i do
-				while i <= to and cmp(self[i], pivot) <= 0 do i += 1
-				while j > i and cmp(self[j], pivot) >= 0 do j -= 1
-				if j > i then
-					var t = self[i]
-					self[i] = self[j]
-					self[j] = t
-				end
-			end
-			self[from] = self[i-1]
-			self[i-1] = pivot
-			sub_sort(from, i-2) !cmp(x,y) = cmp(x, y)
-			sub_sort(i, to) !cmp(x,y) = cmp(x, y)
-		else
-			var i = from
-			while i < to do
-				var min = i
-				var min_v = self[i]
-				var j = i
-				while j <= to do
-					if cmp(min_v, self[j]) > 0 then
-						min = j
-						min_v = self[j]
-					end
-					j += 1
-				end
-				if min != i then
-					self[min] = self[i]
-					self[i] = min_v
-				end
-				i += 1
-			end
+	# The size of `_items`.
+	private var capacity: Int = 0
+
+	redef fun ==(o)
+	do
+		if not o isa Array[nullable Object] then return super
+		# Efficient implementation
+		var l = length
+		if l != o.length then return false
+		var i = 0
+		var it = _items
+		var oit = o._items
+		while i < l do
+			if it[i] != oit[i] then return false
+			i += 1
 		end
+		return true
 	end
 end
 
-# An `Iterator' on `AbstractArray'
-class ArrayIterator[E]
+# An `Iterator` on `AbstractArray`
+private class ArrayIterator[E]
 	super IndexedIterator[E]
+
 	redef fun item do return _array[_index]
 
 	# redef fun item=(e) do _array[_index] = e
@@ -411,8 +390,23 @@ class ArrayIterator[E]
 		_index = 0
 	end
 
-	redef readable var _index: Int = 0
-	var _array: AbstractArrayRead[E]
+	redef var index = 0
+
+	private var array: AbstractArrayRead[E]
+end
+
+private class ArrayReverseIterator[E]
+	super ArrayIterator[E]
+
+	redef fun is_ok do return _index >= 0
+
+	redef fun next do _index -= 1
+
+	init(a: AbstractArrayRead[E])
+	do
+		_array = a
+		_index = a.length - 1
+	end
 end
 
 # Others collections ##########################################################
@@ -420,8 +414,9 @@ end
 # A set implemented with an Array.
 class ArraySet[E: Object]
 	super Set[E]
+
 	# The stored elements.
-	var _array: Array[E]
+	private var array: Array[E]
 
 	redef fun has(e) do return _array.has(e)
 
@@ -449,7 +444,7 @@ class ArraySet[E: Object]
 
 	redef fun iterator do return new ArraySetIterator[E](_array.iterator)
 
-	# Assume the capacitydd is at least `cap'.
+	# Assume the capacity is at least `cap`.
 	fun enlarge(cap: Int) do _array.enlarge(cap)
 
 	private fun remove_at(i: Int)
@@ -463,10 +458,12 @@ class ArraySet[E: Object]
 
 	# Create an empty set with a given capacity.
 	init with_capacity(i: Int) do _array = new Array[E].with_capacity(i)
+
+	redef fun new_set do return new ArraySet[E]
 end
 
 # Iterators on sets implemented with arrays.
-class ArraySetIterator[E: Object]
+private class ArraySetIterator[E: Object]
 	super Iterator[E]
 
 	redef fun is_ok do return _iter.is_ok
@@ -477,7 +474,7 @@ class ArraySetIterator[E: Object]
 
 	init(iter: ArrayIterator[E]) do _iter = iter
 
-	var _iter: ArrayIterator[E]
+	private var iter: ArrayIterator[E]
 end
 
 
@@ -492,7 +489,7 @@ class ArrayMap[K: Object, E]
 		if i >= 0 then
 			return _items[i].second
 		else
-			abort
+			return provide_default_value(key)
 		end
 	end
 
@@ -507,19 +504,19 @@ class ArrayMap[K: Object, E]
 		end
 	end
 
-	redef var keys: ArrayMapKeys[K, E] = new ArrayMapKeys[K, E](self)
-	redef var values: ArrayMapValues[K, E] = new ArrayMapValues[K, E](self)
+	redef var keys: RemovableCollection[K] = new ArrayMapKeys[K, E](self)
+	redef var values: RemovableCollection[E] = new ArrayMapValues[K, E](self)
 
 	# O(1)
 	redef fun length do return _items.length
 
-	redef fun iterator: CoupleMapIterator[K, E] do return new CoupleMapIterator[K, E](_items.iterator)
+	redef fun couple_iterator do return _items.iterator
 
 	redef fun is_empty do return _items.is_empty
 
 	redef fun clear do _items.clear
 
-	# Assume the capacity to be at least `cap'.
+	# Assume the capacity to be at least `cap`.
 	fun enlarge(cap: Int) do _items.enlarge(cap)
 
 	redef fun couple_at(key)
@@ -533,7 +530,7 @@ class ArrayMap[K: Object, E]
 	end
 
 	# Internal storage.
-	var _items: Array[Couple[K,E]]
+	private var items = new Array[Couple[K,E]]
 
 	# fast remove the ith element of the array
 	private fun remove_at_index(i: Int)
@@ -543,9 +540,9 @@ class ArrayMap[K: Object, E]
 	end
 
 	# The last positive result given by a index(1) call
-	var _last_index: Int = 0
+	private var last_index: Int = 0
 
-	# Where is the `key' in `_item'?
+	# Where is the `key` in `_item`?
 	# return -1 if not found
 	private fun index(key: K): Int
 	do
@@ -562,15 +559,9 @@ class ArrayMap[K: Object, E]
 		end
 		return -1
 	end
-
-	# A new empty map.
-	init
-	do
-		_items = new Array[Couple[K,E]]
-	end
 end
 
-class ArrayMapKeys[K: Object, E]
+private class ArrayMapKeys[K: Object, E]
 	super RemovableCollection[K]
 	# The original map
 	var map: ArrayMap[K, E]
@@ -590,11 +581,11 @@ class ArrayMapKeys[K: Object, E]
 	redef fun remove_all(key) do self.remove(key)
 end
 
-class ArrayMapValues[K: Object, E]
-	super RemovableCollection[K]
+private class ArrayMapValues[K: Object, E]
+	super RemovableCollection[E]
 	# The original map
 	var map: ArrayMap[K, E]
-	redef fun first do return self.map._items.first.first
+	redef fun first do return self.map._items.first.second
 	redef fun is_empty do return self.map.is_empty
 	redef fun length do return self.map.length
 	redef fun iterator do return new MapValuesIterator[K, E](self.map.iterator)
@@ -649,11 +640,77 @@ class ArrayMapValues[K: Object, E]
 	end
 end
 
+# Comparable array for comparable elements.
+#
+# For two arrays, if one is a prefix, then it is lower.
+#
+# ~~~
+# var a12 = new ArrayCmp[nullable Int].with_items(1,2)
+# var a123 = new ArrayCmp[nullable Int].with_items(1,2,3)
+# assert a12 < a123
+# ~~~
+#
+# Otherwise, the first element just after the longest
+# common prefix gives the order between the two arrays.
+#
+# ~~~
+# var a124 = new ArrayCmp[nullable Int].with_items(1,2,4)
+# var a13 = new ArrayCmp[nullable Int].with_items(1,3)
+# assert a12  < a123
+# assert a123 < a13
+# ~~~
+#
+# Obviously, two equal arrays are equal.
+#
+# ~~~
+# var b12 = new ArrayCmp[nullable Int].with_items(1,2)
+# assert (a12 <=> b12) == 0
+# ~~~
+#
+# `null` is considered lower than any other elements.
+# But is still greater than no element.
+#
+# ~~~
+# var a12n = new ArrayCmp[nullable Int].with_items(1,2,null)
+# assert a12n < a123
+# assert a12  < a12n
+# ~~~
+class ArrayCmp[E: nullable Comparable]
+	super Array[E]
+	super Comparable
+	redef type OTHER: ArrayCmp[E] is fixed
+
+	redef fun <(o) do return (self <=> o) < 0
+
+	redef fun <=>(o)
+	do
+		var it = _items
+		var oit = o._items
+		var i = 0
+		var l = length
+		var ol = o.length
+		var len
+		if l < ol then len = l else len = ol
+		while i < len do
+			var a = it[i]
+			var b = oit[i]
+			if a != null then
+				if b == null then return 1
+				var d = a <=> b.as(Comparable)
+				if d != 0 then return d
+			else
+				if b != null then return -1
+			end
+			i += 1
+		end
+		return l <=> ol
+	end
+end
 
 # Others tools ################################################################
 
 redef class Iterator[E]
-	# Interate on `self' and build an array
+	# Interate on `self` and build an array
 	fun to_a: Array[E]
 	do
 		var res = new Array[E]
@@ -669,7 +726,9 @@ redef class Collection[E]
 	# Build a new array from a collection
 	fun to_a: Array[E]
 	do
-		return iterator.to_a
+		var res = new Array[E].with_capacity(length)
+		res.add_all(self)
+		return res
 	end
 end
 
@@ -677,12 +736,20 @@ end
 
 # Subclasses of this class can create native arrays
 interface ArrayCapable[E]
-	# Get a new array of `size' elements.
+	# Get a new array of `size` elements.
 	protected fun calloc_array(size: Int): NativeArray[E] is intern
 end
 
-# Native C array (void ...).
+# Native Nit array
+# Access are unchecked and it has a fixed size
+# Not for public use: may become private.
 universal NativeArray[E]
+	# Creates a new NativeArray of capacity `length`
+	new(length: Int) is intern
+	# The length of the array
+	fun length: Int is intern
+	# Use `self` to initialize a standard Nit Array.
+	fun to_a: Array[E] do return new Array[E].with_native(self, length)
 	fun [](index: Int): E is intern
 	fun []=(index: Int, item: E) is intern
 	fun copy_to(dest: NativeArray[E], length: Int) is intern