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

diff --git a/lib/standard/ropes.nit b/lib/standard/ropes.nit
index 68593fd..902649a 100644
--- a/lib/standard/ropes.nit
+++ b/lib/standard/ropes.nit
@@ -67,20 +67,20 @@ private abstract class RopeString
 	super Rope
 	super String
 
-	redef fun chars is cached do return new RopeChars(self)
+	redef var chars is lazy do return new RopeChars(self)
 end
 
 # Node that represents a concatenation between two `String`
 private class Concat
 	super RopeString
 
-	redef var length: Int
+	redef var length is noinit
 
 	redef fun substrings do return new RopeSubstrings(self)
 
 	redef fun empty do return ""
 
-	redef fun to_cstring is cached do
+	redef var to_cstring is lazy do
 		var len = length
 		var ns = new NativeString(len + 1)
 		ns[len] = '\0'
@@ -98,10 +98,8 @@ private class Concat
 	# Right child of the node
 	var right: String
 
-	init(l: String, r: String) is old_style_init do
-		left = l
-		right = r
-		length = l.length + r.length
+	init do
+		length = left.length + right.length
 	end
 
 	redef fun output do
@@ -159,6 +157,26 @@ private class Concat
 			return new Concat(left, r + s)
 		end
 	end
+
+	redef fun copy_to_native(dest, n, src_offset, dest_offset) do
+		var subs = new RopeSubstrings.from(self, src_offset)
+		var st = src_offset - subs.pos
+		var off = dest_offset
+		while n > 0 do
+			var it = subs.item
+			if n > it.length then
+				var cplen = it.length - st
+				it.items.copy_to(dest, cplen, st, off)
+				off += cplen
+				n -= cplen
+			else
+				it.items.copy_to(dest, n, st, off)
+				n = 0
+			end
+			subs.next
+			st = 0
+		end
+	end
 end
 
 # Mutable `Rope`, optimized for concatenation operations
@@ -179,7 +197,7 @@ class RopeBuffer
 	super Rope
 	super Buffer
 
-	redef fun chars: Sequence[Char] is cached do return new RopeBufferChars(self)
+	redef var chars: Sequence[Char] is lazy do return new RopeBufferChars(self)
 
 	# The final string being built on the fly
 	private var str: String is noinit
@@ -206,7 +224,7 @@ class RopeBuffer
 	# mutable native string (`ns`)
 	private var buf_size: Int is noinit
 
-	redef fun substrings: Iterator[String] do return new RopeBufSubstringIterator(self)
+	redef fun substrings do return new RopeBufSubstringIterator(self)
 
 	# Builds an empty `RopeBuffer`
 	init do
@@ -650,12 +668,12 @@ private class ReverseRopeSubstrings
 end
 
 private class RopeBufSubstringIterator
-	super Iterator[String]
+	super Iterator[FlatText]
 
 	# Iterator on the substrings of the building string
-	var iter: Iterator[String]
+	var iter: Iterator[FlatText]
 	# Makes a String out of the buffered part of the Ropebuffer
-	var nsstr: String
+	var nsstr: FlatString
 	# Did we attain the buffered part ?
 	var nsstr_done = false
 
@@ -684,7 +702,7 @@ end
 
 # Substrings of a Rope (i.e. Postfix iterator on leaves)
 private class RopeSubstrings
-	super IndexedIterator[String]
+	super IndexedIterator[FlatString]
 
 	# Visit Stack
 	var iter: RopeIterPiece is noinit
@@ -694,7 +712,7 @@ private class RopeSubstrings
 	var max: Int is noinit
 
 	# Current leaf
-	var str: String is noinit
+	var str: FlatString is noinit
 
 	init(root: RopeString) is old_style_init do
 		var r = new RopeIterPiece(root, true, false, null)
@@ -706,7 +724,7 @@ private class RopeSubstrings
 				rnod = rnod.left
 				r = new RopeIterPiece(rnod, true, false, r)
 			else
-				str = rnod
+				str = rnod.as(FlatString)
 				r.rdone = true
 				iter = r
 				break
@@ -731,7 +749,7 @@ private class RopeSubstrings
 					r = new RopeIterPiece(rnod, true, false, r)
 				end
 			else
-				str = rnod
+				str = rnod.as(FlatString)
 				r.rdone = true
 				iter = r
 				self.pos = pos - off
@@ -755,7 +773,7 @@ private class RopeSubstrings
 			if not rnod isa Concat then
 				it.ldone = true
 				it.rdone = true
-				str = rnod
+				str = rnod.as(FlatString)
 				iter = it.as(not null)
 				break
 			end
@@ -780,17 +798,15 @@ end
 private class RopeChars
 	super StringCharView
 
-	var tgt: RopeString
-
-	init(s: RopeString) is old_style_init do tgt = s
+	redef type SELFTYPE: RopeString
 
 	redef fun [](i) do
-		return tgt[i]
+		return target[i]
 	end
 
-	redef fun iterator_from(i) do return new RopeIter.from(tgt, i)
+	redef fun iterator_from(i) do return new RopeIter.from(target, i)
 
-	redef fun reverse_iterator_from(i) do return new RopeReviter.from(tgt, i)
+	redef fun reverse_iterator_from(i) do return new RopeReviter.from(target, i)
 
 end
 
@@ -810,7 +826,7 @@ class RopeBufferIter
 	# Maximum position iterable.
 	var maxpos: Int
 
-	redef var index: Int
+	redef var index
 
 	# Init the iterator from a RopeBuffer.
 	init(t: RopeBuffer) is old_style_init do
@@ -860,7 +876,7 @@ class RopeBufferReviter
 	# Current position in `ns`.
 	var pns: Int
 
-	redef var index: Int
+	redef var index
 
 	# Init the iterator from a RopeBuffer.
 	init(tgt: RopeBuffer) is old_style_init do