Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/byte-reader.carp
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,12 @@
(doc read-bytes "Read `n` bytes from a file.")
(defn read-bytes [f n]
(let-do [bytes (Array.allocate n)
i 0
result (Result.Success [])]
(while-do (< i n)
(match (read-byte @(file f))
(Result.Success b) (Array.aset-uninitialized! &bytes i b)
(Result.Error err) (do (set! result (Result.Error err)) (break)))
(++ i))
(when (not (error? &result)) (set! result (Result.Success bytes)))
result))
result (IO.Raw.fread (Array.unsafe-raw &bytes) 1 n @(file f))]
(if (IO.Raw.feof @(file f))
(Result.Error @"EOF encountered while reading")
(if (IO.Raw.ferror @(file f))
(Result.Error @"Error encountered while reading")
(Result.Success bytes)))))
(implements read-from-file read-bytes)

(doc read
Expand Down
2 changes: 1 addition & 1 deletion src/string-reader.carp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"the file is not readable.")
(defn read-string [f len]
(let-do [s (String.allocate len (Char.from-int 0))]
(ignore (IO.Raw.fread &s 1 len @(file f)))
(ignore (IO.Raw.fread (String.cstr &s) 1 len @(file f)))
(Result.Success s)))
(implements read-from-file read-string)

Expand Down