umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

skip redundant check for uescape escaping

Browse source
This commit is contained in:
alisdair sullivan 2014-12-07 22:21:55 +00:00
parent 43ba093ec5
commit 8a4f92d8e6
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/jsx_decoder.erl
View file

@ -311,7 +311,7 @@ string(<<?solidus, Rest/binary>>, Handler, Acc, Stack, Config) ->
string(<<?rsolidus/utf8, Rest/binary>>, Handler, Acc, Stack, Config) -> string(<<?rsolidus/utf8, Rest/binary>>, Handler, Acc, Stack, Config) ->
unescape(Rest, Handler, Acc, Stack, Config); unescape(Rest, Handler, Acc, Stack, Config);
string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config=#config{uescape=true}) when X >= 16#80 -> string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config=#config{uescape=true}) when X >= 16#80 ->
string(Rest, Handler, [Acc, maybe_replace(X, Config)], Stack, Config); string(Rest, Handler, [Acc, json_escape_sequence(X)], Stack, Config);
string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X == 16#2028; X == 16#2029 -> string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X == 16#2028; X == 16#2029 ->
string(Rest, Handler, [Acc, maybe_replace(X, Config)], Stack, Config); string(Rest, Handler, [Acc, maybe_replace(X, Config)], Stack, Config);
string(<<_/utf8, _/binary>> = Bin, Handler, Acc, Stack, Config) -> string(<<_/utf8, _/binary>> = Bin, Handler, Acc, Stack, Config) ->
@ -761,9 +761,6 @@ maybe_replace(X, Config=#config{escaped_strings=true}) when X == 16#2028; X ==
end; end;
maybe_replace(X, #config{escaped_strings=true}) when X < 32 -> maybe_replace(X, #config{escaped_strings=true}) when X < 32 ->
json_escape_sequence(X); json_escape_sequence(X);
%% escaped even if no other escaping requested!
maybe_replace(X, #config{uescape=true}) when X >= 16#80 ->
json_escape_sequence(X);
maybe_replace(X, _Config) -> <<X/utf8>>. maybe_replace(X, _Config) -> <<X/utf8>>.

5
src/jsx_parser.erl
View file

@ -205,7 +205,7 @@ clean(<<47, Rest/binary>>, Acc, Config) ->
clean(<<92, Rest/binary>>, Acc, Config) -> clean(<<92, Rest/binary>>, Acc, Config) ->
clean(Rest, [Acc, maybe_replace(92, Config)], Config); clean(Rest, [Acc, maybe_replace(92, Config)], Config);
clean(<<X/utf8, Rest/binary>>, Acc, Config=#config{uescape=true}) when X >= 16#80 -> clean(<<X/utf8, Rest/binary>>, Acc, Config=#config{uescape=true}) when X >= 16#80 ->
clean(Rest, [Acc, maybe_replace(X, Config)], Config); clean(Rest, [Acc, json_escape_sequence(X)], Config);
clean(<<X/utf8, Rest/binary>>, Acc, Config) when X == 16#2028; X == 16#2029 -> clean(<<X/utf8, Rest/binary>>, Acc, Config) when X == 16#2028; X == 16#2029 ->
clean(Rest, [Acc, maybe_replace(X, Config)], Config); clean(Rest, [Acc, maybe_replace(X, Config)], Config);
clean(<<_/utf8, _/binary>> = Bin, Acc, Config) -> clean(<<_/utf8, _/binary>> = Bin, Acc, Config) ->
@ -489,9 +489,6 @@ maybe_replace($\\, #config{escaped_strings=true}) ->
[$\\, $\\]; [$\\, $\\];
maybe_replace(X, #config{escaped_strings=true}) when X < 32 -> maybe_replace(X, #config{escaped_strings=true}) when X < 32 ->
json_escape_sequence(X); json_escape_sequence(X);
%% escaped even if no other escaping was requested!
maybe_replace(X, #config{uescape=true}) when X >= 16#80 ->
json_escape_sequence(X);
maybe_replace(X, Config=#config{escaped_strings=true}) when X == 16#2028; X == 16#2029 -> maybe_replace(X, Config=#config{escaped_strings=true}) when X == 16#2028; X == 16#2029 ->
case Config#config.unescaped_jsonp of case Config#config.unescaped_jsonp of
true -> [<<X/utf8>>]; true -> [<<X/utf8>>];