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

diff --git a/src/location.nit b/src/location.nit
index c3eb80d..3da516f 100644
--- a/src/location.nit
+++ b/src/location.nit
@@ -14,19 +14,41 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# This module is used to model Nit source-file and locations in source-file
 package location
 
+# A raw text Nit source file
+class SourceFile
+	# The path of the source
+	var filename: String
+
+	# The content of the source
+	var string: String
+
+	# Create a new sourcefile using a filename and a stream
+	init(filename: String, stream: IStream)
+	do
+		self.filename = filename
+		string = stream.read_all
+		line_starts[0] = 0
+	end
+
+	# Position of each line start
+	var line_starts: Array[Int] = new Array[Int]
+end
+
+# A location inside a source file
 class Location
-special Comparable
+	super Comparable
 	redef type OTHER: Location
 
-	readable var _file: String
+	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: String, line_s: Int, line_e: Int, column_s: Int, column_e: Int) do
+	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
@@ -34,7 +56,22 @@ special Comparable
 		_column_end = column_e
 	end
 
-	init with_file(f: String) do init(f,0,0,0,0)
+	# The verbatim associated text in the source-file
+	fun text: String
+	do
+		var res = self.text_cache
+		if res != null then return res
+		var l = self
+		var pstart = l.file.line_starts[l.line_start-1] + l.column_start-1
+		var pend = l.file.line_starts[l.line_end-1] + l.column_end-1
+		res = l.file.string.substring(pstart, pend-pstart+1)
+		self.text_cache = res
+		return res
+	end
+
+	private var text_cache: nullable String
+
+	init with_file(f: SourceFile) do init(f,0,0,0,0)
 
 	redef fun ==(other: nullable Object): Bool do
 		if other == null then return false
@@ -68,8 +105,11 @@ special Comparable
 	end
 
 	redef fun to_s: String do
-		var file_part = file
-		if file_part.length > 0 then file_part += ":"
+		var file_part = ""
+		if file != null then
+			file_part = file.filename
+			if file.filename.length > 0 then file_part += ":"
+		end
 
 		if line_start == line_end then
 			if column_start == column_end then
@@ -78,14 +118,14 @@ special Comparable
 				return "{file_part}{line_start},{column_start}--{column_end}"
 			end
 		else
-			return "{file_part}{line_start},{column_start}--{line_end}:{column_end}"
+			return "{file_part}{line_start},{column_start}--{line_end},{column_end}"
 		end
 	end
 
 	fun relative_to(loc: nullable Location): String do
 		var relative: Location
 		if loc != null and loc.file == self.file then
-			relative = new Location("", self.line_start, self.line_end, self.column_start, self.column_end)
+			relative = new Location(null, self.line_start, self.line_end, self.column_start, self.column_end)
 		else
 			relative = new Location(self.file, self.line_start, self.line_end, self.column_start, self.column_end)
 		end
@@ -103,5 +143,51 @@ special Comparable
 
 		return column_end < other.column_end
 	end
+
+	# Return the associated line with the location highlihted with color and a carret 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
+	# "0;32" for green
+	fun colored_line(color: String): String
+	do
+		var esc = 27.ascii
+		var def = "{esc}[0m"
+		var col = "{esc}[{color}m"
+
+		var l = self
+		var i = l.line_start
+		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
+			line_end += 1
+		end
+		var lstart = string.substring(line_start, l.column_start - 1)
+		var cend
+		if i != l.line_end then
+			cend = line_end - line_start + 1
+		else
+			cend = l.column_end
+		end
+		var lmid
+		var lend
+		if line_start + cend <= string.length then
+			lmid = string.substring(line_start + l.column_start - 1, cend - l.column_start + 1)
+			lend = string.substring(line_start + cend, line_end - line_start - cend + 1)
+		else
+			lmid = ""
+			lend = ""
+		end
+		var indent = new Buffer
+		for j in [line_start..line_start+l.column_start-1[ do
+			if string[j] == '\t' then
+				indent.add '\t'
+			else
+				indent.add ' '
+			end
+		end
+		return "\t{lstart}{col}{lmid}{def}{lend}\n\t{indent}^"
+	end
 end