From 2a2275136a810569c3eb4a80b2583df467464c16 Mon Sep 17 00:00:00 2001
From: alisdair sullivan <alisdairsullivan@yahoo.ca>
Date: Thu, 27 May 2010 12:56:21 -0700
Subject: [PATCH] Removed all records from the core decoder. Replaced with
 macros and a raw tuple containing options. Updated one test to account for
 changed api.

---
 src/jsx.erl                         | 18 ++++-------
 src/jsx_common.hrl                  | 10 +++---
 src/jsx_decoder.erl                 | 47 ++++++++++++++++++-----------
 test/cases/unicode_unconverted.test |  3 +-
 4 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/src/jsx.erl b/src/jsx.erl
index eb0d227..08fc7b5 100644
--- a/src/jsx.erl
+++ b/src/jsx.erl
@@ -43,26 +43,20 @@ decoder({{Mod, Fun}, State}, OptsList) when is_list(OptsList), is_atom(Mod), is_
     Opts = parse_opts(OptsList),
     decoder({fun(E, S) -> Mod:Fun(E, S) end, State}, Opts);
 decoder(Callbacks, Opts) ->
-    case Opts#opts.encoding of
-        utf8 ->
-            fun(Stream) -> jsx_decoder:start(Stream, [], Callbacks, Opts) end
-    end.
+    fun(Stream) -> jsx_decoder:start(Stream, [], Callbacks, Opts) end.
 
     
 parse_opts(Opts) ->
-    parse_opts(Opts, #opts{}).
+    parse_opts(Opts, {false, codepoint}).
 
 parse_opts([], Opts) ->
     Opts;    
-parse_opts([{comments, Value}|Rest], Opts) ->
+parse_opts([{comments, Value}|Rest], {_Comments, EscapedUnicode}) ->
     true = lists:member(Value, [true, false]),
-    parse_opts(Rest, Opts#opts{comments = Value});
-parse_opts([{escaped_unicode, Value}|Rest], Opts) ->
+    parse_opts(Rest, {Value, EscapedUnicode});
+parse_opts([{escaped_unicode, Value}|Rest], {Comments, _EscapedUnicode}) ->
     true = lists:member(Value, [ascii, codepoint, none]),
-    parse_opts(Rest, Opts#opts{escaped_unicode = Value});
-parse_opts([{encoding, Value}|Rest], Opts) ->
-    true = lists:member(Value, [utf8]),
-    parse_opts(Rest, Opts#opts{encoding = Value});
+    parse_opts(Rest, {Comments, Value});
 parse_opts([_UnknownOpt|Rest], Opts) ->
     parse_opts(Rest, Opts).
 
diff --git a/src/jsx_common.hrl b/src/jsx_common.hrl
index 10a139f..127aee1 100644
--- a/src/jsx_common.hrl
+++ b/src/jsx_common.hrl
@@ -21,11 +21,11 @@
 %% THE SOFTWARE.
 
 
--record(opts, {
-    comments = false,
-    escaped_unicode = ascii,
-    encoding = utf8
-}).
+%% option flags
+
+-define(comments_true(X), {true, _} = X).
+-define(escaped_unicode_to_ascii(X), {_, ascii} = X).
+-define(escaped_unicode_to_codepoint(X), {_, codepoint} = X).
 
 %% whitespace
 -define(space, 16#20).
diff --git a/src/jsx_decoder.erl b/src/jsx_decoder.erl
index 75c71dd..e4e8562 100644
--- a/src/jsx_decoder.erl
+++ b/src/jsx_decoder.erl
@@ -57,7 +57,7 @@ start(<<?zero, Rest/binary>>, Stack, Callbacks, Opts) ->
     zero(Rest, Stack, Callbacks, Opts, "0");
 start(<<S, Rest/binary>>, Stack, Callbacks, Opts) when ?is_nonzero(S) ->
     integer(Rest, Stack, Callbacks, Opts, [S]);
-start(<<?solidus, Rest/binary>>, Stack, Callbacks, Opts) when Opts#opts.comments == true ->
+start(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts)) ->
     maybe_comment(Rest, fun(Resume) -> start(Resume, Stack, Callbacks, Opts) end);
 start(<<>>, [], Callbacks, Opts) ->
     fun(<<>>) -> {fold(completed_parse, Callbacks), <<>>}
@@ -79,7 +79,7 @@ maybe_done(<<?comma, Rest/binary>>, [object|Stack], Callbacks, Opts) ->
     key(Rest, [key|Stack], Callbacks, Opts);
 maybe_done(<<?comma, Rest/binary>>, [array|_] = Stack, Callbacks, Opts) ->
     value(Rest, Stack, Callbacks, Opts);
-maybe_done(<<?solidus, Rest/binary>>, Stack, Callbacks, Opts) when Opts#opts.comments == true ->
+maybe_done(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts)) ->
     maybe_comment(Rest, fun(Resume) -> maybe_done(Resume, Stack, Callbacks, Opts) end);
 maybe_done(<<>>, Stack, Callbacks, Opts) ->
     fun(Stream) -> maybe_done(Stream, Stack, Callbacks, Opts) end.
@@ -91,7 +91,7 @@ object(<<?quote, Rest/binary>>, Stack, Callbacks, Opts) ->
     string(Rest, Stack, Callbacks, Opts, []);
 object(<<?end_object, Rest/binary>>, [key|Stack], Callbacks, Opts) ->
     maybe_done(Rest, Stack, fold(end_object, Callbacks), Opts);
-object(<<?solidus, Rest/binary>>, Stack, Callbacks, Opts) when Opts#opts.comments == true ->
+object(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts)) ->
     maybe_comment(Rest, fun(Resume) -> object(Resume, Stack, Callbacks, Opts) end);
 object(<<>>, Stack, Callbacks, Opts) ->
     fun(Stream) -> object(Stream, Stack, Callbacks, Opts) end.
@@ -119,7 +119,7 @@ array(<<?start_array, Rest/binary>>, Stack, Callbacks, Opts) ->
     array(Rest, [array|Stack], fold(start_array, Callbacks), Opts);
 array(<<?end_array, Rest/binary>>, [array|Stack], Callbacks, Opts) ->
     maybe_done(Rest, Stack, fold(end_array, Callbacks), Opts);
-array(<<?solidus, Rest/binary>>, Stack, Callbacks, Opts) when Opts#opts.comments == true ->
+array(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts)) ->
     maybe_comment(Rest, fun(Resume) -> array(Resume, Stack, Callbacks, Opts) end);
 array(<<>>, Stack, Callbacks, Opts) ->
     fun(Stream) -> array(Stream, Stack, Callbacks, Opts) end.  
@@ -145,7 +145,7 @@ value(<<?start_object, Rest/binary>>, Stack, Callbacks, Opts) ->
     object(Rest, [key|Stack], fold(start_object, Callbacks), Opts);
 value(<<?start_array, Rest/binary>>, Stack, Callbacks, Opts) ->
     array(Rest, [array|Stack], fold(start_array, Callbacks), Opts);
-value(<<?solidus, Rest/binary>>, Stack, Callbacks, Opts) when Opts#opts.comments == true ->
+value(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts)) ->
     maybe_comment(Rest, fun(Resume) -> value(Resume, Stack, Callbacks, Opts) end);
 value(<<>>, Stack, Callbacks, Opts) ->
     fun(Stream) -> value(Stream, Stack, Callbacks, Opts) end.
