nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/mnit: expand images to the nearest power of 2 for OpenGL ES 1.0
[nit.git]
/
src
/
location.nit
diff --git
a/src/location.nit
b/src/location.nit
index
8ed4428
..
b65511d
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
@@
-26,7
+26,7
@@
class SourceFile
var string: String is noinit
# The original stream used to initialize `string`
var string: String is noinit
# The original stream used to initialize `string`
- var stream: IStream
+ var stream: Reader
init
do
init
do
@@
-51,10
+51,27
@@
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)
+ #
+ # If `line_start==0` then the whole file is considered
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
+95,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
@@
-116,9
+131,12
@@
class Location
var file_part = ""
if file != null then
file_part = file.filename
var file_part = ""
if file != null then
file_part = file.filename
- if file.filename.length > 0 then file_part += ":"
end
end
+ if line_start <= 0 then return file_part
+
+ if file != null and file.filename.length > 0 then file_part += ":"
+
if line_start == line_end then
if column_start == column_end then
return "{file_part}{line_start},{column_start}"
if line_start == line_end then
if column_start == column_end then
return "{file_part}{line_start},{column_start}"
@@
-168,6
+186,8
@@
class Location
var l = self
var i = l.line_start
var l = self
var i = l.line_start
+ if i <= 0 then return ""
+
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