umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

change behaviour of dirty_strings option, dont attempt to escape or ensure clean at all

Browse source
This commit is contained in:
alisdair sullivan 2012-05-23 01:07:54 -07:00
parent 9d34818d52
commit 608f2437cf
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/jsx_encoder.erl
View file

@ -107,6 +107,7 @@ fix_key(Key) when is_atom(Key) -> fix_key(atom_to_binary(Key, utf8));
fix_key(Key) when is_binary(Key) -> Key. fix_key(Key) when is_binary(Key) -> Key.
clean_string(Bin, Opts=#opts{dirty_strings=true}) -> Bin;
clean_string(Bin, Opts) -> clean_string(Bin, Opts) ->
case Opts#opts.replaced_bad_utf8 orelse Opts#opts.escaped_strings of case Opts#opts.replaced_bad_utf8 orelse Opts#opts.escaped_strings of
true -> clean(Bin, [], Opts) true -> clean(Bin, [], Opts)
@ -468,7 +469,6 @@ strip_continuations(<<X, Rest/binary>>, N) when X >= 128, X =< 191 ->
strip_continuations(Bin, _) -> Bin. strip_continuations(Bin, _) -> Bin.
maybe_replace(X, #opts{dirty_strings=true}) when is_integer(X) -> [X];
maybe_replace($\b, #opts{escaped_strings=true}) -> [$b, $\\]; maybe_replace($\b, #opts{escaped_strings=true}) -> [$b, $\\];
maybe_replace($\t, #opts{escaped_strings=true}) -> [$t, $\\]; maybe_replace($\t, #opts{escaped_strings=true}) -> [$t, $\\];
maybe_replace($\n, #opts{escaped_strings=true}) -> [$n, $\\]; maybe_replace($\n, #opts{escaped_strings=true}) -> [$n, $\\];

2
src/jsx_parser.erl
View file

@ -161,6 +161,7 @@ fix_key(Key) when is_atom(Key) -> fix_key(atom_to_binary(Key, utf8));
fix_key(Key) when is_binary(Key) -> Key. fix_key(Key) when is_binary(Key) -> Key.
clean_string(Bin, Opts=#opts{dirty_strings=true}) -> Bin;
clean_string(Bin, Opts) -> clean_string(Bin, Opts) ->
case Opts#opts.replaced_bad_utf8 orelse Opts#opts.escaped_strings of case Opts#opts.replaced_bad_utf8 orelse Opts#opts.escaped_strings of
true -> clean(Bin, [], Opts) true -> clean(Bin, [], Opts)
@ -522,7 +523,6 @@ strip_continuations(<<X, Rest/binary>>, N) when X >= 128, X =< 191 ->
strip_continuations(Bin, _) -> Bin. strip_continuations(Bin, _) -> Bin.
maybe_replace(X, #opts{dirty_strings=true}) when is_integer(X) -> [X];
maybe_replace($\b, #opts{escaped_strings=true}) -> [$b, $\\]; maybe_replace($\b, #opts{escaped_strings=true}) -> [$b, $\\];
maybe_replace($\t, #opts{escaped_strings=true}) -> [$t, $\\]; maybe_replace($\t, #opts{escaped_strings=true}) -> [$t, $\\];
maybe_replace($\n, #opts{escaped_strings=true}) -> [$n, $\\]; maybe_replace($\n, #opts{escaped_strings=true}) -> [$n, $\\];