From 6d521dae843ee098e823e1c4a3bb2e426409dcea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Tue, 28 Oct 2014 16:49:41 +0100
Subject: stdlib: Enable io_lib:format/* for hamt maps

This is a commit to enable printouts of hashmaps during development and
will be enhanced once hashmaps are in place.
---
 lib/stdlib/src/io_lib.erl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib/stdlib')

diff --git a/lib/stdlib/src/io_lib.erl b/lib/stdlib/src/io_lib.erl
index e90cda0533..24ae83da9c 100644
--- a/lib/stdlib/src/io_lib.erl
+++ b/lib/stdlib/src/io_lib.erl
@@ -296,8 +296,8 @@ write(T, D) when is_tuple(T) ->
               write_tail(tl(tuple_to_list(T)), D-1, $,)],
 	     $}]
     end;
-%write(Term, D)  when is_map(Term) -> write_map(Term, D);
-write(Term, D) -> write_map(Term, D).
+write(Term, D) when is_map(Term) -> write_map(Term, D);
+write(Term, D) -> write_hashmap(Term, D).
 
 %% write_tail(List, Depth, CharacterBeforeDots)
 %%  Test the terminating case first as this looks better with depth.
@@ -315,6 +315,9 @@ write_port(Port) ->
 write_ref(Ref) ->
     erlang:ref_to_list(Ref).
 
+write_hashmap(Map,D) ->
+    ["#{", write_map_body(hashmap:to_list(Map),D), $}].
+
 write_map(Map, D) when is_integer(D) ->
     [$#,${,write_map_body(maps:to_list(Map), D),$}].
 
-- 
cgit v1.2.3


From 3189e981fc1a178821505307cecd4d34298d16ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Fri, 13 Mar 2015 16:38:48 +0100
Subject: stdlib: Remove obsolete hashmap references in io_lib

---
 lib/stdlib/src/io_lib.erl | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'lib/stdlib')

diff --git a/lib/stdlib/src/io_lib.erl b/lib/stdlib/src/io_lib.erl
index 24ae83da9c..3378d668a5 100644
--- a/lib/stdlib/src/io_lib.erl
+++ b/lib/stdlib/src/io_lib.erl
@@ -287,6 +287,8 @@ write([H|T], D) ->
     end;
 write(F, _D) when is_function(F) ->
     erlang:fun_to_list(F);
+write(Term, D) when is_map(Term) ->
+    write_map(Term, D);
 write(T, D) when is_tuple(T) ->
     if
 	D =:= 1 -> "{...}";
@@ -295,9 +297,7 @@ write(T, D) when is_tuple(T) ->
 	     [write(element(1, T), D-1)|
               write_tail(tl(tuple_to_list(T)), D-1, $,)],
 	     $}]
-    end;
-write(Term, D) when is_map(Term) -> write_map(Term, D);
-write(Term, D) -> write_hashmap(Term, D).
+    end.
 
 %% write_tail(List, Depth, CharacterBeforeDots)
 %%  Test the terminating case first as this looks better with depth.
@@ -315,9 +315,6 @@ write_port(Port) ->
 write_ref(Ref) ->
     erlang:ref_to_list(Ref).
 
-write_hashmap(Map,D) ->
-    ["#{", write_map_body(hashmap:to_list(Map),D), $}].
-
 write_map(Map, D) when is_integer(D) ->
     [$#,${,write_map_body(maps:to_list(Map), D),$}].
 
-- 
cgit v1.2.3


From b91daf163f146c9f787957ad593b20caea1b647b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Fri, 13 Mar 2015 17:52:47 +0100
Subject: stdlib: Update qlc tests to reflect new ETS hash

---
 lib/stdlib/test/qlc_SUITE.erl | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'lib/stdlib')

diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index 4173a40d14..0b7b96da8e 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -3418,7 +3418,8 @@ lookup2(Config) when is_list(Config) ->
            end, [{1},{2}])">>
 
        ],
-    ?line run(Config, Ts),
+
+    ok = run(Config, Ts),
 
     TsR = [
        %% is_record/2,3:
@@ -3456,7 +3457,8 @@ lookup2(Config) when is_list(Config) ->
          end, [{keypos,1}], [#r{}])">>
 
        ],
-    ?line run(Config, <<"-record(r, {a}).\n">>, TsR),
+
+    ok = run(Config, <<"-record(r, {a}).\n">>, TsR),
 
     Ts2 = [
        <<"etsc(fun(E) ->
@@ -3566,7 +3568,6 @@ lookup2(Config) when is_list(Config) ->
                        [{1,2},{2,2}] = qlc:e(Q),
                        [2] = lookup_keys(Q)
                end, [{keypos,1}], [{1},{2},{3}])">>,
-
        <<"%% Matchspec only. No cache.
           etsc(fun(E) ->
                        Q = qlc:q([{X,Y} ||
@@ -3578,7 +3579,7 @@ lookup2(Config) when is_list(Config) ->
                                {generate,_,
                                 {table,{ets,_,[_,[{traverse,_}]]}}}],[]} = 
                                        i(Q),
-                       [{1,2},{1,3},{2,2},{2,3}] = qlc:e(Q),
+                       [{1,2},{1,3},{2,2},{2,3}] = lists:sort(qlc:e(Q)),
                        false = lookup_keys(Q)
                end, [{keypos,1}], [{1},{2},{3}])">>,
        <<"%% Matchspec only. Cache
@@ -3592,7 +3593,7 @@ lookup2(Config) when is_list(Config) ->
                             {generate,_,{qlc,_,
                            [{generate,_,{table,{ets,_,[_,[{traverse,_}]]}}}],
                           [{cache,ets}]}}],[]} = i(Q),
-                       [{1,2},{1,3},{2,2},{2,3}] = qlc:e(Q),
+                       [{1,2},{1,3},{2,2},{2,3}] = lists:sort(qlc:e(Q)),
                        false = lookup_keys(Q)
                end, [{keypos,1}], [{1},{2},{3}])">>,
        <<"%% An empty list. Always unique and cached.
@@ -3645,7 +3646,7 @@ lookup2(Config) when is_list(Config) ->
 
       ],
 
-    ?line run(Config, Ts2),
+    ok = run(Config, Ts2),
 
     LTs = [
        <<"etsc(fun(E) ->
@@ -3677,7 +3678,8 @@ lookup2(Config) when is_list(Config) ->
                end, [{1,a},{2,b}])">>
 
        ],
-    ?line run(Config, LTs),
+
+    ok = run(Config, LTs),
 
     ok.
 
-- 
cgit v1.2.3