diff options
| author | Gustav Simonsson <[email protected]> | 2012-03-15 10:31:34 +0100 |
|---|---|---|
| committer | Gustav Simonsson <[email protected]> | 2012-03-15 10:31:34 +0100 |
| commit | b99ff6a992770ea14506079fd2c656210bc912c9 (patch) | |
| tree | e9c8653c88b0502dd2246130615baa226d9ba9cc /lib/dialyzer/src/dialyzer_behaviours.erl | |
| parent | 195a9fe1a07a9aa439e6ea1cd4f7e548267253b4 (diff) | |
| parent | 3cc9dc31c5935168051286d524618b2b64795498 (diff) | |
| download | otp-b99ff6a992770ea14506079fd2c656210bc912c9.tar.gz otp-b99ff6a992770ea14506079fd2c656210bc912c9.tar.bz2 otp-b99ff6a992770ea14506079fd2c656210bc912c9.zip | |
Merge branch 'sa/dialyzer-fixes' into maint
Diffstat (limited to 'lib/dialyzer/src/dialyzer_behaviours.erl')
| -rw-r--r-- | lib/dialyzer/src/dialyzer_behaviours.erl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/dialyzer/src/dialyzer_behaviours.erl b/lib/dialyzer/src/dialyzer_behaviours.erl index e89c08df7d..fdaa8b663c 100644 --- a/lib/dialyzer/src/dialyzer_behaviours.erl +++ b/lib/dialyzer/src/dialyzer_behaviours.erl @@ -72,9 +72,11 @@ check_callbacks(Module, Attrs, Plt, Codeserver) -> %%-------------------------------------------------------------------- get_behaviours(Attrs) -> - BehaviourListsAndLine = [{cerl:concrete(L2), hd(cerl:get_ann(L2))} || - {L1, L2} <- Attrs, cerl:is_literal(L1), - cerl:is_literal(L2), cerl:concrete(L1) =:= 'behaviour'], + BehaviourListsAndLine = + [{cerl:concrete(L2), hd(cerl:get_ann(L2))} || + {L1, L2} <- Attrs, cerl:is_literal(L1), + cerl:is_literal(L2), cerl:concrete(L1) =:= 'behaviour' orelse + cerl:concrete(L1) =:= 'behavior'], Behaviours = lists:append([Behs || {Behs,_} <- BehaviourListsAndLine]), BehLines = [{B,L} || {L1,L} <- BehaviourListsAndLine, B <- L1], {Behaviours, BehLines}. @@ -239,12 +241,12 @@ translatable_behaviours(Tree) -> get_behaviour_apis(Behaviours) -> get_behaviour_apis(Behaviours, []). --spec translate_behaviour_api_call(dialyzer_races:mfa_or_funlbl(), +-spec translate_behaviour_api_call(dialyzer_callgraph:mfa_or_funlbl(), [erl_types:erl_type()], [dialyzer_races:core_vars()], module(), behaviour_api_dict()) -> - {dialyzer_races:mfa_or_funlbl(), + {dialyzer_callgraph:mfa_or_funlbl(), [erl_types:erl_type()], [dialyzer_races:core_vars()]} | 'plain_call'. |