diff options
| author | Hans Bolinder <[email protected]> | 2012-07-04 12:52:15 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2012-08-21 10:30:26 +0200 |
| commit | 53adc16177c9c8029a5e3348f0542b42af15d3ab (patch) | |
| tree | a27d0f6476413086e235ad0078fececa89d83a8a /lib/dialyzer/src/dialyzer_dataflow.erl | |
| parent | 73f042d16fc016fa6c1c3bded1b3333707fc668a (diff) | |
| download | otp-53adc16177c9c8029a5e3348f0542b42af15d3ab.tar.gz otp-53adc16177c9c8029a5e3348f0542b42af15d3ab.tar.bz2 otp-53adc16177c9c8029a5e3348f0542b42af15d3ab.zip | |
Fix a bug in dialyzer_dataflow
Diffstat (limited to 'lib/dialyzer/src/dialyzer_dataflow.erl')
| -rw-r--r-- | lib/dialyzer/src/dialyzer_dataflow.erl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl index cb376daf68..7131633da1 100644 --- a/lib/dialyzer/src/dialyzer_dataflow.erl +++ b/lib/dialyzer/src/dialyzer_dataflow.erl @@ -2468,14 +2468,18 @@ join_maps(Maps, MapOut) -> Keys = ordsets:from_list(dict:fetch_keys(Dict) ++ dict:fetch_keys(Subst)), join_maps(Keys, Maps, MapOut). -join_maps([Key|Left], Maps, MapOut) -> +join_maps(Keys, Maps, MapOut) -> + KTs = join_maps_collect(Keys, Maps, MapOut), + lists:foldl(fun({K, T}, M) -> enter_type(K, T, M) end, MapOut, KTs). + +join_maps_collect([Key|Left], Maps, MapOut) -> Type = join_maps_one_key(Maps, Key, t_none()), case t_is_equal(lookup_type(Key, MapOut), Type) of - true -> join_maps(Left, Maps, MapOut); - false -> join_maps(Left, Maps, enter_type(Key, Type, MapOut)) + true -> join_maps_collect(Left, Maps, MapOut); + false -> [{Key, Type} | join_maps_collect(Left, Maps, MapOut)] end; -join_maps([], _Maps, MapOut) -> - MapOut. +join_maps_collect([], _Maps, _MapOut) -> + []. join_maps_one_key([Map|Left], Key, AccType) -> case t_is_any(AccType) of |