diff options
| author | Marcus Arendt <[email protected]> | 2014-11-27 09:27:11 +0100 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-11-27 09:27:11 +0100 |
| commit | 469b13dfb101764a864cdc1214ccda222f344784 (patch) | |
| tree | ebeb430fab2757177207340148ce59044bd21944 /lib | |
| parent | 10dc487109c6aaf67427e1213333bec07ba3b639 (diff) | |
| parent | aca180838c407296613c944dd6cd4df3fa1fe708 (diff) | |
| download | otp-469b13dfb101764a864cdc1214ccda222f344784.tar.gz otp-469b13dfb101764a864cdc1214ccda222f344784.tar.bz2 otp-469b13dfb101764a864cdc1214ccda222f344784.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tools/src/cover.erl | 2 | ||||
| -rw-r--r-- | lib/tools/test/cover_SUITE_data/b.erl | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl index 113fa24bd5..31754015f7 100644 --- a/lib/tools/src/cover.erl +++ b/lib/tools/src/cover.erl @@ -1696,6 +1696,8 @@ fix_expr(T, Line, Bump) when is_tuple(T) -> fix_expr(E, _Line, _Bump) -> E. +fix_clauses([], _Line, _Bump) -> + []; fix_clauses(Cs, Line, Bump) -> case bumps_line(lists:last(Cs), Line) of true -> diff --git a/lib/tools/test/cover_SUITE_data/b.erl b/lib/tools/test/cover_SUITE_data/b.erl index 13f39b8cb9..0a418a58d8 100644 --- a/lib/tools/test/cover_SUITE_data/b.erl +++ b/lib/tools/test/cover_SUITE_data/b.erl @@ -1,5 +1,5 @@ -module(b). --export([start/0, loop/0]). +-export([start/0, loop/0, wait/0]). start() -> spawn(?MODULE, loop, []). @@ -12,3 +12,9 @@ loop() -> stop -> done end. + +%% This checks for a bug in expressions which have no +%% "main" clauses (only after and friends) followed by +%% a return value in the same line. +wait() -> + receive after 1000 -> done end, ok. |