aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src/v3_life.erl
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-03-26 14:19:55 +0100
committerBjörn-Egil Dahlberg <[email protected]>2014-03-26 14:19:55 +0100
commitc5e3c774bd12cc15a04dd9880cad6eb66d2541be (patch)
treef2794368409e9af8854cd6a87c5c1e90c64ab97b /lib/compiler/src/v3_life.erl
parentdbd429512ba3fe2db4dcca1a8d9357d173718e63 (diff)
parent2d95280094fa6429081a9b9df3c73705819e2461 (diff)
downloadotp-c5e3c774bd12cc15a04dd9880cad6eb66d2541be.tar.gz
otp-c5e3c774bd12cc15a04dd9880cad6eb66d2541be.tar.bz2
otp-c5e3c774bd12cc15a04dd9880cad6eb66d2541be.zip
Merge branch 'egil/maps-compiler-coverage'
* egil/maps-compiler-coverage: compiler: Do not evaluate map expressions with bad keys compiler: Throw 'nomatch' on matching with bad binary keys compiler: Variable keys are not allowed in Maps compiler: Strengthen Maps warnings tests compiler: map_pair cannot be a type clause in v3_life compiler: Remove redudant code in v3_codegen compiler: Test deep map structure compiler: Remove redundant clause in v3_codegen compiler: Cover #{ [] => Var } in testcase
Diffstat (limited to 'lib/compiler/src/v3_life.erl')
-rw-r--r--lib/compiler/src/v3_life.erl3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/compiler/src/v3_life.erl b/lib/compiler/src/v3_life.erl
index c4f54a7970..cd4b5fd674 100644
--- a/lib/compiler/src/v3_life.erl
+++ b/lib/compiler/src/v3_life.erl
@@ -324,8 +324,7 @@ type(k_binary) -> binary;
type(k_bin_seg) -> bin_seg;
type(k_bin_int) -> bin_int;
type(k_bin_end) -> bin_end;
-type(k_map) -> map;
-type(k_map_pair) -> map_pair.
+type(k_map) -> map.
%% variable(Klit) -> Lit.
%% var_list([Klit]) -> [Lit].