diff options
| author | Louis Pilfold <louis@lpil.uk> | 2019-05-04 21:39:20 +0000 |
|---|---|---|
| committer | Louis Pilfold <louis@lpil.uk> | 2019-05-04 21:39:20 +0000 |
| commit | df54ea2835a094d1716dbace5108d76c49ffbb3b (patch) | |
| tree | f6141a390ec01ede8483e6883917ef5ec73ce533 /gen | |
| parent | 40499a14d0565f9c8edb4f01c99a9199bcb73c6e (diff) | |
| download | gleam_stdlib-df54ea2835a094d1716dbace5108d76c49ffbb3b.tar.gz gleam_stdlib-df54ea2835a094d1716dbace5108d76c49ffbb3b.zip | |
map_dict:merge
Diffstat (limited to 'gen')
| -rw-r--r-- | gen/src/map_dict.erl | 5 | ||||
| -rw-r--r-- | gen/test/map_dict_test.erl | 16 |
2 files changed, 19 insertions, 2 deletions
diff --git a/gen/src/map_dict.erl b/gen/src/map_dict.erl index 7d97a7d..dcff286 100644 --- a/gen/src/map_dict.erl +++ b/gen/src/map_dict.erl @@ -1,7 +1,7 @@ -module(map_dict). -compile(no_auto_import). --export([size/1, to_list/1, from_list/1, has_key/2, new/0, fetch/2, put/3, map_values/2, keys/1, values/1, filter/2, take/2, drop/2]). +-export([size/1, to_list/1, from_list/1, has_key/2, new/0, fetch/2, put/3, map_values/2, keys/1, values/1, filter/2, take/2, drop/2, merge/2]). size(A) -> maps:size(A). @@ -59,3 +59,6 @@ erl_drop(A, B) -> drop(Map, Keys) -> erl_drop(Keys, Map). + +merge(A, B) -> + maps:merge(A, B). diff --git a/gen/test/map_dict_test.erl b/gen/test/map_dict_test.erl index e59911e..20be544 100644 --- a/gen/test/map_dict_test.erl +++ b/gen/test/map_dict_test.erl @@ -1,7 +1,7 @@ -module(map_dict_test). -compile(no_auto_import). --export([from_list_test/0, has_key_test/0, new_test/0, fetch_test/0, put_test/0, map_values_test/0, keys_test/0, values_test/0, take_test/0, drop_test/0]). +-export([from_list_test/0, has_key_test/0, new_test/0, fetch_test/0, put_test/0, map_values_test/0, keys_test/0, values_test/0, take_test/0, drop_test/0, merge_test/0]). from_list_test() -> expect:equal(map_dict:size(map_dict:from_list([{4, 0}, {1, 0}])), 2). @@ -67,3 +67,17 @@ drop_test() -> {<<"c">>, 2}]), [<<"a">>, <<"b">>, <<"d">>]), map_dict:from_list([{<<"c">>, 2}])). + +merge_test() -> + A = map_dict:from_list([{<<"a">>, 2}, {<<"c">>, 4}, {<<"d">>, 3}]), + B = map_dict:from_list([{<<"a">>, 0}, {<<"b">>, 1}, {<<"c">>, 2}]), + expect:equal(map_dict:merge(A, B), + map_dict:from_list([{<<"a">>, 0}, + {<<"b">>, 1}, + {<<"c">>, 2}, + {<<"d">>, 3}])), + expect:equal(map_dict:merge(B, A), + map_dict:from_list([{<<"a">>, 2}, + {<<"b">>, 1}, + {<<"c">>, 4}, + {<<"d">>, 3}])). |