umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

add resume/6 function to jsx_decoder and move ?incomplete over to using it, still not ready to be exposed however

Browse source
This commit is contained in:
alisdair sullivan 2013-03-05 18:21:34 -08:00
parent b0512add5d
commit 21bdf35ecb
1 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/jsx_decoder.erl
View file

@ -29,7 +29,7 @@
-compile({inline, [format_number/1]}). -compile({inline, [format_number/1]}).
-compile({inline, [maybe_replace/2]}). -compile({inline, [maybe_replace/2]}).
-export([decoder/3]). -export([decoder/3, resume/6]).
-spec decoder(Handler::module(), State::any(), Config::jsx:config()) -> jsx:decoder(). -spec decoder(Handler::module(), State::any(), Config::jsx:config()) -> jsx:decoder().
@ -110,9 +110,10 @@ decoder(Handler, State, Config) ->
case Config#config.incomplete_handler of case Config#config.incomplete_handler of
false -> false ->
{incomplete, fun(Stream) when is_binary(Stream) -> {incomplete, fun(Stream) when is_binary(Stream) ->
State(<<Rest/binary, Stream/binary>>, Handler, Acc, Stack, Config) resume(<<Rest/binary, Stream/binary>>, State, Handler, Acc, Stack, Config)
; (end_stream) -> ; (end_stream) ->
case State(<<Rest/binary, <<" ">>/binary>>, case resume(<<Rest/binary, <<" ">>/binary>>,
State,
Handler, Handler,
Acc, Acc,
Stack, Stack,
@ -129,10 +130,12 @@ decoder(Handler, State, Config) ->
case Config#config.incomplete_handler of case Config#config.incomplete_handler of
false -> false ->
{incomplete, fun(Stream) when is_binary(Stream) -> {incomplete, fun(Stream) when is_binary(Stream) ->
State(<<Rest/binary, Stream/binary>>, Handler, Stack, Config) resume(<<Rest/binary, Stream/binary>>, State, Handler, unused, Stack, Config)
; (end_stream) -> ; (end_stream) ->
case State(<<Rest/binary, <<" ">>/binary>>, case resume(<<Rest/binary, <<" ">>/binary>>,
State,
Handler, Handler,
unused,
Stack, Stack,
Config#config{explicit_end=false}) of Config#config{explicit_end=false}) of
{incomplete, _} -> ?error(State, Rest, Handler, Stack, Config) {incomplete, _} -> ?error(State, Rest, Handler, Stack, Config)
@ -140,12 +143,33 @@ decoder(Handler, State, Config) ->
end end
end end
}; };
F -> F(Rest, {decoder, State, Handler, null, Stack}, jsx_utils:config_to_list(Config)) F -> F(Rest, {decoder, State, Handler, unused, Stack}, jsx_utils:config_to_list(Config))
end end
). ).
-endif. -endif.
resume(Rest, State, Handler, Acc, Stack, Config) ->
case State of
start -> start(Rest, Handler, Stack, Config);
value -> value(Rest, Handler, Stack, Config);
object -> object(Rest, Handler, Stack, Config);
array -> array(Rest, Handler, Stack, Config);
colon -> colon(Rest, Handler, Stack, Config);
key -> key(Rest, Handler, Stack, Config);
string -> string(Rest, Handler, Acc, Stack, Config);
integer -> integer(Rest, Handler, Acc, Stack, Config);
decimal -> decimal(Rest, Handler, Acc, Stack, Config);
exp -> exp(Rest, Handler, Acc, Stack, Config);
true -> true(Rest, Handler, Stack, Config);
false -> false(Rest, Handler, Stack, Config);
null -> null(Rest, Handler, Stack, Config);
comment -> comment(Rest, Handler, Acc, Stack, Config);
maybe_done -> maybe_done(Rest, Handler, Stack, Config);
done -> done(Rest, Handler, Stack, Config)
end.
new_seq() -> []. new_seq() -> [].
new_seq(C) -> [C]. new_seq(C) -> [C].