X-Git-Url: http://nitlanguage.org diff --git a/lib/standard/file.nit b/lib/standard/file.nit index 0d00cdd..b797da1 100644 --- a/lib/standard/file.nit +++ b/lib/standard/file.nit @@ -16,7 +16,7 @@ module file intrude import stream -intrude import string +intrude import ropes import string_search import time @@ -28,44 +28,11 @@ in "C Header" `{ #include `} -redef class Object -# Simple I/O - - # Print `objects` on the standard output (`stdout`). - protected fun printn(objects: Object...) - do - stdout.write(objects.to_s) - end - - # Print an `object` on the standard output (`stdout`) and add a newline. - protected fun print(object: Object) - do - stdout.write(object.to_s) - stdout.write("\n") - end - - # Read a character from the standard input (`stdin`). - protected fun getc: Char - do - return stdin.read_char.ascii - end - - # Read a line from the standard input (`stdin`). - protected fun gets: String - do - return stdin.read_line - end - - # Return the working (current) directory - protected fun getcwd: String do return file_getcwd.to_s - private fun file_getcwd: NativeString is extern "string_NativeString_NativeString_file_getcwd_0" -end - # File Abstract Stream abstract class FStream super IOS # The path of the file. - readable var _path: nullable String = null + var path: nullable String = null # The FILE *. var _file: nullable NativeFile = null @@ -85,8 +52,8 @@ class IFStream fun reopen do if not eof then close - _file = new NativeFile.io_open_read(_path.to_cstring) - _end_reached = false + _file = new NativeFile.io_open_read(path.to_cstring) + end_reached = false _buffer_pos = 0 _buffer.clear end @@ -94,30 +61,32 @@ class IFStream redef fun close do var i = _file.io_close - _end_reached = true + end_reached = true end redef fun fill_buffer do - var nb = _file.io_read(_buffer._items, _buffer._capacity) + var nb = _file.io_read(_buffer.items, _buffer.capacity) if nb <= 0 then - _end_reached = true + end_reached = true nb = 0 end - _buffer._length = nb + _buffer.length = nb _buffer_pos = 0 end # End of file? - redef readable var _end_reached: Bool = false + redef var end_reached: Bool = false # Open the file at `path` for reading. init open(path: String) do - _path = path + self.path = path prepare_buffer(10) - _file = new NativeFile.io_open_read(_path.to_cstring) - assert cant_open_file: _file != null + _file = new NativeFile.io_open_read(path.to_cstring) + assert not _file.address_is_null else + print "Error: Opening file at '{path}' failed with '{sys.errno.strerror}'" + end end private init do end @@ -132,7 +101,11 @@ class OFStream redef fun write(s) do assert _writable - write_native(s.to_cstring, s.length) + if s isa FlatText then + write_native(s.to_cstring, s.length) + else + for i in s.substrings do write_native(i.to_cstring, i.length) + end end redef fun is_writable do return _writable @@ -161,8 +134,10 @@ class OFStream init open(path: String) do _file = new NativeFile.io_open_write(path.to_cstring) - assert cant_open_file: _file != null - _path = path + assert not _file.address_is_null else + print "Error: Opening file at '{path}' failed with '{sys.errno.strerror}'" + end + self.path = path _writable = true end @@ -174,22 +149,22 @@ end class Stdin super IFStream + super PollableIStream + private init do _file = new NativeFile.native_stdin - _path = "/dev/stdin" + path = "/dev/stdin" prepare_buffer(1) end - # Is these something to read? (non blocking) - # FIXME: should be generalized - fun poll_in: Bool is extern "file_stdin_poll_in" + redef fun poll_in: Bool is extern "file_stdin_poll_in" end class Stdout super OFStream private init do _file = new NativeFile.native_stdout - _path = "/dev/stdout" + path = "/dev/stdout" _writable = true end end @@ -198,7 +173,7 @@ class Stderr super OFStream private init do _file = new NativeFile.native_stderr - _path = "/dev/stderr" + path = "/dev/stderr" _writable = true end end @@ -274,10 +249,10 @@ redef class String # assert "".basename("") == "" fun basename(ext: String): String do - var l = _length - 1 # Index of the last char + var l = length - 1 # Index of the last char while l > 0 and self.chars[l] == '/' do l -= 1 # remove all trailing `/` if l == 0 then return "/" - var pos = last_index_of_from('/', l) + var pos = chars.last_index_of_from('/', l) var n = self if pos >= 0 then n = substring(pos+1, l-pos) @@ -297,9 +272,9 @@ redef class String # assert "".dirname == "." fun dirname: String do - var l = _length - 1 # Index of the last char + var l = length - 1 # Index of the last char while l > 0 and self.chars[l] == '/' do l -= 1 # remove all trailing `/` - var pos = last_index_of_from('/', l) + var pos = chars.last_index_of_from('/', l) if pos > 0 then return substring(0, pos) else if pos == 0 then @@ -375,7 +350,7 @@ redef class String fun mkdir do var dirs = self.split_with("/") - var path = new Buffer + var path = new FlatBuffer if dirs.is_empty then return if dirs[0].is_empty then # it was a starting / @@ -419,7 +394,7 @@ redef class String # assert ".file".file_extension == null fun file_extension: nullable String do - var last_slash = last_index_of('.') + var last_slash = chars.last_index_of('.') if last_slash > 0 then return substring( last_slash+1, length ) else @@ -507,7 +482,7 @@ extern class FileStat `{ struct stat * `} end # Instance of this class are standard FILE * pointers -private extern NativeFile `{ FILE* `} +private extern class NativeFile `{ FILE* `} fun io_read(buf: NativeString, len: Int): Int is extern "file_NativeFile_NativeFile_io_read_2" fun io_write(buf: NativeString, len: Int): Int is extern "file_NativeFile_NativeFile_io_write_2" fun io_close: Int is extern "file_NativeFile_NativeFile_io_close_0" @@ -520,11 +495,44 @@ private extern NativeFile `{ FILE* `} new native_stderr is extern "file_NativeFileCapable_NativeFileCapable_native_stderr_0" end -# Standard input. -fun stdin: Stdin do return once new Stdin +redef class Sys + + # Standard input + var stdin: PollableIStream protected writable = new Stdin + + # Standard output + var stdout: OStream protected writable = new Stdout + + # Standard output for errors + var stderr: OStream protected writable = new Stderr + +end + +# Print `objects` on the standard output (`stdout`). +protected fun printn(objects: Object...) +do + sys.stdout.write(objects.to_s) +end + +# Print an `object` on the standard output (`stdout`) and add a newline. +protected fun print(object: Object) +do + sys.stdout.write(object.to_s) + sys.stdout.write("\n") +end + +# Read a character from the standard input (`stdin`). +protected fun getc: Char +do + return sys.stdin.read_char.ascii +end -# Standard output. -fun stdout: OFStream do return once new Stdout +# Read a line from the standard input (`stdin`). +protected fun gets: String +do + return sys.stdin.read_line +end -# Standard output for error. -fun stderr: OFStream do return once new Stderr +# Return the working (current) directory +protected fun getcwd: String do return file_getcwd.to_s +private fun file_getcwd: NativeString is extern "string_NativeString_NativeString_file_getcwd_0"