nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dump_rta'
[nit.git]
/
src
/
location.nit
diff --git
a/src/location.nit
b/src/location.nit
index
9b2dcd1
..
753acea
100644
(file)
--- a/
src/location.nit
+++ b/
src/location.nit
@@
-50,18
+50,18
@@
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
# The index in the start character in the source
end
# The index in the start character in the source
@@
-174,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)
@@
-195,7
+195,7
@@
class Location
end
var indent = new Buffer
for j in [line_start..line_start+l.column_start-1[ do
end
var indent = new Buffer
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 ' '