umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

cleaned up prettifier, now catches exceptions

Browse source
This commit is contained in:
alisdair sullivan 2010-05-25 22:06:52 -07:00
parent 4fdd939327
commit c16351ad12
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
examples/jsx_prettify.erl
View file

@ -34,17 +34,24 @@
pretty(JSON, Opts) -> pretty(JSON, Opts) ->
Init = init(parse_opts(Opts, #opts{})), Init = init(parse_opts(Opts, #opts{})),
{Result, Rest} = (jsx:decoder({{jsx_prettify, jsx_event}, Init}, []))(JSON), P = jsx:decoder({{jsx_prettify, jsx_event}, Init}, []),
case jsx:tail_clean(Rest) of try
true -> Result {Result, Rest} = P(JSON),
; _ -> exit(badarg) case jsx:tail_clean(Rest) of
true -> Result
; _ -> throw(badarg)
end
catch
_:_ -> throw(badarg)
end. end.
parse_opts([{indent, Val}|Rest], Opts) -> parse_opts([{indent, Val}|Rest], Opts) ->
parse_opts(Rest, Opts#opts{indent = Val}); parse_opts(Rest, Opts#opts{indent = Val});
parse_opts([], Opts) -> parse_opts([], Opts) ->
Opts. Opts.
init(Opts) -> init(Opts) ->
{[], Opts#opts.indent, 0, new}. {[], Opts#opts.indent, 0, new}.
@ -59,25 +66,21 @@ jsx_event(start_array, {Acc, Indent, Level, value}) ->
jsx_event(start_array, {Acc, Indent, Level, _}) -> jsx_event(start_array, {Acc, Indent, Level, _}) ->
{Acc ++ "[", Indent, Level + 1, new}; {Acc ++ "[", Indent, Level + 1, new};
jsx_event(end_object, {Acc, Indent, Level, value}) -> jsx_event(end_object, {Acc, Indent, Level, value}) ->
{Acc ++ "\n" ++ indent(Indent, Level - 1) ++ "}", Indent, Level - 1, value}; {Acc ++ "\n" ++ indent(Indent, Level - 1) ++ "}", Indent, Level - 1, value};
jsx_event(end_object, {Acc, Indent, Level, new}) -> jsx_event(end_object, {Acc, Indent, Level, new}) ->
{Acc ++ "}", Indent, Level - 1, value}; {Acc ++ "}", Indent, Level - 1, value};
jsx_event(end_array, {Acc, Indent, Level, value}) -> jsx_event(end_array, {Acc, Indent, Level, value}) ->
{Acc ++ "\n" ++ indent(Indent, Level - 1) ++ "]", Indent, Level - 1, value}; {Acc ++ "\n" ++ indent(Indent, Level - 1) ++ "]", Indent, Level - 1, value};
jsx_event(end_array, {Acc, Indent, Level, new}) -> jsx_event(end_array, {Acc, Indent, Level, new}) ->
{Acc ++ "]", Indent, Level - 1, value}; {Acc ++ "]", Indent, Level - 1, value};
jsx_event({key, Key}, {Acc, Indent, Level, value}) -> jsx_event({key, Key}, {Acc, Indent, Level, value}) ->
{Acc ++ ",\n" ++ indent(Indent, Level) ++ "\"" ++ Key ++ "\": ", Indent, Level, key}; {Acc ++ ",\n" ++ indent(Indent, Level) ++ "\"" ++ Key ++ "\": ", Indent, Level, key};
jsx_event({key, Key}, {Acc, Indent, Level, _}) -> jsx_event({key, Key}, {Acc, Indent, Level, _}) ->
{Acc ++ "\n" ++ indent(Indent, Level) ++ "\"" ++ Key ++ "\": ", Indent, Level, key}; {Acc ++ "\n" ++ indent(Indent, Level) ++ "\"" ++ Key ++ "\": ", Indent, Level, key};
jsx_event({Type, Value}, {Acc, Indent, Level, value}) -> jsx_event({Type, Value}, {Acc, Indent, Level, value}) ->
{Acc ++ ",\n" ++ indent(Indent, Level) ++ format(Type, Value), Indent, Level, value}; {Acc ++ ",\n" ++ indent(Indent, Level) ++ format(Type, Value), Indent, Level, value};
jsx_event({Type, Value}, {Acc, Indent, Level, new}) -> jsx_event({Type, Value}, {Acc, Indent, Level, new}) ->
@ -85,7 +88,6 @@ jsx_event({Type, Value}, {Acc, Indent, Level, new}) ->
jsx_event({Type, Value}, {Acc, Indent, Level, key}) -> jsx_event({Type, Value}, {Acc, Indent, Level, key}) ->
{Acc ++ format(Type, Value), Indent, Level, value}; {Acc ++ format(Type, Value), Indent, Level, value};
jsx_event(eof, {Acc, _, _, _}) -> jsx_event(eof, {Acc, _, _, _}) ->
Acc. Acc.