aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2017-02-28 14:33:26 +0100
committerHans Bolinder <[email protected]>2017-02-28 14:33:26 +0100
commit52f822ab407be031a0013f47ff2b1b45b27fc1f5 (patch)
tree8d7b19d1970aa5719b35208de92412cc934ec8b2 /lib/stdlib/src
parentfc77f400672d7e9af2c495b96bee1228497acc0e (diff)
parent1870c04e56f56334fc836c1f64c5e123dc9a359b (diff)
downloadotp-52f822ab407be031a0013f47ff2b1b45b27fc1f5.tar.gz
otp-52f822ab407be031a0013f47ff2b1b45b27fc1f5.tar.bz2
otp-52f822ab407be031a0013f47ff2b1b45b27fc1f5.zip
Merge branch 'hasse/stdlib/fix_term_traversal' into maint
* hasse/stdlib/fix_term_traversal: stdlib: Add maps to term traversal
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/qlc.erl6
1 files changed, 5 insertions, 1 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)).