@@ -155,7 +155,7 @@ colon(<<S, Rest/binary>>, Stack, Callbacks, Opts) when ?is_whitespace(S) ->
     colon(Rest, Stack, Callbacks, Opts);
 colon(<<?colon, Rest/binary>>, [key|Stack], Callbacks, Opts) ->
     value(Rest, [object|Stack], Callbacks, Opts);
-colon(<<?solidus, Rest/binary>>, Stack, Callbacks, Opts) when Opts#opts.comments == true ->
+colon(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts)) ->
     maybe_comment(Rest, fun(Resume) -> colon(Resume, Stack, Callbacks, Opts) end);
 colon(<<>>, Stack, Callbacks, Opts) ->
     fun(Stream) -> colon(Stream, Stack, Callbacks, Opts) end.
@@ -165,7 +165,7 @@ key(<<S, Rest/binary>>, Stack, Callbacks, Opts) when ?is_whitespace(S) ->
     key(Rest, Stack, Callbacks, Opts);        
 key(<<?quote, Rest/binary>>, Stack, Callbacks, Opts) ->
     string(Rest, Stack, Callbacks, Opts, []);
-key(<<?solidus, Rest/binary>>, Stack, Callbacks, Opts) when Opts#opts.comments == true ->
+key(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts)) ->
     maybe_comment(Rest, fun(Resume) -> key(Resume, Stack, Callbacks, Opts) end);
 key(<<>>, Stack, Callbacks, Opts) ->
     fun(Stream) -> key(Stream, Stack, Callbacks, Opts) end.
@@ -219,16 +219,29 @@ escape(<<>>, Stack, Callbacks, Opts, Acc) ->
 %%   insane). any other option and the sequence is converted back to an erlang string
 %%   and appended to the string in place.
     
-escaped_unicode(<<D, Rest/binary>>, Stack, Callbacks, Opts, String, [C, B, A]) when ?is_hex(D) ->
-    X = erlang:list_to_integer([A, B, C, D], 16),
-    case Opts#opts.escaped_unicode of
-        ascii when X < 16#0080 ->
-            string(Rest, Stack, Callbacks, Opts, [X] ++ String)
-        ; codepoint ->
+escaped_unicode(<<D, Rest/binary>>, 
+        Stack, 
+        Callbacks, 
+        ?escaped_unicode_to_ascii(Opts), 
+        String, 
+        [C, B, A]) 
+            when ?is_hex(D) ->
+    case erlang:list_to_integer([A, B, C, D], 16) of
+        X when X < 127 ->
             string(Rest, Stack, Callbacks, Opts, [X] ++ String)
         ; _ ->
             string(Rest, Stack, Callbacks, Opts, [D, C, B, A, $u, ?rsolidus] ++ String)
     end;
