aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-05-26 10:38:55 +0200
committerBjörn-Egil Dahlberg <[email protected]>2014-05-26 10:38:55 +0200
commit40052e19a6bbebdf1af89d19245a7abb1d32d1f8 (patch)
treeb3c64d57006db480ca08f5610f2ece3a212cf295 /lib/compiler
parent33d93dd68404d567b2dfb7a5b9ffcf5f525dcd3c (diff)
parent41fa9cf089edf3d8c0d7950d38285ebd68ec8070 (diff)
downloadotp-40052e19a6bbebdf1af89d19245a7abb1d32d1f8.tar.gz
otp-40052e19a6bbebdf1af89d19245a7abb1d32d1f8.tar.bz2
otp-40052e19a6bbebdf1af89d19245a7abb1d32d1f8.zip
Merge branch 'nox/maps-cerl-ann_make_tree' into maint
* nox/maps-cerl-ann_make_tree: Support maps in cerl:ann_make_tree/3
Diffstat (limited to 'lib/compiler')
-rw-r--r--lib/compiler/src/cerl.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/compiler/src/cerl.erl b/lib/compiler/src/cerl.erl
index 54eac20ac4..b7e1f0b70b 100644
--- a/lib/compiler/src/cerl.erl
+++ b/lib/compiler/src/cerl.erl
@@ -4245,6 +4245,9 @@ ann_make_tree(As, bitstr, [[V],[S],[U],[T],[Fs]]) ->
ann_c_bitstr(As, V, S, U, T, Fs);
ann_make_tree(As, cons, [[H], [T]]) -> ann_c_cons(As, H, T);
ann_make_tree(As, tuple, [Es]) -> ann_c_tuple(As, Es);
+ann_make_tree(As, map, [Es]) -> ann_c_map(As, Es);
+ann_make_tree(As, map, [[A], Es]) -> ann_c_map(As, A, Es);
+ann_make_tree(As, map_pair, [[Op], [K], [V]]) -> ann_c_map_pair(As, Op, K, V);
ann_make_tree(As, 'let', [Vs, [A], [B]]) -> ann_c_let(As, Vs, A, B);
ann_make_tree(As, seq, [[A], [B]]) -> ann_c_seq(As, A, B);
ann_make_tree(As, apply, [[Op], Es]) -> ann_c_apply(As, Op, Es);