Merge: ordered_tree: make OrderedTree implement Collection

[nit.git] / src / location.nit

diff --git a/src/location.nit b/src/location.nit
index 26b6fa1..2737580 100644 (file)
--- a/src/location.nit
+++ b/src/location.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # This module is used to model Nit source-file and locations in source-file
-package location
+module location
 
 # A raw text Nit source file
 class SourceFile
@@ -50,18 +50,18 @@ class Location
        super Comparable
        redef type OTHER: Location
 
-       readable var _file: nullable SourceFile
-       readable var _line_start: Int
-       readable var _line_end: Int
-       readable var _column_start: Int
-       readable var _column_end: Int
+       var file: nullable SourceFile
+       var line_start: Int
+       var line_end: Int
+       var column_start: Int
+       var column_end: Int
 
        init(f: nullable SourceFile, line_s: Int, line_e: Int, column_s: Int, column_e: Int) do
-               _file = f
-               _line_start = line_s
-               _line_end = line_e
-               _column_start = column_s
-               _column_end = column_e
+               file = f
+               line_start = line_s
+               line_end = line_e
+               column_start = column_s
+               column_end = column_e
        end
 
        # The index in the start character in the source
@@ -174,7 +174,7 @@ class Location
                var line_start = l.file.line_starts[i-1]
                var line_end = line_start
                var string = l.file.string
-               while line_end+1 < string.length and string[line_end+1] != '\n' and string[line_end+1] != '\r' do
+               while line_end+1 < string.length and string.chars[line_end+1] != '\n' and string.chars[line_end+1] != '\r' do
                        line_end += 1
                end
                var lstart = string.substring(line_start, l.column_start - 1)
@@ -193,9 +193,9 @@ class Location
                        lmid = ""
                        lend = ""
                end
-               var indent = new Buffer
+               var indent = new FlatBuffer
                for j in [line_start..line_start+l.column_start-1[ do
-                       if string[j] == '\t' then
+                       if string.chars[j] == '\t' then
                                indent.add '\t'
                        else
                                indent.add ' '