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

diff --git a/lib/string_experimentations/utf8.nit b/lib/string_experimentations/utf8.nit
index 8581351..b7a74ce 100644
--- a/lib/string_experimentations/utf8.nit
+++ b/lib/string_experimentations/utf8.nit
@@ -16,6 +16,7 @@
 module utf8
 
 intrude import standard::string
+intrude import standard::file
 
 in "C Header" `{
 
@@ -105,11 +106,11 @@ extern class UnicodeChar `{ UTF8Char* `}
 	fun to_upper: UnicodeChar import UnicodeChar.code_point `{
 		int cp = UnicodeChar_code_point(recv);
 		if(cp < 97 || cp > 122){ return recv; }
-		char* ns = nit_alloc(2);
+		char* ns = malloc(2);
 		ns[1] = '\0';
 		char c = recv->ns[recv->pos];
 		ns[0] = c - 32;
-		UTF8Char* ret = nit_alloc(sizeof(UTF8Char));
+		UTF8Char* ret = malloc(sizeof(UTF8Char));
 		ret->ns = ns;
 		ret->pos = 0;
 		return ret;
@@ -122,11 +123,11 @@ extern class UnicodeChar `{ UTF8Char* `}
 	fun to_lower: UnicodeChar import UnicodeChar.code_point `{
 		int cp = UnicodeChar_code_point(recv);
 		if(cp < 65 || cp > 90){ return recv; }
-		char* ns = nit_alloc(2);
+		char* ns = malloc(2);
 		ns[1] = '\0';
 		char c = recv->ns[recv->pos];
 		ns[0] = c + 32;
-		UTF8Char* ret = nit_alloc(sizeof(UTF8Char));
+		UTF8Char* ret = malloc(sizeof(UTF8Char));
 		ret->ns = ns;
 		ret->pos = 0;
 		return ret;
@@ -144,6 +145,23 @@ extern class UnicodeChar `{ UTF8Char* `}
 		return false
 	end
 
+	redef fun output import UnicodeChar.code_point `{
+		switch(UnicodeChar_len(recv)){
+			case 1:
+				printf("%c", recv->ns[recv->pos]);
+				break;
+			case 2:
+				printf("%c%c", recv->ns[recv->pos], recv->ns[recv->pos + 1]);
+				break;
+			case 3:
+				printf("%c%c%c", recv->ns[recv->pos], recv->ns[recv->pos + 1], recv->ns[recv->pos + 2]);
+				break;
+			case 4:
+				printf("%c%c%c%c", recv->ns[recv->pos], recv->ns[recv->pos + 1], recv->ns[recv->pos + 2], recv->ns[recv->pos + 3]);
+				break;
+		}
+	`}
+
 	redef fun to_s import NativeString.to_s_with_length `{
 		int len = utf8___UnicodeChar_len___impl(recv);
 		char* r = malloc(len + 1);
@@ -196,7 +214,7 @@ redef class FlatString
 	redef fun to_cstring
 	do
 		if real_items != null then return real_items.as(not null)
-		var new_items = calloc_string(bytelen + 1)
+		var new_items = new NativeString(bytelen + 1)
 		self.items.copy_to(new_items, bytelen, index[index_from].pos, 0)
 		new_items[bytelen] = '\0'
 		self.real_items = new_items
@@ -227,7 +245,7 @@ redef class FlatString
 
 	redef fun reversed
 	do
-		var native = calloc_string(self.bytelen + 1)
+		var native = new NativeString(self.bytelen + 1)
 		var length = self.length
 		var index = self.index
 		var pos = 0
@@ -260,7 +278,7 @@ redef class FlatString
 		var my_real_len = length
 		var my_real_fin_len = my_real_len * i
 
-		var target_string = calloc_string((finlen) + 1)
+		var target_string = new NativeString((finlen) + 1)
 
 		var my_index = index
 		var new_index = new StringIndex(my_real_fin_len)
@@ -280,6 +298,74 @@ redef class FlatString
 
 	end
 
+	redef fun to_upper
+	do
+		var outstr = new NativeString(self.bytelen + 1)
+
+		var out_index = 0
+		var index = self.index
+		var ipos = 0
+		var max = length
+		var items = self.items
+
+		while ipos < max do
+			var u = index[ipos].to_upper
+			u.ns.copy_to(outstr, u.len, u.pos, out_index)
+			out_index += u.len
+			ipos += 1
+		end
+
+		outstr[self.bytelen] = '\0'
+
+		return outstr.to_s_with_length(self.bytelen)
+	end
+
+	redef fun to_lower
+	do
+		var outstr = new NativeString(self.bytelen + 1)
+
+		var out_index = 0
+		var index = self.index
+		var ipos = 0
+		var max = length
+		var items = self.items
+
+		while ipos < max do
+			var u = index[ipos].to_lower
+			u.ns.copy_to(outstr, u.len, u.pos, out_index)
+			out_index += u.len
+			ipos += 1
+		end
+
+		outstr[self.bytelen] = '\0'
+
+		return outstr.to_s_with_length(self.bytelen)
+	end
+
+	redef fun output
+	do
+		var i = self.index_from
+		var imax = self.index_to
+		while i <= imax do
+			index[i].output
+			i += 1
+		end
+	end
+
+end
+
+redef class FlatBuffer
+
+	# Fix for this particular implementation
+	#
+	# Since the to_s of a FlatBuffer now builds using
+	# the old String contructor, this breaks everything.
+	#
+	# This will disappear when UTF8 is fully-supported
+	redef fun to_s do
+		written = false
+		return to_cstring.to_s_with_length(length)
+	end
 end
 
 redef class NativeString
@@ -320,8 +406,22 @@ redef class NativeString
 		var real_len = new Container[Int](0)
 		var length = cstring_length
 		var x = make_index(length, real_len)
-		var new_self = calloc_string(length + 1)
+		var new_self = new NativeString(length + 1)
 		copy_to(new_self, length, 0, 0)
 		return new FlatString.with_infos_index(new_self, real_len.item, 0, real_len.item - 1, x, length)
 	end
 end
+
+redef class OFStream
+	redef fun write(s)
+	do
+		assert is_writable
+		if s isa FlatText then
+			if s isa FlatString then
+				write_native(s.to_cstring, s.bytelen)
+			else
+				write_native(s.to_cstring, s.length)
+			end
+		else for i in s.substrings do write_native(i.to_cstring, i.length)
+	end
+end