strings returned as binaries
This commit is contained in:
alisdair sullivan
parent
d5a91c0a06
commit
0ea61233c5
22 changed files with 86 additions and 98 deletions
|
|
@ -120,12 +120,12 @@ decoder(Opts) ->
|
|||
).
|
||||
-endif.
|
||||
|
||||
-define(new_seq(), []).
|
||||
-define(new_seq(C), [C]).
|
||||
-define(new_seq(), <<>>).
|
||||
-define(new_seq(C), <<C/utf8>>).
|
||||
|
||||
-define(acc_seq(Seq, C), [C] ++ Seq).
|
||||
-define(acc_seq(Seq, C), <<Seq/binary, C/utf8>>).
|
||||
|
||||
-define(end_seq(Seq), lists:reverse(Seq)).
|
||||
-define(end_seq(Seq), Seq).
|
||||
|
||||
|
||||
start(<<?start_object, Rest/binary>>, Out, Stack, Opts) ->
|
||||
|
|
@ -141,11 +141,11 @@ start(<<$f, Rest/binary>>, Out, Stack, Opts) ->
|
|||
start(<<$n, Rest/binary>>, Out, Stack, Opts) ->
|
||||
nu(Rest, Out, Stack, Opts);
|
||||
start(<<?negative, Rest/binary>>, Out, Stack, Opts) ->
|
||||
negative(Rest, Out, [?new_seq($-)|Stack], Opts);
|
||||
negative(Rest, Out, [[$-]|Stack], Opts);
|
||||
start(<<?zero, Rest/binary>>, Out, Stack, Opts) ->
|
||||
zero(Rest, Out, [?new_seq($0)|Stack], Opts);
|
||||
zero(Rest, Out, [[$0]|Stack], Opts);
|
||||
start(<<S/utf8, Rest/binary>>, Out, Stack, Opts) when ?is_nonzero(S) ->
|
||||
integer(Rest, Out, [?new_seq(S)|Stack], Opts);
|
||||
integer(Rest, Out, [[S]|Stack], Opts);
|
||||
start(<<S, Rest/binary>>, Out, Stack, Opts) when ?is_whitespace(S) ->
|
||||
start(Rest, Out, Stack, Opts);
|
||||
start(<<>>, Out, Stack, Opts) ->
|
||||
|
|
@ -175,11 +175,11 @@ array(<<$f, Rest/binary>>, Out, Stack, Opts) ->
|
|||
array(<<$n, Rest/binary>>, Out, Stack, Opts) ->
|
||||
nu(Rest, Out, Stack, Opts);
|
||||
array(<<?negative, Rest/binary>>, Out, Stack, Opts) ->
|
||||
negative(Rest, Out, [?new_seq($-)|Stack], Opts);
|
||||
negative(Rest, Out, [[$-]|Stack], Opts);
|
||||
array(<<?zero, Rest/binary>>, Out, Stack, Opts) ->
|
||||
zero(Rest, Out, [?new_seq($0)|Stack], Opts);
|
||||
zero(Rest, Out, [[$0]|Stack], Opts);
|
||||
array(<<S, Rest/binary>>, Out, Stack, Opts) when ?is_nonzero(S) ->
|
||||
integer(Rest, Out, [?new_seq(S)|Stack], Opts);
|
||||
integer(Rest, Out, [[S]|Stack], Opts);
|
||||
array(<<?start_object, Rest/binary>>, Out, Stack, Opts) ->
|
||||
?event([start_object], object, Rest, Out, [key|Stack], Opts);
|
||||
array(<<?start_array, Rest/binary>>, Out, Stack, Opts) ->
|
||||
|
|
@ -203,11 +203,11 @@ value(<<$f, Rest/binary>>, Out, Stack, Opts) ->
|
|||
value(<<$n, Rest/binary>>, Out, Stack, Opts) ->
|
||||
nu(Rest, Out, Stack, Opts);
|
||||
value(<<?negative, Rest/binary>>, Out, Stack, Opts) ->
|
||||
negative(Rest, Out, [?new_seq($-)|Stack], Opts);
|
||||
negative(Rest, Out, [[$-]|Stack], Opts);
|
||||
value(<<?zero, Rest/binary>>, Out, Stack, Opts) ->
|
||||
zero(Rest, Out, [?new_seq($0)|Stack], Opts);
|
||||
zero(Rest, Out, [[$0]|Stack], Opts);
|
||||
value(<<S, Rest/binary>>, Out, Stack, Opts) when ?is_nonzero(S) ->
|
||||
integer(Rest, Out, [?new_seq(S)|Stack], Opts);
|
||||
integer(Rest, Out, [[S]|Stack], Opts);
|
||||
value(<<?start_object, Rest/binary>>, Out, Stack, Opts) ->
|
||||
?event([start_object], object, Rest, Out, [key|Stack], Opts);
|
||||
value(<<?start_array, Rest/binary>>, Out, Stack, Opts) ->
|
||||
|
|
@ -335,7 +335,7 @@ escape(<<$r, Rest/binary>>, Out, [Acc|Stack], Opts) ->
|
|||
escape(<<$t, Rest/binary>>, Out, [Acc|Stack], Opts) ->
|
||||
string(Rest, Out, [?acc_seq(Acc, $\t)|Stack], Opts);
|
||||
escape(<<$u, Rest/binary>>, Out, Stack, Opts) ->
|
||||
escaped_unicode(Rest, Out, [?new_seq()|Stack], Opts);
|
||||
escaped_unicode(Rest, Out, [[]|Stack], Opts);
|
||||
escape(<<S, Rest/binary>>, Out, [Acc|Stack], Opts)
|
||||
when S =:= ?quote; S =:= ?solidus; S =:= ?rsolidus ->
|
||||
string(Rest, Out, [?acc_seq(Acc, S)|Stack], Opts);
|
||||
|
|
@ -376,7 +376,7 @@ escaped_unicode(<<D, Rest/binary>>, Out, [[C,B,A], Acc|Stack], Opts)
|
|||
end;
|
||||
escaped_unicode(<<S, Rest/binary>>, Out, [Acc|Stack], Opts)
|
||||
when ?is_hex(S) ->
|
||||
escaped_unicode(Rest, Out, [?acc_seq(Acc, S)|Stack], Opts);
|
||||
escaped_unicode(Rest, Out, [[S] ++ Acc|Stack], Opts);
|
||||
escaped_unicode(<<>>, Out, Stack, Opts) ->
|
||||
?incomplete(escaped_unicode, <<>>, Out, Stack, Opts);
|
||||
escaped_unicode(Bin, Out, Stack, Opts) ->
|
||||
|
|
@ -401,7 +401,7 @@ low_surrogate(Bin, Out, Stack, Opts) ->
|
|||
|
||||
|
||||
low_surrogate_u(<<$u, Rest/binary>>, Out, Stack, Opts) ->
|
||||
low_surrogate_v(Rest, Out, [?new_seq()|Stack], Opts);
|
||||
low_surrogate_v(Rest, Out, [[]|Stack], Opts);
|
||||
low_surrogate_u(<<>>, Out, Stack, Opts) ->
|
||||
?incomplete(low_surrogate_u, <<>>, Out, Stack, Opts);
|
||||
%% not a low surrogate, dispatch back to string to handle, including the
|
||||
|
|
@ -441,7 +441,7 @@ low_surrogate_v(<<D, Rest/binary>>, Out, [[C,B,A], High, String|Stack], Opts)
|
|||
end;
|
||||
low_surrogate_v(<<S, Rest/binary>>, Out, [Acc|Stack], Opts)
|
||||
when ?is_hex(S) ->
|
||||
low_surrogate_v(Rest, Out, [?acc_seq(Acc, S)|Stack], Opts);
|
||||
low_surrogate_v(Rest, Out, [[S] ++ Acc|Stack], Opts);
|
||||
low_surrogate_v(<<>>, Out, Stack, Opts) ->
|
||||
?incomplete(low_surrogate_v, <<>>, Out, Stack, Opts);
|
||||
low_surrogate_v(Bin, Out, Stack, Opts) ->
|
||||
|
|
@ -783,7 +783,7 @@ check_bad(List) ->
|
|||
).
|
||||
|
||||
check_replaced(List) ->
|
||||
lists:dropwhile(fun({_, [{string, [16#fffd]}|_]}) ->
|
||||
lists:dropwhile(fun({_, [{string, <<16#fffd/utf8>>}|_]}) ->
|
||||
true
|
||||
; (_) ->
|
||||
false
|
||||
|
|
|
|||
|
|
@ -61,26 +61,15 @@ encoder(OptsList) ->
|
|||
|
||||
|
||||
|
||||
start([{string, String}], [], [], Opts) when is_binary(String); is_list(String) ->
|
||||
{ok,
|
||||
[{string,
|
||||
unicode:characters_to_list(jsx_utils:json_escape(String, Opts))},
|
||||
end_json
|
||||
]
|
||||
};
|
||||
start([{string, String}], [], [], Opts) when is_binary(String) ->
|
||||
{ok, [{string, jsx_utils:json_escape(String, Opts)}, end_json]};
|
||||
start([{float, Float}], [], [], _Opts) when is_float(Float) ->
|
||||
{ok,
|
||||
[{float, Float}, end_json]
|
||||
};
|
||||
{ok, [{float, Float}, end_json]};
|
||||
start([{integer, Int}], [], [], _Opts) when is_integer(Int) ->
|
||||
{ok,
|
||||
[{integer, Int}, end_json]
|
||||
};
|
||||
{ok, [{integer, Int}, end_json]};
|
||||
start([{literal, Atom}], [], [], _Opts)
|
||||
when Atom == true; Atom == false; Atom == null ->
|
||||
{ok,
|
||||
[{literal, Atom}, end_json]
|
||||
};
|
||||
{ok, [{literal, Atom}, end_json]};
|
||||
%% third parameter is a stack to match end_foos to start_foos
|
||||
start(Forms, [], [], Opts) when is_list(Forms) ->
|
||||
list_or_object(Forms, [], [], Opts);
|
||||
|
|
@ -96,9 +85,9 @@ list_or_object([], T, Stack, Opts) ->
|
|||
list_or_object(Forms, T, Stack, Opts) -> ?error([Forms, T, Stack, Opts]).
|
||||
|
||||
|
||||
key([{key, Key}|Forms], T, Stack, Opts) when is_binary(Key); is_list(Key) ->
|
||||
key([{key, Key}|Forms], T, Stack, Opts) when is_binary(Key) ->
|
||||
?event([{key,
|
||||
unicode:characters_to_list(jsx_utils:json_escape(Key, Opts))
|
||||
unicode:characters_to_binary(jsx_utils:json_escape(Key, Opts))
|
||||
}],
|
||||
value, Forms, T, Stack, Opts
|
||||
);
|
||||
|
|
@ -108,8 +97,8 @@ key([], T, Stack, Opts) -> ?incomplete(key, T, Stack, Opts);
|
|||
key(Forms, T, Stack, Opts) -> ?error([Forms, T, Stack, Opts]).
|
||||
|
||||
|
||||
value([{string, S}|Forms], T, Stack, Opts) when is_binary(S); is_list(S) ->
|
||||
?event([{string, unicode:characters_to_list(jsx_utils:json_escape(S, Opts))}],
|
||||
value([{string, S}|Forms], T, Stack, Opts) when is_binary(S) ->
|
||||
?event([{string, jsx_utils:json_escape(S, Opts)}],
|
||||
maybe_done, Forms, T, Stack, Opts
|
||||
);
|
||||
value([{float, F}|Forms], T, Stack, Opts) when is_float(F) ->
|
||||
|
|
@ -141,8 +130,7 @@ maybe_done([], T, Stack, Opts) -> ?incomplete(maybe_done, T, Stack, Opts);
|
|||
maybe_done(Forms, T, Stack, Opts) -> ?error([Forms, T, Stack, Opts]).
|
||||
|
||||
|
||||
done([], T, [], _Opts) ->
|
||||
{ok, lists:reverse(T)};
|
||||
done([], T, [], _Opts) -> {ok, lists:reverse(T)};
|
||||
done(Forms, T, Stack, Opts) -> ?error([Forms, T, Stack, Opts]).
|
||||
|
||||
|
||||
|
|
@ -164,9 +152,9 @@ encode_test_() ->
|
|||
{"empty object", ?_assert(encode([start_object, end_object, end_json]))},
|
||||
{"empty array", ?_assert(encode([start_array, end_array, end_json]))},
|
||||
{"nested empty objects", ?_assert(encode([start_object,
|
||||
{key, "empty object"},
|
||||
{key, <<"empty object">>},
|
||||
start_object,
|
||||
{key, "empty object"},
|
||||
{key, <<"empty object">>},
|
||||
start_object,
|
||||
end_object,
|
||||
end_object,
|
||||
|
|
@ -182,19 +170,19 @@ encode_test_() ->
|
|||
end_json
|
||||
]))},
|
||||
{"simple object", ?_assert(encode([start_object,
|
||||
{key, "a"},
|
||||
{string, "hello"},
|
||||
{key, "b"},
|
||||
{key, <<"a">>},
|
||||
{string, <<"hello">>},
|
||||
{key, <<"b">>},
|
||||
{integer, 1},
|
||||
{key, "c"},
|
||||
{key, <<"c">>},
|
||||
{float, 1.0},
|
||||
{key, "d"},
|
||||
{key, <<"d">>},
|
||||
{literal, true},
|
||||
end_object,
|
||||
end_json
|
||||
]))},
|
||||
{"simple array", ?_assert(encode([start_array,
|
||||
{string, "hello"},
|
||||
{string, <<"hello">>},
|
||||
{integer, 1},
|
||||
{float, 1.0},
|
||||
{literal, true},
|
||||
|
|
@ -207,8 +195,8 @@ encode_test_() ->
|
|||
end_array,
|
||||
end_json
|
||||
]))},
|
||||
{"naked string", ?_assert((jsx:scanner())([{string, "hello"}])
|
||||
=:= {ok, [{string, "hello"}, end_json]}
|
||||
{"naked string", ?_assert((jsx:scanner())([{string, <<"hello">>}])
|
||||
=:= {ok, [{string, <<"hello">>}, end_json]}
|
||||
)},
|
||||
{"naked literal", ?_assert((jsx:scanner())([{literal, true}])
|
||||
=:= {ok, [{literal, true}, end_json]}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue