Merge branch 'maint'

2 files changed, 27 insertions, 15 deletions

diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index a626d98ee4..767b620871 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -765,6 +765,9 @@ attribute_farity({cons,L,H,T}) ->
 attribute_farity({tuple,L,Args0}) ->
     Args = attribute_farity_list(Args0),
     {tuple,L,Args};
+attribute_farity({map,L,Args0}) ->
+    Args = attribute_farity_map(Args0),
+    {map,L,Args};
 attribute_farity({op,L,'/',{atom,_,_}=Name,{integer,_,_}=Arity}) ->
     {tuple,L,[Name,Arity]};
 attribute_farity(Other) -> Other.
@@ -772,6 +775,10 @@ attribute_farity(Other) -> Other.
 attribute_farity_list(Args) ->
     [attribute_farity(A) || A <- Args].
 
+%% It is not meaningful to have farity keys.
+attribute_farity_map(Args) ->
+    [{Op,L,K,attribute_farity(V)} || {Op,L,K,V} <- Args].
+
 -spec error_bad_decl(integer(), attributes()) -> no_return().
 
 error_bad_decl(L, S) ->
@@ -966,7 +973,9 @@ abstract([H|T], L, none=E) ->
 abstract(List, L, E) when is_list(List) ->
     abstract_list(List, [], L, E);
 abstract(Tuple, L, E) when is_tuple(Tuple) ->
-    {tuple,L,abstract_tuple_list(tuple_to_list(Tuple), L, E)}.
+    {tuple,L,abstract_tuple_list(tuple_to_list(Tuple), L, E)};
+abstract(Map, L, E) when is_map(Map) ->
+    {map,L,abstract_map_fields(maps:to_list(Map),L,E)}.
 
 abstract_list([H|T], String, L, E) ->
     case is_integer(H) andalso H >= 0 andalso E(H) of
@@ -991,6 +1000,9 @@ abstract_tuple_list([H|T], L, E) ->
 abstract_tuple_list([], _L, _E) ->
     [].
 
+abstract_map_fields(Fs,L,E) ->
+    [{map_field_assoc,L,abstract(K,L,E),abstract(V,L,E)}||{K,V}<-Fs].
+
 abstract_byte(Byte, L) when is_integer(Byte) ->
     {bin_element, L, {integer, L, Byte}, default, default};
 abstract_byte(Bits, L) ->
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index 12817943d0..046b5cf330 100644
--- a/lib/stdlib/test/erl_pp_SUITE.erl
+++ b/lib/stdlib/test/erl_pp_SUITE.erl
@@ -604,20 +604,20 @@ import_export(Config) when is_list(Config) ->
 misc_attrs(suite) ->
     [];
 misc_attrs(Config) when is_list(Config) ->
-    ?line ok = pp_forms(<<"-module(m). ">>),
-    ?line ok = pp_forms(<<"-module(m, [Aafjlksfjdlsjflsdfjlsdjflkdsfjlk,"
-                          "Blsjfdlslfjsdf]). ">>),
-    ?line ok = pp_forms(<<"-export([]). ">>),
-    ?line ok = pp_forms(<<"-export([foo/2, bar/0]). ">>),
-    ?line ok = pp_forms(<<"-export([bar/0]). ">>),
-    ?line ok = pp_forms(<<"-import(lists, []). ">>),
-    ?line ok = pp_forms(<<"-import(lists, [map/2]). ">>),
-    ?line ok = pp_forms(<<"-import(lists, [map/2, foreach/2]). ">>),
-    ?line ok = pp_forms(<<"-'wild '({attr2,3}). ">>),
-    ?line ok = pp_forms(<<"-record(a, {b,c}). ">>),
-    ?line ok = pp_forms(<<"-record(' a ', {}). ">>),
-    ?line ok = pp_forms(<<"-record(' a ', {foo = foo:bar()}). ">>),
-
+    ok = pp_forms(<<"-module(m). ">>),
+    ok = pp_forms(<<"-module(m, [Aafjlksfjdlsjflsdfjlsdjflkdsfjlk,"
+                    "Blsjfdlslfjsdf]). ">>),
+    ok = pp_forms(<<"-export([]). ">>),
+    ok = pp_forms(<<"-export([foo/2, bar/0]). ">>),
+    ok = pp_forms(<<"-export([bar/0]). ">>),
+    ok = pp_forms(<<"-import(lists, []). ">>),
+    ok = pp_forms(<<"-import(lists, [map/2]). ">>),
+    ok = pp_forms(<<"-import(lists, [map/2, foreach/2]). ">>),
+    ok = pp_forms(<<"-'wild '({attr2,3}). ">>),
+    ok = pp_forms(<<"-record(a, {b,c}). ">>),
+    ok = pp_forms(<<"-record(' a ', {}). ">>),
+    ok = pp_forms(<<"-record(' a ', {foo = foo:bar()}). ">>),
+    ok = pp_forms(<<"-custom1(#{test1 => init/2, test2 => [val/1, val/2]}). ">>),
     ok.
 
 dialyzer_attrs(suite) ->