refactor: check reader finished state at the end of read

* One function call less
ttytm · Jun 20, 2023 · 4b8ba41 · 4b8ba41
1 parent c4e4b7e
commit 4b8ba41
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/examples/smooth_reader.v b/examples/smooth_reader.v
@@ -14,12 +14,12 @@ mut:
 }
 
 fn (mut r MyCustomReader) read(mut buf []u8) !int {
-	if r.pos >= r.size {
-		return io.Eof{}
-	}
 	n := copy(mut buf, r.data[r.pos..r.pos + buf.cap])
 	time.sleep(1 * time.millisecond)
 	r.pos += n
+	if r.pos >= r.size {
+		return io.Eof{}
+	}
 	return n
 }
 

diff --git a/src/_instructions_reader.v b/src/_instructions_reader.v
@@ -13,9 +13,6 @@ fn bar_reader(b BarType, reader io.Reader, size u64) &io.BufferedReader {
 }
 
 fn (mut br BarReader) read(mut buf []u8) !int {
-	if br.pos >= br.size {
-		return io.Eof{}
-	}
 	n := br.reader.read(mut buf)!
 	br.pos += n
 	match mut br.bar {
@@ -32,5 +29,8 @@ fn (mut br BarReader) read(mut buf []u8) !int {
 			}
 		}
 	}
+	if br.pos >= br.size {
+		return io.Eof{}
+	}
 	return n
 }