diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-05-12 16:37:22 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-05-12 16:37:22 +0200 |
| commit | 316cdd16e221870397ee9571609de09314749927 (patch) | |
| tree | 21dd3cf2650993ec9b4373daf0f4f003092dcc38 /lib/debugger/src | |
| parent | e3507ba17f6cb0873d23899e686443b7b8b0f2c7 (diff) | |
| parent | c563f5866b42a3479050241284fffc1245aebe7d (diff) | |
| download | otp-316cdd16e221870397ee9571609de09314749927.tar.gz otp-316cdd16e221870397ee9571609de09314749927.tar.bz2 otp-316cdd16e221870397ee9571609de09314749927.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/debugger/src')
| -rw-r--r-- | lib/debugger/src/dbg_ieval.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl index 0653ce4c00..77297de0f3 100644 --- a/lib/debugger/src/dbg_ieval.erl +++ b/lib/debugger/src/dbg_ieval.erl @@ -665,11 +665,11 @@ expr({map,Line,E0,Fs0}, Bs0, Ieval0) -> {value,E,Bs1} = expr(E0, Bs0, Ieval), case E of #{} -> - {Fs,Bs2} = eval_map_fields(Fs0, Bs1, Ieval), + {Fs,Bs2} = eval_map_fields(Fs0, Bs0, Ieval), Value = lists:foldl(fun ({map_assoc,K,V}, Mi) -> maps:put(K,V,Mi); ({map_exact,K,V}, Mi) -> maps:update(K,V,Mi) end, E, Fs), - {value,Value,Bs2}; + {value,Value,merge_bindings(Bs2, Bs1, Ieval)}; _ -> exception(error, {badarg,E}, Bs1, Ieval) end; |