Merge branch 'master' into stricter_parsing

.gitignore

@@ -0,0 +1,3 @@
+ebin/
+deps/
+*.orig

rebar.config

@@ -4,3 +4,20 @@
 
 %% uncomment to get verbose output from test suite
 %% {eunit_opts, [verbose]}.
+
+{erl_opts, [{i, "src"}, {src_dirs, ["src"]},
+            warn_unused_vars,
+            warn_export_all,
+            warn_shadow_vars,
+            warn_unused_import,
+            warn_unused_function,
+            warn_bif_clash,
+            warn_unused_record,
+            warn_deprecated_function,
+            warn_obsolete_guard,
+            strict_validation,
+            warn_export_vars,
+            warn_exported_vars,
+            debug_info]}.
+{dialyzer_opts, [{warnings, [unmatched_returns, error_handling, race_conditions, behaviours]}]}.
+{xref_checks, [undefined_function_calls]}.

src/jsx.erl

@@ -76,7 +76,7 @@ decoder(OptsList) ->
 json_to_term(JSON) ->
     try json_to_term(JSON, [])
     %% rethrow exception so internals aren't confusingly exposed to users
-    catch error:badarg -> erlang:error(badarg,[JSON])
+    catch error:badarg -> erlang:error(badarg, [JSON])
     end.
     
 
@@ -91,7 +91,7 @@ json_to_term(JSON, Opts) ->
 term_to_json(JSON) ->
     try term_to_json(JSON, [])
     %% rethrow exception so internals aren't confusingly exposed to users
-    catch error:badarg -> erlang:error(badarg,[JSON])
+    catch error:badarg -> erlang:error(badarg, [JSON])
     end.
 
 
@@ -100,7 +100,7 @@ term_to_json(JSON) ->
 term_to_json(JSON, Opts) ->
     try jsx_eep0018:term_to_json(JSON, Opts)
     %% rethrow exception so internals aren't confusingly exposed to users
-    catch error:badarg -> erlang:error(badarg,[JSON,Opts])
+    catch error:badarg -> erlang:error(badarg, [JSON, Opts])
     end.
 
 
@@ -275,4 +275,4 @@ multi_test_result() ->
 
 
     
--endif.
+-endif.