aboutsummaryrefslogtreecommitdiffstats
path: root/lib/hipe
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-01-18 10:10:20 +0100
committerBjörn-Egil Dahlberg <[email protected]>2016-01-18 10:10:20 +0100
commitd1db55be9f84331e2ac4ddf3a2c4e2a84a1c4f14 (patch)
tree060134ff66a31612c6cfb3e7fa277d64780fd607 /lib/hipe
parent5c41dbbbb2b1d57f672899f0b13fe0d71686ceb9 (diff)
parent427c9f4f7777dd00e0a03a42b9834a4d669305b6 (diff)
downloadotp-d1db55be9f84331e2ac4ddf3a2c4e2a84a1c4f14.tar.gz
otp-d1db55be9f84331e2ac4ddf3a2c4e2a84a1c4f14.tar.bz2
otp-d1db55be9f84331e2ac4ddf3a2c4e2a84a1c4f14.zip
Merge branch 'maint'
Diffstat (limited to 'lib/hipe')
-rw-r--r--lib/hipe/cerl/cerl_prettypr.erl18
1 files changed, 6 insertions, 12 deletions
diff --git a/lib/hipe/cerl/cerl_prettypr.erl b/lib/hipe/cerl/cerl_prettypr.erl
index 7e8b7f60bd..1a6e6999fe 100644
--- a/lib/hipe/cerl/cerl_prettypr.erl
+++ b/lib/hipe/cerl/cerl_prettypr.erl
@@ -64,8 +64,8 @@
seq_arg/1, seq_body/1, string_lit/1, try_arg/1,
try_body/1, try_vars/1, try_evars/1, try_handler/1,
tuple_es/1, type/1, values_es/1, var_name/1,
- c_map/1, map_arg/1, map_es/1, is_c_map_empty/1,
- c_map_pair/2, map_pair_key/1, map_pair_val/1, map_pair_op/1
+ map_arg/1, map_es/1, is_c_map_empty/1,
+ map_pair_key/1, map_pair_val/1, map_pair_op/1
]).
-define(PAPER, 76).
@@ -499,12 +499,8 @@ lay_literal(Node, Ctxt) ->
lay_cons(Node, Ctxt);
V when is_tuple(V) ->
lay_tuple(Node, Ctxt);
- M when is_map(M), map_size(M) =:= 0 ->
- text("~{}~");
M when is_map(M) ->
- lay_map(c_map([c_map_pair(abstract(K),abstract(V))
- || {K,V} <- maps:to_list(M)]),
- Ctxt)
+ lay_map(Node, Ctxt)
end.
lay_var(Node, Ctxt) ->
@@ -627,12 +623,10 @@ lay_map_pair(Node, Ctxt) ->
K = map_pair_key(Node),
V = map_pair_val(Node),
OpTxt = case concrete(map_pair_op(Node)) of
- assoc -> "::<";
- exact -> "~<"
+ assoc -> "=>";
+ exact -> ":="
end,
- beside(floating(text(OpTxt)),
- beside(lay(K,Ctxt),beside(floating(text(",")), beside(lay(V,Ctxt),
- floating(text(">")))))).
+ beside(lay(K,Ctxt),beside(floating(text(OpTxt)),lay(V,Ctxt))).
lay_let(Node, Ctxt) ->
V = lay_value_list(let_vars(Node), Ctxt),