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

tools: check formatting of more modules with v test-cleancode, colorize v vet output

Browse Source
This commit is contained in:
Delyan Angelov
2021-03-24 12:39:09 +02:00
parent 9e48826bcb
commit 9b78d7d21d
13 changed files with 128 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vlib/io/reader.v
View File

@@ -25,7 +25,7 @@ const (
// ReadAllConfig allows options to be passed for the behaviour
// of read_all
pub struct ReadAllConfig {
reader Reader
reader Reader
read_to_end_of_stream bool
}
@@ -35,18 +35,16 @@ pub fn read_all(config ReadAllConfig) ?[]byte {
r := config.reader
read_till_eof := config.read_to_end_of_stream
mut b := []byte{len: read_all_len}
mut b := []byte{len: io.read_all_len}
mut read := 0
for {
new_read := r.read(mut b[read..]) or {
break
}
new_read := r.read(mut b[read..]) or { break }
read += new_read
if !read_till_eof && read == 0 {
break
}
if b.len == read {
unsafe { b.grow_len(read_all_grow_len) }
unsafe { b.grow_len(io.read_all_grow_len) }
}
}
return b[..read]
@@ -55,18 +53,16 @@ pub fn read_all(config ReadAllConfig) ?[]byte {
// read_any reads any available bytes from a reader
// (until the reader returns a read of 0 length)
pub fn read_any(r Reader) ?[]byte {
mut b := []byte{len: read_all_len}
mut b := []byte{len: io.read_all_len}
mut read := 0
for {
new_read := r.read(mut b[read..]) or {
break
}
new_read := r.read(mut b[read..]) or { break }
read += new_read
if new_read == 0 {
break
}
if b.len == read {
unsafe { b.grow_len(read_all_grow_len) }
unsafe { b.grow_len(io.read_all_grow_len) }
}
}
return b[..read]

26
vlib/io/reader_test.v
View File

@@ -4,7 +4,7 @@ struct Buf {
pub:
bytes []byte
mut:
i int
i int
}
fn (mut b Buf) read(mut buf []byte) ?int {
@@ -39,7 +39,7 @@ fn test_read_all_huge() {
}
struct StringReader {
text string
text string
mut:
place int
}
@@ -58,17 +58,15 @@ const (
)
fn test_stringreader() {
text := '12345\n'.repeat(newline_count)
text := '12345\n'.repeat(io.newline_count)
mut s := StringReader{
text: text
}
mut r := new_buffered_reader({
reader: make_reader(s)
})
mut r := new_buffered_reader(reader: make_reader(s))
for i := 0; true; i++ {
if _ := r.read_line() {
} else {
assert i == newline_count
assert i == io.newline_count
break
}
}
@@ -85,24 +83,22 @@ fn test_stringreader() {
}
fn test_stringreader2() {
text := '12345\r\n'.repeat(newline_count)
text := '12345\r\n'.repeat(io.newline_count)
mut s := StringReader{
text: text
}
mut r := new_buffered_reader({
reader: make_reader(s)
})
mut r := new_buffered_reader(reader: make_reader(s))
for i := 0; true; i++ {
if _ := r.read_line() {
} else {
assert i == newline_count
assert i == io.newline_count
break
}
}
if _ := r.read_line() {
assert false
}
leftover := read_all(reader: io.make_reader(r)) or {
leftover := read_all(reader: make_reader(r)) or {
assert false
panic('bad')
}
@@ -116,9 +112,7 @@ fn test_leftover() {
mut s := StringReader{
text: text
}
mut r := new_buffered_reader({
reader: make_reader(s)
})
mut r := new_buffered_reader(reader: make_reader(s))
_ := r.read_line() or {
assert false
panic('bad')