Merge branch 'evilbluebeaver/iterator_from'

* evilbluebeaver/iterator_from:
  stdlib: Add gb_sets:iterator_from
  stdlib: Add gb_trees:iterator_from

4 files changed, 95 insertions, 9 deletions

diff --git a/lib/stdlib/test/dict_SUITE.erl b/lib/stdlib/test/dict_SUITE.erl
index 69814e12ce..ab624e8dd2 100644
--- a/lib/stdlib/test/dict_SUITE.erl
+++ b/lib/stdlib/test/dict_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2015. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -25,16 +25,16 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2,
-	 create/1,store/1]).
+         create/1,store/1,iterate/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
--import(lists, [foldl/3,reverse/1]).
+-import(lists, [foldl/3]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [create, store].
+    [create, store, iterate].
 
 groups() -> 
     [].
@@ -93,6 +93,48 @@ store_1(List, M) ->
     D0.
 
 %%%
+%%% Test specifics for gb_trees.
+%%%
+
+iterate(Config) when is_list(Config) ->
+    test_all(fun iterate_1/1).
+
+iterate_1(M) ->
+    case M(module, []) of
+	gb_trees -> iterate_2(M);
+	_ -> ok
+    end,
+    M(empty, []).
+
+iterate_2(M) ->
+    random:seed(1, 2, 42),
+    iter_tree(M, 1000).
+
+iter_tree(_M, 0) ->
+    ok;
+iter_tree(M, N) ->
+    L = [{I, I} || I <- lists:seq(1, N)],
+    T = M(from_list, L),
+    L = lists:reverse(iterate_tree(M, T)),
+    R = random:uniform(N),
+    KV = lists:reverse(iterate_tree_from(M, R, T)),
+    KV = [P || P={K,_} <- L, K >= R],
+    iter_tree(M, N-1).
+
+iterate_tree(M, Tree) ->
+    I = M(iterator, Tree),
+    iterate_tree_1(M, M(next, I), []).
+
+iterate_tree_from(M, Start, Tree) ->
+    I = M(iterator_from, {Start, Tree}),
+    iterate_tree_1(M, M(next, I), []).
+
+iterate_tree_1(_, none, R) ->
+    R;
+iterate_tree_1(M, {K, V, I}, R) ->
+    iterate_tree_1(M, M(next, I), [{K, V} | R]).
+
+%%%
 %%% Helper functions.
 %%%
 
diff --git a/lib/stdlib/test/dict_test_lib.erl b/lib/stdlib/test/dict_test_lib.erl
index 4fdb4fa0bd..81d26ce5f8 100644
--- a/lib/stdlib/test/dict_test_lib.erl
+++ b/lib/stdlib/test/dict_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2015. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -29,6 +29,9 @@ new(Mod, Eq) ->
 	(module, []) -> Mod;
 	(size, D) -> Mod:size(D);
 	(is_empty, D) -> Mod:is_empty(D);
+        (iterator, S) -> Mod:iterator(S);
+        (iterator_from, {Start, S}) -> Mod:iterator_from(Start, S);
+        (next, I) -> Mod:next(I);
 	(to_list, D) -> to_list(Mod, D)
     end.
 
diff --git a/lib/stdlib/test/sets_SUITE.erl b/lib/stdlib/test/sets_SUITE.erl
index c0cf1fc7e8..24f5d65f82 100644
--- a/lib/stdlib/test/sets_SUITE.erl
+++ b/lib/stdlib/test/sets_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2015. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -28,7 +28,7 @@
 	 create/1,add_element/1,del_element/1,
 	 subtract/1,intersection/1,union/1,is_subset/1,
 	 is_set/1,fold/1,filter/1,
-	 take_smallest/1,take_largest/1]).
+	 take_smallest/1,take_largest/1, iterate/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -48,7 +48,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     [create, add_element, del_element, subtract,
      intersection, union, is_subset, is_set, fold, filter,
-     take_smallest, take_largest].
+     take_smallest, take_largest, iterate].
 
 groups() -> 
     [].
@@ -426,6 +426,44 @@ take_largest_3(S0, List0, M) ->
 	    take_largest_3(S, List, M)
     end.
 
+iterate(Config) when is_list(Config) ->
+    test_all(fun iterate_1/1).
+
+iterate_1(M) ->
+    case M(module, []) of
+	gb_sets -> iterate_2(M);
+	_ -> ok
+    end,
+    M(empty, []).
+
+iterate_2(M) ->
+    random:seed(1, 2, 42),
+    iter_set(M, 1000).
+
+iter_set(_M, 0) ->
+    ok;
+iter_set(M, N) ->
+    L = [I || I <- lists:seq(1, N)],
+    T = M(from_list, L),
+    L = lists:reverse(iterate_set(M, T)),
+    R = random:uniform(N),
+    S = lists:reverse(iterate_set(M, R, T)),
+    S = [E || E <- L, E >= R],
+    iter_set(M, N-1).
+
+iterate_set(M, Set) ->
+    I = M(iterator, Set),
+    iterate_set_1(M, M(next, I), []).
+
+iterate_set(M, Start, Set) ->
+    I = M(iterator_from, {Start, Set}),
+    iterate_set_1(M, M(next, I), []).
+
+iterate_set_1(_, none, R) ->
+    R;
+iterate_set_1(M, {E, I}, R) ->
+    iterate_set_1(M, M(next, I), [E | R]).
+
 %%%
 %%% Helper functions.
 %%%
diff --git a/lib/stdlib/test/sets_test_lib.erl b/lib/stdlib/test/sets_test_lib.erl
index 86f009a8f9..772139406d 100644
--- a/lib/stdlib/test/sets_test_lib.erl
+++ b/lib/stdlib/test/sets_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2015. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -34,7 +34,10 @@ new(Mod, Eq) ->
 	(is_empty, S) -> is_empty(Mod, S);
 	(is_set, S) -> Mod:is_set(S);
 	(is_subset, {S,Set}) -> is_subset(Mod, Eq, S, Set);
+        (iterator, S) -> Mod:iterator(S);
+        (iterator_from, {Start, S}) -> Mod:iterator_from(Start, S);
 	(module, []) -> Mod;
+        (next, I) -> Mod:next(I);
 	(singleton, E) -> singleton(Mod, E);
 	(size, S) -> Mod:size(S);
 	(subtract, {S1,S2}) -> subtract(Mod, S1, S2);