X-Git-Url: http://nitlanguage.org

diff --git a/src/location.nit b/src/location.nit
index 26b6fa1..993ce7d 100644
--- 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
@@ -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
@@ -42,7 +43,7 @@ class SourceFile
 	end
 
 	# Position of each line start
-	var line_starts: Array[Int] = new Array[Int]
+	var line_starts = new Array[Int]
 end
 
 # A location inside a source file
@@ -50,19 +51,11 @@ 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
-
-	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 file: nullable SourceFile
+	var line_start: Int
+	var line_end: Int
+	var column_start: Int
+	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 +76,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)
 
@@ -100,6 +93,7 @@ class Location
 		return true
 	end
 
+	# Is `self` included (or equals) to `loc`?
 	fun located_in(loc: nullable Location): Bool do
 		if loc == null then return false
 
@@ -136,6 +130,9 @@ class Location
 		end
 	end
 
+	# Return a location message according to an observer.
+	#
+	# Currently, if both are in the same file, the file information is not present in the result.
 	fun relative_to(loc: nullable Location): String do
 		var relative: Location
 		if loc != null and loc.file == self.file then
@@ -158,7 +155,7 @@ class Location
 		return column_end < other.column_end
 	end
 
-	# Return the associated line with the location highlihted with color and a carret under the starting position
+	# Return the associated line with the location highlighted with color and a caret under the starting position
 	# `color` must be and terminal escape sequence used as `"{escape}[{color}m;"`
 	# * `"0;31"` for red
 	# * `"1;31"` for bright red
@@ -174,7 +171,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 +190,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 ' '
@@ -204,4 +201,3 @@ class Location
 		return "\t{lstart}{col}{lmid}{def}{lend}\n\t{indent}^"
 	end
 end
-