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
c092b28
..
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
@@
-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: Reader
+
+ init
do
do
- self.filename = filename
string = stream.read_all
line_starts[0] = 0
end
string = stream.read_all
line_starts[0] = 0
end
@@
-50,19
+51,28
@@
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
- 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
+ # End of this location on `line_end`
+ var column_end: Int
# 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,9
+93,7
@@
class Location
return res
end
return res
end
- private var text_cache: nullable String
-
- init with_file(f: SourceFile) do init(f,0,0,0,0)
+ private var text_cache: nullable String = null
redef fun ==(other: nullable Object): Bool do
if other == null then return false
redef fun ==(other: nullable Object): Bool do
if other == null then return false
@@
-123,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}"
@@
-175,13
+186,20
@@
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
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 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.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