aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/test
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2015-12-07 10:10:20 +0100
committerHans Bolinder <[email protected]>2015-12-07 10:10:20 +0100
commit6436c0d210b46b949f5e2de7ad328d3081eb3fa4 (patch)
treef505e62aac5bdc06455c5562c6336ec9b0e37540 /lib/stdlib/test
parent4dd436b2d887517d50386372946a495aed698663 (diff)
parent572bea9807504670b1eec4aab6b8ac833cd42b26 (diff)
downloadotp-6436c0d210b46b949f5e2de7ad328d3081eb3fa4.tar.gz
otp-6436c0d210b46b949f5e2de7ad328d3081eb3fa4.tar.bz2
otp-6436c0d210b46b949f5e2de7ad328d3081eb3fa4.zip
Merge branch 'maint'
* maint: doc: Fix some minor issues in Types and Function Specifications erts: Remove CDATA from The Abstract Format document erts: Correct the types section in The Abstract Format document stdlib: Correct pretty-printing of map types stdlib: Pretty-print constraints as 'V :: T' Conflicts: erts/doc/src/absform.xml
Diffstat (limited to 'lib/stdlib/test')
-rw-r--r--lib/stdlib/test/erl_pp_SUITE.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index 9bb193d865..8cdd2ceca9 100644
--- a/lib/stdlib/test/erl_pp_SUITE.erl
+++ b/lib/stdlib/test/erl_pp_SUITE.erl
@@ -962,6 +962,9 @@ maps_syntax(Config) when is_list(Config) ->
"-compile(export_all).\n"
"-type t1() :: map().\n"
"-type t2() :: #{ atom() => integer(), atom() => float() }.\n"
+ "-type u() :: #{a => (I :: integer()) | (A :: atom()),\n"
+ " (X :: atom()) | (Y :: atom()) =>\n"
+ " (I :: integer()) | (A :: atom())}.\n"
"-spec f1(t1()) -> 'true'.\n"
"f1(M) when is_map(M) -> true.\n"
"-spec f2(t2()) -> integer().\n"