From 3d1096f8f5cbc9356c912486c4e466337bb560ee Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Tue, 4 Jun 2013 01:12:25 +0000 Subject: [PATCH] remove deprecated functions --- src/jsx.erl | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/src/jsx.erl b/src/jsx.erl index dbf072b..8c45bfe 100644 --- a/src/jsx.erl +++ b/src/jsx.erl @@ -28,10 +28,6 @@ -export([format/1, format/2, minify/1, prettify/1]). -export([encoder/3, decoder/3, parser/3]). -export([resume/3]). -%% old api --export([term_to_json/1, term_to_json/2, json_to_term/1, json_to_term/2]). --export([to_json/1, to_json/2]). --export([to_term/1, to_term/2]). -export_type([json_term/0, json_text/0, token/0]). -export_type([encoder/0, decoder/0, parser/0, internal_state/0]). @@ -61,12 +57,12 @@ encode(Source) -> encode(Source, []). encode(Source, Config) -> jsx_to_json:to_json(Source, Config). -%% old api, alias for encode/x -to_json(Source) -> encode(Source, []). -to_json(Source, Config) -> encode(Source, Config). -term_to_json(Source) -> encode(Source, []). -term_to_json(Source, Config) -> encode(Source, Config). +-spec decode(Source::json_text()) -> json_term() | {incomplete, decoder()}. +-spec decode(Source::json_text(), Config::jsx_to_term:config()) -> json_term() | {incomplete, decoder()}. + +decode(Source) -> decode(Source, []). +decode(Source, Config) -> jsx_to_term:to_term(Source, Config). -spec format(Source::json_text()) -> json_text() | {incomplete, decoder()}. @@ -86,20 +82,6 @@ minify(Source) -> format(Source, []). prettify(Source) -> format(Source, [space, {indent, 2}]). --spec decode(Source::json_text()) -> json_term() | {incomplete, decoder()}. --spec decode(Source::json_text(), Config::jsx_to_term:config()) -> json_term() | {incomplete, decoder()}. - -decode(Source) -> decode(Source, []). -decode(Source, Config) -> jsx_to_term:to_term(Source, Config). - -%% old api, alias for to_term/x - -to_term(Source) -> decode(Source, []). -to_term(Source, Config) -> decode(Source, Config). -json_to_term(Source) -> decode(Source, []). -json_to_term(Source, Config) -> decode(Source, Config). - - -spec is_json(Source::any()) -> true | false. -spec is_json(Source::any(), Config::jsx_verify:config()) -> true | false.