diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-02-10 15:16:11 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-02-10 15:16:11 +0100 |
| commit | edb90b1c1e6dc290727a516f4a00e939479aff98 (patch) | |
| tree | 03b8073ebf664913f95e8fb73dc261d700c1d987 /erts | |
| parent | 1918d8fead3a8d4bfd177f68806db539911ad808 (diff) | |
| parent | c8741b7c62db3abc9dfde0fa8c7cf3d099adb347 (diff) | |
| download | otp-edb90b1c1e6dc290727a516f4a00e939479aff98.tar.gz otp-edb90b1c1e6dc290727a516f4a00e939479aff98.tar.bz2 otp-edb90b1c1e6dc290727a516f4a00e939479aff98.zip | |
Merge branch 'egil/compiler/maps-fix-codegen'
* egil/compiler/maps-fix-codegen:
compiler: Fix codegen multiple updates for Maps
erts,compiler: Correct and amend tests for Maps
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/test/map_SUITE.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/erts/emulator/test/map_SUITE.erl b/erts/emulator/test/map_SUITE.erl index 31c1486f1c..8cc5621181 100644 --- a/erts/emulator/test/map_SUITE.erl +++ b/erts/emulator/test/map_SUITE.erl @@ -254,7 +254,15 @@ t_update_exact(Config) when is_list(Config) -> M2 = M0#{3.0:=new}, #{1:=a,2:=b,3.0:=new,4:=d,5:=e} = M2, M2 = M0#{3.0=>wrong,3.0:=new}, - M2 = M0#{3=>wrong,3.0:=new}, + true = M2 =/= M0#{3=>right,3.0:=new}, + #{ 3 := right, 3.0 := new } = M0#{3=>right,3.0:=new}, + + M3 = id(#{ 1 => val}), + #{1 := update2,1.0 := new_val4} = M3#{ + 1.0 => new_val1, 1 := update, 1=> update3, + 1 := update2, 1.0 := new_val2, 1.0 => new_val3, + 1.0 => new_val4 }, + %% Errors cases. {'EXIT',{badarg,_}} = (catch M0#{nonexisting:=val}), |