X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=src%2Fhope_kv_list.erl;h=468c8d85fcd905ff777db07a086b4d15882fe8a4;hb=d10156b093c1075d1b396386275f831e7af21190;hp=12dbcd2e838a585efe9a781239f2b8b6432f9f19;hpb=37c6e98b7b4b018972e0e6bdc557b266277fe353;p=hope.git

diff --git a/src/hope_kv_list.erl b/src/hope_kv_list.erl
index 12dbcd2..468c8d8 100644
--- a/src/hope_kv_list.erl
+++ b/src/hope_kv_list.erl
@@ -51,17 +51,17 @@ update(T, K, F) ->
     % TODO: Eliminate the 2nd lookup.
     set(T, K, V2).
 
-iter(T, Map1) ->
-    Map2 = lift_map_into_list(Map1),
-    lists:foreach(Map2, T).
+iter(T, F1) ->
+    F2 = lift_map(F1),
+    lists:foreach(F2, T).
 
-map(T, Map1) ->
-    Map2 = lift_map_into_list(Map1),
-    lists:map(Map2, T).
+map(T, F1) ->
+    F2 = fun ({K, _}=X) -> {K, apply_map(F1, X)} end,
+    lists:map(F2, T).
 
-filter(T, Map1) ->
-    Map2 = lift_map_into_list(Map1),
-    lists:filter(Map2, T).
+filter(T, F1) ->
+    F2 = lift_map(F1),
+    lists:filter(F2, T).
 
 fold(T, F1, Accumulator) ->
     F2 = fun ({K, V}, Acc) -> F1(K, V, Acc) end,
@@ -79,5 +79,8 @@ of_kv_list(List) ->
 %% Helpers
 %% ============================================================================
 
-lift_map_into_list(Map) ->
-    fun ({K, V}) -> {K, Map(K, V)} end.
+lift_map(F) ->
+    fun (X) -> apply_map(F, X) end.
+
+apply_map(F, {K, V}) ->
+    F(K, V).