diff options
author | Björn Gustavsson <bjorn@erlang.org> | 2015-01-29 09:40:42 +0100 |
---|---|---|
committer | Björn Gustavsson <bjorn@erlang.org> | 2015-01-29 09:40:42 +0100 |
commit | 47f77f2576ca02243ed22d9e42b09eb7415ee3a1 (patch) | |
tree | 853c99efa58482ed03182593ad3f3c5b77b6c384 /lib/compiler/src/cerl_clauses.erl | |
parent | f5aa1d9943fbf401fed9799c204e893d0d4b4644 (diff) | |
parent | 70478d290046844b504c8fe0643e499009b735b4 (diff) | |
download | otp-47f77f2576ca02243ed22d9e42b09eb7415ee3a1.tar.gz otp-47f77f2576ca02243ed22d9e42b09eb7415ee3a1.tar.bz2 otp-47f77f2576ca02243ed22d9e42b09eb7415ee3a1.zip |
Merge branch 'bjorn/compiler/map-fixes'
* bjorn/compiler/map-fixes:
cerl: Remove a clause in fold_map_pairs/3 that will never be reached
Move grouping of map constructions from v3_core to v3_kernel
core_pp: Correct printing of map literals
Strengthen and modernize compile_SUITE
core_parse: Always fold literal conses
cerl: Make sure that we preserve the invariants for maps
cerl_clauses: Fix indentation
sys_core_fold: Strengthen optimization of letrecs in effect context
Fix handling of binary map keys in comprehensions
core_lib: Teach is_var_used/2 to handle keys in map patterns
warnings_SUITE: Eliminate compiler warning for a shadowed variable
lc_SUITE: Add shadow/1
Modernize lc_SUITE
Diffstat (limited to 'lib/compiler/src/cerl_clauses.erl')
-rw-r--r-- | lib/compiler/src/cerl_clauses.erl | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/lib/compiler/src/cerl_clauses.erl b/lib/compiler/src/cerl_clauses.erl index 87bd47c08b..ef74c5b76f 100644 --- a/lib/compiler/src/cerl_clauses.erl +++ b/lib/compiler/src/cerl_clauses.erl @@ -354,29 +354,29 @@ match(P, E, Bs) -> {false, Bs} end end; - map -> - %% The most we can do is to say "definitely no match" if a - %% map pattern is matched against non-map data. - case E of - any -> - {false, Bs}; - _ -> - case type(E) of - literal -> - case is_map(concrete(E)) of - false -> - none; - true -> - {false, Bs} - end; - cons -> - none; - tuple -> - none; - _ -> - {false, Bs} - end - end; + map -> + %% The most we can do is to say "definitely no match" if a + %% map pattern is matched against non-map data. + case E of + any -> + {false, Bs}; + _ -> + case type(E) of + literal -> + case is_map(concrete(E)) of + false -> + none; + true -> + {false, Bs} + end; + cons -> + none; + tuple -> + none; + _ -> + {false, Bs} + end + end; _ -> match_1(P, E, Bs) end. |