diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-04-04 12:00:07 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-04-04 12:00:07 +0200 |
| commit | 89eef897c6564c72d9717228a73959339e486bdb (patch) | |
| tree | ebb39bfd3e9bbd3526b2996e36f1d57ee1f0b2c8 /lib/compiler/src/sys_pre_expand.erl | |
| parent | 76c73b9554a3d74b027bc2e1fdace7192b7a8de6 (diff) | |
| parent | e26dbc750fdd207c852bf9006668c5771f465dcf (diff) | |
| download | otp-89eef897c6564c72d9717228a73959339e486bdb.tar.gz otp-89eef897c6564c72d9717228a73959339e486bdb.tar.bz2 otp-89eef897c6564c72d9717228a73959339e486bdb.zip | |
Merge branch 'egil/maps-fix-map-key-patterns'
* egil/maps-fix-map-key-patterns:
stdlib: Fix erl_id_trans example
stdlib: Deny map keys defined as #{ .. := .. } in patterns
compiler: Fix compiling map keys in patterns from core
compiler,stdlib: Fix Map literals as keys for Maps in patterns
Diffstat (limited to 'lib/compiler/src/sys_pre_expand.erl')
| -rw-r--r-- | lib/compiler/src/sys_pre_expand.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/compiler/src/sys_pre_expand.erl b/lib/compiler/src/sys_pre_expand.erl index 91a46a20fe..761ae8409c 100644 --- a/lib/compiler/src/sys_pre_expand.erl +++ b/lib/compiler/src/sys_pre_expand.erl @@ -232,7 +232,7 @@ pattern({map,Line,Ps}, St0) -> {TPs,St1} = pattern_list(Ps, St0), {{map,Line,TPs},St1}; pattern({map_field_exact,Line,K0,V0}, St0) -> - {K,St1} = pattern(K0, St0), + {K,St1} = expr(K0, St0), {V,St2} = pattern(V0, St1), {{map_field_exact,Line,K,V},St2}; %%pattern({struct,Line,Tag,Ps}, St0) -> |