removed redundant initialization function, pushed to api level
This commit is contained in:
parent
5d014bbef8
commit
e9ddde9fb7
1 changed files with 3 additions and 9 deletions
10
src/jsx.erl
10
src/jsx.erl
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
|
|
||||||
decoder() ->
|
decoder() ->
|
||||||
decoder(none, []).
|
decoder({none, []}, []).
|
||||||
|
|
||||||
decoder(Callbacks, OptsList) when is_list(OptsList) ->
|
decoder(Callbacks, OptsList) when is_list(OptsList) ->
|
||||||
Opts = parse_opts(OptsList),
|
Opts = parse_opts(OptsList),
|
||||||
|
@ -14,7 +14,7 @@ decoder(Callbacks, OptsList) when is_list(OptsList) ->
|
||||||
decoder(Callbacks, Opts) ->
|
decoder(Callbacks, Opts) ->
|
||||||
case Opts#opts.encoding of
|
case Opts#opts.encoding of
|
||||||
utf8 ->
|
utf8 ->
|
||||||
fun(Stream) -> jsx_decoder:start(Stream, [], init_callbacks(Callbacks), Opts) end
|
fun(Stream) -> jsx_decoder:start(Stream, [], Callbacks, Opts) end
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
|
||||||
|
@ -39,12 +39,6 @@ parse_opts([{explicit_termination, Value}|Rest], Opts) ->
|
||||||
true = lists:member(Value, [true, false]),
|
true = lists:member(Value, [true, false]),
|
||||||
parse_opts(Rest, Opts#opts{explicit_termination = Value}).
|
parse_opts(Rest, Opts#opts{explicit_termination = Value}).
|
||||||
|
|
||||||
init_callbacks(none) ->
|
|
||||||
{none, []};
|
|
||||||
init_callbacks({{M, F}, S}) when is_atom(M), is_atom(F) ->
|
|
||||||
{{M, F}, S};
|
|
||||||
init_callbacks({F, S}) when is_function(F) ->
|
|
||||||
{F, S}.
|
|
||||||
|
|
||||||
tail_clean(<<X/utf8, Rest/binary>>) when ?is_whitespace(X) ->
|
tail_clean(<<X/utf8, Rest/binary>>) when ?is_whitespace(X) ->
|
||||||
tail_clean(Rest);
|
tail_clean(Rest);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue