umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

removes catch blocks from jsx_verify, allow errors to propogate

Browse source
This commit is contained in:
alisdair sullivan 2011-08-10 22:48:55 -07:00
parent 5db827f6ed
commit 0624321347
1 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/jsx_verify.erl
View file

@ -34,21 +34,13 @@
; (F::jsx_iterator(), Opts::verify_opts()) -> true | false. ; (F::jsx_iterator(), Opts::verify_opts()) -> true | false.
is_json(JSON, OptsList) when is_binary(JSON) -> is_json(JSON, OptsList) when is_binary(JSON) ->
F = jsx:decoder(extract_parser_opts(OptsList)), F = jsx:decoder(extract_parser_opts(OptsList)),
verify(F(JSON), parse_opts(OptsList)); verify(F(JSON), parse_opts(OptsList));
is_json(JSON, OptsList) when is_list(JSON) -> is_json(JSON, OptsList) when is_list(JSON) ->
try F = jsx:encoder(extract_parser_opts(OptsList)),
F = jsx:encoder(extract_parser_opts(OptsList)), verify(F(JSON), parse_opts(OptsList));
verify(F(JSON), parse_opts(OptsList))
catch
_:_ -> erlang:error(badarg)
end;
is_json(F, OptsList) when is_function(F) -> is_json(F, OptsList) when is_function(F) ->
try verify(jsx_utils:collect(F), parse_opts(OptsList)).
verify(jsx_utils:collect(F), parse_opts(OptsList))
catch
_:_ -> erlang:error(badarg)
end.
extract_parser_opts(Opts) -> extract_parser_opts(Opts) ->