remove additional accumulators from intermediate states
This commit is contained in:
alisdair sullivan
parent
b0844273c3
commit
95dd7a67c6
1 changed files with 377 additions and 377 deletions
|
|
@ -60,144 +60,144 @@
|
||||||
|
|
||||||
|
|
||||||
-ifndef(incomplete).
|
-ifndef(incomplete).
|
||||||
-define(incomplete(State, Rest, T, Stack, Opts),
|
-define(incomplete(State, Rest, Out, Stack, Opts),
|
||||||
{ok, lists:reverse(T), fun(Stream) when is_binary(Stream) ->
|
{ok, lists:reverse(Out), fun(Stream) when is_binary(Stream) ->
|
||||||
State(<<Rest/binary, Stream/binary>>, [], Stack, Opts)
|
State(<<Rest/binary, Stream/binary>>, [], Stack, Opts)
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
).
|
).
|
||||||
-define(incomplete(State, Rest, T, Stack, Opts, Acc),
|
|
||||||
{ok, lists:reverse(T), fun(Stream) when is_binary(Stream) ->
|
|
||||||
State(<<Rest/binary, Stream/binary>>, [], Stack, Opts, Acc)
|
|
||||||
end
|
|
||||||
}
|
|
||||||
).
|
|
||||||
-endif.
|
-endif.
|
||||||
|
|
||||||
|
|
||||||
-ifndef(event).
|
-ifndef(event).
|
||||||
-define(event(Event, State, Rest, T, Stack, Opts),
|
-define(event(Event, State, Rest, Out, Stack, Opts),
|
||||||
State(Rest, Event ++ T, Stack, Opts)
|
State(Rest, Event ++ Out, Stack, Opts)
|
||||||
).
|
).
|
||||||
-endif.
|
-endif.
|
||||||
|
|
||||||
|
-define(new_seq(), []).
|
||||||
|
-define(new_seq(C), [C]).
|
||||||
|
|
||||||
start(<<?start_object, Rest/binary>>, T, Stack, Opts) ->
|
-define(acc_seq(Seq, C), [C] ++ Seq).
|
||||||
?event([start_object], object, Rest, T, [key|Stack], Opts);
|
|
||||||
start(<<?start_array, Rest/binary>>, T, Stack, Opts) ->
|
-define(end_seq(Seq), lists:reverse(Seq)).
|
||||||
?event([start_array], array, Rest, T, [array|Stack], Opts);
|
|
||||||
start(<<?quote, Rest/binary>>, T, Stack, Opts) ->
|
|
||||||
string(Rest, T, Stack, Opts, []);
|
|
||||||
start(<<$t, Rest/binary>>, T, Stack, Opts) ->
|
|
||||||
tr(Rest, T, Stack, Opts);
|
|
||||||
start(<<$f, Rest/binary>>, T, Stack, Opts) ->
|
|
||||||
fa(Rest, T, Stack, Opts);
|
|
||||||
start(<<$n, Rest/binary>>, T, Stack, Opts) ->
|
|
||||||
nu(Rest, T, Stack, Opts);
|
|
||||||
start(<<?negative, Rest/binary>>, T, Stack, Opts) ->
|
|
||||||
negative(Rest, T, Stack, Opts, "-");
|
|
||||||
start(<<?zero, Rest/binary>>, T, Stack, Opts) ->
|
|
||||||
zero(Rest, T, Stack, Opts, "0");
|
|
||||||
start(<<S/utf8, Rest/binary>>, T, Stack, Opts) when ?is_nonzero(S) ->
|
|
||||||
integer(Rest, T, Stack, Opts, [S]);
|
|
||||||
start(<<S, Rest/binary>>, T, Stack, Opts) when ?is_whitespace(S) ->
|
|
||||||
start(Rest, T, Stack, Opts);
|
|
||||||
start(<<>>, T, Stack, Opts) ->
|
|
||||||
?incomplete(start, <<>>, T, Stack, Opts);
|
|
||||||
start(Bin, T, Stack, Opts) ->
|
|
||||||
?error([Bin, T, Stack, Opts]).
|
|
||||||
|
|
||||||
|
|
||||||
object(<<?quote, Rest/binary>>, T, Stack, Opts) ->
|
start(<<?start_object, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
string(Rest, T, Stack, Opts, []);
|
?event([start_object], object, Rest, Out, [key|Stack], Opts);
|
||||||
object(<<?end_object, Rest/binary>>, T, [key|Stack], Opts) ->
|
start(<<?start_array, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
?event([end_object], maybe_done, Rest, T, Stack, Opts);
|
?event([start_array], array, Rest, Out, [array|Stack], Opts);
|
||||||
object(<<S, Rest/binary>>, T, Stack, Opts) when ?is_whitespace(S) ->
|
start(<<?quote, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
object(Rest, T, Stack, Opts);
|
string(Rest, Out, [?new_seq()|Stack], Opts);
|
||||||
object(<<>>, T, Stack, Opts) ->
|
start(<<$t, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
?incomplete(object, <<>>, T, Stack, Opts);
|
tr(Rest, Out, Stack, Opts);
|
||||||
object(Bin, T, Stack, Opts) ->
|
start(<<$f, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
fa(Rest, 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);
|
||||||
|
start(<<?zero, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
|
zero(Rest, Out, [?new_seq($0)|Stack], Opts);
|
||||||
|
start(<<S/utf8, Rest/binary>>, Out, Stack, Opts) when ?is_nonzero(S) ->
|
||||||
|
integer(Rest, Out, [?new_seq(S)|Stack], Opts);
|
||||||
|
start(<<S, Rest/binary>>, Out, Stack, Opts) when ?is_whitespace(S) ->
|
||||||
|
start(Rest, Out, Stack, Opts);
|
||||||
|
start(<<>>, Out, Stack, Opts) ->
|
||||||
|
?incomplete(start, <<>>, Out, Stack, Opts);
|
||||||
|
start(Bin, Out, Stack, Opts) ->
|
||||||
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
|
object(<<?quote, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
|
string(Rest, Out, [?new_seq()|Stack], Opts);
|
||||||
|
object(<<?end_object, Rest/binary>>, Out, [key|Stack], Opts) ->
|
||||||
|
?event([end_object], maybe_done, Rest, Out, Stack, Opts);
|
||||||
|
object(<<S, Rest/binary>>, Out, Stack, Opts) when ?is_whitespace(S) ->
|
||||||
|
object(Rest, Out, Stack, Opts);
|
||||||
|
object(<<>>, Out, Stack, Opts) ->
|
||||||
|
?incomplete(object, <<>>, Out, Stack, Opts);
|
||||||
|
object(Bin, Out, Stack, Opts) ->
|
||||||
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
array(<<?quote, Rest/binary>>, T, Stack, Opts) ->
|
array(<<?quote, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
string(Rest, T, Stack, Opts, []);
|
string(Rest, Out, [?new_seq()|Stack], Opts);
|
||||||
array(<<$t, Rest/binary>>, T, Stack, Opts) ->
|
array(<<$t, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
tr(Rest, T, Stack, Opts);
|
tr(Rest, Out, Stack, Opts);
|
||||||
array(<<$f, Rest/binary>>, T, Stack, Opts) ->
|
array(<<$f, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
fa(Rest, T, Stack, Opts);
|
fa(Rest, Out, Stack, Opts);
|
||||||
array(<<$n, Rest/binary>>, T, Stack, Opts) ->
|
array(<<$n, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
nu(Rest, T, Stack, Opts);
|
nu(Rest, Out, Stack, Opts);
|
||||||
array(<<?negative, Rest/binary>>, T, Stack, Opts) ->
|
array(<<?negative, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
negative(Rest, T, Stack, Opts, "-");
|
negative(Rest, Out, [?new_seq($-)|Stack], Opts);
|
||||||
array(<<?zero, Rest/binary>>, T, Stack, Opts) ->
|
array(<<?zero, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
zero(Rest, T, Stack, Opts, "0");
|
zero(Rest, Out, [?new_seq($0)|Stack], Opts);
|
||||||
array(<<S, Rest/binary>>, T, Stack, Opts) when ?is_nonzero(S) ->
|
array(<<S, Rest/binary>>, Out, Stack, Opts) when ?is_nonzero(S) ->
|
||||||
integer(Rest, T, Stack, Opts, [S]);
|
integer(Rest, Out, [?new_seq(S)|Stack], Opts);
|
||||||
array(<<?start_object, Rest/binary>>, T, Stack, Opts) ->
|
array(<<?start_object, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
?event([start_object], object, Rest, T, [key|Stack], Opts);
|
?event([start_object], object, Rest, Out, [key|Stack], Opts);
|
||||||
array(<<?start_array, Rest/binary>>, T, Stack, Opts) ->
|
array(<<?start_array, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
?event([start_array], array, Rest, T, [array|Stack], Opts);
|
?event([start_array], array, Rest, Out, [array|Stack], Opts);
|
||||||
array(<<?end_array, Rest/binary>>, T, [array|Stack], Opts) ->
|
array(<<?end_array, Rest/binary>>, Out, [array|Stack], Opts) ->
|
||||||
maybe_done(Rest, [end_array] ++ T, Stack, Opts);
|
maybe_done(Rest, [end_array] ++ Out, Stack, Opts);
|
||||||
array(<<S, Rest/binary>>, T, Stack, Opts) when ?is_whitespace(S) ->
|
array(<<S, Rest/binary>>, Out, Stack, Opts) when ?is_whitespace(S) ->
|
||||||
array(Rest, T, Stack, Opts);
|
array(Rest, Out, Stack, Opts);
|
||||||
array(<<>>, T, Stack, Opts) ->
|
array(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(array, <<>>, T, Stack, Opts);
|
?incomplete(array, <<>>, Out, Stack, Opts);
|
||||||
array(Bin, T, Stack, Opts) ->
|
array(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
value(<<?quote, Rest/binary>>, T, Stack, Opts) ->
|
value(<<?quote, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
string(Rest, T, Stack, Opts, []);
|
string(Rest, Out, [?new_seq()|Stack], Opts);
|
||||||
value(<<$t, Rest/binary>>, T, Stack, Opts) ->
|
value(<<$t, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
tr(Rest, T, Stack, Opts);
|
tr(Rest, Out, Stack, Opts);
|
||||||
value(<<$f, Rest/binary>>, T, Stack, Opts) ->
|
value(<<$f, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
fa(Rest, T, Stack, Opts);
|
fa(Rest, Out, Stack, Opts);
|
||||||
value(<<$n, Rest/binary>>, T, Stack, Opts) ->
|
value(<<$n, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
nu(Rest, T, Stack, Opts);
|
nu(Rest, Out, Stack, Opts);
|
||||||
value(<<?negative, Rest/binary>>, T, Stack, Opts) ->
|
value(<<?negative, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
negative(Rest, T, Stack, Opts, "-");
|
negative(Rest, Out, [?new_seq($-)|Stack], Opts);
|
||||||
value(<<?zero, Rest/binary>>, T, Stack, Opts) ->
|
value(<<?zero, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
zero(Rest, T, Stack, Opts, "0");
|
zero(Rest, Out, [?new_seq($0)|Stack], Opts);
|
||||||
value(<<S, Rest/binary>>, T, Stack, Opts) when ?is_nonzero(S) ->
|
value(<<S, Rest/binary>>, Out, Stack, Opts) when ?is_nonzero(S) ->
|
||||||
integer(Rest, T, Stack, Opts, [S]);
|
integer(Rest, Out, [?new_seq(S)|Stack], Opts);
|
||||||
value(<<?start_object, Rest/binary>>, T, Stack, Opts) ->
|
value(<<?start_object, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
?event([start_object], object, Rest, T, [key|Stack], Opts);
|
?event([start_object], object, Rest, Out, [key|Stack], Opts);
|
||||||
value(<<?start_array, Rest/binary>>, T, Stack, Opts) ->
|
value(<<?start_array, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
?event([start_array], array, Rest, T, [array|Stack], Opts);
|
?event([start_array], array, Rest, Out, [array|Stack], Opts);
|
||||||
value(<<S, Rest/binary>>, T, Stack, Opts) when ?is_whitespace(S) ->
|
value(<<S, Rest/binary>>, Out, Stack, Opts) when ?is_whitespace(S) ->
|
||||||
value(Rest, T, Stack, Opts);
|
value(Rest, Out, Stack, Opts);
|
||||||
value(<<>>, T, Stack, Opts) ->
|
value(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(value, <<>>, T, Stack, Opts);
|
?incomplete(value, <<>>, Out, Stack, Opts);
|
||||||
value(Bin, T, Stack, Opts) ->
|
value(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
colon(<<?colon, Rest/binary>>, T, [key|Stack], Opts) ->
|
colon(<<?colon, Rest/binary>>, Out, [key|Stack], Opts) ->
|
||||||
value(Rest, T, [object|Stack], Opts);
|
value(Rest, Out, [object|Stack], Opts);
|
||||||
colon(<<S, Rest/binary>>, T, Stack, Opts) when ?is_whitespace(S) ->
|
colon(<<S, Rest/binary>>, Out, Stack, Opts) when ?is_whitespace(S) ->
|
||||||
colon(Rest, T, Stack, Opts);
|
colon(Rest, Out, Stack, Opts);
|
||||||
colon(<<>>, T, Stack, Opts) ->
|
colon(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(colon, <<>>, T, Stack, Opts);
|
?incomplete(colon, <<>>, Out, Stack, Opts);
|
||||||
colon(Bin, T, Stack, Opts) ->
|
colon(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
key(<<?quote, Rest/binary>>, T, Stack, Opts) ->
|
key(<<?quote, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
string(Rest, T, Stack, Opts, []);
|
string(Rest, Out, [?new_seq()|Stack], Opts);
|
||||||
key(<<S, Rest/binary>>, T, Stack, Opts) when ?is_whitespace(S) ->
|
key(<<S, Rest/binary>>, Out, Stack, Opts) when ?is_whitespace(S) ->
|
||||||
key(Rest, T, Stack, Opts);
|
key(Rest, Out, Stack, Opts);
|
||||||
key(<<>>, T, Stack, Opts) ->
|
key(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(key, <<>>, T, Stack, Opts);
|
?incomplete(key, <<>>, Out, Stack, Opts);
|
||||||
key(Bin, T, Stack, Opts) ->
|
key(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
%% string has an additional parameter, an accumulator (Acc) used to hold the
|
%% string appends it's output to the term at the top of the stack. for
|
||||||
%% intermediate representation of the string being parsed. using a list of
|
%% efficiency the strings are build in reverse order and reversed before
|
||||||
%% integers representing unicode codepoints is faster than constructing
|
%% being added to the output stream
|
||||||
%% binaries, there's a branch kicking around which proves it
|
|
||||||
%% string uses partial_utf/1 to cease parsing when invalid encodings are
|
%% string uses partial_utf/1 to cease parsing when invalid encodings are
|
||||||
%% encountered rather than just checking remaining binary size like other
|
%% encountered rather than just checking remaining binary size like other
|
||||||
%% states to eliminate certain incomplete states
|
%% states to eliminate certain incomplete states
|
||||||
|
|
@ -215,24 +215,24 @@ partial_utf(<<X, Y, Z>>)
|
||||||
partial_utf(_) -> false.
|
partial_utf(_) -> false.
|
||||||
|
|
||||||
|
|
||||||
string(<<?quote/utf8, Rest/binary>>, T, [key|_] = Stack, Opts, Acc) ->
|
string(<<?quote/utf8, Rest/binary>>, Out, [Acc, key|Stack], Opts) ->
|
||||||
?event([{key, lists:reverse(Acc)}], colon, Rest, T, Stack, Opts);
|
?event([{key, ?end_seq(Acc)}], colon, Rest, Out, [key|Stack], Opts);
|
||||||
string(<<?quote/utf8, Rest/binary>>, T, Stack, Opts, Acc) ->
|
string(<<?quote/utf8, Rest/binary>>, Out, [Acc|Stack], Opts) ->
|
||||||
?event([{string, lists:reverse(Acc)}], maybe_done, Rest, T, Stack, Opts);
|
?event([{string, ?end_seq(Acc)}], maybe_done, Rest, Out, Stack, Opts);
|
||||||
string(<<?rsolidus/utf8, Rest/binary>>, T, Stack, Opts, Acc) ->
|
string(<<?rsolidus/utf8, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
escape(Rest, T, Stack, Opts, Acc);
|
escape(Rest, Out, Stack, Opts);
|
||||||
%% things get dumb here. erlang doesn't properly restrict unicode non-characters
|
%% things get dumb here. erlang doesn't properly restrict unicode non-characters
|
||||||
%% so you can't trust the codepoints it returns always
|
%% so you can't trust the codepoints it returns always
|
||||||
%% the range 32..16#fdcf is safe, so allow that
|
%% the range 32..16#fdcf is safe, so allow that
|
||||||
string(<<S/utf8, Rest/binary>>, T, Stack, Opts, Acc)
|
string(<<S/utf8, Rest/binary>>, Out, [Acc|Stack], Opts)
|
||||||
when ?is_noncontrol(S), S < 16#fdd0 ->
|
when ?is_noncontrol(S), S < 16#fdd0 ->
|
||||||
string(Rest, T, Stack, Opts, [S] ++ Acc);
|
string(Rest, Out, [?acc_seq(Acc, S)|Stack], Opts);
|
||||||
%% the range 16#fdf0..16#fffd is also safe
|
%% the range 16#fdf0..16#fffd is also safe
|
||||||
string(<<S/utf8, Rest/binary>>, T, Stack, Opts, Acc)
|
string(<<S/utf8, Rest/binary>>, Out, [Acc|Stack], Opts)
|
||||||
when S > 16#fdef, S < 16#fffe ->
|
when S > 16#fdef, S < 16#fffe ->
|
||||||
string(Rest, T, Stack, Opts, [S] ++ Acc);
|
string(Rest, Out, [?acc_seq(Acc, S)|Stack], Opts);
|
||||||
%% yes, i think it's insane too
|
%% yes, i think it's insane too
|
||||||
string(<<S/utf8, Rest/binary>>, T, Stack, Opts, Acc)
|
string(<<S/utf8, Rest/binary>>, Out, [Acc|Stack], Opts)
|
||||||
when S > 16#ffff andalso
|
when S > 16#ffff andalso
|
||||||
S =/= 16#1fffe andalso S =/= 16#1ffff andalso
|
S =/= 16#1fffe andalso S =/= 16#1ffff andalso
|
||||||
S =/= 16#2fffe andalso S =/= 16#2ffff andalso
|
S =/= 16#2fffe andalso S =/= 16#2ffff andalso
|
||||||
|
|
@ -250,14 +250,14 @@ string(<<S/utf8, Rest/binary>>, T, Stack, Opts, Acc)
|
||||||
S =/= 16#efffe andalso S =/= 16#effff andalso
|
S =/= 16#efffe andalso S =/= 16#effff andalso
|
||||||
S =/= 16#ffffe andalso S =/= 16#fffff andalso
|
S =/= 16#ffffe andalso S =/= 16#fffff andalso
|
||||||
S =/= 16#10fffe andalso S =/= 16#10ffff ->
|
S =/= 16#10fffe andalso S =/= 16#10ffff ->
|
||||||
string(Rest, T, Stack, Opts, [S] ++ Acc);
|
string(Rest, Out, [?acc_seq(Acc, S)|Stack], Opts);
|
||||||
string(Bin, T, Stack, Opts, Acc) ->
|
string(Bin, Out, Stack, Opts) ->
|
||||||
case partial_utf(Bin) of
|
case partial_utf(Bin) of
|
||||||
true -> ?incomplete(string, Bin, T, Stack, Opts, Acc)
|
true -> ?incomplete(string, Bin, Out, Stack, Opts)
|
||||||
; false ->
|
; false ->
|
||||||
case Opts#opts.loose_unicode of
|
case Opts#opts.loose_unicode of
|
||||||
true -> noncharacter(Bin, T, Stack, Opts, Acc)
|
true -> noncharacter(Bin, Out, Stack, Opts)
|
||||||
; false -> ?error([Bin, T, Stack, Opts, Acc])
|
; false -> ?error([Bin, Out, Stack, Opts])
|
||||||
end
|
end
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
|
@ -265,112 +265,112 @@ string(Bin, T, Stack, Opts, Acc) ->
|
||||||
%% care of in string. theoretically, the last clause of noncharacter/4 is
|
%% care of in string. theoretically, the last clause of noncharacter/4 is
|
||||||
%% unreachable
|
%% unreachable
|
||||||
%% non-characters erlang doesn't recognize as non-characters, idiotically
|
%% non-characters erlang doesn't recognize as non-characters, idiotically
|
||||||
noncharacter(<<S/utf8, Rest/binary>>, T, Stack, Opts, Acc)
|
noncharacter(<<S/utf8, Rest/binary>>, Out, [Acc|Stack], Opts)
|
||||||
when ?is_noncontrol(S) ->
|
when ?is_noncontrol(S) ->
|
||||||
string(Rest, T, Stack, Opts, [16#fffd] ++ Acc);
|
string(Rest, Out, [?acc_seq(Acc, 16#fffd)|Stack], Opts);
|
||||||
%% u+fffe and u+ffff
|
%% u+fffe and u+ffff
|
||||||
noncharacter(<<239, 191, X, Rest/binary>>, T, Stack, Opts, Acc)
|
noncharacter(<<239, 191, X, Rest/binary>>, Out, [Acc|Stack], Opts)
|
||||||
when X == 190; X == 191 ->
|
when X == 190; X == 191 ->
|
||||||
string(Rest, T, Stack, Opts, [16#fffd] ++ Acc);
|
string(Rest, Out, [?acc_seq(Acc, 16#fffd)|Stack], Opts);
|
||||||
%% surrogates
|
%% surrogates
|
||||||
noncharacter(<<237, X, _, Rest/binary>>, T, Stack, Opts, Acc) when X >= 160 ->
|
noncharacter(<<237, X, _, Rest/binary>>, Out, [Acc|Stack], Opts) when X >= 160 ->
|
||||||
string(Rest, T, Stack, Opts, [16#fffd] ++ Acc);
|
string(Rest, Out, [?acc_seq(Acc, 16#fffd)|Stack], Opts);
|
||||||
noncharacter(Bin, T, Stack, Opts, Acc) ->
|
noncharacter(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts, Acc]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
escape(<<$b, Rest/binary>>, T, Stack, Opts, Acc) ->
|
escape(<<$b, Rest/binary>>, Out, [Acc|Stack], Opts) ->
|
||||||
string(Rest, T, Stack, Opts, "\b" ++ Acc);
|
string(Rest, Out, [?acc_seq(Acc, $\b)|Stack], Opts);
|
||||||
escape(<<$f, Rest/binary>>, T, Stack, Opts, Acc) ->
|
escape(<<$f, Rest/binary>>, Out, [Acc|Stack], Opts) ->
|
||||||
string(Rest, T, Stack, Opts, "\f" ++ Acc);
|
string(Rest, Out, [?acc_seq(Acc, $\f)|Stack], Opts);
|
||||||
escape(<<$n, Rest/binary>>, T, Stack, Opts, Acc) ->
|
escape(<<$n, Rest/binary>>, Out, [Acc|Stack], Opts) ->
|
||||||
string(Rest, T, Stack, Opts, "\n" ++ Acc);
|
string(Rest, Out, [?acc_seq(Acc, $\n)|Stack], Opts);
|
||||||
escape(<<$r, Rest/binary>>, T, Stack, Opts, Acc) ->
|
escape(<<$r, Rest/binary>>, Out, [Acc|Stack], Opts) ->
|
||||||
string(Rest, T, Stack, Opts, "\r" ++ Acc);
|
string(Rest, Out, [?acc_seq(Acc, $\r)|Stack], Opts);
|
||||||
escape(<<$t, Rest/binary>>, T, Stack, Opts, Acc) ->
|
escape(<<$t, Rest/binary>>, Out, [Acc|Stack], Opts) ->
|
||||||
string(Rest, T, Stack, Opts, "\t" ++ Acc);
|
string(Rest, Out, [?acc_seq(Acc, $\t)|Stack], Opts);
|
||||||
escape(<<$u, Rest/binary>>, T, Stack, Opts, Acc) ->
|
escape(<<$u, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
escaped_unicode(Rest, T, Stack, Opts, {[], Acc});
|
escaped_unicode(Rest, Out, [?new_seq()|Stack], Opts);
|
||||||
escape(<<S, Rest/binary>>, T, Stack, Opts, Acc)
|
escape(<<S, Rest/binary>>, Out, [Acc|Stack], Opts)
|
||||||
when S =:= ?quote; S =:= ?solidus; S =:= ?rsolidus ->
|
when S =:= ?quote; S =:= ?solidus; S =:= ?rsolidus ->
|
||||||
string(Rest, T, Stack, Opts, [S] ++ Acc);
|
string(Rest, Out, [?acc_seq(Acc, S)|Stack], Opts);
|
||||||
escape(<<>>, T, Stack, Opts, Acc) ->
|
escape(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(escape, <<>>, T, Stack, Opts, Acc);
|
?incomplete(escape, <<>>, Out, Stack, Opts);
|
||||||
escape(Bin, T, Stack, Opts, Acc) ->
|
escape(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts, Acc]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
%% this code is ugly and unfortunate, but so is json's handling of escaped
|
%% this code is ugly and unfortunate, but so is json's handling of escaped
|
||||||
%% unicode codepoint sequences.
|
%% unicode codepoint sequences.
|
||||||
escaped_unicode(<<D, Rest/binary>>, T, Stack, Opts, {[C, B, A], String})
|
escaped_unicode(<<D, Rest/binary>>, Out, [[C,B,A], Acc|Stack], Opts)
|
||||||
when ?is_hex(D) ->
|
when ?is_hex(D) ->
|
||||||
case erlang:list_to_integer([A, B, C, D], 16) of
|
case erlang:list_to_integer([A, B, C, D], 16) of
|
||||||
%% high surrogate, we need a low surrogate next
|
%% high surrogate, we need a low surrogate next
|
||||||
X when X >= 16#d800, X =< 16#dbff ->
|
X when X >= 16#d800, X =< 16#dbff ->
|
||||||
low_surrogate(Rest, T, Stack, Opts, {X, String})
|
low_surrogate(Rest, Out, [X, Acc|Stack], Opts)
|
||||||
%% non-characters, you're not allowed to exchange these
|
%% non-characters, you're not allowed to exchange these
|
||||||
; X when X == 16#fffe; X == 16#ffff; X >= 16#fdd0, X =< 16#fdef ->
|
; X when X == 16#fffe; X == 16#ffff; X >= 16#fdd0, X =< 16#fdef ->
|
||||||
case Opts#opts.loose_unicode of
|
case Opts#opts.loose_unicode of
|
||||||
true ->
|
true ->
|
||||||
string(Rest, T, Stack, Opts, [16#fffd] ++ String)
|
string(Rest, Out, [?acc_seq(Acc, 16#fffd)|Stack], Opts)
|
||||||
; false ->
|
; false ->
|
||||||
?error([<<D, Rest/binary>>, T, Stack, Opts, {[C, B, A], String}])
|
?error([<<D, Rest/binary>>, Out, [[C,B,A], Acc|Stack], Opts])
|
||||||
end
|
end
|
||||||
%% allowing interchange of null bytes allows attackers to forge
|
%% allowing interchange of null bytes allows attackers to forge
|
||||||
%% malicious streams
|
%% malicious streams
|
||||||
; X when X == 16#0000 ->
|
; X when X == 16#0000 ->
|
||||||
case Opts#opts.loose_unicode of
|
case Opts#opts.loose_unicode of
|
||||||
true ->
|
true ->
|
||||||
string(Rest, T, Stack, Opts, [16#fffd] ++ String)
|
string(Rest, Out, [?acc_seq(Acc, 16#fffd)|Stack], Opts)
|
||||||
; false ->
|
; false ->
|
||||||
?error([<<D, Rest/binary>>, T, Stack, Opts, {[C, B, A], String}])
|
?error([<<D, Rest/binary>>, Out, [[C,B,A], Acc|Stack], Opts])
|
||||||
end
|
end
|
||||||
%% anything else
|
%% anything else
|
||||||
; X ->
|
; X ->
|
||||||
string(Rest, T, Stack, Opts, [X] ++ String)
|
string(Rest, Out, [?acc_seq(Acc, X)|Stack], Opts)
|
||||||
end;
|
end;
|
||||||
escaped_unicode(<<S, Rest/binary>>, T, Stack, Opts, {Acc, String})
|
escaped_unicode(<<S, Rest/binary>>, Out, [Acc|Stack], Opts)
|
||||||
when ?is_hex(S) ->
|
when ?is_hex(S) ->
|
||||||
escaped_unicode(Rest, T, Stack, Opts, {[S] ++ Acc, String});
|
escaped_unicode(Rest, Out, [?acc_seq(Acc, S)|Stack], Opts);
|
||||||
escaped_unicode(<<>>, T, Stack, Opts, Acc) ->
|
escaped_unicode(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(escaped_unicode, <<>>, T, Stack, Opts, Acc);
|
?incomplete(escaped_unicode, <<>>, Out, Stack, Opts);
|
||||||
escaped_unicode(Bin, T, Stack, Opts, Acc) ->
|
escaped_unicode(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts, Acc]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
low_surrogate(<<?rsolidus, Rest/binary>>, T, Stack, Opts, Acc) ->
|
low_surrogate(<<?rsolidus, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
low_surrogate_u(Rest, T, Stack, Opts, Acc);
|
low_surrogate_u(Rest, Out, Stack, Opts);
|
||||||
%% not an escaped codepoint, our high codepoint is illegal. dispatch back to
|
%% not an escaped codepoint, our high codepoint is illegal. dispatch back to
|
||||||
%% string to handle
|
%% string to handle
|
||||||
low_surrogate(<<S, Rest/binary>> = Bin, T, Stack, Opts, {High, String}) ->
|
low_surrogate(<<S, Rest/binary>> = Bin, Out, [High, String|Stack], Opts) ->
|
||||||
case Opts#opts.loose_unicode of
|
case Opts#opts.loose_unicode of
|
||||||
true ->
|
true ->
|
||||||
string(Bin, T, Stack, Opts, [16#fffd] ++ String)
|
string(Bin, Out, [?acc_seq(String, 16#fffd)|Stack], Opts)
|
||||||
; false ->
|
; false ->
|
||||||
?error([<<S, Rest/binary>>, T, Stack, Opts, {High, String}])
|
?error([<<S, Rest/binary>>, Out, [High, String|Stack], Opts])
|
||||||
end;
|
end;
|
||||||
low_surrogate(<<>>, T, Stack, Opts, Acc) ->
|
low_surrogate(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(low_surrogate, <<>>, T, Stack, Opts, Acc);
|
?incomplete(low_surrogate, <<>>, Out, Stack, Opts);
|
||||||
low_surrogate(Bin, T, Stack, Opts, Acc) ->
|
low_surrogate(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts, Acc]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
low_surrogate_u(<<$u, Rest/binary>>, T, Stack, Opts, {High, String}) ->
|
low_surrogate_u(<<$u, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
low_surrogate_v(Rest, T, Stack, Opts, {[], High, String});
|
low_surrogate_v(Rest, Out, [?new_seq()|Stack], Opts);
|
||||||
low_surrogate_u(<<>>, T, Stack, Opts, Acc) ->
|
low_surrogate_u(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(low_surrogate_u, <<>>, T, Stack, Opts, Acc);
|
?incomplete(low_surrogate_u, <<>>, Out, Stack, Opts);
|
||||||
%% not a low surrogate, dispatch back to string to handle, including the
|
%% not a low surrogate, dispatch back to string to handle, including the
|
||||||
%% rsolidus we parsed previously
|
%% rsolidus we parsed previously
|
||||||
low_surrogate_u(Bin, T, Stack, Opts, {High, String}) ->
|
low_surrogate_u(Bin, Out, [High, String|Stack], Opts) ->
|
||||||
case Opts#opts.loose_unicode of
|
case Opts#opts.loose_unicode of
|
||||||
true ->
|
true ->
|
||||||
string(<<?rsolidus, Bin/binary>>, T, Stack, Opts, [16#fffd] ++ String)
|
string(<<?rsolidus, Bin/binary>>, Out, [?acc_seq(String, 16#fffd)|Stack], Opts)
|
||||||
; false ->
|
; false ->
|
||||||
?error([Bin, T, Stack, Opts, {High, String}])
|
?error([Bin, Out, [High, String|Stack], Opts])
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
|
||||||
low_surrogate_v(<<D, Rest/binary>>, T, Stack, Opts, {[C, B, A], High, String})
|
low_surrogate_v(<<D, Rest/binary>>, Out, [[C,B,A], High, String|Stack], Opts)
|
||||||
when ?is_hex(D) ->
|
when ?is_hex(D) ->
|
||||||
case erlang:list_to_integer([A, B, C, D], 16) of
|
case erlang:list_to_integer([A, B, C, D], 16) of
|
||||||
X when X >= 16#dc00, X =< 16#dfff ->
|
X when X >= 16#dc00, X =< 16#dfff ->
|
||||||
|
|
@ -378,29 +378,29 @@ low_surrogate_v(<<D, Rest/binary>>, T, Stack, Opts, {[C, B, A], High, String})
|
||||||
case V rem 16#10000 of Y when Y == 16#fffe; Y == 16#ffff ->
|
case V rem 16#10000 of Y when Y == 16#fffe; Y == 16#ffff ->
|
||||||
case Opts#opts.loose_unicode of
|
case Opts#opts.loose_unicode of
|
||||||
true ->
|
true ->
|
||||||
string(Rest, T, Stack, Opts, [16#fffd] ++ String)
|
string(Rest, Out, [?acc_seq(String, 16#fffd)|Stack], Opts)
|
||||||
; false ->
|
; false ->
|
||||||
?error([<<D, Rest/binary>>, T, Stack, Opts, {[C, B, A], High, String}])
|
?error([<<D, Rest/binary>>, Out, [[C,B,A], High, String|Stack], Opts])
|
||||||
end
|
end
|
||||||
; _ ->
|
; _ ->
|
||||||
string(Rest, T, Stack, Opts, [V] ++ String)
|
string(Rest, Out, [?acc_seq(String, V)|Stack], Opts)
|
||||||
end
|
end
|
||||||
%% not a low surrogate, bad bad bad
|
%% not a low surrogate, bad bad bad
|
||||||
; _ ->
|
; _ ->
|
||||||
case Opts#opts.loose_unicode of
|
case Opts#opts.loose_unicode of
|
||||||
true ->
|
true ->
|
||||||
string(Rest, T, Stack, Opts, [16#fffd, 16#fffd] ++ String)
|
string(Rest, Out, [?acc_seq(?acc_seq(String, 16#fffd), 16#fffd)|Stack], Opts)
|
||||||
; false ->
|
; false ->
|
||||||
?error([<<D, Rest/binary>>, T, Stack, Opts, {[C, B, A], High, String}])
|
?error([<<D, Rest/binary>>, Out, [[C,B,A], High, String|Stack], Opts])
|
||||||
end
|
end
|
||||||
end;
|
end;
|
||||||
low_surrogate_v(<<S, Rest/binary>>, T, Stack, Opts, {Low, High, String})
|
low_surrogate_v(<<S, Rest/binary>>, Out, [Acc|Stack], Opts)
|
||||||
when ?is_hex(S) ->
|
when ?is_hex(S) ->
|
||||||
low_surrogate_v(Rest, T, Stack, Opts, {[S] ++ Low, High, String});
|
low_surrogate_v(Rest, Out, [?acc_seq(Acc, S)|Stack], Opts);
|
||||||
low_surrogate_v(<<>>, T, Stack, Opts, Acc) ->
|
low_surrogate_v(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(low_surrogate_v, <<>>, T, Stack, Opts, Acc);
|
?incomplete(low_surrogate_v, <<>>, Out, Stack, Opts);
|
||||||
low_surrogate_v(Bin, T, Stack, Opts, Acc) ->
|
low_surrogate_v(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts, Acc]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
%% stole this from the unicode spec
|
%% stole this from the unicode spec
|
||||||
|
|
@ -410,127 +410,127 @@ surrogate_to_codepoint(High, Low) ->
|
||||||
|
|
||||||
%% like strings, numbers are collected in an intermediate accumulator before
|
%% like strings, numbers are collected in an intermediate accumulator before
|
||||||
%% being emitted to the callback handler
|
%% being emitted to the callback handler
|
||||||
negative(<<$0, Rest/binary>>, T, Stack, Opts, Acc) ->
|
negative(<<$0, Rest/binary>>, Out, [Acc|Stack], Opts) ->
|
||||||
zero(Rest, T, Stack, Opts, "0" ++ Acc);
|
zero(Rest, Out, ["0" ++ Acc|Stack], Opts);
|
||||||
negative(<<S, Rest/binary>>, T, Stack, Opts, Acc) when ?is_nonzero(S) ->
|
negative(<<S, Rest/binary>>, Out, [Acc|Stack], Opts) when ?is_nonzero(S) ->
|
||||||
integer(Rest, T, Stack, Opts, [S] ++ Acc);
|
integer(Rest, Out, [[S] ++ Acc|Stack], Opts);
|
||||||
negative(<<>>, T, Stack, Opts, Acc) ->
|
negative(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(negative, <<>>, T, Stack, Opts, Acc);
|
?incomplete(negative, <<>>, Out, Stack, Opts);
|
||||||
negative(Bin, T, Stack, Opts, Acc) ->
|
negative(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts, Acc]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
zero(<<?end_object, Rest/binary>>, T, [object|Stack], Opts, Acc) ->
|
zero(<<?end_object, Rest/binary>>, Out, [Acc, object|Stack], Opts) ->
|
||||||
?event([end_object, format_number(Acc)], maybe_done, Rest, T, Stack, Opts);
|
?event([end_object, format_number(Acc)], maybe_done, Rest, Out, Stack, Opts);
|
||||||
zero(<<?end_array, Rest/binary>>, T, [array|Stack], Opts, Acc) ->
|
zero(<<?end_array, Rest/binary>>, Out, [Acc, array|Stack], Opts) ->
|
||||||
?event([end_array, format_number(Acc)], maybe_done, Rest, T, Stack, Opts);
|
?event([end_array, format_number(Acc)], maybe_done, Rest, Out, Stack, Opts);
|
||||||
zero(<<?comma, Rest/binary>>, T, [object|Stack], Opts, Acc) ->
|
zero(<<?comma, Rest/binary>>, Out, [Acc, object|Stack], Opts) ->
|
||||||
?event([format_number(Acc)], key, Rest, T, [key|Stack], Opts);
|
?event([format_number(Acc)], key, Rest, Out, [key|Stack], Opts);
|
||||||
zero(<<?comma, Rest/binary>>, T, [array|_] = Stack, Opts, Acc) ->
|
zero(<<?comma, Rest/binary>>, Out, [Acc, array|Stack], Opts) ->
|
||||||
?event([format_number(Acc)], value, Rest, T, Stack, Opts);
|
?event([format_number(Acc)], value, Rest, Out, [array|Stack], Opts);
|
||||||
zero(<<?decimalpoint, Rest/binary>>, T, Stack, Opts, Acc) ->
|
zero(<<?decimalpoint, Rest/binary>>, Out, [Acc|Stack], Opts) ->
|
||||||
initial_decimal(Rest, T, Stack, Opts, {Acc, []});
|
initial_decimal(Rest, Out, [{Acc, []}|Stack], Opts);
|
||||||
zero(<<S, Rest/binary>>, T, Stack, Opts, Acc) when ?is_whitespace(S) ->
|
zero(<<S, Rest/binary>>, Out, [Acc|Stack], Opts) when ?is_whitespace(S) ->
|
||||||
?event([format_number(Acc)], maybe_done, Rest, T, Stack, Opts);
|
?event([format_number(Acc)], maybe_done, Rest, Out, Stack, Opts);
|
||||||
zero(<<>>, T, Stack, Opts, Acc) ->
|
zero(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(zero, <<>>, T, Stack, Opts, Acc);
|
?incomplete(zero, <<>>, Out, Stack, Opts);
|
||||||
zero(Bin, T, Stack, Opts, Acc) ->
|
zero(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts, Acc]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
integer(<<S, Rest/binary>>, T, Stack, Opts, Acc) when ?is_nonzero(S) ->
|
integer(<<S, Rest/binary>>, Out, [Acc|Stack], Opts) when ?is_nonzero(S) ->
|
||||||
integer(Rest, T, Stack, Opts, [S] ++ Acc);
|
integer(Rest, Out, [[S] ++ Acc|Stack], Opts);
|
||||||
integer(<<?end_object, Rest/binary>>, T, [object|Stack], Opts, Acc) ->
|
integer(<<?end_object, Rest/binary>>, Out, [Acc, object|Stack], Opts) ->
|
||||||
?event([end_object, format_number(Acc)], maybe_done, Rest, T, Stack, Opts);
|
?event([end_object, format_number(Acc)], maybe_done, Rest, Out, Stack, Opts);
|
||||||
integer(<<?end_array, Rest/binary>>, T, [array|Stack], Opts, Acc) ->
|
integer(<<?end_array, Rest/binary>>, Out, [Acc, array|Stack], Opts) ->
|
||||||
?event([end_array, format_number(Acc)], maybe_done, Rest, T, Stack, Opts);
|
?event([end_array, format_number(Acc)], maybe_done, Rest, Out, Stack, Opts);
|
||||||
integer(<<?comma, Rest/binary>>, T, [object|Stack], Opts, Acc) ->
|
integer(<<?comma, Rest/binary>>, Out, [Acc, object|Stack], Opts) ->
|
||||||
?event([format_number(Acc)], key, Rest, T, [key|Stack], Opts);
|
?event([format_number(Acc)], key, Rest, Out, [key|Stack], Opts);
|
||||||
integer(<<?comma, Rest/binary>>, T, [array|_] = Stack, Opts, Acc) ->
|
integer(<<?comma, Rest/binary>>, Out, [Acc, array|Stack], Opts) ->
|
||||||
?event([format_number(Acc)], value, Rest, T, Stack, Opts);
|
?event([format_number(Acc)], value, Rest, Out, [array|Stack], Opts);
|
||||||
integer(<<?decimalpoint, Rest/binary>>, T, Stack, Opts, Acc) ->
|
integer(<<?decimalpoint, Rest/binary>>, Out, [Acc|Stack], Opts) ->
|
||||||
initial_decimal(Rest, T, Stack, Opts, {Acc, []});
|
initial_decimal(Rest, Out, [{Acc, []}|Stack], Opts);
|
||||||
integer(<<?zero, Rest/binary>>, T, Stack, Opts, Acc) ->
|
integer(<<?zero, Rest/binary>>, Out, [Acc|Stack], Opts) ->
|
||||||
integer(Rest, T, Stack, Opts, [?zero] ++ Acc);
|
integer(Rest, Out, [[?zero] ++ Acc|Stack], Opts);
|
||||||
integer(<<S, Rest/binary>>, T, Stack, Opts, Acc) when S =:= $e; S =:= $E ->
|
integer(<<S, Rest/binary>>, Out, [Acc|Stack], Opts) when S =:= $e; S =:= $E ->
|
||||||
e(Rest, T, Stack, Opts, {Acc, [], []});
|
e(Rest, Out, [{Acc, [], []}|Stack], Opts);
|
||||||
integer(<<S, Rest/binary>>, T, Stack, Opts, Acc) when ?is_whitespace(S) ->
|
integer(<<S, Rest/binary>>, Out, [Acc|Stack], Opts) when ?is_whitespace(S) ->
|
||||||
?event([format_number(Acc)], maybe_done, Rest, T, Stack, Opts);
|
?event([format_number(Acc)], maybe_done, Rest, Out, Stack, Opts);
|
||||||
integer(<<>>, T, Stack, Opts, Acc) ->
|
integer(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(integer, <<>>, T, Stack, Opts, Acc);
|
?incomplete(integer, <<>>, Out, Stack, Opts);
|
||||||
integer(Bin, T, Stack, Opts, Acc) ->
|
integer(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts, Acc]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
initial_decimal(<<S, Rest/binary>>, T, Stack, Opts, {Int, Frac})
|
initial_decimal(<<S, Rest/binary>>, Out, [{Int, Frac}|Stack], Opts)
|
||||||
when S =:= ?zero; ?is_nonzero(S) ->
|
when S =:= ?zero; ?is_nonzero(S) ->
|
||||||
decimal(Rest, T, Stack, Opts, {Int, [S] ++ Frac});
|
decimal(Rest, Out, [{Int, [S] ++ Frac}|Stack], Opts);
|
||||||
initial_decimal(<<>>, T, Stack, Opts, Acc) ->
|
initial_decimal(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(initial_decimal, <<>>, T, Stack, Opts, Acc);
|
?incomplete(initial_decimal, <<>>, Out, Stack, Opts);
|
||||||
initial_decimal(Bin, T, Stack, Opts, Acc) ->
|
initial_decimal(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts, Acc]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
decimal(<<S, Rest/binary>>, T, Stack, Opts, {Int, Frac})
|
decimal(<<S, Rest/binary>>, Out, [{Int, Frac}|Stack], Opts)
|
||||||
when S=:= ?zero; ?is_nonzero(S) ->
|
when S=:= ?zero; ?is_nonzero(S) ->
|
||||||
decimal(Rest, T, Stack, Opts, {Int, [S] ++ Frac});
|
decimal(Rest, Out, [{Int, [S] ++ Frac}|Stack], Opts);
|
||||||
decimal(<<?end_object, Rest/binary>>, T, [object|Stack], Opts, Acc) ->
|
decimal(<<?end_object, Rest/binary>>, Out, [Acc, object|Stack], Opts) ->
|
||||||
?event([end_object, format_number(Acc)], maybe_done, Rest, T, Stack, Opts);
|
?event([end_object, format_number(Acc)], maybe_done, Rest, Out, Stack, Opts);
|
||||||
decimal(<<?end_array, Rest/binary>>, T, [array|Stack], Opts, Acc) ->
|
decimal(<<?end_array, Rest/binary>>, Out, [Acc, array|Stack], Opts) ->
|
||||||
?event([end_array, format_number(Acc)], maybe_done, Rest, T, Stack, Opts);
|
?event([end_array, format_number(Acc)], maybe_done, Rest, Out, Stack, Opts);
|
||||||
decimal(<<?comma, Rest/binary>>, T, [object|Stack], Opts, Acc) ->
|
decimal(<<?comma, Rest/binary>>, Out, [Acc, object|Stack], Opts) ->
|
||||||
?event([format_number(Acc)], key, Rest, T, [key|Stack], Opts);
|
?event([format_number(Acc)], key, Rest, Out, [key|Stack], Opts);
|
||||||
decimal(<<?comma, Rest/binary>>, T, [array|_] = Stack, Opts, Acc) ->
|
decimal(<<?comma, Rest/binary>>, Out, [Acc, array|Stack], Opts) ->
|
||||||
?event([format_number(Acc)], value, Rest, T, Stack, Opts);
|
?event([format_number(Acc)], value, Rest, Out, [array|Stack], Opts);
|
||||||
decimal(<<S, Rest/binary>>, T, Stack, Opts, {Int, Frac})
|
decimal(<<S, Rest/binary>>, Out, [{Int, Frac}|Stack], Opts)
|
||||||
when S =:= $e; S =:= $E ->
|
when S =:= $e; S =:= $E ->
|
||||||
e(Rest, T, Stack, Opts, {Int, Frac, []});
|
e(Rest, Out, [{Int, Frac, []}|Stack], Opts);
|
||||||
decimal(<<S, Rest/binary>>, T, Stack, Opts, Acc) when ?is_whitespace(S) ->
|
decimal(<<S, Rest/binary>>, Out, [Acc|Stack], Opts) when ?is_whitespace(S) ->
|
||||||
?event([format_number(Acc)], maybe_done, Rest, T, Stack, Opts);
|
?event([format_number(Acc)], maybe_done, Rest, Out, Stack, Opts);
|
||||||
decimal(<<>>, T, Stack, Opts, Acc) ->
|
decimal(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(decimal, <<>>, T, Stack, Opts, Acc);
|
?incomplete(decimal, <<>>, Out, Stack, Opts);
|
||||||
decimal(Bin, T, Stack, Opts, Acc) ->
|
decimal(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts, Acc]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
e(<<S, Rest/binary>>, T, Stack, Opts, {Int, Frac, Exp})
|
e(<<S, Rest/binary>>, Out, [{Int, Frac, Exp}|Stack], Opts)
|
||||||
when S =:= ?zero; ?is_nonzero(S) ->
|
when S =:= ?zero; ?is_nonzero(S) ->
|
||||||
exp(Rest, T, Stack, Opts, {Int, Frac, [S] ++ Exp});
|
exp(Rest, Out, [{Int, Frac, [S] ++ Exp}|Stack], Opts);
|
||||||
e(<<S, Rest/binary>>, T, Stack, Opts, {Int, Frac, Exp})
|
e(<<S, Rest/binary>>, Out, [{Int, Frac, Exp}|Stack], Opts)
|
||||||
when S =:= ?positive; S =:= ?negative ->
|
when S =:= ?positive; S =:= ?negative ->
|
||||||
ex(Rest, T, Stack, Opts, {Int, Frac, [S] ++ Exp});
|
ex(Rest, Out, [{Int, Frac, [S] ++ Exp}|Stack], Opts);
|
||||||
e(<<>>, T, Stack, Opts, Acc) ->
|
e(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(e, <<>>, T, Stack, Opts, Acc);
|
?incomplete(e, <<>>, Out, Stack, Opts);
|
||||||
e(Bin, T, Stack, Opts, Acc) ->
|
e(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts, Acc]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
ex(<<S, Rest/binary>>, T, Stack, Opts, {Int, Frac, Exp})
|
ex(<<S, Rest/binary>>, Out, [{Int, Frac, Exp}|Stack], Opts)
|
||||||
when S =:= ?zero; ?is_nonzero(S) ->
|
when S =:= ?zero; ?is_nonzero(S) ->
|
||||||
exp(Rest, T, Stack, Opts, {Int, Frac, [S] ++ Exp});
|
exp(Rest, Out, [{Int, Frac, [S] ++ Exp}|Stack], Opts);
|
||||||
ex(<<>>, T, Stack, Opts, Acc) ->
|
ex(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(ex, <<>>, T, Stack, Opts, Acc);
|
?incomplete(ex, <<>>, Out, Stack, Opts);
|
||||||
ex(Bin, T, Stack, Opts, Acc) ->
|
ex(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts, Acc]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
exp(<<S, Rest/binary>>, T, Stack, Opts, {Int, Frac, Exp})
|
exp(<<S, Rest/binary>>, Out, [{Int, Frac, Exp}|Stack], Opts)
|
||||||
when S =:= ?zero; ?is_nonzero(S) ->
|
when S =:= ?zero; ?is_nonzero(S) ->
|
||||||
exp(Rest, T, Stack, Opts, {Int, Frac, [S] ++ Exp});
|
exp(Rest, Out, [{Int, Frac, [S] ++ Exp}|Stack], Opts);
|
||||||
exp(<<?end_object, Rest/binary>>, T, [object|Stack], Opts, Acc) ->
|
exp(<<?end_object, Rest/binary>>, Out, [Acc, object|Stack], Opts) ->
|
||||||
?event([end_object, format_number(Acc)], maybe_done, Rest, T, Stack, Opts);
|
?event([end_object, format_number(Acc)], maybe_done, Rest, Out, Stack, Opts);
|
||||||
exp(<<?end_array, Rest/binary>>, T, [array|Stack], Opts, Acc) ->
|
exp(<<?end_array, Rest/binary>>, Out, [Acc, array|Stack], Opts) ->
|
||||||
?event([end_array, format_number(Acc)], maybe_done, Rest, T, Stack, Opts);
|
?event([end_array, format_number(Acc)], maybe_done, Rest, Out, Stack, Opts);
|
||||||
exp(<<?comma, Rest/binary>>, T, [object|Stack], Opts, Acc) ->
|
exp(<<?comma, Rest/binary>>, Out, [Acc, object|Stack], Opts) ->
|
||||||
?event([format_number(Acc)], key, Rest, T, [key|Stack], Opts);
|
?event([format_number(Acc)], key, Rest, Out, [key|Stack], Opts);
|
||||||
exp(<<?comma, Rest/binary>>, T, [array|_] = Stack, Opts, Acc) ->
|
exp(<<?comma, Rest/binary>>, Out, [Acc, array|Stack], Opts) ->
|
||||||
?event([format_number(Acc)], value, Rest, T, Stack, Opts);
|
?event([format_number(Acc)], value, Rest, Out, [array|Stack], Opts);
|
||||||
exp(<<S, Rest/binary>>, T, Stack, Opts, Acc) when ?is_whitespace(S) ->
|
exp(<<S, Rest/binary>>, Out, [Acc|Stack], Opts) when ?is_whitespace(S) ->
|
||||||
?event([format_number(Acc)], maybe_done, Rest, T, Stack, Opts);
|
?event([format_number(Acc)], maybe_done, Rest, Out, Stack, Opts);
|
||||||
exp(<<>>, T, Stack, Opts, Acc) ->
|
exp(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(exp, <<>>, T, Stack, Opts, Acc);
|
?incomplete(exp, <<>>, Out, Stack, Opts);
|
||||||
exp(Bin, T, Stack, Opts, Acc) ->
|
exp(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts, Acc]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
format_number(Int) when is_list(Int) ->
|
format_number(Int) when is_list(Int) ->
|
||||||
|
|
@ -543,105 +543,105 @@ format_number({Int, Frac, Exp}) ->
|
||||||
{float, list_to_float(lists:reverse(Exp ++ "e" ++ Frac ++ "." ++ Int))}.
|
{float, list_to_float(lists:reverse(Exp ++ "e" ++ Frac ++ "." ++ Int))}.
|
||||||
|
|
||||||
|
|
||||||
tr(<<$r, Rest/binary>>, T, Stack, Opts) ->
|
tr(<<$r, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
tru(Rest, T, Stack, Opts);
|
tru(Rest, Out, Stack, Opts);
|
||||||
tr(<<>>, T, Stack, Opts) ->
|
tr(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(tr, <<>>, T, Stack, Opts);
|
?incomplete(tr, <<>>, Out, Stack, Opts);
|
||||||
tr(Bin, T, Stack, Opts) ->
|
tr(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
tru(<<$u, Rest/binary>>, T, Stack, Opts) ->
|
tru(<<$u, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
true(Rest, T, Stack, Opts);
|
true(Rest, Out, Stack, Opts);
|
||||||
tru(<<>>, T, Stack, Opts) ->
|
tru(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(tru, <<>>, T, Stack, Opts);
|
?incomplete(tru, <<>>, Out, Stack, Opts);
|
||||||
tru(Bin, T, Stack, Opts) ->
|
tru(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
true(<<$e, Rest/binary>>, T, Stack, Opts) ->
|
true(<<$e, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
?event([{literal, true}], maybe_done, Rest, T, Stack, Opts);
|
?event([{literal, true}], maybe_done, Rest, Out, Stack, Opts);
|
||||||
true(<<>>, T, Stack, Opts) ->
|
true(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(true, <<>>, T, Stack, Opts);
|
?incomplete(true, <<>>, Out, Stack, Opts);
|
||||||
true(Bin, T, Stack, Opts) ->
|
true(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
fa(<<$a, Rest/binary>>, T, Stack, Opts) ->
|
fa(<<$a, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
fal(Rest, T, Stack, Opts);
|
fal(Rest, Out, Stack, Opts);
|
||||||
fa(<<>>, T, Stack, Opts) ->
|
fa(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(fa, <<>>, T, Stack, Opts);
|
?incomplete(fa, <<>>, Out, Stack, Opts);
|
||||||
fa(Bin, T, Stack, Opts) ->
|
fa(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
fal(<<$l, Rest/binary>>, T, Stack, Opts) ->
|
fal(<<$l, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
fals(Rest, T, Stack, Opts);
|
fals(Rest, Out, Stack, Opts);
|
||||||
fal(<<>>, T, Stack, Opts) ->
|
fal(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(fal, <<>>, T, Stack, Opts);
|
?incomplete(fal, <<>>, Out, Stack, Opts);
|
||||||
fal(Bin, T, Stack, Opts) ->
|
fal(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
fals(<<$s, Rest/binary>>, T, Stack, Opts) ->
|
fals(<<$s, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
false(Rest, T, Stack, Opts);
|
false(Rest, Out, Stack, Opts);
|
||||||
fals(<<>>, T, Stack, Opts) ->
|
fals(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(fals, <<>>, T, Stack, Opts);
|
?incomplete(fals, <<>>, Out, Stack, Opts);
|
||||||
fals(Bin, T, Stack, Opts) ->
|
fals(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
false(<<$e, Rest/binary>>, T, Stack, Opts) ->
|
false(<<$e, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
?event([{literal, false}], maybe_done, Rest, T, Stack, Opts);
|
?event([{literal, false}], maybe_done, Rest, Out, Stack, Opts);
|
||||||
false(<<>>, T, Stack, Opts) ->
|
false(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(false, <<>>, T, Stack, Opts);
|
?incomplete(false, <<>>, Out, Stack, Opts);
|
||||||
false(Bin, T, Stack, Opts) ->
|
false(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
nu(<<$u, Rest/binary>>, T, Stack, Opts) ->
|
nu(<<$u, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
nul(Rest, T, Stack, Opts);
|
nul(Rest, Out, Stack, Opts);
|
||||||
nu(<<>>, T, Stack, Opts) ->
|
nu(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(nu, <<>>, T, Stack, Opts);
|
?incomplete(nu, <<>>, Out, Stack, Opts);
|
||||||
nu(Bin, T, Stack, Opts) ->
|
nu(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
nul(<<$l, Rest/binary>>, T, Stack, Opts) ->
|
nul(<<$l, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
null(Rest, T, Stack, Opts);
|
null(Rest, Out, Stack, Opts);
|
||||||
nul(<<>>, T, Stack, Opts) ->
|
nul(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(nul, <<>>, T, Stack, Opts);
|
?incomplete(nul, <<>>, Out, Stack, Opts);
|
||||||
nul(Bin, T, Stack, Opts) ->
|
nul(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
null(<<$l, Rest/binary>>, T, Stack, Opts) ->
|
null(<<$l, Rest/binary>>, Out, Stack, Opts) ->
|
||||||
?event([{literal, null}], maybe_done, Rest, T, Stack, Opts);
|
?event([{literal, null}], maybe_done, Rest, Out, Stack, Opts);
|
||||||
null(<<>>, T, Stack, Opts) ->
|
null(<<>>, Out, Stack, Opts) ->
|
||||||
?incomplete(null, <<>>, T, Stack, Opts);
|
?incomplete(null, <<>>, Out, Stack, Opts);
|
||||||
null(Bin, T, Stack, Opts) ->
|
null(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
maybe_done(<<?end_object, Rest/binary>>, T, [object|Stack], Opts) ->
|
maybe_done(<<?end_object, Rest/binary>>, Out, [object|Stack], Opts) ->
|
||||||
?event([end_object], maybe_done, Rest, T, Stack, Opts);
|
?event([end_object], maybe_done, Rest, Out, Stack, Opts);
|
||||||
maybe_done(<<?end_array, Rest/binary>>, T, [array|Stack], Opts) ->
|
maybe_done(<<?end_array, Rest/binary>>, Out, [array|Stack], Opts) ->
|
||||||
?event([end_array], maybe_done, Rest, T, Stack, Opts);
|
?event([end_array], maybe_done, Rest, Out, Stack, Opts);
|
||||||
maybe_done(<<?comma, Rest/binary>>, T, [object|Stack], Opts) ->
|
maybe_done(<<?comma, Rest/binary>>, Out, [object|Stack], Opts) ->
|
||||||
key(Rest, T, [key|Stack], Opts);
|
key(Rest, Out, [key|Stack], Opts);
|
||||||
maybe_done(<<?comma, Rest/binary>>, T, [array|_] = Stack, Opts) ->
|
maybe_done(<<?comma, Rest/binary>>, Out, [array|_] = Stack, Opts) ->
|
||||||
value(Rest, T, Stack, Opts);
|
value(Rest, Out, Stack, Opts);
|
||||||
maybe_done(<<S, Rest/binary>>, T, Stack, Opts) when ?is_whitespace(S) ->
|
maybe_done(<<S, Rest/binary>>, Out, Stack, Opts) when ?is_whitespace(S) ->
|
||||||
maybe_done(Rest, T, Stack, Opts);
|
maybe_done(Rest, Out, Stack, Opts);
|
||||||
maybe_done(<<>>, T, Stack, Opts) when length(Stack) > 0 ->
|
maybe_done(<<>>, Out, Stack, Opts) when length(Stack) > 0 ->
|
||||||
?incomplete(maybe_done, <<>>, T, Stack, Opts);
|
?incomplete(maybe_done, <<>>, Out, Stack, Opts);
|
||||||
maybe_done(Rest, T, [], Opts) ->
|
maybe_done(Rest, Out, [], Opts) ->
|
||||||
?event([end_json], done, Rest, T, [], Opts);
|
?event([end_json], done, Rest, Out, [], Opts);
|
||||||
maybe_done(Bin, T, Stack, Opts) ->
|
maybe_done(Bin, Out, Stack, Opts) ->
|
||||||
?error([Bin, T, Stack, Opts]).
|
?error([Bin, Out, Stack, Opts]).
|
||||||
|
|
||||||
|
|
||||||
done(<<S, Rest/binary>>, T, [], Opts) when ?is_whitespace(S) ->
|
done(<<S, Rest/binary>>, Out, [], Opts) when ?is_whitespace(S) ->
|
||||||
done(Rest, T, [], Opts);
|
done(Rest, Out, [], Opts);
|
||||||
done(<<>>, T, [], Opts) -> ?incomplete(done, <<>>, T, [], Opts);
|
done(<<>>, Out, [], Opts) -> ?incomplete(done, <<>>, Out, [], Opts);
|
||||||
done(Bin, T, [], Opts) -> ?error([Bin, T, [], Opts]).
|
done(Bin, Out, Stack, Opts) -> ?error([Bin, Out, Stack, Opts]).
|
||||||
Loading…
Add table
Add a link
Reference in a new issue