Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added the possibility of null params for option types #155

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added the possibility of null params for option types #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/lib/rpcmarshal.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ let rec unmarshal : type a. a typ -> Rpc.t -> (a, err) Result.result =
| Unit -> unit_of_rpc v
| Option t -> (
match v with
| Enum [Null] -> return None
| Enum [x] -> unmarshal t x >>= fun x -> return (Some x)
| Enum [] -> return None
| y ->
Expand Down Expand Up @@ -119,8 +120,9 @@ let rec unmarshal : type a. a typ -> Rpc.t -> (a, err) Result.result =
match ty with
| Option x -> (
try
List.assoc s keys |> unmarshal x
>>= fun o -> return (Some o)
let z = List.assoc s keys in
if z = Null then return None
else unmarshal x z >>= fun o -> return (Some o)
with _ -> return None )
| y ->
try List.assoc s keys |> unmarshal y with Not_found ->
Expand Down