diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | gen/src/map_dict.erl | 5 | ||||
| -rw-r--r-- | gen/test/map_dict_test.erl | 16 | ||||
| -rw-r--r-- | src/map_dict.gleam | 7 | ||||
| -rw-r--r-- | test/map_dict_test.gleam | 29 |
5 files changed, 58 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7dd5354..9e9cdf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Unreleased + +- `map_dict` module gains `merge` function. + ## v0.1.2 - 2019-04-25 - `list` module gains `at`, `all`, `any`, `index_map`, `intersperse`, `sort`, 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}])). diff --git a/src/map_dict.gleam b/src/map_dict.gleam index 28d64fc..e702f89 100644 --- a/src/map_dict.gleam +++ b/src/map_dict.gleam @@ -2,8 +2,11 @@ import any import result // TODO: update :: fn(MapDict(k, v), k, fn(Result(v, NotFound)) -> v) -> MapDict(k, v) -// TODO: merge :: fn(MapDict(k, v), MapDict(k, v)) -> MapDict(k, v) // TODO: delete :: fn(MapDict(k, v), k) -> MapDict(k, v) +// TODO: is_disjoint +// TODO: is_subset +// TODO: difference +// TODO: intersection pub external type MapDict(key, value); @@ -72,3 +75,5 @@ external fn erl_drop(List(k), MapDict(k, v)) -> MapDict(k, v) = "maps" "without" pub fn drop(map, keys) { erl_drop(keys, map) } + +pub external fn merge(MapDict(k, v), MapDict(k, v)) -> MapDict(k, v) = "maps" "merge" diff --git a/test/map_dict_test.gleam b/test/map_dict_test.gleam index a0797c2..1ee489a 100644 --- a/test/map_dict_test.gleam +++ b/test/map_dict_test.gleam @@ -133,3 +133,32 @@ pub fn drop_test() { |> map_dict:drop(_, ["a", "b", "d"]) |> expect:equal(_, map_dict:from_list([{"c", 2}])) } + +pub fn merge_test() { + let a = map_dict:from_list([ + {"a", 2}, + {"c", 4}, + {"d", 3}, + ]) + let b = map_dict:from_list([ + {"a", 0}, + {"b", 1}, + {"c", 2}, + ]) + + map_dict:merge(a, b) + |> expect:equal(_, map_dict:from_list([ + {"a", 0}, + {"b", 1}, + {"c", 2}, + {"d", 3}, + ])) + + map_dict:merge(b, a) + |> expect:equal(_, map_dict:from_list([ + {"a", 2}, + {"b", 1}, + {"c", 4}, + {"d", 3}, + ])) +} |