nitdoc: Mangle names in IDs.

[nit.git] / src / location.nit

diff --git a/src/location.nit b/src/location.nit
index c092b28..e82775a 100644 (file)
--- a/src/location.nit
+++ b/src/location.nit
@@ -23,12 +23,13 @@ class SourceFile
        var filename: String
 
        # The content of the source
-       var string: String
+       var string: String is noinit
 
-       # Create a new sourcefile using a filename and a stream
-       init(filename: String, stream: IStream)
+       # The original stream used to initialize `string`
+       var stream: IStream
+
+       init
        do
-               self.filename = filename
                string = stream.read_all
                line_starts[0] = 0
        end
@@ -53,16 +54,17 @@ class Location
        var file: nullable SourceFile
        var line_start: Int
        var line_end: Int
+
+       # Start of this location on `line_start`
+       #
+       # A `column_start` of 1 means the first column or character.
+       #
+       # If `column_start == 0` this location concerns the whole line.
+       #
+       # Require: `column_start >= 0`
        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
-       end
+       var column_end: Int
 
        # The index in the start character in the source
        fun pstart: Int do return file.line_starts[line_start-1] + column_start-1
@@ -83,7 +85,7 @@ class Location
                return res
        end
 
-       private var text_cache: nullable String
+       private var text_cache: nullable String = null
 
        init with_file(f: SourceFile) do init(f,0,0,0,0)
 
@@ -181,7 +183,12 @@ class Location
                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)
+               var lstart
+               if l.column_start > 0 then
+                       lstart = string.substring(line_start, l.column_start - 1)
+               else
+                       lstart = ""
+               end
                var cend
                if i != l.line_end then
                        cend = line_end - line_start + 1