umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

nestable /* */ style comments

Browse source
This commit is contained in:
alisdair sullivan 2013-02-26 18:41:53 -08:00
parent 8a8af8af84
commit 9bf0ca50e9
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/jsx_decoder.erl
View file

@ -888,6 +888,11 @@ comment(<<?solidus, Rest/binary>>, Handler, Stack, Config) ->
single_comment(Rest, Handler, Stack, Config); single_comment(Rest, Handler, Stack, Config);
comment(<<?star, Rest/binary>>, Handler, Stack, Config) -> comment(<<?star, Rest/binary>>, Handler, Stack, Config) ->
multi_comment(Rest, Handler, Stack, Config); multi_comment(Rest, Handler, Stack, Config);
%% nested /**/ comments
comment(<<_/utf8, Rest/binary>>, Handler, [comment|Stack], Config) ->
multi_comment(Rest, Handler, Stack, Config);
comment(<<_, Rest/binary>>, Handler, [comment|Stack], Config=#config{replaced_bad_utf8=true}) ->
multi_comment(Rest, Handler, Stack, Config);
comment(<<>>, Handler, [Resume|Stack], Config) -> comment(<<>>, Handler, [Resume|Stack], Config) ->
?incomplete(comment, <<>>, Handler, Resume, Stack, Config); ?incomplete(comment, <<>>, Handler, Resume, Stack, Config);
comment(Bin, Handler, Stack, Config) -> comment(Bin, Handler, Stack, Config) ->
@ -910,6 +915,8 @@ single_comment(Bin, Handler, Stack, Config) ->
multi_comment(<<?star, Rest/binary>>, Handler, Stack, Config) -> multi_comment(<<?star, Rest/binary>>, Handler, Stack, Config) ->
end_multi_comment(Rest, Handler, Stack, Config); end_multi_comment(Rest, Handler, Stack, Config);
multi_comment(<<?solidus, Rest/binary>>, Handler, Stack, Config) ->
comment(Rest, Handler, [comment|Stack], Config);
multi_comment(<<_S/utf8, Rest/binary>>, Handler, Stack, Config) -> multi_comment(<<_S/utf8, Rest/binary>>, Handler, Stack, Config) ->
multi_comment(Rest, Handler, Stack, Config); multi_comment(Rest, Handler, Stack, Config);
multi_comment(<<_, Rest/binary>>, Handler, Stack, Config=#config{replaced_bad_utf8=true}) -> multi_comment(<<_, Rest/binary>>, Handler, Stack, Config=#config{replaced_bad_utf8=true}) ->
@ -939,6 +946,7 @@ end_comment(Rest, Handler, [Resume|Stack], Config) ->
; key -> key(Rest, Handler, Stack, Config) ; key -> key(Rest, Handler, Stack, Config)
; maybe_done -> maybe_done(Rest, Handler, Stack, Config) ; maybe_done -> maybe_done(Rest, Handler, Stack, Config)
; done -> done(Rest, Handler, Stack, Config) ; done -> done(Rest, Handler, Stack, Config)
; comment -> multi_comment(Rest, Handler, Stack, Config)
end. end.
@ -1245,6 +1253,10 @@ comments_test_() ->
[start_array, {literal, true}, end_array, end_json], [start_array, {literal, true}, end_array, end_json],
decode(<<"[// comment", ?newline, "// comment", ?newline, "true]">>, [comments]) decode(<<"[// comment", ?newline, "// comment", ?newline, "true]">>, [comments])
)}, )},
{"/**/ comment inside /**/ comment", ?_assertEqual(
[start_array, {literal, true}, end_array, end_json],
decode(<<"[ /* /* comment */ */ true ]">>, [comments])
)},
{"// comment with badutf", ?_assertEqual( {"// comment with badutf", ?_assertEqual(
[start_array, {literal, true}, end_array, end_json], [start_array, {literal, true}, end_array, end_json],
decode(<<"[ // comment ", 16#00c0, " ", ?newline, "true]">>, [comments, replaced_bad_utf8]) decode(<<"[ // comment ", 16#00c0, " ", ?newline, "true]">>, [comments, replaced_bad_utf8])