umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

format/1,2 takes a list of terms as an argument now, in addition to binary json or a jsx_iterator

Browse source
This commit is contained in:
alisdair sullivan 2011-07-17 01:26:00 -07:00
parent 9cee07212f
commit 04dfde559e
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/jsx_format.erl
View file

@ -33,12 +33,19 @@
-spec format(JSON::binary(), Opts::format_opts()) -> binary() | iolist() -spec format(JSON::binary(), Opts::format_opts()) ->
; (F::jsx_iterator(), Opts::format_opts()) -> binary() | iolist(). binary() | iolist()
; (Terms::list(jsx_encodeable()), Opts::format_opts()) ->
binary() | iolist()
; (F::jsx_iterator(), Opts::format_opts()) ->
binary() | iolist().
format(JSON, OptsList) when is_binary(JSON) -> format(JSON, OptsList) when is_binary(JSON) ->
P = jsx:decoder(extract_parser_opts(OptsList)), P = jsx:decoder(extract_parser_opts(OptsList)),
format(fun() -> P(JSON) end, OptsList); format(fun() -> P(JSON) end, OptsList);
format(Terms, OptsList) when is_list(Terms) ->
P = jsx:encoder(),
format(fun() -> P(Terms) end, OptsList);
format(F, OptsList) when is_function(F) -> format(F, OptsList) when is_function(F) ->
Opts = parse_opts(OptsList, #format_opts{}), Opts = parse_opts(OptsList, #format_opts{}),
{Continue, String} = format_something(F(), Opts, 0), {Continue, String} = format_something(F(), Opts, 0),