umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

cleanup of comments, some of which were no longer strictly true

Browse source
This commit is contained in:
alisdair sullivan 2011-07-31 00:12:47 -07:00
parent 03381567d2
commit e90c5461e8
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/jsx_decoder.hrl
View file

@ -350,10 +350,10 @@ key(Bin, Stack, Opts) ->
%% string has an additional parameter, an accumulator (Acc) used to hold the %% string has an additional parameter, an accumulator (Acc) used to hold the
%% intermediate representation of the string being parsed. using a list of %% intermediate representation of the string being parsed. using a list of
%% integers representing unicode codepoints is faster than constructing %% integers representing unicode codepoints is faster than constructing
%% binaries, many of which will be converted back to lists by the user anyways %% binaries, there's a branch kicking around which proves it
%% string uses partial_utf/1 to cease parsing when invalid encodings are %% string uses partial_utf/1 to cease parsing when invalid encodings are
%% encountered rather than just checking remaining binary size like other %% encountered rather than just checking remaining binary size like other
%% states %% states to eliminate certain incomplete states
string(Bin, Stack, Opts) -> string(Bin, Stack, Opts, []). string(Bin, Stack, Opts) -> string(Bin, Stack, Opts, []).
string(<<?quote/?utfx, Rest/binary>>, [key|_] = Stack, Opts, Acc) -> string(<<?quote/?utfx, Rest/binary>>, [key|_] = Stack, Opts, Acc) ->
@ -376,7 +376,6 @@ string(<<S/?utfx, Rest/binary>>, Stack, Opts, Acc)
string(<<S/?utfx, Rest/binary>>, Stack, Opts, Acc) string(<<S/?utfx, Rest/binary>>, Stack, Opts, Acc)
when S > 16#fdef, S < 16#fffe -> when S > 16#fdef, S < 16#fffe ->
string(Rest, Stack, Opts, [S] ++ Acc); string(Rest, Stack, Opts, [S] ++ Acc);
%% i think doing it like this is faster than just putting this clause first.
%% yes, i think it's insane too %% yes, i think it's insane too
string(<<S/?utfx, Rest/binary>>, Stack, Opts, Acc) string(<<S/?utfx, Rest/binary>>, Stack, Opts, Acc)
when S > 16#ffff andalso when S > 16#ffff andalso
@ -591,7 +590,6 @@ escape(Bin, Stack, Opts, Acc) ->
%% this code is ugly and unfortunate, but so is json's handling of escaped %% this code is ugly and unfortunate, but so is json's handling of escaped
%% unicode codepoint sequences. %% unicode codepoint sequences.
%% fuck json escaping. new rule: if it's not a valid codepoint, it's an error
escaped_unicode(<<D/?utfx, Rest/binary>>, Stack, Opts, String, [C, B, A]) escaped_unicode(<<D/?utfx, Rest/binary>>, Stack, Opts, String, [C, B, A])
when ?is_hex(D) -> when ?is_hex(D) ->
case erlang:list_to_integer([A, B, C, D], 16) of case erlang:list_to_integer([A, B, C, D], 16) of