umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

tests could fail silently when file:consult failed, fixed

Browse source
This commit is contained in:
alisdair sullivan 2011-07-31 18:43:14 -07:00
parent e90c5461e8
commit 20f9e0368d
4 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/jsx.erl
View file

@ -194,16 +194,10 @@ load_tests(Path) ->
load_tests([], _Dir, Acc) ->
lists:reverse(Acc);
load_tests([Test|Rest], Dir, Acc) ->
%% should alert about badly formed tests eventually, but for now just skip
%% over them
case file:consult(Dir ++ "/" ++ Test) of
{ok, TestSpec} ->
try
ParsedTest = parse_tests(TestSpec, Dir),
load_tests(Rest, Dir, [ParsedTest] ++ Acc)
catch _:_ ->
load_tests(Rest, Dir, Acc)
end
ParsedTest = parse_tests(TestSpec, Dir),
load_tests(Rest, Dir, [ParsedTest] ++ Acc)
; {error, _Reason} ->
load_tests(Rest, Dir, Acc)
end.

2
src/jsx_decoder.hrl
View file

@ -839,7 +839,7 @@ integer(<<?decimalpoint/?utfx, Rest/binary>>, Stack, Opts, Acc) ->
integer(<<?zero/?utfx, Rest/binary>>, Stack, Opts, Acc) ->
integer(Rest, Stack, Opts, [?zero] ++ Acc);
integer(<<S/?utfx, Rest/binary>>, Stack, Opts, Acc) when S =:= $e; S =:= $E ->
e(Rest, Stack, Opts, {lists:reverse(Acc), [], []});
e(Rest, Stack, Opts, {Acc, [], []});
integer(<<S/?utfx, Rest/binary>>, Stack, Opts, Acc) when ?is_whitespace(S) ->
{jsx, format_number(Acc), fun() ->
maybe_done(Rest, Stack, Opts)