umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

changed comments_true macro to comments_enabled

Browse source
This commit is contained in:
alisdair sullivan 2010-05-29 18:25:56 -07:00
parent c25ad16f13
commit 97520b06ae
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/jsx_common.hrl
View file

@ -23,7 +23,7 @@
%% option flags %% option flags
-define(comments_true(X), {true, _} = X). -define(comments_enabled(X), {true, _} = X).
-define(escaped_unicode_to_ascii(X), {_, ascii} = X). -define(escaped_unicode_to_ascii(X), {_, ascii} = X).
-define(escaped_unicode_to_codepoint(X), {_, codepoint} = X). -define(escaped_unicode_to_codepoint(X), {_, codepoint} = X).

22
src/jsx_decoder.erl
View file

@ -57,7 +57,7 @@ start(<<?zero, Rest/binary>>, Stack, Callbacks, Opts) ->
zero(Rest, Stack, Callbacks, Opts, "0"); zero(Rest, Stack, Callbacks, Opts, "0");
start(<<S, Rest/binary>>, Stack, Callbacks, Opts) when ?is_nonzero(S) -> start(<<S, Rest/binary>>, Stack, Callbacks, Opts) when ?is_nonzero(S) ->
integer(Rest, Stack, Callbacks, Opts, [S]); integer(Rest, Stack, Callbacks, Opts, [S]);
start(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts)) -> start(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_enabled(Opts)) ->
maybe_comment(Rest, fun(Resume) -> start(Resume, Stack, Callbacks, Opts) end); maybe_comment(Rest, fun(Resume) -> start(Resume, Stack, Callbacks, Opts) end);
start(<<>>, Stack, Callbacks, Opts) -> start(<<>>, Stack, Callbacks, Opts) ->
{incomplete, fun(Stream) -> start(Stream, Stack, Callbacks, Opts) end}. {incomplete, fun(Stream) -> start(Stream, Stack, Callbacks, Opts) end}.
@ -73,7 +73,7 @@ maybe_done(<<?comma, Rest/binary>>, [object|Stack], Callbacks, Opts) ->
key(Rest, [key|Stack], Callbacks, Opts); key(Rest, [key|Stack], Callbacks, Opts);
maybe_done(<<?comma, Rest/binary>>, [array|_] = Stack, Callbacks, Opts) -> maybe_done(<<?comma, Rest/binary>>, [array|_] = Stack, Callbacks, Opts) ->
value(Rest, Stack, Callbacks, Opts); value(Rest, Stack, Callbacks, Opts);
maybe_done(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts)) -> maybe_done(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_enabled(Opts)) ->
maybe_comment(Rest, fun(Resume) -> maybe_done(Resume, Stack, Callbacks, Opts) end); maybe_comment(Rest, fun(Resume) -> maybe_done(Resume, Stack, Callbacks, Opts) end);
maybe_done(<<>>, [], Callbacks, Opts) -> maybe_done(<<>>, [], Callbacks, Opts) ->
{fold(completed_parse, Callbacks), fun(Stream) -> maybe_done(Stream, [], Callbacks, Opts) end}; {fold(completed_parse, Callbacks), fun(Stream) -> maybe_done(Stream, [], Callbacks, Opts) end};
@ -87,7 +87,7 @@ object(<<?quote, Rest/binary>>, Stack, Callbacks, Opts) ->
string(Rest, Stack, Callbacks, Opts, []); string(Rest, Stack, Callbacks, Opts, []);
object(<<?end_object, Rest/binary>>, [key|Stack], Callbacks, Opts) -> object(<<?end_object, Rest/binary>>, [key|Stack], Callbacks, Opts) ->
maybe_done(Rest, Stack, fold(end_object, Callbacks), Opts); maybe_done(Rest, Stack, fold(end_object, Callbacks), Opts);
object(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts)) -> object(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_enabled(Opts)) ->
maybe_comment(Rest, fun(Resume) -> object(Resume, Stack, Callbacks, Opts) end); maybe_comment(Rest, fun(Resume) -> object(Resume, Stack, Callbacks, Opts) end);
object(<<>>, Stack, Callbacks, Opts) -> object(<<>>, Stack, Callbacks, Opts) ->
{incomplete, fun(Stream) -> object(Stream, Stack, Callbacks, Opts) end}. {incomplete, fun(Stream) -> object(Stream, Stack, Callbacks, Opts) end}.
@ -115,7 +115,7 @@ array(<<?start_array, Rest/binary>>, Stack, Callbacks, Opts) ->
array(Rest, [array|Stack], fold(start_array, Callbacks), Opts); array(Rest, [array|Stack], fold(start_array, Callbacks), Opts);
array(<<?end_array, Rest/binary>>, [array|Stack], Callbacks, Opts) -> array(<<?end_array, Rest/binary>>, [array|Stack], Callbacks, Opts) ->
maybe_done(Rest, Stack, fold(end_array, Callbacks), Opts); maybe_done(Rest, Stack, fold(end_array, Callbacks), Opts);
array(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts)) -> array(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_enabled(Opts)) ->
maybe_comment(Rest, fun(Resume) -> array(Resume, Stack, Callbacks, Opts) end); maybe_comment(Rest, fun(Resume) -> array(Resume, Stack, Callbacks, Opts) end);
array(<<>>, Stack, Callbacks, Opts) -> array(<<>>, Stack, Callbacks, Opts) ->
{incomplete, fun(Stream) -> array(Stream, Stack, Callbacks, Opts) end}. {incomplete, fun(Stream) -> array(Stream, Stack, Callbacks, Opts) end}.
@ -141,7 +141,7 @@ value(<<?start_object, Rest/binary>>, Stack, Callbacks, Opts) ->
object(Rest, [key|Stack], fold(start_object, Callbacks), Opts); object(Rest, [key|Stack], fold(start_object, Callbacks), Opts);
value(<<?start_array, Rest/binary>>, Stack, Callbacks, Opts) -> value(<<?start_array, Rest/binary>>, Stack, Callbacks, Opts) ->
array(Rest, [array|Stack], fold(start_array, Callbacks), Opts); array(Rest, [array|Stack], fold(start_array, Callbacks), Opts);
value(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts)) -> value(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_enabled(Opts)) ->
maybe_comment(Rest, fun(Resume) -> value(Resume, Stack, Callbacks, Opts) end); maybe_comment(Rest, fun(Resume) -> value(Resume, Stack, Callbacks, Opts) end);
value(<<>>, Stack, Callbacks, Opts) -> value(<<>>, Stack, Callbacks, Opts) ->
{incomplete, fun(Stream) -> value(Stream, Stack, Callbacks, Opts) end}. {incomplete, fun(Stream) -> value(Stream, Stack, Callbacks, Opts) end}.
@ -151,7 +151,7 @@ colon(<<S, Rest/binary>>, Stack, Callbacks, Opts) when ?is_whitespace(S) ->
colon(Rest, Stack, Callbacks, Opts); colon(Rest, Stack, Callbacks, Opts);
colon(<<?colon, Rest/binary>>, [key|Stack], Callbacks, Opts) -> colon(<<?colon, Rest/binary>>, [key|Stack], Callbacks, Opts) ->
value(Rest, [object|Stack], Callbacks, Opts); value(Rest, [object|Stack], Callbacks, Opts);
colon(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts)) -> colon(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_enabled(Opts)) ->
maybe_comment(Rest, fun(Resume) -> colon(Resume, Stack, Callbacks, Opts) end); maybe_comment(Rest, fun(Resume) -> colon(Resume, Stack, Callbacks, Opts) end);
colon(<<>>, Stack, Callbacks, Opts) -> colon(<<>>, Stack, Callbacks, Opts) ->
{incomplete, fun(Stream) -> colon(Stream, Stack, Callbacks, Opts) end}. {incomplete, fun(Stream) -> colon(Stream, Stack, Callbacks, Opts) end}.
@ -161,7 +161,7 @@ key(<<S, Rest/binary>>, Stack, Callbacks, Opts) when ?is_whitespace(S) ->
key(Rest, Stack, Callbacks, Opts); key(Rest, Stack, Callbacks, Opts);
key(<<?quote, Rest/binary>>, Stack, Callbacks, Opts) -> key(<<?quote, Rest/binary>>, Stack, Callbacks, Opts) ->
string(Rest, Stack, Callbacks, Opts, []); string(Rest, Stack, Callbacks, Opts, []);
key(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts)) -> key(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_enabled(Opts)) ->
maybe_comment(Rest, fun(Resume) -> key(Resume, Stack, Callbacks, Opts) end); maybe_comment(Rest, fun(Resume) -> key(Resume, Stack, Callbacks, Opts) end);
key(<<>>, Stack, Callbacks, Opts) -> key(<<>>, Stack, Callbacks, Opts) ->
{incomplete, fun(Stream) -> key(Stream, Stack, Callbacks, Opts) end}. {incomplete, fun(Stream) -> key(Stream, Stack, Callbacks, Opts) end}.
@ -271,7 +271,7 @@ zero(<<?decimalpoint, Rest/binary>>, Stack, Callbacks, Opts, Acc) ->
fraction(Rest, Stack, Callbacks, Opts, [?decimalpoint] ++ Acc); fraction(Rest, Stack, Callbacks, Opts, [?decimalpoint] ++ Acc);
zero(<<S, Rest/binary>>, Stack, Callbacks, Opts, Acc) when ?is_whitespace(S) -> zero(<<S, Rest/binary>>, Stack, Callbacks, Opts, Acc) when ?is_whitespace(S) ->
maybe_done(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts); maybe_done(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts);
zero(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts), Acc) -> zero(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_enabled(Opts), Acc) ->
maybe_comment(Rest, fun(Resume) -> zero(Resume, Stack, Callbacks, Opts, Acc) end); maybe_comment(Rest, fun(Resume) -> zero(Resume, Stack, Callbacks, Opts, Acc) end);
zero(<<>>, [], Callbacks, Opts, Acc) -> zero(<<>>, [], Callbacks, Opts, Acc) ->
{fold(completed_parse, fold({number, lists:reverse(Acc)}, Callbacks)), {fold(completed_parse, fold({number, lists:reverse(Acc)}, Callbacks)),
@ -300,7 +300,7 @@ integer(<<$E, Rest/binary>>, Stack, Callbacks, Opts, Acc) ->
e(Rest, Stack, Callbacks, Opts, "e" ++ Acc); e(Rest, Stack, Callbacks, Opts, "e" ++ Acc);
integer(<<S, Rest/binary>>, Stack, Callbacks, Opts, Acc) when ?is_whitespace(S) -> integer(<<S, Rest/binary>>, Stack, Callbacks, Opts, Acc) when ?is_whitespace(S) ->
maybe_done(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts); maybe_done(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts);
integer(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts), Acc) -> integer(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_enabled(Opts), Acc) ->
maybe_comment(Rest, fun(Resume) -> integer(Resume, Stack, Callbacks, Opts, Acc) end); maybe_comment(Rest, fun(Resume) -> integer(Resume, Stack, Callbacks, Opts, Acc) end);
integer(<<>>, [], Callbacks, Opts, Acc) -> integer(<<>>, [], Callbacks, Opts, Acc) ->
{fold(completed_parse, fold({number, lists:reverse(Acc)}, Callbacks)), {fold(completed_parse, fold({number, lists:reverse(Acc)}, Callbacks)),
@ -326,7 +326,7 @@ fraction(<<$E, Rest/binary>>, Stack, Callbacks, Opts, Acc) ->
e(Rest, Stack, Callbacks, Opts, "e" ++ Acc); e(Rest, Stack, Callbacks, Opts, "e" ++ Acc);
fraction(<<S, Rest/binary>>, Stack, Callbacks, Opts, Acc) when ?is_whitespace(S) -> fraction(<<S, Rest/binary>>, Stack, Callbacks, Opts, Acc) when ?is_whitespace(S) ->
maybe_done(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts); maybe_done(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts);
fraction(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts), Acc) -> fraction(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_enabled(Opts), Acc) ->
maybe_comment(Rest, fun(Resume) -> fraction(Resume, Stack, Callbacks, Opts, Acc) end); maybe_comment(Rest, fun(Resume) -> fraction(Resume, Stack, Callbacks, Opts, Acc) end);
fraction(<<>>, [], Callbacks, Opts, Acc) -> fraction(<<>>, [], Callbacks, Opts, Acc) ->
{fold(completed_parse, fold({number, lists:reverse(Acc)}, Callbacks)), {fold(completed_parse, fold({number, lists:reverse(Acc)}, Callbacks)),
@ -361,7 +361,7 @@ exp(<<?comma, Rest/binary>>, [array|_] = Stack, Callbacks, Opts, Acc) ->
value(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts); value(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts);
exp(<<?zero, Rest/binary>>, Stack, Callbacks, Opts, Acc) -> exp(<<?zero, Rest/binary>>, Stack, Callbacks, Opts, Acc) ->
exp(Rest, Stack, Callbacks, Opts, [?zero] ++ Acc); exp(Rest, Stack, Callbacks, Opts, [?zero] ++ Acc);
exp(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts), Acc) -> exp(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_enabled(Opts), Acc) ->
maybe_comment(Rest, fun(Resume) -> exp(Resume, Stack, Callbacks, Opts, Acc) end); maybe_comment(Rest, fun(Resume) -> exp(Resume, Stack, Callbacks, Opts, Acc) end);
exp(<<S, Rest/binary>>, Stack, Callbacks, Opts, Acc) when ?is_whitespace(S) -> exp(<<S, Rest/binary>>, Stack, Callbacks, Opts, Acc) when ?is_whitespace(S) ->
maybe_done(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts); maybe_done(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts);