nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests.sh: remove tap output
[nit.git]
/
src
/
location.nit
diff --git
a/src/location.nit
b/src/location.nit
index
e392ff0
..
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
# 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
# A raw text Nit source file
class SourceFile
@@
-50,28
+50,34
@@
class Location
super Comparable
redef type OTHER: 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
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
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 on the end character in the source
+ fun pend: Int do return file.line_starts[line_end-1] + column_end-1
+
# 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
# 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
+ var pstart = self.pstart
+ var pend = self.pend
res = l.file.string.substring(pstart, pend-pstart+1)
self.text_cache = res
return res
res = l.file.string.substring(pstart, pend-pstart+1)
self.text_cache = res
return res
@@
-153,10
+159,10
@@
class Location
end
# Return the associated line with the location highlihted with color and a carret under the starting position
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
+ # `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
fun colored_line(color: String): String
do
var esc = 27.ascii
@@
-168,7
+174,7
@@
class Location
var line_start = l.file.line_starts[i-1]
var line_end = line_start
var string = l.file.string
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)
line_end += 1
end
var lstart = string.substring(line_start, l.column_start - 1)
@@
-187,9
+193,9
@@
class Location
lmid = ""
lend = ""
end
lmid = ""
lend = ""
end
- var indent = new Buffer
+ var indent = new FlatBuffer
for j in [line_start..line_start+l.column_start-1[ do
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 ' '
indent.add '\t'
else
indent.add ' '