simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-06 11:15:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(resp2): handle \r\n properly and more efficiently

Browse source
This commit is contained in:
Simon Cruanes 2022-04-27 22:49:43 -04:00
parent 8665f0a37d
commit 8db462e30c
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/resp2/containers_resp2.ml
View file

@ -9,7 +9,7 @@ module Data = struct
let rec pp out = function let rec pp out = function
| Simple_string s -> Format.fprintf out "%S" s | Simple_string s -> Format.fprintf out "%S" s
| Bulk_string s -> Format.fprintf out "bulk %S" s | Bulk_string s -> Format.fprintf out "bulk %d %S" (String.length s) s
| Int i -> Format.fprintf out "%d" i | Int i -> Format.fprintf out "%d" i
| Error s -> Format.fprintf out "error %S" s | Error s -> Format.fprintf out "error %S" s
| Array l -> | Array l ->
@ -38,21 +38,20 @@ module Parse = struct
let rec cont_parser () : Data.t action = let rec cont_parser () : Data.t action =
read_char @@ function read_char @@ function
| '+' -> | '+' -> read_line @@ fun line -> return (Data.Simple_string line)
read_line @@ fun line -> return (Data.Simple_string (String.trim line)) | '-' -> read_line @@ fun line -> return (Data.Error line)
| '-' -> read_line @@ fun line -> return (Data.Error (String.trim line))
| ':' -> | ':' ->
read_line @@ fun line -> read_line @@ fun line ->
(try return (Data.Int (int_of_string @@ String.trim line)) (try return (Data.Int (int_of_string line))
with _ -> fail "expected integer") with _ -> fail "expected integer")
| '$' -> | '$' ->
read_line @@ fun line -> read_line @@ fun line ->
(match int_of_string @@ String.trim line with (match int_of_string line with
| exception _ -> fail "expected integer (length of bulk string)" | exception _ -> fail "expected integer (length of bulk string)"
| i -> read_exact i @@ fun str -> return (Data.Bulk_string str)) | i -> read_exact i @@ fun str -> return (Data.Bulk_string str))
| '*' -> | '*' ->
read_line @@ fun line -> read_line @@ fun line ->
(match int_of_string @@ String.trim line with (match int_of_string line with
| exception _ -> fail "expected integer (length of array)" | exception _ -> fail "expected integer (length of array)"
| i -> | i ->
let rec loop acc i = let rec loop acc i =
@ -79,12 +78,17 @@ module Parse = struct
(match String.index_from str i '\n' with (match String.index_from str i '\n' with
| exception Not_found -> failwith "expected a line" | exception Not_found -> failwith "expected a line"
| j -> | j ->
let line = String.sub str i (j - i) in if str.[j - 1] <> '\r' then
failwith "expected '\\r' before the newline";
let line = String.sub str i (j - i - 1) in
run (j + 1) (f line) k) run (j + 1) (f line) k)
| Read_exact (n, f) -> | Read_exact (n, f) ->
if i + n > String.length str then failwith "not enough bytes"; if i + n + 2 > String.length str then failwith "not enough bytes";
let sub = String.sub str i n in let sub = String.sub str i n in
run (i + n) (f sub) k let i = i + n in
if str.[i] <> '\r' || str.[i + 1] <> '\n' then
failwith "bytes must be followed by '\\r\\n'";
run (i + 2) (f sub) k
in in
run 0 (cont_parser ()) (fun _ x -> x) run 0 (cont_parser ()) (fun _ x -> x)
@ -101,7 +105,7 @@ module Parse = struct
let c = input_char ic in let c = input_char ic in
run (f c) run (f c)
| Read_line f -> | Read_line f ->
let line = input_line ic in let line = input_line ic |> String.trim in
run (f line) run (f line)
| Read_exact (n, f) -> | Read_exact (n, f) ->
let sub = really_input_string ic n in let sub = really_input_string ic n in