From 06243213476ba113c3f2a4d81d3c09cfd23acc03 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Wed, 10 Aug 2011 22:48:55 -0700 Subject: [PATCH] removes catch blocks from jsx_verify, allow errors to propogate --- src/jsx_verify.erl | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/jsx_verify.erl b/src/jsx_verify.erl index da08d92..b2b7cdd 100644 --- a/src/jsx_verify.erl +++ b/src/jsx_verify.erl @@ -34,21 +34,13 @@ ; (F::jsx_iterator(), Opts::verify_opts()) -> true | false. is_json(JSON, OptsList) when is_binary(JSON) -> - F = jsx:decoder(extract_parser_opts(OptsList)), - verify(F(JSON), parse_opts(OptsList)); + F = jsx:decoder(extract_parser_opts(OptsList)), + verify(F(JSON), parse_opts(OptsList)); is_json(JSON, OptsList) when is_list(JSON) -> - try - F = jsx:encoder(extract_parser_opts(OptsList)), - verify(F(JSON), parse_opts(OptsList)) - catch - _:_ -> erlang:error(badarg) - end; + F = jsx:encoder(extract_parser_opts(OptsList)), + verify(F(JSON), parse_opts(OptsList)); is_json(F, OptsList) when is_function(F) -> - try - verify(jsx_utils:collect(F), parse_opts(OptsList)) - catch - _:_ -> erlang:error(badarg) - end. + verify(jsx_utils:collect(F), parse_opts(OptsList)). extract_parser_opts(Opts) ->