diff options
| author | Hans Bolinder <hasse@erlang.org> | 2014-04-28 12:05:38 +0200 |
|---|---|---|
| committer | Hans Bolinder <hasse@erlang.org> | 2014-04-28 12:05:38 +0200 |
| commit | 683a293321b42ff6159637b2e0171c397db9a872 (patch) | |
| tree | b7414677fed503f2db33adbc47b1cb44a8e6f23b /lib/typer | |
| parent | 3be1dc100140139b2542cd327cf4f8453d43aca1 (diff) | |
| parent | eafe7f889a4ff60d9e3155518bda095740efe143 (diff) | |
| download | otp-683a293321b42ff6159637b2e0171c397db9a872.tar.gz otp-683a293321b42ff6159637b2e0171c397db9a872.tar.bz2 otp-683a293321b42ff6159637b2e0171c397db9a872.zip | |
Merge branch 'hb/optional_callbacks/OTP-11861'
* hb/optional_callbacks/OTP-11861:
[edoc] Handle optional behaviour callbacks
[syntax_tools] Let erl_syntax:concrete() accept the F/A syntax
Introduce the attribute -optional_callbacks in the context of behaviours
Diffstat (limited to 'lib/typer')
| -rw-r--r-- | lib/typer/src/typer.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/typer/src/typer.erl b/lib/typer/src/typer.erl index 572bf24ca4..cbad05081e 100644 --- a/lib/typer/src/typer.erl +++ b/lib/typer/src/typer.erl @@ -405,7 +405,7 @@ get_type({{M, F, A} = MFA, Range, Arg}, CodeServer, Records) -> case dialyzer_codeserver:lookup_mfa_contract(MFA, CodeServer) of error -> {{F, A}, {Range, Arg}}; - {ok, {_FileLine, Contract}} -> + {ok, {_FileLine, Contract, _Xtra}} -> Sig = erl_types:t_fun(Arg, Range), case dialyzer_contracts:check_contract(Contract, Sig) of ok -> {{F, A}, {contract, Contract}}; |