nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge: Ropefix
[nit.git]
/
src
/
location.nit
diff --git
a/src/location.nit
b/src/location.nit
index
993ce7d
..
d7154ca
100644
(file)
--- a/
src/location.nit
+++ b/
src/location.nit
@@
-14,7
+14,7
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# 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
+# Nit source-file and locations in source-file
module location
# A raw text Nit source file
module location
# A raw text Nit source file
@@
-51,10
+51,25
@@
class Location
super Comparable
redef type OTHER: Location
super Comparable
redef type OTHER: Location
+ # The associated source-file
var file: nullable SourceFile
var file: nullable SourceFile
+
+ # The starting line number (starting from 1)
var line_start: Int
var line_start: Int
+
+ # The stopping line number (starting from 1)
var line_end: Int
var line_end: Int
+
+ # Start of this location on `line_start`
+ #
+ # A `column_start` of 1 means the first column or character.
+ #
+ # If `column_start == 0` this location concerns the whole line.
+ #
+ # Require: `column_start >= 0`
var column_start: Int
var column_start: Int
+
+ # End of this location on `line_end`
var column_end: Int
# The index in the start character in the source
var column_end: Int
# The index in the start character in the source
@@
-78,8
+93,6
@@
class Location
private var text_cache: nullable String = null
private var text_cache: nullable String = null
- 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
if not other isa Location then return false
redef fun ==(other: nullable Object): Bool do
if other == null then return false
if not other isa Location then return false
@@
-174,7
+187,12
@@
class Location
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
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)
+ var lstart
+ if l.column_start > 0 then
+ lstart = string.substring(line_start, l.column_start - 1)
+ else
+ lstart = ""
+ end
var cend
if i != l.line_end then
cend = line_end - line_start + 1
var cend
if i != l.line_end then
cend = line_end - line_start + 1