nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge: Optimized use of escape_to_c
[nit.git]
/
lib
/
csv
/
csv.nit
diff --git
a/lib/csv/csv.nit
b/lib/csv/csv.nit
index
c6f0b41
..
f76d41c
100644
(file)
--- a/
lib/csv/csv.nit
+++ b/
lib/csv/csv.nit
@@
-314,10
+314,9
@@
class CsvReader
var got_delimiter = false
loop
var got_delimiter = false
loop
- var i = istream.read_char
- var c: Char
+ var c = istream.read_char
- if i < 0 then
+ if c == null then
if got_row then
row.add value.to_s
return row
if got_row then
row.add value.to_s
return row
@@
-325,7
+324,6
@@
class CsvReader
return null
end
end
return null
end
end
- c = i.ascii
if c == format.delimiter then
if got_delimiter and unescaped == 0 then
if c == format.delimiter then
if got_delimiter and unescaped == 0 then
@@
-334,11
+332,10
@@
class CsvReader
end
# Read all bytes until the delimiter.
loop
end
# Read all bytes until the delimiter.
loop
- i = istream.read_char
- assert not_eof: i >= 0 else
+ c = istream.read_char
+ assert not_eof: c != null else
sys.stderr.write "Unexpected end of file before the end of a delimited value.\n"
end
sys.stderr.write "Unexpected end of file before the end of a delimited value.\n"
end
- c = i.ascii
if c == format.delimiter then break
value.add c
end
if c == format.delimiter then break
value.add c
end