From 23e728cd0f68de11feca27358bedb0a6b71e4715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= Date: Thu, 16 Jan 2014 16:19:45 +0100 Subject: dialyzer: Reflect map_pair core changes in dialyzer --- lib/dialyzer/src/dialyzer_dataflow.erl | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'lib/dialyzer/src/dialyzer_dataflow.erl') diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl index 4d614320c2..239df1b8bd 100644 --- a/lib/dialyzer/src/dialyzer_dataflow.erl +++ b/lib/dialyzer/src/dialyzer_dataflow.erl @@ -309,10 +309,8 @@ traverse(Tree, Map, State) -> handle_tuple(Tree, Map, State); map -> handle_map(Tree, Map, State); - map_pair_assoc -> - handle_map_pair_assoc(Tree, Map, State); - map_pair_exact -> - handle_map_pair_exact(Tree, Map, State); + map_pair -> + handle_map_pair(Tree, Map, State); values -> Elements = cerl:values_es(Tree), {State1, Map1, EsType} = traverse_list(Elements, Map, State), @@ -1068,14 +1066,10 @@ handle_map(Tree,Map,State) -> {State1, Map1, TypePairs} = traverse_list(Pairs,Map,State), {State1, Map1, t_map(TypePairs)}. -handle_map_pair_assoc(Tree,Map,State) -> - Elements = cerl:map_pair_assoc_es(Tree), - {State1, Map1, [K,V]} = traverse_list(Elements,Map,State), - {State1, Map1, {K,V}}. - -handle_map_pair_exact(Tree,Map,State) -> - Elements = cerl:map_pair_exact_es(Tree), - {State1, Map1, [K,V]} = traverse_list(Elements,Map,State), +handle_map_pair(Tree,Map,State) -> + Key = cerl:map_pair_key(Tree), + Val = cerl:map_pair_val(Tree), + {State1, Map1, [K,V]} = traverse_list([Key,Val],Map,State), {State1, Map1, {K,V}}. %%---------------------------------------- -- cgit v1.2.3