umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

Merge https://github.com/okeuday/jsx into develop

Browse source
This commit is contained in:
alisdair sullivan 2012-03-25 13:14:08 -07:00
commit 91dcb65e3c
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/jsx.erl
View file

@ -60,8 +60,11 @@ format(Source) -> format(Source, []).
format(Source, Opts) -> jsx_to_json:format(Source, Opts).
-spec to_term(Source::binary()) -> any().
-spec to_term(Source::binary(), Opts::jsx_to_term:opts()) -> any().
-spec to_term(Source::binary()) ->
list({binary(), any()}).
-spec to_term(Source::binary(), Opts::jsx_to_term:opts()) ->
list({binary(), any()}).
to_term(Source) -> to_term(Source, []).
@ -258,4 +261,4 @@ incremental_decode_loop({incomplete, More}, <<C:1/binary, Rest/binary>>) ->
incremental_decode_loop(More(C), Rest).
-endif.
-endif.

5
src/jsx_to_term.erl
View file

@ -34,7 +34,8 @@
-type opts() :: list().
-spec to_term(Source::(binary() | list()), Opts::opts()) -> binary().
-spec to_term(Source::(binary() | list()), Opts::opts()) ->
list({binary(), any()}).
to_term(Source, Opts) when is_list(Opts) ->
(jsx:decoder(?MODULE, Opts, jsx_utils:extract_opts(Opts)))(Source).
@ -173,4 +174,4 @@ naked_test_() ->
{"naked string", ?_assertEqual(to_term(<<"\"string\"">>, []), <<"string">>)}
].
-endif.
-endif.