lib/core: remove uses of Byte for Text

[nit.git] / lib / core / codecs / utf8.nit

diff --git a/lib/core/codecs/utf8.nit b/lib/core/codecs/utf8.nit
index bb257dd..c37bd35 100644 (file)
--- a/lib/core/codecs/utf8.nit
+++ b/lib/core/codecs/utf8.nit
@@ -30,7 +30,7 @@ private class UTF8Codec
        redef fun max_lookahead do return 4
 
        redef fun encode_char(c) do
-               var ns = new NativeString(c.u8char_len)
+               var ns = new CString(c.u8char_len)
                add_char_to(c, ns)
                return ns
        end
@@ -41,20 +41,20 @@ private class UTF8Codec
        end
 
        redef fun encode_string(s) do
-               var buf = new Bytes.with_capacity(s.bytelen)
+               var buf = new Bytes.with_capacity(s.byte_length)
                add_string_to(s, buf)
                return buf
        end
 
        redef fun add_string_to(s, b) do
                s.append_to_bytes(b)
-               return s.bytelen
+               return s.byte_length
        end
 
        redef fun is_valid_char(ns, len) do
                if len == 0 then return 2
                if not ns[0].is_valid_utf8_start then return 2
-               for i in [1 .. len[ do if ns[i] & 0b1100_0000u8 != 0b1000_0000u8 then return 2
+               for i in [1 .. len[ do if ns[i] & 0b1100_0000 != 0b1000_0000 then return 2
                if len != ns[0].u8len then return 1
                return 0
        end
@@ -68,12 +68,13 @@ private class UTF8Codec
        end
 
        redef fun decode_string(ns, len) do
-               var ret = ns.to_s_with_length(len)
+               assert len >= 0
+               var ret = ns.to_s_unsafe(len, copy=false)
                var rit = ret.as(FlatString).items
                if rit == ns then
-                       var nns = new NativeString(len)
+                       var nns = new CString(len)
                        rit.copy_to(nns, len, 0, 0)
-                       return nns.to_s_full(ret.bytelen, ret.length)
+                       return nns.to_s_unsafe(ret.byte_length, ret.length, copy=false)
                end
                return ret
        end