encoder actually uses multi_term option, encoding and escaped_unicode still useless

This commit is contained in:
alisdair sullivan 2011-07-22 21:18:22 -07:00
parent 3bf5506292
commit 1a59448849

View file

@ -30,10 +30,16 @@
-include("jsx_common.hrl"). -include("jsx_common.hrl").
-record(opts, {
escaped_unicode = codepoint,
multi_term = false,
encoding = auto
}).
-spec encoder(Opts::jsx_opts()) -> jsx_encoder(). -spec encoder(Opts::jsx_opts()) -> jsx_encoder().
encoder(_) -> fun(Forms) -> start(Forms) end. encoder(Opts) -> fun(Forms) -> start(Forms, Opts) end.
-define(ENDJSON, -define(ENDJSON,
@ -43,81 +49,85 @@ encoder(_) -> fun(Forms) -> start(Forms) end.
). ).
start({string, String}) when is_list(String) -> start({string, String}, _Opts) when is_list(String) ->
{event, {string, String}, fun() -> ?ENDJSON end}; {event, {string, String}, fun() -> ?ENDJSON end};
start({float, Float}) when is_list(Float) -> start({float, Float}, _Opts) when is_list(Float) ->
{event, {float, Float}, fun() -> ?ENDJSON end}; {event, {float, Float}, fun() -> ?ENDJSON end};
start({integer, Int}) when is_list(Int) -> start({integer, Int}, _Opts) when is_list(Int) ->
{event, {integer, Int}, fun() -> ?ENDJSON end}; {event, {integer, Int}, fun() -> ?ENDJSON end};
start({literal, Atom}) when Atom == true; Atom == false; Atom == null -> start({literal, Atom}, _Opts) when Atom == true; Atom == false; Atom == null ->
{event, {literal, Atom}, fun() -> ?ENDJSON end}; {event, {literal, Atom}, fun() -> ?ENDJSON end};
%% second parameter is a stack to match end_foos to start_foos %% second parameter is a stack to match end_foos to start_foos
start(Forms) -> list_or_object(Forms, []). start(Forms, Opts) -> list_or_object(Forms, [], Opts).
list_or_object([start_object|Forms], Stack) -> list_or_object([start_object|Forms], Stack, Opts) ->
{event, start_object, fun() -> key(Forms, [object] ++ Stack) end}; {event, start_object, fun() -> key(Forms, [object] ++ Stack, Opts) end};
list_or_object([start_array|Forms], Stack) -> list_or_object([start_array|Forms], Stack, Opts) ->
{event, start_array, fun() -> value(Forms, [array] ++ Stack) end}; {event, start_array, fun() -> value(Forms, [array] ++ Stack, Opts) end};
list_or_object([], Stack) -> list_or_object([], Stack, Opts) ->
{incomplete, fun(end_stream) -> {incomplete, fun(end_stream) ->
{error, {badjson, []}} {error, {badjson, []}}
; (Stream) -> ; (Stream) ->
list_or_object(Stream, Stack) list_or_object(Stream, Stack, Opts)
end}; end};
list_or_object(Forms, _) -> {error, {badjson, Forms}}. list_or_object(Forms, _, _) -> {error, {badjson, Forms}}.
key([{key, Key}|Forms], Stack) when is_list(Key) -> key([{key, Key}|Forms], Stack, Opts) when is_list(Key) ->
{event, {key, Key}, fun() -> value(Forms, Stack) end}; {event, {key, Key}, fun() -> value(Forms, Stack, Opts) end};
key([end_object|Forms], [object|Stack]) -> key([end_object|Forms], [object|Stack], Opts) ->
{event, end_object, fun() -> maybe_done(Forms, Stack) end}; {event, end_object, fun() -> maybe_done(Forms, Stack, Opts) end};
key([], Stack) -> key([], Stack, Opts) ->
{incomplete, fun(end_stream) -> {incomplete, fun(end_stream) ->
{error, {badjson, []}} {error, {badjson, []}}
; (Stream) -> ; (Stream) ->
key(Stream, Stack) key(Stream, Stack, Opts)
end}; end};
key(Forms, _) -> {error, {badjson, Forms}}. key(Forms, _, _) -> {error, {badjson, Forms}}.
value([{string, S}|Forms], Stack) when is_list(S) -> value([{string, S}|Forms], Stack, Opts) when is_list(S) ->
{event, {string, S}, fun() -> maybe_done(Forms, Stack) end}; {event, {string, S}, fun() -> maybe_done(Forms, Stack, Opts) end};
value([{float, F}|Forms], Stack) when is_list(F) -> value([{float, F}|Forms], Stack, Opts) when is_list(F) ->
{event, {float, F}, fun() -> maybe_done(Forms, Stack) end}; {event, {float, F}, fun() -> maybe_done(Forms, Stack, Opts) end};
value([{integer, I}|Forms], Stack) when is_list(I) -> value([{integer, I}|Forms], Stack, Opts) when is_list(I) ->
{event, {integer, I}, fun() -> maybe_done(Forms, Stack) end}; {event, {integer, I}, fun() -> maybe_done(Forms, Stack, Opts) end};
value([{literal, L}|Forms], Stack) when L == true; L == false; L == null -> value([{literal, L}|Forms], Stack, Opts)
{event, {literal, L}, fun() -> maybe_done(Forms, Stack) end}; when L == true; L == false; L == null ->
value([start_object|Forms], Stack) -> {event, {literal, L}, fun() -> maybe_done(Forms, Stack, Opts) end};
{event, start_object, fun() -> key(Forms, [object] ++ Stack) end}; value([start_object|Forms], Stack, Opts) ->
value([start_array|Forms], Stack) -> {event, start_object, fun() -> key(Forms, [object] ++ Stack, Opts) end};
{event, start_array, fun() -> value(Forms, [array] ++ Stack) end}; value([start_array|Forms], Stack, Opts) ->
value([end_array|Forms], [array|Stack]) -> {event, start_array, fun() -> value(Forms, [array] ++ Stack, Opts) end};
{event, end_array, fun() -> maybe_done(Forms, Stack) end}; value([end_array|Forms], [array|Stack], Opts) ->
value([], Stack) -> {event, end_array, fun() -> maybe_done(Forms, Stack, Opts) end};
value([], Stack, Opts) ->
{incomplete, fun(end_stream) -> {incomplete, fun(end_stream) ->
{error, {badjson, []}} {error, {badjson, []}}
; (Stream) -> ; (Stream) ->
value(Stream, Stack) value(Stream, Stack, Opts)
end}; end};
value(Forms, _) -> {error, {badjson, Forms}}. value(Forms, _, _) -> {error, {badjson, Forms}}.
maybe_done([], []) -> ?ENDJSON; maybe_done([], [], _) -> ?ENDJSON;
maybe_done([end_object|Forms], [object|Stack]) -> maybe_done([end_json], [], _) -> ?ENDJSON;
{event, end_object, fun() -> maybe_done(Forms, Stack) end}; maybe_done([end_json|Forms], [], #opts{multi_term=true}=Opts) ->
maybe_done([end_array|Forms], [array|Stack]) -> {event, end_json, fun() -> start(Forms, Opts) end};
{event, end_array, fun() -> maybe_done(Forms, Stack) end}; maybe_done([end_object|Forms], [object|Stack], Opts) ->
maybe_done(Forms, [object|_] = Stack) -> key(Forms, Stack); {event, end_object, fun() -> maybe_done(Forms, Stack, Opts) end};
maybe_done(Forms, [array|_] = Stack) -> value(Forms, Stack); maybe_done([end_array|Forms], [array|Stack], Opts) ->
maybe_done([], Stack) -> {event, end_array, fun() -> maybe_done(Forms, Stack, Opts) end};
maybe_done(Forms, [object|_] = Stack, Opts) -> key(Forms, Stack, Opts);
maybe_done(Forms, [array|_] = Stack, Opts) -> value(Forms, Stack, Opts);
maybe_done([], Stack, Opts) ->
{incomplete, fun(end_stream) -> {incomplete, fun(end_stream) ->
{error, {badjson, []}} {error, {badjson, []}}
; (Stream) -> ; (Stream) ->
maybe_done(Stream, Stack) maybe_done(Stream, Stack, Opts)
end}; end};
maybe_done(Forms, _) -> {error, {badjson, Forms}}. maybe_done(Forms, _, _) -> {error, {badjson, Forms}}.