umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

simplified api, end_json now signifies you can cease parsing, no need to continue and check tail

Browse source
This commit is contained in:
alisdair sullivan 2010-08-02 20:42:12 -07:00
parent 5975048ee4
commit db91b3fb74
35 changed files with 234 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/cases/absurdly_deep_array.test
View file

File diff suppressed because one or more lines are too long

2
test/cases/array.test
View file

@ -1 +1 @@
[start_array, {string, "foo"}, {string, "bar"}, {string, "baz"}, start_array, {literal, true}, end_array, start_array, {literal, false}, end_array, start_array, {literal, null}, end_array, {literal, true}, {literal, false}, {literal, null}, {float, "0.7"}, start_object, {key, "key"}, {string, "value"}, end_object, start_array, start_object, end_object, {literal, null}, {literal, null}, {literal, null}, start_array, end_array, end_array, {string, "\n\r\\"}, start_array, {integer, "-1"}, end_array, end_array].
[start_array, {string, "foo"}, {string, "bar"}, {string, "baz"}, start_array, {literal, true}, end_array, start_array, {literal, false}, end_array, start_array, {literal, null}, end_array, {literal, true}, {literal, false}, {literal, null}, {float, "0.7"}, start_object, {key, "key"}, {string, "value"}, end_object, start_array, start_object, end_object, {literal, null}, {literal, null}, {literal, null}, start_array, end_array, end_array, {string, "\n\r\\"}, start_array, {integer, "-1"}, end_array, end_array, end_json].

2
test/cases/comments.test
View file

@ -1,3 +1,3 @@
[start_array, {string, "a string"}, {integer, "1"}, start_object, {key, "key"}, start_array, end_array, {key, "another key"}, {integer, "0"}, end_object, {literal, true}, end_array].
[start_array, {string, "a string"}, {integer, "1"}, start_object, {key, "key"}, start_array, end_array, {key, "another key"}, {integer, "0"}, end_object, {literal, true}, end_array, end_json].
[{comments, true}].

2
test/cases/deep_array.test
View file

@ -1 +1 @@
[start_array, start_array, start_array, end_array, end_array, end_array].
[start_array, start_array, start_array, end_array, end_array, end_array, end_json].

2
test/cases/empty_array.test
View file

@ -1 +1 @@
[start_array, end_array].
[start_array, end_array, end_json].

2
test/cases/empty_array_with_comment.test
View file

@ -1,3 +1,3 @@
[start_array, end_array].
[start_array, end_array, end_json].
[{comments, true}].

2
test/cases/empty_object.test
View file

@ -1 +1 @@
[start_object, end_object].
[start_object, end_object, end_json].

2
test/cases/empty_object_with_comment.test
View file

@ -1,3 +1,3 @@
[start_object, end_object].
[start_object, end_object, end_json].
[{comments, true}].

2
test/cases/encoded_surrogates.test
View file

@ -1,3 +1,3 @@
[start_array, {string, [66560]}, end_array].
[start_array, {string, [66560]}, end_array, end_json].
[{escaped_unicode, codepoint}].

2
test/cases/exp.test
View file

@ -1,3 +1,3 @@
[start_array, start_array, {float, "2.0e7"}, end_array, {float, "2.0e7"}, start_object, {key, "key"}, {float, "2.0e7"}, {key, "another key"}, {float, "2.0e7"}, end_object, {float, "4.2e70"}, end_array].
[start_array, start_array, {float, "2.0e7"}, end_array, {float, "2.0e7"}, start_object, {key, "key"}, {float, "2.0e7"}, {key, "another key"}, {float, "2.0e7"}, end_object, {float, "4.2e70"}, end_array, end_json].
[{comments, true}].

2
test/cases/fraction.test
View file

@ -1,3 +1,3 @@
[start_array, start_array, {float, "2.0"}, end_array, {float, "2.0"}, start_object, {key, "key"}, {float, "2.0e7"}, {key, "another key"}, {float, "2.0e7"}, end_object, start_object, {key, "key"}, {float, "2.0"}, {key, "another key"}, {float, "2.0"}, end_object, {float, "4.2"}, end_array].
[start_array, start_array, {float, "2.0"}, end_array, {float, "2.0"}, start_object, {key, "key"}, {float, "2.0e7"}, {key, "another key"}, {float, "2.0e7"}, end_object, start_object, {key, "key"}, {float, "2.0"}, {key, "another key"}, {float, "2.0"}, end_object, {float, "4.2"}, end_array, end_json].
[{comments, true}].

