From d9e0611a52c8e185399e76efe5d5580dafb0108c Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Sat, 9 Feb 2013 09:44:45 -0800 Subject: [PATCH] remove stray tabs --- src/jsx.erl | 8 ++++---- src/jsx_encoder.erl | 43 +++++++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/jsx.erl b/src/jsx.erl index b4eb526..9886bb1 100644 --- a/src/jsx.erl +++ b/src/jsx.erl @@ -373,10 +373,10 @@ test_decode(JSON, Flags) -> incremental_decode(<>, Flags) -> - P = jsx_decoder:decoder(?MODULE, [], Flags ++ [explicit_end]), - try incremental_decode_loop(P(C), Rest) - catch error:badarg -> {error, badarg} - end. + P = jsx_decoder:decoder(?MODULE, [], Flags ++ [explicit_end]), + try incremental_decode_loop(P(C), Rest) + catch error:badarg -> {error, badarg} + end. incremental_decode_loop({incomplete, More}, <<>>) -> case More(end_stream) of diff --git a/src/jsx_encoder.erl b/src/jsx_encoder.erl index 86a894e..b800168 100644 --- a/src/jsx_encoder.erl +++ b/src/jsx_encoder.erl @@ -73,23 +73,23 @@ value(Term, Handler, Opts) -> ?error([Term, Handler, Opts]). list_or_object([Term|Rest], {Handler, State}, Opts) -> - case pre_encode(Term, Opts) of - {K, V} -> - object([{K, V}|Rest], {Handler, Handler:handle_event(start_object, State)}, Opts) - ; T -> - list([T|Rest], {Handler, Handler:handle_event(start_array, State)}, Opts) - end. + case pre_encode(Term, Opts) of + {K, V} -> + object([{K, V}|Rest], {Handler, Handler:handle_event(start_object, State)}, Opts) + ; T -> + list([T|Rest], {Handler, Handler:handle_event(start_array, State)}, Opts) + end. object([{Key, Value}, Next|Rest], {Handler, State}, Opts) when is_atom(Key); is_binary(Key) -> V = pre_encode(Value, Opts), - object( + object( [pre_encode(Next, Opts)|Rest], { Handler, value( - V, - {Handler, Handler:handle_event({key, clean_string(fix_key(Key), Opts)}, State)}, + V, + {Handler, Handler:handle_event({key, clean_string(fix_key(Key), Opts)}, State)}, Opts ) }, @@ -115,13 +115,12 @@ object(Term, Handler, Opts) -> ?error([Term, Handler, Opts]). list([Value, Next|Rest], {Handler, State}, Opts) -> list([pre_encode(Next, Opts)|Rest], {Handler, value(Value, {Handler, State}, Opts)}, Opts); list([Value], {Handler, State}, Opts) -> - list([], {Handler, value(Value, {Handler, State}, Opts)}, Opts); + list([], {Handler, value(Value, {Handler, State}, Opts)}, Opts); list([], {Handler, State}, _Opts) -> Handler:handle_event(end_array, State); list(Term, Handler, Opts) -> ?error([Term, Handler, Opts]). - -pre_encode(Value, #opts{pre_encode=false}) -> Value; -pre_encode(Value, Opts) -> (Opts#opts.pre_encode)(Value). +pre_encode(Value, #opts{pre_encode=false}) -> Value; pre_encode(Value, Opts) -> +(Opts#opts.pre_encode)(Value). fix_key(Key) when is_atom(Key) -> fix_key(atom_to_binary(Key, utf8)); @@ -331,15 +330,15 @@ pre_encoders_test_() -> end_json ] )}, - {"pre_encode list", ?_assertEqual( - encode([1,2,3], [{pre_encode, fun(X) when is_integer(X) -> X + 1; (V) -> V end}]), - [ - start_array, - {integer, 2}, {integer, 3}, {integer, 4}, - end_array, - end_json - ] - )} + {"pre_encode list", ?_assertEqual( + encode([1,2,3], [{pre_encode, fun(X) when is_integer(X) -> X + 1; (V) -> V end}]), + [ + start_array, + {integer, 2}, {integer, 3}, {integer, 4}, + end_array, + end_json + ] + )} ].