umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

changed end of stream token

Browse source
This commit is contained in:
alisdair sullivan 2010-06-07 16:10:29 -07:00
parent 152c2ec75f
commit 5460796e33
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/jsx.erl
View file

@ -33,7 +33,10 @@ decoder() ->
decoder([]). decoder([]).
decoder(Opts) -> decoder(Opts) ->
F = fun(end_of_stream, State) -> lists:reverse(State) ;(Event, State) -> [Event] ++ State end, F = fun(end_of_json, State) -> lists:reverse(State)
; (reset, _State) -> []
; (Event, State) -> [Event] ++ State
end,
decoder({F, []}, Opts). decoder({F, []}, Opts).
decoder({F, _} = Callbacks, OptsList) when is_list(OptsList), is_function(F) -> decoder({F, _} = Callbacks, OptsList) when is_list(OptsList), is_function(F) ->
@ -124,24 +127,21 @@ detect_encoding(<<X, Y, _Rest/binary>> = JSON, Stack, Callbacks, Opts) when X =/
%% the problem %% the problem
detect_encoding(<<X>>, Stack, Callbacks, Opts) when X =/= 0 -> detect_encoding(<<X>>, Stack, Callbacks, Opts) when X =/= 0 ->
{ {try {Result, _} = jsx_utf8:start(<<X>>, [], Callbacks, Opts), Result
try {Result, _} = jsx_utf8:start(<<X>>, [], Callbacks, Opts), Result
catch error:function_clause -> incomplete end, catch error:function_clause -> incomplete end,
fun(Stream) -> fun(Stream) ->
detect_encoding(<<X, Stream/binary>>, Stack, Callbacks, Opts) detect_encoding(<<X, Stream/binary>>, Stack, Callbacks, Opts)
end end
}; };
detect_encoding(<<0, X>>, Stack, Callbacks, Opts) when X =/= 0 -> detect_encoding(<<0, X>>, Stack, Callbacks, Opts) when X =/= 0 ->
{ {try {Result, _} = jsx_utf16:start(<<0, X>>, [], Callbacks, Opts), Result
try {Result, _} = jsx_utf16:start(<<0, X>>, [], Callbacks, Opts), Result
catch error:function_clause -> incomplete end, catch error:function_clause -> incomplete end,
fun(Stream) -> fun(Stream) ->
detect_encoding(<<0, X, Stream/binary>>, Stack, Callbacks, Opts) detect_encoding(<<0, X, Stream/binary>>, Stack, Callbacks, Opts)
end end
}; };
detect_encoding(<<X, 0>>, Stack, Callbacks, Opts) when X =/= 0 -> detect_encoding(<<X, 0>>, Stack, Callbacks, Opts) when X =/= 0 ->
{ {try {Result, _} = jsx_utf16le:start(<<X, 0>>, [], Callbacks, Opts), Result
try {Result, _} = jsx_utf16le:start(<<X, 0>>, [], Callbacks, Opts), Result
catch error:function_clause -> incomplete end, catch error:function_clause -> incomplete end,
fun(Stream) -> fun(Stream) ->
detect_encoding(<<X, 0, Stream/binary>>, Stack, Callbacks, Opts) detect_encoding(<<X, 0, Stream/binary>>, Stack, Callbacks, Opts)

2
test/jsx_test.erl
View file

@ -41,7 +41,7 @@ test(Dir) ->
decoder(Flags) -> decoder(Flags) ->
jsx:decoder({jsx_test, test_event, []}, Flags). jsx:decoder({jsx_test, test_event, []}, Flags).
test_event(end_of_stream, Acc) -> test_event(end_of_json, Acc) ->
lists:reverse(Acc); lists:reverse(Acc);
test_event(Event, Acc) -> test_event(Event, Acc) ->
[Event] ++ Acc. [Event] ++ Acc.