umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

added option for explicit termination requirement when parsing streams

Browse source
This commit is contained in:
alisdair sullivan 2010-05-24 15:47:29 -07:00
parent 3b3e33c6e3
commit 6515f9981d
11 changed files with 59 additions and 2232 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/jsx.erl
View file

@ -13,17 +13,7 @@ decoder(Callbacks, OptsList) when is_list(OptsList) ->
decoder(Callbacks, Opts) ->
case Opts#opts.encoding of
utf8 ->
fun(Stream) -> jsx_utf8:start(Stream, [], init_callbacks(Callbacks), Opts) end
; utf16b ->
fun(Stream) -> jsx_utf16b:start(Stream, [], init_callbacks(Callbacks), Opts) end
; utf16l ->
fun(Stream) -> jsx_utf16l:start(Stream, [], init_callbacks(Callbacks), Opts) end
; utf32b ->
fun(Stream) -> jsx_utf32b:start(Stream, [], init_callbacks(Callbacks), Opts) end
; utf32l ->
fun(Stream) -> jsx_utf32l:start(Stream, [], init_callbacks(Callbacks), Opts) end
; auto ->
fun(Stream) -> detect_encoding(Stream, Callbacks, Opts) end
fun(Stream) -> jsx_decoder:start(Stream, [], init_callbacks(Callbacks), Opts) end
end.
@ -40,10 +30,13 @@ parse_opts([{escaped_unicode, Value}|Rest], Opts) ->
parse_opts(Rest, Opts#opts{escaped_unicode = Value});
parse_opts([{naked_values, Value}|Rest], Opts) ->
true = lists:member(Value, [true, false]),
parse_opts(Rest, Opts#opts{naked_values = Value});
parse_opts(Rest, Opts#opts{naked_values = Value, explicit_termination = true});
parse_opts([{encoding, Value}|Rest], Opts) ->
true = lists:member(Value, [auto, utf8, utf16b, utf16l, utf32b, utf32l]),
parse_opts(Rest, Opts#opts{encoding = Value}).
true = lists:member(Value, [utf8]),
parse_opts(Rest, Opts#opts{encoding = Value});
parse_opts([{explicit_termination, Value}|Rest], Opts) ->
true = lists:member(Value, [true, false]),
parse_opts(Rest, Opts#opts{explicit_termination = Value}).
init_callbacks(none) ->
{none, []};
@ -51,16 +44,4 @@ init_callbacks({M, S}) when is_atom(M) ->
{M, S};
init_callbacks({F, S}) when is_function(F) ->
{F, S}.
detect_encoding(<<A:8, B:8, C:8, D:8, _/binary>> = Stream, Callbacks, Opts) ->
Encoding = case [A, B, C, D] of
[0, 0, 0, _] -> utf32b
; [0, _, 0, _] -> utf16b
; [_, 0, 0, 0] -> utf32l
; [_, 0, _, 0] -> utf16l
; _ -> utf8
end,
(decoder(Callbacks, Opts#opts{encoding = Encoding}))(Stream);
detect_encoding(Else, Callbacks, Opts) ->
fun(Stream) -> detect_encoding(<<Else/binary, Stream/binary>>, Callbacks, Opts) end.