diff options
Diffstat (limited to 'gen')
-rw-r--r-- | gen/src/list.erl | 11 | ||||
-rw-r--r-- | gen/test/list_test.erl | 9 |
2 files changed, 18 insertions, 2 deletions
diff --git a/gen/src/list.erl b/gen/src/list.erl index 85df70e..3170ec2 100644 --- a/gen/src/list.erl +++ b/gen/src/list.erl @@ -1,7 +1,7 @@ -module(list). -compile(no_auto_import). --export([length/1, reverse/1, is_empty/1, contains/2, head/1, tail/1, filter/2, map/2, index_map/2, traverse/2, drop/2, take/2, new/0, append/2, flatten/1, fold/3, fold_right/3, find/2, all/2, any/2, zip/2, intersperse/2, at/2, unique/1, sort/1, range/2]). +-export([length/1, reverse/1, is_empty/1, contains/2, head/1, tail/1, filter/2, map/2, index_map/2, traverse/2, drop/2, take/2, new/0, append/2, flatten/1, fold/3, fold_right/3, find/2, all/2, any/2, zip/2, strict_zip/2, intersperse/2, at/2, unique/1, sort/1, range/2]). length(A) -> erlang:length(A). @@ -226,6 +226,15 @@ zip(L1, L2) -> [{X1, X2} | zip(Rest1, Rest2)] end. +strict_zip(L1, L2) -> + case length(L1) =:= length(L2) of + true -> + {ok, zip(L1, L2)}; + + false -> + {error, length_mismatch} + end. + intersperse(List, Elem) -> case List of [] -> diff --git a/gen/test/list_test.erl b/gen/test/list_test.erl index ca76423..20c1d1c 100644 --- a/gen/test/list_test.erl +++ b/gen/test/list_test.erl @@ -1,7 +1,7 @@ -module(list_test). -compile(no_auto_import). --export([length_test/0, reverse_test/0, is_empty_test/0, contains_test/0, head_test/0, tail_test/0, filter_test/0, map_test/0, traverse_test/0, drop_test/0, take_test/0, new_test/0, append_test/0, flatten_test/0, fold_test/0, fold_right_test/0, find_test/0, all_test/0, any_test/0, zip_test/0, intersperse_test/0, at_test/0, unique_test/0, sort_test/0, index_map_test/0, range_test/0]). +-export([length_test/0, reverse_test/0, is_empty_test/0, contains_test/0, head_test/0, tail_test/0, filter_test/0, map_test/0, traverse_test/0, drop_test/0, take_test/0, new_test/0, append_test/0, flatten_test/0, fold_test/0, fold_right_test/0, find_test/0, all_test/0, any_test/0, zip_test/0, strict_zip_test/0, intersperse_test/0, at_test/0, unique_test/0, sort_test/0, index_map_test/0, range_test/0]). length_test() -> expect:equal(list:length([]), 0), @@ -111,6 +111,13 @@ zip_test() -> expect:equal(list:zip([5, 6], [1, 2, 3]), [{5, 1}, {6, 2}]), expect:equal(list:zip([5, 6, 7], [1, 2]), [{5, 1}, {6, 2}]). +strict_zip_test() -> + expect:is_error(list:strict_zip([], [1, 2, 3])), + expect:is_error(list:strict_zip([1, 2], [])), + expect:equal(list:zip([1, 2, 3], [4, 5, 6]), [{1, 4}, {2, 5}, {3, 6}]), + expect:is_error(list:strict_zip([5, 6], [1, 2, 3])), + expect:is_error(list:strict_zip([5, 6, 7], [1, 2])). + intersperse_test() -> expect:equal(list:intersperse([1, 2, 3], 4), [1, 4, 2, 4, 3]), expect:equal(list:intersperse([], 2), []). |