moves opts and parse_opts to external header

src/jsx_decoder.hrl

@@ -26,6 +26,8 @@
 %%   this file should take that into account
 
 
+-export([decoder/1]).
+
 %% exported solely to facilitate stupid trick i shouldn't be using
 -export([start/4,
     maybe_done/4,
@@ -63,22 +65,11 @@
 ]).
 
 
-
-%% opts record for decoder
--record(opts, {
-    multi_term = false,
-    loose_unicode = false,
-    encoding = auto,
-    escape_forward_slash = false,   %% does nothing, used by encoder
-    iterate = false
-}).
+-include("jsx_opts.hrl").
 
 
-
--export([decoder/1]).
 -spec decoder(OptsList::jsx_opts()) -> jsx_decoder().
 
-
 decoder(OptsList) ->
     case parse_opts(OptsList) of 
         {error, badopt} -> {error, badopt}
@@ -90,25 +81,6 @@ decoder(OptsList) ->
     end.
 
 
-
-%% converts a proplist into a tuple
-parse_opts(Opts) ->
-    parse_opts(Opts, #opts{}).
-
-parse_opts([], Opts) ->
-    Opts;
-parse_opts([multi_term|Rest], Opts) ->
-    parse_opts(Rest, Opts#opts{multi_term=true});
-parse_opts([loose_unicode|Rest], Opts) ->
-    parse_opts(Rest, Opts#opts{loose_unicode=true});
-parse_opts([iterate|Rest], Opts) ->
-    parse_opts(Rest, Opts#opts{iterate=true});
-parse_opts([{encoding, _}|Rest], Opts) ->
-    parse_opts(Rest, Opts);
-parse_opts(_, _) ->
-    {error, badarg}.
-
-
 %% whitespace
 -define(space, 16#20).
 -define(tab, 16#09).
@@ -280,11 +252,9 @@ emit([Event|Events], {State, Rest, T, Args}) ->
     emit(Events, {State, Rest, [Event] ++ T, Args}).
 
 
-
 bad_json(Stream, _) -> {error, {badjson, Stream}}.
 
 
-
 start(<<S/?utfx, Rest/binary>>, T, Stack, Opts) when ?is_whitespace(S) -> 
     start(Rest, T, Stack, Opts);
 start(<<?start_object/?utfx, Rest/binary>>, T, Stack, Opts) ->