aboutsummaryrefslogtreecommitdiffstats
path: root/lib/dialyzer/src/dialyzer_plt.erl
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2014-04-28 12:05:38 +0200
committerHans Bolinder <[email protected]>2014-04-28 12:05:38 +0200
commit683a293321b42ff6159637b2e0171c397db9a872 (patch)
treeb7414677fed503f2db33adbc47b1cb44a8e6f23b /lib/dialyzer/src/dialyzer_plt.erl
parent3be1dc100140139b2542cd327cf4f8453d43aca1 (diff)
parenteafe7f889a4ff60d9e3155518bda095740efe143 (diff)
downloadotp-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/dialyzer/src/dialyzer_plt.erl')
-rw-r--r--lib/dialyzer/src/dialyzer_plt.erl8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/dialyzer/src/dialyzer_plt.erl b/lib/dialyzer/src/dialyzer_plt.erl
index 63798f44b1..7c970daf41 100644
--- a/lib/dialyzer/src/dialyzer_plt.erl
+++ b/lib/dialyzer/src/dialyzer_plt.erl
@@ -158,9 +158,7 @@ lookup_contract(#mini_plt{contracts = ETSContracts},
ets_table_lookup(ETSContracts, MFA).
-spec lookup_callbacks(plt(), module()) ->
- 'none' | {'value', [{mfa(), {{Filename::string(),
- Line::pos_integer()},
- #contract{}}}]}.
+ 'none' | {'value', [{mfa(), dialyzer_contracts:file_contract()}]}.
lookup_callbacks(#mini_plt{callbacks = ETSCallbacks}, Mod) when is_atom(Mod) ->
ets_table_lookup(ETSCallbacks, Mod).
@@ -618,9 +616,7 @@ table_insert_list(Plt, [{Key, Val}|Left]) ->
table_insert_list(Plt, []) ->
Plt.
-table_insert(Plt, Key, {_Ret, _Arg} = Obj) ->
- dict:store(Key, Obj, Plt);
-table_insert(Plt, Key, #contract{} = C) ->
+table_insert(Plt, Key, {_File, #contract{}, _Xtra} = C) ->
dict:store(Key, C, Plt).
table_lookup(Plt, Obj) ->