removed mid level api completely

priv/jsx_test.escript

@@ -30,6 +30,12 @@ main([Path]) ->
 
 test(Dir) ->
 	code:add_path("ebin"),
+	code:load_file(jsx),
+	code:load_file(jsx_utf8),
+	code:load_file(jsx_utf16),
+	code:load_file(jsx_utf16le),
+	code:load_file(jsx_utf32),
+	code:load_file(jsx_utf32le),
 
     ValidJSONTests = load_tests(Dir),
     
@@ -92,12 +98,15 @@ incremental_decode({event, Event, F}, Rest, Acc) ->
 
 
 decode(JSON, Flags) ->
-    {ok, Result} = jsx:fold(fun(end_json, S) -> 
+    P = jsx:parser(Flags),
-				lists:reverse(S) 
+    decode_loop(P(JSON), []).
-			;(E, S) -> 
+    
-				[E] ++ S 
+decode_loop({incomplete, _Next, Force}, Acc) ->
-		end, [], JSON, Flags),
+    decode_loop(Force(), Acc);
-	Result.
+decode_loop({event, end_json, _}, Acc) ->
+    lists:reverse(Acc);
+decode_loop({event, E, Next}, Acc) ->
+    decode_loop(Next(), [E] ++ Acc).
     
 to_utf16(Bin) -> unicode:characters_to_binary(Bin, utf8, utf16).
 to_utf16le(Bin) -> unicode:characters_to_binary(Bin, utf8, {utf16,little}).

src/jsx.erl

@@ -27,15 +27,9 @@
 %% the core parser api
 -export([parser/0, parser/1]).
 
-%% example usage of core api
--export([is_json/1, is_json/2]).
--export([decode/1, decode/2, decode/3, decode/4]).
--export([fold/1, fold/2, fold/3, fold/4]).
-
 %% types for function specifications
 -include("jsx_types.hrl").
 
-    
 
 -spec parser() -> jsx_parser().
 -spec parser(Opts::jsx_opts()) -> jsx_parser().
@@ -59,99 +53,6 @@ start(F, OptsList) ->
     fun(Stream) -> F(Stream, Opts) end.
 
 
--spec is_json(JSON::json()) -> true | false.
--spec is_json(JSON::json(), Opts::jsx_opts()) -> true | false.
-
-is_json(JSON) ->
-    is_json(JSON, []).
-
-is_json(JSON, Opts) ->
-    case fold(fun(end_json, ok) -> true ;(_, _) -> ok end, ok, JSON, Opts) of
-        {incomplete, _} -> false
-        ; {error, _} -> false
-        ; {ok, true} -> true
-    end.
- 
-
--spec decode(JSON::json()) -> {ok, [jsx_event(),...]} | {error, atom()}.
--spec decode(JSON::json(), Parse::jsx_opts() | jsx_parser()) -> {ok, [jsx_event(),...]} | {error, atom()}. 
--spec decode(F::fun((jsx_event(), any()) -> any()), 
-        Acc::any(), 
-        JSON::json()) -> 
-    {ok, any()} | {error, atom()}.
--spec decode(F::fun((jsx_event(), any()) -> any()), 
-        Acc::any(), 
-        JSON::json(), 
-        Parse::jsx_opts() | jsx_parser()) -> 
-    {ok, any()} | {error, atom()}.
-
-decode(JSON) ->
-    decode(JSON, []).
-    
-decode(JSON, Parse) ->
-    F = fun(end_json, S) -> lists:reverse(S) ;(E, S) -> [E] ++ S end,
-    decode(F, [], JSON, Parse).
-
-decode(F, Acc, JSON) ->
-    decode(F, Acc, JSON, []).
-
-decode(F, Acc, JSON, Parse) ->
-    case fold(F, Acc, JSON, Parse) of
-        {ok, Result} -> {ok, Result}
-        ; _ -> {error, badjson}
-    end.
-        
--spec fold(JSON::json()) -> 
-    {ok, [jsx_event(),...]} | {incomplete, jsx_parser(), fun(() -> jsx_parser_result())} | {error, atom()}.
--spec fold(JSON::json(), Parse::jsx_opts() | jsx_parser()) -> 
-    {ok, [jsx_event(),...]} | {incomplete, jsx_parser(), fun(() -> jsx_parser_result())} | {error, atom()}.
--spec fold(F::fun((jsx_event(), any()) -> any()), 
-            Acc::any(), 
-            JSON::json()) -> 
-        {ok, any()} | {incomplete, jsx_parser(), fun(() -> jsx_parser_result())} | {error, atom()}.
--spec fold(F::fun((jsx_event(), any()) -> any()), 
-            Acc::any(), 
-            JSON::json(), 
-            Opts::jsx_opts()) -> 
-        {ok, any()} | {incomplete, jsx_parser(), fun(() -> jsx_parser_result())} | {error, atom()}
-    ; (F::fun((jsx_event(), any()) -> any()), 
-            Acc::any(), 
-            JSON::json(), 
-            Parser::jsx_parser()) -> 
-        {ok, any()} | {incomplete, jsx_parser(), fun(() -> jsx_parser_result())} | {error, atom()}.
-    
-fold(JSON) ->
-    fold(JSON, []).
-
-fold(JSON, Parse) ->
-    F = fun(end_json, S) -> lists:reverse(S) ;(E, S) -> [E] ++ S end,
-    fold(F, [], JSON, Parse).
-        
-fold(F, Acc, JSON) ->
-    P = jsx:parser(),
-    fold(F, Acc, JSON, P).
-    
-fold(F, Acc, JSON, Opts) when is_list(Opts) ->
-    P = jsx:parser(Opts),
-    fold(F, Acc, JSON, P);
-fold(F, Acc, JSON, P) ->
-    fold_loop(F, Acc, P(JSON)).
- 
-fold_loop(F, Acc, {incomplete, Next, Force}) ->
-    case Force() of
-        {event, Val, End} -> 
-            case End() of
-                {event, end_json, _} -> {ok, F(end_json, F(Val, Acc))}
-                ; _ -> {incomplete, fun(Bin) -> fold_loop(F, Acc, Next(Bin)) end}
-            end
-        ; _ -> {incomplete, fun(Bin) -> fold_loop(F, Acc, Next(Bin)) end}
-    end;
-fold_loop(_, _, {error, Error}) -> {error, Error};
-fold_loop(F, Acc, {event, end_json, _}) -> {ok, F(end_json, Acc)};
-fold_loop(F, Acc, {event, Event, Next}) -> fold_loop(F, F(Event, Acc), Next()).
-
-    
-    
 %% option parsing
 
 %% converts a proplist into a tuple