umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

Removed all records from the core decoder. Replaced with macros and a raw tuple containing options. Updated one test to account for changed api.

Browse source
This commit is contained in:
alisdair sullivan 2010-05-27 12:56:21 -07:00
parent 6d90c49be3
commit 2a2275136a
4 changed files with 43 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/jsx.erl
View file

@ -43,26 +43,20 @@ decoder({{Mod, Fun}, State}, OptsList) when is_list(OptsList), is_atom(Mod), is_
Opts = parse_opts(OptsList),
decoder({fun(E, S) -> Mod:Fun(E, S) end, State}, Opts);
decoder(Callbacks, Opts) ->
case Opts#opts.encoding of
utf8 ->
fun(Stream) -> jsx_decoder:start(Stream, [], Callbacks, Opts) end
end.
fun(Stream) -> jsx_decoder:start(Stream, [], Callbacks, Opts) end.
parse_opts(Opts) ->
parse_opts(Opts, #opts{}).
parse_opts(Opts, {false, codepoint}).
parse_opts([], Opts) ->
Opts;
parse_opts([{comments, Value}|Rest], Opts) ->
parse_opts([{comments, Value}|Rest], {_Comments, EscapedUnicode}) ->
true = lists:member(Value, [true, false]),
parse_opts(Rest, Opts#opts{comments = Value});
parse_opts([{escaped_unicode, Value}|Rest], Opts) ->
parse_opts(Rest, {Value, EscapedUnicode});
parse_opts([{escaped_unicode, Value}|Rest], {Comments, _EscapedUnicode}) ->
true = lists:member(Value, [ascii, codepoint, none]),
parse_opts(Rest, Opts#opts{escaped_unicode = Value});
parse_opts([{encoding, Value}|Rest], Opts) ->
true = lists:member(Value, [utf8]),
parse_opts(Rest, Opts#opts{encoding = Value});
parse_opts(Rest, {Comments, Value});
parse_opts([_UnknownOpt|Rest], Opts) ->
parse_opts(Rest, Opts).