diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-03-26 14:19:55 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-03-26 14:19:55 +0100 |
| commit | c5e3c774bd12cc15a04dd9880cad6eb66d2541be (patch) | |
| tree | f2794368409e9af8854cd6a87c5c1e90c64ab97b /lib/compiler/src/v3_kernel.erl | |
| parent | dbd429512ba3fe2db4dcca1a8d9357d173718e63 (diff) | |
| parent | 2d95280094fa6429081a9b9df3c73705819e2461 (diff) | |
| download | otp-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_kernel.erl')
| -rw-r--r-- | lib/compiler/src/v3_kernel.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/compiler/src/v3_kernel.erl b/lib/compiler/src/v3_kernel.erl index d3b785aa14..40d2f72b4c 100644 --- a/lib/compiler/src/v3_kernel.erl +++ b/lib/compiler/src/v3_kernel.erl @@ -581,8 +581,7 @@ map_key_clean(#k_literal{val=V}) -> {k_literal,V}; map_key_clean(#k_int{val=V}) -> {k_int,V}; map_key_clean(#k_float{val=V}) -> {k_float,V}; map_key_clean(#k_atom{val=V}) -> {k_atom,V}; -map_key_clean(#k_nil{}) -> k_nil; -map_key_clean(#k_var{name=V}) -> {k_var,V}. +map_key_clean(#k_nil{}) -> k_nil. %% call_type(Module, Function, Arity) -> call | bif | apply | error. |