2
test/cases/integer.test
View file

@ -1 +1 @@
[start_array, start_array, {integer, "20"}, end_array, {integer, "20"}, start_object, {key, "key"}, {integer, "20"}, {key, "another key"}, {integer, "20"}, end_object, {integer, "42"}, end_array].
[start_array, start_array, {integer, "20"}, end_array, {integer, "20"}, start_object, {key, "key"}, {integer, "20"}, {key, "another key"}, {integer, "20"}, end_object, {integer, "42"}, end_array, end_json].

2
test/cases/multibyte_utf.test
View file

@ -1 +1 @@
[start_array,{string,[32, 119070, 32]},end_array].
[start_array,{string,[32, 119070, 32]},end_array,end_json].

2
test/cases/naked_false.test
View file

@ -1 +1 @@
[{literal, false}].
[{literal, false}, end_json].

2
test/cases/naked_null.test
View file

@ -1 +1 @@
[{literal, null}].
[{literal, null}, end_json].

2
test/cases/naked_number_a.test
View file

@ -1 +1 @@
[{integer, "42"}].
[{integer, "42"}, end_json].

2
test/cases/naked_number_b.test
View file

@ -1 +1 @@
[{integer, "-42"}].
[{integer, "-42"}, end_json].

2
test/cases/naked_number_c.test
View file

@ -1 +1 @@
[{float, "-0.7"}].
[{float, "-0.7"}, end_json].

2
test/cases/naked_number_d.test
View file

@ -1 +1 @@
[{float, "0.7"}].
[{float, "0.7"}, end_json].

2
test/cases/naked_number_e.test
View file

@ -1 +1 @@
[{integer, "0"}].
[{integer, "0"}, end_json].

2
test/cases/naked_number_f.test
View file

@ -1 +1 @@
[{float, "1.0e100"}].
[{float, "1.0e100"}, end_json].

2
test/cases/naked_number_g.test
View file

@ -1 +1 @@
[{integer, "7"}].
[{integer, "7"}, end_json].

2
test/cases/naked_string.test
View file

@ -1 +1 @@
[{string, "this is a naked string"}].
[{string, "this is a naked string"}, end_json].

2
test/cases/naked_true.test
View file

@ -1 +1 @@
[{literal, true}].
[{literal, true}, end_json].

2
test/cases/negative_zero.test
View file

@ -1 +1 @@
[start_array, start_array, {integer, "-0"}, end_array, {integer, "-0"}, start_object, {key, "key"}, {integer, "-0"}, {key, "another key"}, {integer, "-0"}, end_object, {integer, "-0"}, end_array].
[start_array, start_array, {integer, "-0"}, end_array, {integer, "-0"}, start_object, {key, "key"}, {integer, "-0"}, {key, "another key"}, {integer, "-0"}, end_object, {integer, "-0"}, end_array, end_json].

2
test/cases/numbers.test
View file

@ -1 +1 @@
[ start_array, {integer, "1"}, {integer, "2"}, {integer, "3"}, {integer, "4"}, {integer, "5"}, {integer, "6"}, {integer, "7"}, {integer, "8"}, {integer, "9"}, {integer, "42"}, {integer, "127"}, {integer, "99999999999999999999999999999"}, {float, "1.0e1"}, {float, "1.0e1"}, {float, "1.0e1"}, {float, "1.325e478534"}, {integer, "-1"}, {float, "-1.0e-1"}, {float, "3.7e-57834235"}, end_array ].
[ start_array, {integer, "1"}, {integer, "2"}, {integer, "3"}, {integer, "4"}, {integer, "5"}, {integer, "6"}, {integer, "7"}, {integer, "8"}, {integer, "9"}, {integer, "42"}, {integer, "127"}, {integer, "99999999999999999999999999999"}, {float, "1.0e1"}, {float, "1.0e1"}, {float, "1.0e1"}, {float, "1.325e478534"}, {integer, "-1"}, {float, "-1.0e-1"}, {float, "3.7e-57834235"}, end_array, end_json].

2
test/cases/object.test
View file

