should now be possible to autodirect utf encoding
This commit is contained in:
parent
ab67abd01a
commit
e3f5637da1
2 changed files with 20 additions and 5 deletions
19
src/jsx.erl
19
src/jsx.erl
|
@ -7,8 +7,10 @@
|
||||||
decoder() ->
|
decoder() ->
|
||||||
decoder(none, []).
|
decoder(none, []).
|
||||||
|
|
||||||
decoder(Callbacks, OptsList) ->
|
decoder(Callbacks, OptsList) when is_list(OptsList) ->
|
||||||
Opts = parse_opts(OptsList),
|
Opts = parse_opts(OptsList),
|
||||||
|
decoder(Callbacks, Opts);
|
||||||
|
decoder(Callbacks, Opts) ->
|
||||||
case Opts#opts.encoding of
|
case Opts#opts.encoding of
|
||||||
utf8 ->
|
utf8 ->
|
||||||
fun(Stream) -> jsx_utf8:start(Stream, [], init_callbacks(Callbacks), Opts) end
|
fun(Stream) -> jsx_utf8:start(Stream, [], init_callbacks(Callbacks), Opts) end
|
||||||
|
@ -20,7 +22,8 @@ decoder(Callbacks, OptsList) ->
|
||||||
fun(Stream) -> jsx_utf32b:start(Stream, [], init_callbacks(Callbacks), Opts) end
|
fun(Stream) -> jsx_utf32b:start(Stream, [], init_callbacks(Callbacks), Opts) end
|
||||||
; utf32-little ->
|
; utf32-little ->
|
||||||
fun(Stream) -> jsx_utf32l:start(Stream, [], init_callbacks(Callbacks), Opts) end
|
fun(Stream) -> jsx_utf32l:start(Stream, [], init_callbacks(Callbacks), Opts) end
|
||||||
;
|
; auto ->
|
||||||
|
fun(Stream) -> detect_encoding(Stream, Callbacks, Opts, []) end
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
|
||||||
|
@ -49,3 +52,15 @@ init_callbacks({M, S}) when is_atom(M) ->
|
||||||
init_callbacks({F, S}) when is_function(F) ->
|
init_callbacks({F, S}) when is_function(F) ->
|
||||||
{F, S}.
|
{F, S}.
|
||||||
|
|
||||||
|
detect_encoding(<<A:1, B:1, C:1, D:1, Rest/binary>> = Stream, Callbacks, Opts) ->
|
||||||
|
Encoding = case [A, B, C, D] of
|
||||||
|
[0, 0, 0, _] -> utf32-big
|
||||||
|
; [0, _, 0, _] -> utf16-big
|
||||||
|
; [_, 0, 0, 0] -> utf32-little
|
||||||
|
; [_, 0, _, 0] -> utf16-little
|
||||||
|
; _ -> 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.
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
comments = false,
|
comments = false,
|
||||||
escaped_unicode = ascii,
|
escaped_unicode = ascii,
|
||||||
naked_values = false,
|
naked_values = false,
|
||||||
encoding = utf8
|
encoding = auto
|
||||||
}).
|
}).
|
||||||
|
|
||||||
%% whitespace
|
%% whitespace
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue