umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

decoder now returns end_json event at earliest possible time, Next() returns nothing but {error, badjson} if fed bad input or incomplete after that point, even if forced

Browse source
This commit is contained in:
alisdair sullivan 2010-06-25 02:46:54 -07:00
parent d58343bff3
commit a9ecb733e3
2 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
priv/jsx_test.escript
View file

@ -101,14 +101,18 @@ incremental_decode(<<C:1/binary, Rest/binary>>, Flags) ->
incremental_decode_loop({incomplete, Next, _}, <<C:1/binary, Rest/binary>>, Acc) ->
incremental_decode_loop(Next(C), Rest, Acc);
incremental_decode_loop({incomplete, _, Force}, <<>>, Acc) ->
incremental_decode_loop(Force(), <<>>, Acc);
incremental_decode_loop({event, end_json, Next}, <<C:1/binary, Rest/binary>>, Acc) ->
incremental_decode_loop(Next(C), Rest, Acc);
incremental_decode_loop({event, end_json, _}, <<>>, Acc) ->
incremental_decode_loop({incomplete, _Next, Force}, <<>>, Acc) ->
case Force() of
{error, badjson} -> {error, badjson}
; {incomplete, _, _} -> Acc
; _ -> incremental_decode_loop(Force(), <<>>, Acc)
end;
incremental_decode_loop({event, end_json, Next}, Rest, Acc) ->
incremental_decode_loop(Next(), Rest, lists:reverse(Acc));
incremental_decode_loop({event, end_json, _Next}, <<>>, Acc) ->
lists:reverse(Acc);
incremental_decode_loop({event, Event, F}, Rest, Acc) ->
incremental_decode_loop(F(), Rest, [Event] ++ Acc).
incremental_decode_loop({event, Event, Next}, Rest, Acc) ->
incremental_decode_loop(Next(), Rest, [Event] ++ Acc).
multi_decode(JSON, Flags) ->