diff options
author | Björn Gustavsson <[email protected]> | 2015-01-27 13:42:31 +0100 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2015-01-28 11:59:53 +0100 |
commit | 440c54f6a6b78015e8c8e0c7d16ad3cbb3d22147 (patch) | |
tree | 232502616859bd1c428c4f17cc867bc27c7faff0 /lib/compiler/src/cerl.erl | |
parent | 4a3ad317ec6ebe02ad1ecc8a4132896c333ba742 (diff) | |
download | otp-440c54f6a6b78015e8c8e0c7d16ad3cbb3d22147.tar.gz otp-440c54f6a6b78015e8c8e0c7d16ad3cbb3d22147.tar.bz2 otp-440c54f6a6b78015e8c8e0c7d16ad3cbb3d22147.zip |
core_pp: Correct printing of map literals
A map key in a pattern would be incorrectly pretty-printed.
As an example, the pattern in:
x() ->
#{ #{ a => 3 } := 42 } = X.
would be pretty-printed as:
<~{~<~{~<'a',3>}~,42>}~
instead of:
<~{~<~{::<'a',3>}~,42>}~
When this problem has been corrected, the workaround for it in
cerl:ann_c_map/3 can be removed. The workaround was not harmless,
as it would cause the following map update to incorrectly succeed:
(#{})#{a:=1}
Diffstat (limited to 'lib/compiler/src/cerl.erl')
-rw-r--r-- | lib/compiler/src/cerl.erl | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/compiler/src/cerl.erl b/lib/compiler/src/cerl.erl index 96c8e02542..705c87539e 100644 --- a/lib/compiler/src/cerl.erl +++ b/lib/compiler/src/cerl.erl @@ -1617,18 +1617,6 @@ ann_c_map(As, Es) -> -spec ann_c_map([term()], c_map() | c_literal(), [c_map_pair()]) -> c_map() | c_literal(). -ann_c_map(As,#c_literal{val=Mval}=M,Es) when is_map(Mval), map_size(Mval) =:= 0 -> - Pairs = [[Ck,Cv]||#c_map_pair{key=Ck,val=Cv}<-Es], - IsLit = lists:foldl(fun(Pair,Res) -> - Res andalso is_lit_list(Pair) - end, true, Pairs), - Fun = fun(Pair) -> [K,V] = lit_list_vals(Pair), {K,V} end, - case IsLit of - false -> - #c_map{arg=M, es=Es, anno=As }; - true -> - #c_literal{anno=As, val=maps:from_list(lists:map(Fun, Pairs))} - end; ann_c_map(As,#c_literal{val=M},Es) when is_map(M) -> fold_map_pairs(As,Es,M); ann_c_map(As,M,Es) -> |