From 6481bae328a61ba75fbc5221259c835a4328aeb2 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Sat, 16 Apr 2011 22:25:02 -0700 Subject: [PATCH] removes useless eventify function --- src/jsx.erl | 15 --------------- src/jsx_eep0018.erl | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/jsx.erl b/src/jsx.erl index 412deb5..55f7c53 100644 --- a/src/jsx.erl +++ b/src/jsx.erl @@ -30,7 +30,6 @@ -export([json_to_term/1, json_to_term/2]). -export([is_json/1, is_json/2]). -export([format/1, format/2]). --export([eventify/1]). -include("./include/jsx_common.hrl"). @@ -117,20 +116,6 @@ format(JSON, Opts) -> jsx_format:format(JSON, Opts). --spec eventify(List::list()) -> jsx_parser_result(). - -eventify([]) -> - fun() -> - {incomplete, fun(List) when is_list(List) -> - eventify(List) - ; (_) -> - erlang:error(badarg) - end} - end; -eventify([Next|Rest]) -> - fun() -> {event, Next, eventify(Rest)} end. - - -ifdef(TEST). diff --git a/src/jsx_eep0018.erl b/src/jsx_eep0018.erl index db7b093..26bebad 100644 --- a/src/jsx_eep0018.erl +++ b/src/jsx_eep0018.erl @@ -60,10 +60,22 @@ term_to_json(List, Opts) -> ; false -> continue end, Encoding = proplists:get_value(encoding, Opts, utf8), - jsx:format(jsx:eventify(lists:reverse([end_json] ++ term_to_events(List))), + jsx:format(eventify(lists:reverse([end_json] ++ term_to_events(List))), [{output_encoding, Encoding}] ++ Opts ). - + + +eventify([]) -> + fun() -> + {incomplete, fun(List) when is_list(List) -> + eventify(List) + ; (_) -> + erlang:error(badarg) + end} + end; +eventify([Next|Rest]) -> + fun() -> {event, Next, eventify(Rest)} end. + extract_parser_opts(Opts) -> extract_parser_opts(Opts, []).