From 86333b8e7f90485e71b9914e5acb35a9e644c354 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Tue, 25 May 2010 22:23:06 -0700 Subject: [PATCH] did you know the module definition must be the first non-whitespace, non-comment line in a module? i did not --- examples/jsx_parser.erl | 3 +-- examples/jsx_prettify.erl | 4 ++-- examples/jsx_stream_parser.erl | 4 ++-- src/jsx.erl | 3 +-- src/jsx_decoder.erl | 3 +-- test/jsx_test.erl | 9 +++++---- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/examples/jsx_parser.erl b/examples/jsx_parser.erl index 836a054..2f47637 100644 --- a/examples/jsx_parser.erl +++ b/examples/jsx_parser.erl @@ -20,10 +20,9 @@ %% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN %% THE SOFTWARE. --author("alisdairsullivan@yahoo.ca"). - -module(jsx_parser). +-author("alisdairsullivan@yahoo.ca"). -export([decode/1, event/2]). -export([literal/1, string/1, number/1]). diff --git a/examples/jsx_prettify.erl b/examples/jsx_prettify.erl index 445b4c3..da6c97b 100644 --- a/examples/jsx_prettify.erl +++ b/examples/jsx_prettify.erl @@ -20,10 +20,10 @@ %% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN %% THE SOFTWARE. --author("alisdairsullivan@yahoo.ca"). - -module(jsx_prettify). +-author("alisdairsullivan@yahoo.ca"). + -export([pretty/2, jsx_event/2]). diff --git a/examples/jsx_stream_parser.erl b/examples/jsx_stream_parser.erl index fb1aaf5..60fc96d 100644 --- a/examples/jsx_stream_parser.erl +++ b/examples/jsx_stream_parser.erl @@ -20,10 +20,9 @@ %% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN %% THE SOFTWARE. --author("alisdairsullivan@yahoo.ca"). - -module(jsx_stream_parser). +-author("alisdairsullivan@yahoo.ca"). -export([decoder/1, event/2]). @@ -35,6 +34,7 @@ decoder(Opts) -> catch throw:{ok, Result} -> Result ; throw:not_found -> not_found + ; _:_ -> throw(badarg) end end. diff --git a/src/jsx.erl b/src/jsx.erl index cefc52a..a965f45 100644 --- a/src/jsx.erl +++ b/src/jsx.erl @@ -20,10 +20,9 @@ %% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN %% THE SOFTWARE. --author("alisdairsullivan@yahoo.ca"). - -module(jsx). +-author("alisdairsullivan@yahoo.ca"). -export([decoder/0, decoder/2, tail_clean/1]). diff --git a/src/jsx_decoder.erl b/src/jsx_decoder.erl index 9b7be53..1a18dab 100644 --- a/src/jsx_decoder.erl +++ b/src/jsx_decoder.erl @@ -20,10 +20,9 @@ %% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN %% THE SOFTWARE. --author("alisdairsullivan@yahoo.ca"). - -module(jsx_decoder). +-author("alisdairsullivan@yahoo.ca"). -export([start/4]). diff --git a/test/jsx_test.erl b/test/jsx_test.erl index 266778a..432e146 100644 --- a/test/jsx_test.erl +++ b/test/jsx_test.erl @@ -20,10 +20,9 @@ %% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN %% THE SOFTWARE. --author("alisdairsullivan@yahoo.ca"). - -module(jsx_test). +-author("alisdairsullivan@yahoo.ca"). -export([test/1]). @@ -62,7 +61,8 @@ test_body(TestSpec, Dir) -> end. incremental_decode(F, <<>>) -> - {Result, _} = F(<<>>), + {Result, Rest} = F(<<>>), + true = tail_clean(Rest), Result; incremental_decode(F, <>) -> case F(<>) of @@ -77,7 +77,8 @@ decode(F, JSON) -> G when is_function(G) -> {Result, <<>>} = G(<<>>), Result - ; {Result, _} -> + ; {Result, Rest} -> + true = tail_clean(Rest), Result end. \ No newline at end of file