@ -1 +1 @@
[start_object, {key, "foo"}, {string, "bar"}, {key, "baz"}, {literal, true}, {key, "false"}, {literal, null}, {key, "object"}, start_object, {key, "key"}, {string, "value"}, end_object, {key, "list"}, start_array, {literal, null}, {literal, null}, {literal, null}, start_array, end_array, {string, "\n\r\\"}, end_array, end_object].
[start_object, {key, "foo"}, {string, "bar"}, {key, "baz"}, {literal, true}, {key, "false"}, {literal, null}, {key, "object"}, start_object, {key, "key"}, {string, "value"}, end_object, {key, "list"}, start_array, {literal, null}, {literal, null}, {literal, null}, start_array, end_array, {string, "\n\r\\"}, end_array, end_object, end_json].

2
test/cases/string.test
View file

@ -1 +1 @@
[start_array, {string, "this is a random string with \n embedded escapes in it"}, end_array].
[start_array, {string, "this is a random string with \n embedded escapes in it"}, end_array, end_json].

2
test/cases/string_escapes.test
View file

@ -1,3 +1,3 @@
[start_array, {string, "\""}, {string, "\\"}, {string, "/"}, {string, "\b"}, {string, "\f"}, {string, "\n"}, {string, "\r"}, {string, "\t"}, end_array].
[start_array, {string, "\""}, {string, "\\"}, {string, "/"}, {string, "\b"}, {string, "\f"}, {string, "\n"}, {string, "\r"}, {string, "\t"}, end_array, end_json].

2
test/cases/unicode_to_codepoint.test
View file

