diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-03-04 12:30:48 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-03-04 12:30:48 +0100 |
| commit | 2e5457c71e7c125b3d603e04575648b7afa1b54a (patch) | |
| tree | c0ab3322d915664322b458e25683cc27fb235357 /lib/compiler/src | |
| parent | 77b1aeaa1a663056d228a8d65cdf1daee5bfe51d (diff) | |
| parent | 974de0f23a9f818a2c40cb47d24ebf8d8f8b01d7 (diff) | |
| download | otp-2e5457c71e7c125b3d603e04575648b7afa1b54a.tar.gz otp-2e5457c71e7c125b3d603e04575648b7afa1b54a.tar.bz2 otp-2e5457c71e7c125b3d603e04575648b7afa1b54a.zip | |
Merge branch 'nox/maps-expand-update'
* nox/maps-expand-update:
Fix expansion of map update arguments
Diffstat (limited to 'lib/compiler/src')
| -rw-r--r-- | lib/compiler/src/sys_pre_expand.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/compiler/src/sys_pre_expand.erl b/lib/compiler/src/sys_pre_expand.erl index 9998043013..91a46a20fe 100644 --- a/lib/compiler/src/sys_pre_expand.erl +++ b/lib/compiler/src/sys_pre_expand.erl @@ -331,9 +331,10 @@ expr({tuple,Line,Es0}, St0) -> expr({map,Line,Es0}, St0) -> {Es1,St1} = expr_list(Es0, St0), {{map,Line,Es1},St1}; -expr({map,Line,Var,Es0}, St0) -> - {Es1,St1} = expr_list(Es0, St0), - {{map,Line,Var,Es1},St1}; +expr({map,Line,E0,Es0}, St0) -> + {E1,St1} = expr(E0, St0), + {Es1,St2} = expr_list(Es0, St1), + {{map,Line,E1,Es1},St2}; expr({map_field_assoc,Line,K0,V0}, St0) -> {K,St1} = expr(K0, St0), {V,St2} = expr(V0, St1), |