aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-10-01 14:27:00 +0200
committerBjörn-Egil Dahlberg <[email protected]>2014-10-01 14:27:00 +0200
commite2db6bb0e74cd0871fe18f1c23cbb5c5e4cf8d2b (patch)
tree057aa6d0d8170ef55ce638aa82825ed9be4e0171 /lib
parent49b386294e1ce7a01a8a31623a54cd13cd6acbc1 (diff)
parentfda56bc568c97a6c77092a6e8ecc4219a6fac0c0 (diff)
downloadotp-e2db6bb0e74cd0871fe18f1c23cbb5c5e4cf8d2b.tar.gz
otp-e2db6bb0e74cd0871fe18f1c23cbb5c5e4cf8d2b.tar.bz2
otp-e2db6bb0e74cd0871fe18f1c23cbb5c5e4cf8d2b.zip
Merge branch 'egil/fix-erl_pp/OTP-12190' into maint
* egil/fix-erl_pp/OTP-12190: stdlib: Handle key type expressions
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/src/erl_pp.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/erl_pp.erl b/lib/stdlib/src/erl_pp.erl
index 3dbb5ab64c..1fd6d2a8df 100644
--- a/lib/stdlib/src/erl_pp.erl
+++ b/lib/stdlib/src/erl_pp.erl
@@ -300,7 +300,7 @@ map_pair_types(Fs) ->
tuple_type(Fs, fun map_pair_type/1).
map_pair_type({type,_Line,map_field_assoc,Ktype,Vtype}) ->
- map_assoc_typed(lexpr(Ktype, options(none)), Vtype).
+ map_assoc_typed(ltype(Ktype), Vtype).
map_assoc_typed(B, {type,_,union,Ts}) ->
{first,[B,$\s],{seq,[],[],[],map_assoc_union_type(Ts)}};