@ -1,3 +1,3 @@
[start_array, {string, "arabic letter alef: "}, {string, [16#0627]}, end_array].
[start_array, {string, "arabic letter alef: "}, {string, [16#0627]}, end_array, end_json].
[{escaped_unicode, codepoint}].

2
test/cases/unicode_unconverted.test
View file

@ -1,3 +1,3 @@
[start_array, {string, "arabic letter alef: "}, {string, "\\u0627"}, end_array].
[start_array, {string, "arabic letter alef: "}, {string, "\\u0627"}, end_array, end_json].
[{escaped_unicode, ascii}].

2
test/cases/whitespace.test
View file

@ -1 +1 @@
[start_array, {float, "0.3"}, end_array].
[start_array, {float, "0.3"}, end_array, end_json].

2
test/cases/zero.test
View file

@ -1 +1 @@
[start_array, start_array, {integer, "0"}, end_array, {integer, "0"}, start_object, {key, "key"}, {integer, "0"}, {key, "another key"}, {integer, "0"}, end_object, {integer, "0"}, end_array].
[start_array, start_array, {integer, "0"}, end_array, {integer, "0"}, start_object, {key, "key"}, {integer, "0"}, {key, "another key"}, {integer, "0"}, end_object, {integer, "0"}, end_array, end_json].

144
test/jsx_test.escript Executable file
View file

@ -0,0 +1,144 @@
#!/usr/bin/env escript
%% The MIT License
%% Copyright (c) 2010 Alisdair Sullivan <alisdairsullivan@yahoo.ca>
%% Permission is hereby granted, free of charge, to any person obtaining a copy
%% of this software and associated documentation files (the "Software"), to deal
%% in the Software without restriction, including without limitation the rights
%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
%% copies of the Software, and to permit persons to whom the Software is
%% furnished to do so, subject to the following conditions:
%% The above copyright notice and this permission notice shall be included in
%% all copies or substantial portions of the Software.
%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
%% THE SOFTWARE.
-module(jsx_test).
-export([main/1]).
main([]) ->
test("./test/cases");
main([Path]) ->
test(Path).
test(Dir) ->
code:add_path("ebin"),
ValidJSONTests = load_tests(Dir),
etap:plan((length(ValidJSONTests) * 10) + 1),
run_tests(ValidJSONTests),
etap:is(multi_decode(multi_json_body(), []), multi_test_result(), "multi terms"),
etap:end_tests().
load_tests(Dir) ->
TestSpecs = filelib:wildcard("*.test", Dir),
load_tests(TestSpecs, Dir, []).
load_tests([], _Dir, Acc) ->
lists:reverse(Acc);
load_tests([Test|Rest], Dir, Acc) ->
try
TestName = filename:basename(Test, ".test"),
{ok, JSON} = file:read_file(Dir ++ "/" ++ TestName ++ ".json"),
case file:consult(Dir ++ "/" ++ Test) of
{ok, [Events]} ->
load_tests(Rest, Dir, [{TestName, JSON, Events, []}] ++ Acc)
; {ok, [Events, Flags]} ->
load_tests(Rest, Dir, [{TestName, JSON, Events, Flags}] ++ Acc)
end
catch _:_ -> load_tests(Rest, Dir, Acc) end.
run_tests([]) ->
ok;
run_tests([{TestName, JSON, Events, Flags}|Rest]) ->
etap:is(decode(JSON, Flags), Events, TestName ++ ": utf8"),
etap:is(incremental_decode(JSON, Flags), Events, TestName ++ ": incremental utf8"),
etap:is(decode(to_utf16(JSON), Flags), Events, TestName ++ ": utf16"),
etap:is(incremental_decode(to_utf16(JSON), Flags), Events, TestName ++ ": incremental utf16"),
etap:is(decode(to_utf16le(JSON), Flags), Events, TestName ++ ": utf16le"),
etap:is(incremental_decode(to_utf16le(JSON), Flags), Events, TestName ++ ": incremental utf16le"),
etap:is(decode(to_utf32(JSON), Flags), Events, TestName ++ ": utf32"),
etap:is(incremental_decode(to_utf32(JSON), Flags), Events, TestName ++ ": incremental utf32"),
etap:is(decode(to_utf32le(JSON), Flags), Events, TestName ++ ": utf32le"),
etap:is(incremental_decode(to_utf32le(JSON), Flags), Events, TestName ++ ": incremental utf32le"),
run_tests(Rest).
decode(JSON, Flags) ->
P = jsx:parser(Flags),
decode_loop(P(JSON), []).
decode_loop({event, end_json, Next}, Acc) ->
lists:reverse([end_json] ++ Acc);
decode_loop({incomplete, More}, Acc) ->
decode_loop(More(end_stream), Acc);
decode_loop({event, E, Next}, Acc) ->
decode_loop(Next(), [E] ++ Acc).
incremental_decode(<<C:1/binary, Rest/binary>>, Flags) ->
P = jsx:parser(Flags),
incremental_decode_loop(P(C), Rest, []).
incremental_decode_loop({incomplete, Next}, <<>>, Acc) ->
incremental_decode_loop(Next(end_stream), <<>>, Acc);
incremental_decode_loop({incomplete, Next}, <<C:1/binary, Rest/binary>>, Acc) ->
incremental_decode_loop(Next(C), Rest, Acc);
incremental_decode_loop({event, end_json, Next}, _Rest, Acc) ->
lists:reverse([end_json] ++ Acc);
incremental_decode_loop({event, Event, Next}, Rest, Acc) ->
incremental_decode_loop(Next(), Rest, [Event] ++ Acc).
multi_decode(JSON, Flags) ->
P = jsx:parser(Flags ++ [{multi_term, true}]),
multi_decode_loop(P(JSON), [[]]).
multi_decode_loop({incomplete, _Next}, [[]|Acc]) ->
lists:reverse(Acc);
multi_decode_loop({event, end_json, Next}, [S|Acc]) ->
multi_decode_loop(Next(), [[]|[lists:reverse(S)] ++ Acc]);
multi_decode_loop({event, E, Next}, [S|Acc]) ->
multi_decode_loop(Next(), [[E] ++ S] ++ Acc).
to_utf16(Bin) -> unicode:characters_to_binary(Bin, utf8, utf16).
to_utf16le(Bin) -> unicode:characters_to_binary(Bin, utf8, {utf16,little}).
to_utf32(Bin) -> unicode:characters_to_binary(Bin, utf8, utf32).
to_utf32le(Bin) -> unicode:characters_to_binary(Bin, utf8, {utf32,little}).
multi_json_body() ->
<<"0 1 -1 1e1 0.7 0.7e-1 true false null {} [] [1, 2, 3] \"hope this works\"">>.
multi_test_result() ->
[ [{integer, "0"}],
[{integer, "1"}],
[{integer, "-1"}],
[{float, "1.0e1"}],
[{float, "0.7"}],
[{float, "0.7e-1"}],
[{literal, true}],
[{literal, false}],
[{literal, null}],
[start_object, end_object],
[start_array, end_array],
[start_array, {integer, "1"}, {integer, "2"}, {integer, "3"}, end_array],
[{string, "hope this works"}]
].