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

diff --git a/lib/core/collection/array.nit b/lib/core/collection/array.nit
index ce89435..8747c8b 100644
--- a/lib/core/collection/array.nit
+++ b/lib/core/collection/array.nit
@@ -111,11 +111,18 @@ abstract class AbstractArrayRead[E]
 	#     assert b      ==  [10, 20, 2, 3, 50]
 	fun copy_to(start: Int, len: Int, dest: AbstractArray[E], new_start: Int)
 	do
-		# TODO native one
-		var i = len
-		while i > 0 do
-			i -= 1
-			dest[new_start+i] = self[start+i]
+		if start < new_start then
+			var i = len
+			while i > 0 do
+				i -= 1
+				dest[new_start+i] = self[start+i]
+			end
+		else
+			var i = 0
+			while i < len do
+				dest[new_start+i] = self[start+i]
+				i += 1
+			end
 		end
 	end
 
@@ -130,7 +137,7 @@ abstract class AbstractArrayRead[E]
 		end
 	end
 
-	redef fun iterator: ArrayIterator[E] do
+	redef fun iterator: IndexedIterator[E] do
 		var res = _free_iterator
 		if res == null then return new ArrayIterator[E](self)
 		res._index = 0
@@ -220,22 +227,18 @@ abstract class AbstractArray[E]
 	do
 		assert not_empty: not is_empty
 		var r = first
-		var i = 1
-		var l = length
-		while i < l do
-			self[i-1] = self[i]
-			i += 1
-		end
-		_length = l - 1
+		var l = length-1
+		copy_to(1, l, self, 0)
+		_length = l
 		return r
 	end
 
 	redef fun unshift(item)
 	do
-		var i = length - 1
-		while i >= 0 do
-			self[i+1] = self[i]
-			i -= 1
+		var l = length
+		if l > 0 then
+			enlarge(l + 1)
+			copy_to(0, l, self, 1)
 		end
 		self[0] = item
 	end
@@ -369,6 +372,32 @@ class Array[E]
 		_length = nl
 	end
 
+	redef fun copy_to(start, len, dest, new_start)
+	do
+		# Fast code when source and destination are two arrays
+
+		if not dest isa Array[E] then
+			super
+			return
+		end
+
+		# Enlarge dest if required
+		var dest_len = new_start + len
+		if dest_len > dest.length then
+			dest.enlarge(dest_len)
+			dest.length = dest_len
+		end
+
+		# Get underlying native arrays
+		var items = self.items
+		if items == null then return
+		var dest_items = dest.items
+		assert dest_items != null
+
+		# Native copy
+		items.memmove(start, len, dest_items, new_start)
+	end
+
 	redef fun enlarge(cap)
 	do
 		var c = _capacity
@@ -563,7 +592,6 @@ end
 # A set implemented with an Array.
 class ArraySet[E]
 	super Set[E]
-	super Cloneable
 
 	# The stored elements.
 	private var array: Array[E] is noinit
@@ -653,7 +681,7 @@ private class ArraySetIterator[E]
 
 	redef fun item: E do return _iter.item
 
-	var iter: ArrayIterator[E]
+	var iter: Iterator[E]
 end
 
 
@@ -962,6 +990,24 @@ universal NativeArray[E]
 
 	# Copy `length` items to `dest`.
 	fun copy_to(dest: NativeArray[E], length: Int) is intern
+
+	# Copy `length` items to `dest` starting from `dest`.
+	fun memmove(start: Int, length: Int, dest: NativeArray[E], dest_start: Int) is intern do
+		if start < dest_start then
+			var i = length
+			while i > 0 do
+				i -= 1
+				dest[dest_start+i] = self[start+i]
+			end
+		else
+			var i = 0
+			while i < length do
+				dest[dest_start+i] = self[start+i]
+				i += 1
+			end
+		end
+	end
+
 	#fun =(o: NativeArray[E]): Bool is intern
 	#fun !=(o: NativeArray[E]): Bool is intern
 end