diff options
| author | Micael Karlberg <[email protected]> | 2014-01-28 12:28:13 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2014-01-28 12:28:13 +0100 |
| commit | 4343ee93e8071a705a860a25601fbfe67e4b0cd0 (patch) | |
| tree | f748babf29a9f222719ea983d0adf5b7b0e0b7f3 /lib/stdlib/src | |
| parent | 2db1711130ec5d22c3d76c95fa14888d8868a5bd (diff) | |
| parent | 9b4c2ce1049d668617579525d9beb3061061b8de (diff) | |
| download | otp-4343ee93e8071a705a860a25601fbfe67e4b0cd0.tar.gz otp-4343ee93e8071a705a860a25601fbfe67e4b0cd0.tar.bz2 otp-4343ee93e8071a705a860a25601fbfe67e4b0cd0.zip | |
Merge branch 'master' of super:otp
Diffstat (limited to 'lib/stdlib/src')
| -rw-r--r-- | lib/stdlib/src/erl_lint.erl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl index cf01e1f8cf..f0d50df4c7 100644 --- a/lib/stdlib/src/erl_lint.erl +++ b/lib/stdlib/src/erl_lint.erl @@ -844,8 +844,9 @@ behaviour_callbacks(Line, B, St0) -> {[], St1} end. -behaviour_missing_callbacks([{{Line,B},Bfs}|T], #lint{exports=Exp}=St0) -> - Missing = ordsets:subtract(ordsets:from_list(Bfs), gb_sets:to_list(Exp)), +behaviour_missing_callbacks([{{Line,B},Bfs}|T], St0) -> + Exports = gb_sets:to_list(exports(St0)), + Missing = ordsets:subtract(ordsets:from_list(Bfs), Exports), St = foldl(fun (F, S0) -> add_warning(Line, {undefined_behaviour_func,F,B}, S0) end, St0, Missing), @@ -1149,6 +1150,14 @@ export_type(Line, ETs, #lint{usage = Usage, exp_types = ETs0} = St0) -> add_error(Line, {bad_export_type, ETs}, St0) end. +-spec exports(lint_state()) -> gb_set(). + +exports(#lint{compile = Opts, defined = Defs, exports = Es}) -> + case lists:member(export_all, Opts) of + true -> Defs; + false -> Es + end. + -type import() :: {module(), [fa()]} | module(). -spec import(line(), import(), lint_state()) -> lint_state(). |