aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-10-01 14:29:44 +0200
committerBjörn-Egil Dahlberg <[email protected]>2014-10-01 14:29:44 +0200
commit56dcaabbde116e140d5bbb66ed37ca96c0c00b5b (patch)
tree810dd49f53dc1cf8e55e7a425db5f76a68d6a455
parentc8f2c6db648cc3fba41ccdfe2db4819bf5ce0872 (diff)
parente2db6bb0e74cd0871fe18f1c23cbb5c5e4cf8d2b (diff)
downloadotp-56dcaabbde116e140d5bbb66ed37ca96c0c00b5b.tar.gz
otp-56dcaabbde116e140d5bbb66ed37ca96c0c00b5b.tar.bz2
otp-56dcaabbde116e140d5bbb66ed37ca96c0c00b5b.zip
Merge branch 'maint'
Conflicts: lib/stdlib/src/erl_pp.erl
-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 004aae5330..17a758ff58 100644
--- a/lib/stdlib/src/erl_pp.erl
+++ b/lib/stdlib/src/erl_pp.erl
@@ -311,7 +311,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)}};