updated tests, which are shortly to be rewritten completely

test/cases/array.test

@@ -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}, {number, "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, {number, "-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].

test/cases/comments.test

@@ -1,2 +1,3 @@
-[start_array, {string, "a string"}, {number, "1"}, start_object, {key, "key"}, start_array, end_array, {key, "another key"}, {number, "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].
+
 [{comments, true}].

test/cases/exp.test

@@ -1,3 +1,3 @@
-[start_array, start_array, {number, "2.0e7"}, end_array, {number, "2.0e7"}, start_object, {key, "key"}, {number, "2.0e7"}, {key, "another key"}, {number, "2.0e7"}, end_object, {number, "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].
 
 [{comments, true}].

test/cases/fraction.test

@@ -1,3 +1,3 @@
-[start_array, start_array, {number, "2.0"}, end_array, {number, "2.0"}, start_object, {key, "key"}, {number, "2.0e7"}, {key, "another key"}, {number, "2.0e7"}, end_object, start_object, {key, "key"}, {number, "2.0"}, {key, "another key"}, {number, "2.0"}, end_object, {number, "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].
 
 [{comments, true}].

test/cases/integer.test

@@ -1 +1 @@
-[start_array, start_array, {number, "20"}, end_array, {number, "20"}, start_object, {key, "key"}, {number, "20"}, {key, "another key"}, {number, "20"}, end_object, {number, "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].

test/cases/naked_false.test

@@ -1,2 +1 @@
 [{literal, false}].
-[{naked_values, true}].

test/cases/naked_null.test

@@ -1,2 +1 @@
 [{literal, null}].
-[{naked_values, true}].

test/cases/naked_number_a.test

@@ -1,2 +1 @@
-[{number, "42"}].
+[{integer, "42"}].
-[{naked_values, true}].

test/cases/naked_number_b.test

@@ -1,2 +1 @@
-[{number, "-42"}].
+[{integer, "-42"}].
-[{naked_values, true}].

test/cases/naked_number_c.test

@@ -1,2 +1 @@
-[{number, "-0.7"}].
+[{float, "-0.7"}].
-[{naked_values, true}].

test/cases/naked_number_d.test

@@ -1,2 +1 @@
-[{number, "0.7"}].
+[{float, "0.7"}].
-[{naked_values, true}].

test/cases/naked_number_e.test

@@ -1,2 +1 @@
-[{number, "0"}].
+[{integer, "0"}].
-[{naked_values, true}].

test/cases/naked_number_f.test

@@ -1,2 +1 @@
-[{number, "1e100"}].
+[{float, "1.0e100"}].
-[{naked_values, true}].

test/cases/naked_string.test

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

test/cases/naked_true.test

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

test/cases/numbers.test

@@ -1 +1 @@
-[ start_array, {number, "1"}, {number, "2"}, {number, "3"}, {number, "4"}, {number, "5"}, {number, "6"}, {number, "7"}, {number, "8"}, {number, "9"}, {number, "42"}, {number, "127"}, {number, "99999999999999999999999999999"}, {number, "1e1"}, {number, "1e1"}, {number, "1.0e1"}, {number, "1.325e478534"}, {number, "-1"}, {number, "-1e-1"}, {number, "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 ].

test/cases/unicode_to_codepoint.test

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

test/cases/unicode_unconverted.test

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

test/cases/whitespace.test

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

test/cases/zero.test

@@ -1 +1 @@
-[start_array, start_array, {number, "0"}, end_array, {number, "0"}, start_object, {key, "key"}, {number, "0"}, {key, "another key"}, {number, "0"}, end_object, {number, "0"}, end_array].
+integer[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].

test/jsx_test.erl

@@ -24,7 +24,7 @@
 -module(jsx_test).
 -author("alisdairsullivan@yahoo.ca").
 
--export([test/1]).
+-export([test/1, test_event/2, incremental_decode/2, decode/2]).
 
 -include_lib("eunit/include/eunit.hrl").
 
@@ -33,6 +33,17 @@ test(Dir) ->
     Tests = gen_tests(Dir),
     eunit:test(Tests, [verbose]).
 
+
+decoder(Flags) ->
+    jsx:decoder({jsx_test, test_event, []}, Flags).
+
+test_event(end_of_stream, Acc) ->
+    lists:reverse(Acc);
+test_event(Event, Acc) ->
+    [Event] ++ Acc.
+
+
+
 gen_tests(Dir) ->
     TestSpecs = filelib:wildcard("*.test", Dir),
     gen_tests(TestSpecs, Dir, []).
@@ -65,7 +76,8 @@ incremental_decode(F, <<>>) ->
         {incomplete, G} -> G
         ; {Result, _} -> Result
     end;
-incremental_decode(F, <<A/utf8, Rest/binary>>) ->
+incremental_decode(F, <<A, Rest/binary>>) ->
+    io:fwrite("~p~n", [A]),
     {_, G} = F(<<A>>),
     incremental_decode(G, Rest).