Merge branch 'maint'

* maint:
  stdlib: Add maps to term traversal

2 files changed, 19 insertions, 5 deletions

diff --git a/lib/stdlib/src/qlc.erl b/lib/stdlib/src/qlc.erl
index f3665824f2..8c4d835432 100644
--- a/lib/stdlib/src/qlc.erl
+++ b/lib/stdlib/src/qlc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2017. 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.
@@ -1292,6 +1292,10 @@ abstr_term(Fun, Line) when is_function(Fun) ->
     end;
 abstr_term(PPR, Line) when is_pid(PPR); is_port(PPR); is_reference(PPR) ->
     {special, Line, lists:flatten(io_lib:write(PPR))};    
+abstr_term(Map, Line) when is_map(Map) ->
+    {map,Line,
+     [{map_field_assoc,Line,abstr_term(K, Line),abstr_term(V, Line)} ||
+         {K,V} <- maps:to_list(Map)]};
 abstr_term(Simple, Line) ->
     erl_parse:abstract(Simple, erl_anno:line(Line)).
 
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index c08e138ad3..2b5d52287e 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2017. 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.
@@ -886,11 +886,12 @@ eval_unique(Config) when is_list(Config) ->
              [a] = qlc:e(Q2, {unique_all, true})
             ">>,
 
-          <<"Q = qlc:q([SQV || SQV <- qlc:q([X || X <- [1,2,1]],unique)],
+          <<"Q = qlc:q([SQV || SQV <- qlc:q([X || X <- [1,2,1,#{a => 1}]],
+                                             unique)],
                        unique),
              {call,_,_,[{lc,_,{var,_,'X'},[{generate,_,{var,_,'X'},_}]},_]} =
                  qlc:info(Q, [{format,abstract_code},unique_all]),
-             [1,2] = qlc:e(Q)">>,
+             [1,2,#{a := 1}] = qlc:e(Q)">>,
 
           <<"Q = qlc:q([X || X <- [1,2,1]]),
              {call,_,_,[{lc,_,{var,_,'X'},[{generate,_,{var,_,'X'},_}]},_]} =
@@ -2637,7 +2638,16 @@ info(Config) when is_list(Config) ->
                                       {cons, _, _, _}]},
                               {nil,_}}]}]} = i(QH, {format, abstract_code}),
           [{5},{6}] = qlc:e(QH),
-          [{4},{5},{6}] = qlc:e(F(3))">>
+          [{4},{5},{6}] = qlc:e(F(3))">>,
+
+          <<"Fun = fun ?MODULE:i/2,
+             L = [{#{k => #{v => Fun}}, Fun}],
+             H = qlc:q([Q || Q <- L, Q =:= {#{k => #{v => Fun}}, Fun}]),
+             L = qlc:e(H),
+             {call,_,_,[{lc,_,{var,_,'Q'},
+                         [{generate,_,_,_},
+                          {op,_,_,_,_}]}]} =
+                qlc:info(H, [{format,abstract_code}])">>
 
        ],
     run(Config, Ts),