+escaped_unicode(<<D, Rest/binary>>, 
+        Stack, 
+        Callbacks, 
+        ?escaped_unicode_to_codepoint(Opts), 
+        String, 
+        [C, B, A]) 
+            when ?is_hex(D) ->
+    string(Rest, Stack, Callbacks, Opts, [erlang:list_to_integer([A, B, C, D], 16)] ++ String);
+escaped_unicode(<<D, Rest/binary>>, Stack, Callbacks, Opts, String, [C, B, A]) when ?is_hex(D) ->
+    string(Rest, Stack, Callbacks, Opts, [D, C, B, A, $u, ?rsolidus] ++ String);
 escaped_unicode(<<S, Rest/binary>>, Stack, Callbacks, Opts, String, Acc) when ?is_hex(S) ->
     escaped_unicode(Rest, Stack, Callbacks, Opts, String, [S] ++ Acc);
 escaped_unicode(<<>>, Stack, Callbacks, Opts, String, Acc) ->
@@ -262,7 +275,7 @@ zero(<<?decimalpoint, Rest/binary>>, Stack, Callbacks, Opts, Acc) ->
     fraction(Rest, Stack, Callbacks, Opts, [?decimalpoint] ++ Acc);
 zero(<<S, Rest/binary>>, Stack, Callbacks, Opts, Acc) when ?is_whitespace(S) ->
     maybe_done(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts);
-zero(<<?solidus, Rest/binary>>, Stack, Callbacks, Opts, Acc) when Opts#opts.comments == true ->
+zero(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts), Acc) ->
     maybe_comment(Rest, fun(Resume) -> zero(Resume, Stack, Callbacks, Opts, Acc) end);
 zero(<<>>, Stack, Callbacks, Opts, Acc) ->
     fun(<<>>) -> maybe_done(<<>>, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts)
@@ -290,7 +303,7 @@ integer(<<$E, Rest/binary>>, Stack, Callbacks, Opts, Acc) ->
     e(Rest, Stack, Callbacks, Opts, "e" ++ Acc);
 integer(<<S, Rest/binary>>, Stack, Callbacks, Opts, Acc) when ?is_whitespace(S) ->
     maybe_done(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts);
-integer(<<?solidus, Rest/binary>>, Stack, Callbacks, Opts, Acc) when Opts#opts.comments == true ->
+integer(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts), Acc) ->
     maybe_comment(Rest, fun(Resume) -> integer(Resume, Stack, Callbacks, Opts, Acc) end);
 integer(<<>>, Stack, Callbacks, Opts, Acc) ->
     fun(<<>>) -> maybe_done(<<>>, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts)
@@ -315,7 +328,7 @@ fraction(<<$E, Rest/binary>>, Stack, Callbacks, Opts, Acc) ->
     e(Rest, Stack, Callbacks, Opts, "e" ++ Acc);
 fraction(<<S, Rest/binary>>, Stack, Callbacks, Opts, Acc) when ?is_whitespace(S) ->
     maybe_done(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts);
-fraction(<<?solidus, Rest/binary>>, Stack, Callbacks, Opts, Acc) when Opts#opts.comments == true ->
+fraction(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts), Acc) ->
     maybe_comment(Rest, fun(Resume) -> fraction(Resume, Stack, Callbacks, Opts, Acc) end);
 fraction(<<>>, Stack, Callbacks, Opts, Acc) ->
     fun(<<>>) -> maybe_done(<<>>, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts)
@@ -349,7 +362,7 @@ exp(<<?comma, Rest/binary>>, [array|_] = Stack, Callbacks, Opts, Acc) ->
     value(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts);
 exp(<<?zero, Rest/binary>>, Stack, Callbacks, Opts, Acc) ->
     exp(Rest, Stack, Callbacks, Opts, [?zero] ++ Acc);
-exp(<<?solidus, Rest/binary>>, Stack, Callbacks, Opts, Acc) when Opts#opts.comments == true ->
+exp(<<?solidus, Rest/binary>>, Stack, Callbacks, ?comments_true(Opts), Acc) ->
     maybe_comment(Rest, fun(Resume) -> exp(Resume, Stack, Callbacks, Opts, Acc) end);
 exp(<<S, Rest/binary>>, Stack, Callbacks, Opts, Acc) when ?is_whitespace(S) ->
     maybe_done(Rest, Stack, fold({number, lists:reverse(Acc)}, Callbacks), Opts);
diff --git a/test/cases/unicode_unconverted.test b/test/cases/unicode_unconverted.test
index c70dd06..5525b73 100644
--- a/test/cases/unicode_unconverted.test
+++ b/test/cases/unicode_unconverted.test
@@ -1 +1,2 @@
-[start_array, {string, "arabic letter alef: "}, {string, "\\u0627"}, end_array].
\ No newline at end of file
+[start_array, {string, "arabic letter alef: "}, {string, "\\u0627"}, end_array].
+[{escaped_unicode, ascii}].
\ No newline at end of file