nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src: update most tools to new constructors
[nit.git]
/
src
/
location.nit
diff --git
a/src/location.nit
b/src/location.nit
index
2737580
..
993ce7d
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 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
do
- self.filename = filename
string = stream.read_all
line_starts[0] = 0
end
string = stream.read_all
line_starts[0] = 0
end
@@
-42,7
+43,7
@@
class SourceFile
end
# Position of each line start
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
end
# A location inside a source file
@@
-56,14
+57,6
@@
class Location
var column_start: Int
var column_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
- end
-
# The index in the start character in the source
fun pstart: Int do return file.line_starts[line_start-1] + column_start-1
# 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
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)
init with_file(f: SourceFile) do init(f,0,0,0,0)
@@
-100,6
+93,7
@@
class Location
return true
end
return true
end
+ # Is `self` included (or equals) to `loc`?
fun located_in(loc: nullable Location): Bool do
if loc == null then return false
fun located_in(loc: nullable Location): Bool do
if loc == null then return false
@@
-136,6
+130,9
@@
class Location
end
end
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
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 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
# `color` must be and terminal escape sequence used as `"{escape}[{color}m;"`
# * `"0;31"` for red
# * `"1;31"` for bright red
@@
-204,4
+201,3
@@
class Location
return "\t{lstart}{col}{lmid}{def}{lend}\n\t{indent}^"
end
end
return "\t{lstart}{col}{lmid}{def}{lend}\n\t{indent}^"
end
end
-