rename `NativeString` to `CString`

[nit.git] / src / interpreter / primitive_types.nit

diff --git a/src/interpreter/primitive_types.nit b/src/interpreter/primitive_types.nit
index 122fe4e..129d0c6 100644 (file)
--- a/src/interpreter/primitive_types.nit
+++ b/src/interpreter/primitive_types.nit
@@ -14,8 +14,8 @@
 # underlying implementation and that the services are semantically correct.
 module primitive_types
 
-intrude import standard::file
-intrude import standard::string
+intrude import core::file
+intrude import core::text::flat
 
 # Wrapper for `NativeFile`
 class PrimitiveNativeFile
@@ -23,23 +23,23 @@ class PrimitiveNativeFile
        var file: Stream
 
        init native_stdin do
-               file = sys.stdin
+               init(sys.stdin)
        end
 
        init native_stdout do
-               file = sys.stdout
+               init(sys.stdout)
        end
 
        init native_stderr do
-               file = sys.stderr
+               init(sys.stderr)
        end
 
        init io_open_read(path: String) do
-               file = new FileReader.open(path.to_s)
+               init(new FileReader.open(path.to_s))
        end
 
        init io_open_write(path: String) do
-               file = new FileWriter.open(path.to_s)
+               init(new FileWriter.open(path.to_s))
        end
 
        fun address_is_null: Bool do
@@ -47,16 +47,16 @@ class PrimitiveNativeFile
                return false
        end
 
-       fun io_read(buf: NativeString, len: Int): Int do
+       fun io_read(buf: CString, len: Int): Int do
                if file isa FileStream then return file.as(FileStream)._file.io_read(buf, len)
                var str = file.as(Reader).read(len)
                str.to_cstring.copy_to(buf, str.length, 0, 0)
                return str.length
        end
 
-       fun io_write(buf: NativeString, len: Int): Int do
-               if file isa FileStream then return file.as(FileStream)._file.io_write(buf, len)
-               file.as(Writer).write(buf.to_s_with_length(len))
+       fun io_write(buf: CString, from, len: Int): Int do
+               if file isa FileStream then return file.as(FileStream)._file.io_write(buf, from, len)
+               file.as(Writer).write(buf.to_s_with_length(len).substring_from(from))
                return len
        end