diff --git a/src/jsx.erl b/src/jsx.erl index 6abd282..eb0d227 100644 --- a/src/jsx.erl +++ b/src/jsx.erl @@ -60,9 +60,6 @@ parse_opts([{comments, Value}|Rest], Opts) -> parse_opts([{escaped_unicode, Value}|Rest], Opts) -> true = lists:member(Value, [ascii, codepoint, none]), 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([{encoding, Value}|Rest], Opts) -> true = lists:member(Value, [utf8]), parse_opts(Rest, Opts#opts{encoding = Value}); diff --git a/src/jsx_common.hrl b/src/jsx_common.hrl index 4bf1673..10a139f 100644 --- a/src/jsx_common.hrl +++ b/src/jsx_common.hrl @@ -24,7 +24,6 @@ -record(opts, { comments = false, escaped_unicode = ascii, - naked_values = false, encoding = utf8 }). diff --git a/src/jsx_decoder.erl b/src/jsx_decoder.erl index 3533c7c..75c71dd 100644 --- a/src/jsx_decoder.erl +++ b/src/jsx_decoder.erl @@ -43,19 +43,19 @@ start(<>, Stack, Callbacks, Opts) -> object(Rest, [key|Stack], fold(start_object, Callbacks), Opts); start(<>, Stack, Callbacks, Opts) -> array(Rest, [array|Stack], fold(start_array, Callbacks), Opts); -start(<>, Stack, Callbacks, Opts) when Opts#opts.naked_values == true -> +start(<>, Stack, Callbacks, Opts) -> string(Rest, Stack, Callbacks, Opts, []); -start(<<$t, Rest/binary>>, Stack, Callbacks, Opts) when Opts#opts.naked_values == true -> +start(<<$t, Rest/binary>>, Stack, Callbacks, Opts) -> tr(Rest, Stack, Callbacks, Opts); -start(<<$f, Rest/binary>>, Stack, Callbacks, Opts) when Opts#opts.naked_values == true -> +start(<<$f, Rest/binary>>, Stack, Callbacks, Opts) -> fa(Rest, Stack, Callbacks, Opts); -start(<<$n, Rest/binary>>, Stack, Callbacks, Opts) when Opts#opts.naked_values == true -> +start(<<$n, Rest/binary>>, Stack, Callbacks, Opts) -> nu(Rest, Stack, Callbacks, Opts); -start(<>, Stack, Callbacks, Opts) when Opts#opts.naked_values == true -> +start(<>, Stack, Callbacks, Opts) -> negative(Rest, Stack, Callbacks, Opts, "-"); -start(<>, Stack, Callbacks, Opts) when Opts#opts.naked_values == true -> +start(<>, Stack, Callbacks, Opts) -> zero(Rest, Stack, Callbacks, Opts, "0"); -start(<>, Stack, Callbacks, Opts) when ?is_nonzero(S), Opts#opts.naked_values == true -> +start(<>, Stack, Callbacks, Opts) when ?is_nonzero(S) -> integer(Rest, Stack, Callbacks, Opts, [S]); start(<>, Stack, Callbacks, Opts) when Opts#opts.comments == true -> maybe_comment(Rest, fun(Resume) -> start(Resume, Stack, Callbacks, Opts) end);