From 2d385c33424056d1fcb420ad1ec557c7d6e43918 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Tue, 27 Aug 2013 03:40:16 +0000 Subject: [PATCH] delegate almost all responsibility of encoder to parser to simplify internals --- src/jsx_encoder.erl | 136 ++++++++++---------------------------------- src/jsx_parser.erl | 8 +-- 2 files changed, 32 insertions(+), 112 deletions(-) diff --git a/src/jsx_encoder.erl b/src/jsx_encoder.erl index a68a957..6c04d27 100644 --- a/src/jsx_encoder.erl +++ b/src/jsx_encoder.erl @@ -23,113 +23,38 @@ -module(jsx_encoder). --export([encoder/3]). +-export([encoder/3, encode/1, encode/2, unzip/1]). -spec encoder(Handler::module(), State::any(), Config::jsx:config()) -> jsx:encoder(). encoder(Handler, State, Config) -> - fun(JSON) -> - start( - JSON, - {Handler, Handler:init(State)}, - jsx_config:parse_config(Config) - ) - end. + Parser = jsx:parser(Handler, State, Config), + fun(Term) -> Parser(encode(Term) ++ [end_json]) end. +-spec encode(Term::any()) -> any(). --include("jsx_config.hrl"). +encode(Term) -> encode(Term, ?MODULE). --ifndef(error). --define(error(State, Term, Handler, Config), - case Config#config.error_handler of - false -> erlang:error(badarg); - F -> erlang:throw(F(Term, {encoder, State, Handler}, jsx_config:config_to_list(Config))) - end -). --endif. +-spec encode(Term::any(), EntryPoint::module()) -> any(). + +encode([], _EntryPoint) -> [start_array, end_array]; +encode([{}], _EntryPoint) -> [start_object, end_object]; + +encode([{_, _}|_] = Term, EntryPoint) -> + lists:flatten([start_object] ++ [ EntryPoint:encode(T) || T <- unzip(Term) ] ++ [end_object]); +encode(Term, EntryPoint) when is_list(Term) -> + lists:flatten([start_array] ++ [ EntryPoint:encode(T) || T <- Term ] ++ [end_array]); + +encode(Else, _EntryPoint) -> [Else]. -start(Term, {Handler, State}, Config) -> - try Handler:handle_event(end_json, value(Term, {Handler, State}, Config)) - catch - throw:Error -> Error; - Type:Value -> erlang:Type(Value) - end. +unzip(List) -> unzip(List, []). +unzip([], Acc) -> lists:reverse(Acc); +unzip([{K, V}|Rest], Acc) when is_binary(K); is_atom(K) -> unzip(Rest, [V, K] ++ Acc). -value(String, {Handler, State}, Config) when is_binary(String) -> - Handler:handle_event({string, clean_string(String, {Handler, State}, Config)}, State); -value(Float, {Handler, State}, _Config) when is_float(Float) -> - Handler:handle_event({float, Float}, State); -value(Int, {Handler, State}, _Config) when is_integer(Int) -> - Handler:handle_event({integer, Int}, State); -value(Literal, {Handler, State}, _Config) - when Literal == true; Literal == false; Literal == null -> - Handler:handle_event({literal, Literal}, State); -value([{}], {Handler, State}, _Config) -> - Handler:handle_event(end_object, Handler:handle_event(start_object, State)); -value([], {Handler, State}, _Config) -> - Handler:handle_event(end_array, Handler:handle_event(start_array, State)); -value(List, Handler, Config) when is_list(List) -> - list_or_object(List, Handler, Config); -value(Term, Handler, Config) -> ?error(value, Term, Handler, Config). - - -list_or_object([{K, V}|Rest], {Handler, State}, Config) when is_atom(K); is_binary(K) -> - object([{K, V}|Rest], {Handler, Handler:handle_event(start_object, State)}, Config); -list_or_object(Terms, {Handler, State}, Config) when is_list(Terms) -> - list(Terms, {Handler, Handler:handle_event(start_array, State)}, Config). - - -object([{Key, Value}, Next|Rest], {Handler, State}, Config) when is_atom(Key); is_binary(Key) -> - object([Next|Rest], {Handler, - value( - Value, - {Handler, Handler:handle_event({key, clean_string(fix_key(Key), {Handler, State}, Config)}, State)}, - Config - ) - }, - Config - ); -object([{Key, Value}], {Handler, State}, Config) when is_atom(Key); is_binary(Key) -> - object( - [], - { - Handler, - value( - Value, - {Handler, Handler:handle_event({key, clean_string(fix_key(Key), {Handler, State}, Config)}, State)}, - Config - ) - }, - Config - ); -object([], {Handler, State}, _Config) -> Handler:handle_event(end_object, State); -object(Term, Handler, Config) -> ?error(object, Term, Handler, Config). - - -list([Value, Next|Rest], {Handler, State}, Config) -> - list([Next|Rest], {Handler, value(Value, {Handler, State}, Config)}, Config); -list([Value], {Handler, State}, Config) -> - list([], {Handler, value(Value, {Handler, State}, Config)}, Config); -list([], {Handler, State}, _Config) -> Handler:handle_event(end_array, State). - - -fix_key(Key) when is_atom(Key) -> fix_key(atom_to_binary(Key, utf8)); -fix_key(Key) when is_binary(Key) -> Key. - - -clean_string(Bin, Handler, Config) -> - case clean_string(Bin, Config) of - {error, badarg} -> ?error(string, Bin, Handler, Config); - String -> String - end. - - - --include("jsx_strings.hrl"). -ifdef(TEST). @@ -138,35 +63,34 @@ clean_string(Bin, Handler, Config) -> encode_test_() -> Data = jsx:test_cases(), + Encode = encoder(jsx, [], []), [ { Title, ?_assertEqual( - Events ++ [end_json], - start(Term, {jsx, []}, #config{}) + Events, + Encode(Term) -- [end_json] ) } || {Title, _, Term, Events} <- Data ]. - -encode(Term, Config) -> start(Term, {jsx, []}, jsx_config:parse_config(Config)). - +err(Term, Opts) -> (jsx:parser(jsx, [], Opts))(Term). error_test_() -> [ - {"value error", ?_assertError(badarg, encode(self(), []))}, - {"string error", ?_assertError(badarg, encode(<<239, 191, 191>>, []))} + {"value error", ?_assertError(badarg, err(self(), []))}, + {"string error", ?_assertError(badarg, err(<<239, 191, 191>>, []))} ]. custom_error_handler_test_() -> - Error = fun(Term, {_, State, _}, _) -> {State, Term} end, + Error = fun(Term, {_, State, _, _}, _) -> {State, Term} end, [ {"value error", ?_assertEqual( - {value, self()}, - encode(self(), [{error_handler, Error}]) + {value, [self()]}, + err(self(), [{error_handler, Error}]) )}, {"string error", ?_assertEqual( - {string, <<239, 191, 191>>}, - encode(<<239, 191, 191>>, [{error_handler, Error}]) + {string, [{string, <<239, 191, 191>>}]}, + err(<<239, 191, 191>>, [{error_handler, Error}]) )} ]. diff --git a/src/jsx_parser.erl b/src/jsx_parser.erl index 0616200..11738b5 100644 --- a/src/jsx_parser.erl +++ b/src/jsx_parser.erl @@ -91,12 +91,8 @@ value([start_object|Tokens], Handler, Stack, Config) -> object(Tokens, handle_event(start_object, Handler, Config), [object|Stack], Config); value([start_array|Tokens], Handler, Stack, Config) -> array(Tokens, handle_event(start_array, Handler, Config), [array|Stack], Config); -value([{literal, true}|Tokens], Handler, Stack, Config) -> - maybe_done(Tokens, handle_event({literal, true}, Handler, Config), Stack, Config); -value([{literal, false}|Tokens], Handler, Stack, Config) -> - maybe_done(Tokens, handle_event({literal, false}, Handler, Config), Stack, Config); -value([{literal, null}|Tokens], Handler, Stack, Config) -> - maybe_done(Tokens, handle_event({literal, null}, Handler, Config), Stack, Config); +value([{literal, Literal}|Tokens], Handler, Stack, Config) when Literal == true; Literal == false; Literal == null -> + maybe_done(Tokens, handle_event({literal, Literal}, Handler, Config), Stack, Config); value([Literal|Tokens], Handler, Stack, Config) when Literal == true; Literal == false; Literal == null -> value([{literal, Literal}] ++ Tokens, Handler, Stack, Config); value([{integer, Number}|Tokens], Handler, Stack, Config) when is_integer(Number) ->