lib/core: Re-made `length` an attribute in `FlatString` since its cost as lazy was...

[nit.git] / lib / core / file.nit

diff --git a/lib/core/file.nit b/lib/core/file.nit
index 03955eb..f54901e 100644 (file)
--- a/lib/core/file.nit
+++ b/lib/core/file.nit
@@ -959,10 +959,13 @@ redef class String
        end
 
        # Return the canonicalized absolute pathname (see POSIX function `realpath`)
+       #
+       # Require: `file_exists`
        fun realpath: String do
                var cs = to_cstring.file_realpath
+               assert file_exists
                var res = cs.to_s_with_copy
-               # cs.free_malloc # FIXME memory leak
+               cs.free
                return res
        end
 
@@ -1268,7 +1271,7 @@ redef class FlatString
 
        redef fun file_extension do
                var its = _items
-               var p = _last_byte
+               var p = last_byte
                var c = its[p]
                var st = _first_byte
                while p >= st and c != '.'.ascii do
@@ -1276,12 +1279,12 @@ redef class FlatString
                        c = its[p]
                end
                if p <= st then return null
-               var ls = _last_byte
-               return new FlatString.with_infos(its, ls - p, p + 1, ls)
+               var ls = last_byte
+               return new FlatString.with_infos(its, ls - p, p + 1)
        end
 
        redef fun basename(extension) do
-               var l = _last_byte
+               var l = last_byte
                var its = _items
                var min = _first_byte
                var sl = '/'.ascii
@@ -1289,7 +1292,7 @@ redef class FlatString
                if l == min then return "/"
                var ns = l
                while ns >= min and its[ns] != sl do ns -= 1
-               var bname = new FlatString.with_infos(its, l - ns, ns + 1, l)
+               var bname = new FlatString.with_infos(its, l - ns, ns + 1)
 
                return if extension != null then bname.strip_extension(extension) else bname
        end