mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

compiler/vlib: replace substr/left/right with [start..end] everywhere

Browse Source
This commit is contained in:
joe-conigliaro
2019-10-27 18:03:15 +11:00
committed by Alexander Medvednikov
parent ed55826686
commit 59378dce46
49 changed files with 308 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vlib/encoding/csv/reader.v
View File

@ -80,11 +80,11 @@ fn (r mut Reader) read_line() ?string {
}
}
}
mut line := r.data.substr(r.row_pos, i)
mut line := r.data[r.row_pos..i]
r.row_pos = i+1
// normalize win line endings (remove extra \r)
if !r.is_mac_pre_osx_le && (line.len >= 1 && line[line.len-1] == `\r`) {
line = line.left(line.len-1)
line = line[..line.len-1]
}
return line
}
@ -118,28 +118,28 @@ fn (r mut Reader) read_record() ?[]string {
// last
break
}
fields << line.left(i)
line = line.right(i+1)
fields << line[..i]
line = line[i+1..]
continue
}
// quoted
else {
line = line.right(1)
line = line[1..]
i = line.index('"')
if i != -1 {
if i+1 == line.len {
// last record
fields << line.left(i)
fields << line[..i]
break
}
next := line[i+1]
if next == r.delimiter {
fields << line.left(i)
line = line.right(i)
fields << line[..i]
line = line[i..]
continue
}
}
line = line.right(1)
line = line[1..]
}
if i <= -1 && fields.len == 0 {
return err_invalid_delim