stdlib: Add pretty-printing of exact map types

2 files changed, 44 insertions, 5 deletions

diff --git a/lib/stdlib/src/erl_pp.erl b/lib/stdlib/src/erl_pp.erl
index c5177aca90..ca764675fc 100644
--- a/lib/stdlib/src/erl_pp.erl
+++ b/lib/stdlib/src/erl_pp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -344,11 +344,31 @@ binary_type(I1, I2) ->
 map_type(Fs) ->
     {first,[$#],map_pair_types(Fs)}.
 
-map_pair_types(Fs) ->
+map_pair_types(Fs0) ->
+    Fs = replace_any_map(Fs0),
     tuple_type(Fs, fun map_pair_type/2).
 
+replace_any_map([{type,Line,map_field_assoc,[KType,VType]}]=Fs) ->
+    IsAny = fun({type,_,any,[]}) -> true;
+    %%         ({var,_,'_'}) -> true;
+               (_) -> false
+            end,
+    case IsAny(KType) andalso IsAny(VType) of
+        true ->
+            [{type,Line,map_field_assoc,any}];
+        false ->
+            Fs
+    end;
+replace_any_map([F|Fs]) ->
+    [F|replace_any_map(Fs)];
+replace_any_map([]) -> [].
+
+map_pair_type({type,_Line,map_field_assoc,any}, _Prec) ->
+    leaf("...");
 map_pair_type({type,_Line,map_field_assoc,[KType,VType]}, Prec) ->
-    {list,[{cstep,[ltype(KType, Prec),leaf(" =>")],ltype(VType, Prec)}]}.
+    {list,[{cstep,[ltype(KType, Prec),leaf(" =>")],ltype(VType, Prec)}]};
+map_pair_type({type,_Line,map_field_exact,[KType,VType]}, Prec) ->
+    {list,[{cstep,[ltype(KType, Prec),leaf(" :=")],ltype(VType, Prec)}]}.
 
 record_type(Name, Fields) ->
     {first,[record_name(Name)],field_types(Fields)}.
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index 6dc285e448..a48ba7b5b7 100644
--- a/lib/stdlib/test/erl_pp_SUITE.erl
+++ b/lib/stdlib/test/erl_pp_SUITE.erl
@@ -50,7 +50,7 @@
 
 	  otp_6321/1, otp_6911/1, otp_6914/1, otp_8150/1, otp_8238/1,
 	  otp_8473/1, otp_8522/1, otp_8567/1, otp_8664/1, otp_9147/1,
-          otp_10302/1, otp_10820/1, otp_11100/1, otp_11861/1]).
+          otp_10302/1, otp_10820/1, otp_11100/1, otp_11861/1, pr_1014/1]).
 
 %% Internal export.
 -export([ehook/6]).
@@ -79,7 +79,7 @@ groups() ->
      {tickets, [],
       [otp_6321, otp_6911, otp_6914, otp_8150, otp_8238,
        otp_8473, otp_8522, otp_8567, otp_8664, otp_9147,
-       otp_10302, otp_10820, otp_11100, otp_11861]}].
+       otp_10302, otp_10820, otp_11100, otp_11861, pr_1014]}].
 
 init_per_suite(Config) ->
     Config.
@@ -902,6 +902,7 @@ maps_syntax(Config) when is_list(Config) ->
           "-compile(export_all).\n"
           "-type t1() :: map().\n"
           "-type t2() :: #{ atom() => integer(), atom() => float() }.\n"
+          "-type t3() :: #{ atom() := integer(), atom() := float() }.\n"
           "-type u() :: #{a => (I :: integer()) | (A :: atom()),\n"
           "               (X :: atom()) | (Y :: atom()) =>\n"
           "                   (I :: integer()) | (A :: atom())}.\n"
@@ -1106,6 +1107,24 @@ otp_11861(Config) when is_list(Config) ->
 pf(Form) ->
     lists:flatten(erl_pp:form(Form, none)).
 
+pr_1014(Config) ->
+    ok = pp_forms(<<"-type t() :: #{_ => _}. ">>),
+    ok = pp_forms(<<"-type t() :: #{any() => _}. ">>),
+    ok = pp_forms(<<"-type t() :: #{_ => any()}. ">>),
+    ok = pp_forms(<<"-type t() :: #{any() => any()}. ">>),
+    ok = pp_forms(<<"-type t() :: #{...}. ">>),
+    ok = pp_forms(<<"-type t() :: #{atom() := integer(), ...}. ">>),
+
+    FileName = filename('pr_1014.erl', Config),
+    C = <<"-module pr_1014.\n"
+          "-compile export_all.\n"
+          "-type m() :: #{..., a := integer()}.\n">>,
+    ok = file:write_file(FileName, C),
+    {error,[{_,[{3,erl_parse,["syntax error before: ","','"]}]}],_} =
+        compile:file(FileName, [return]),
+
+    ok.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 compile(Config, Tests) ->