X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=src%2Fhope_kv_list.erl;h=431932f02abb2c183290492b9d27c98c5711495d;hb=c1672ac49e394b724184042a4a0458670f455dea;hp=0b80a4aba75933d85fa41f2e89880df593dc7e58;hpb=03ac148f8fdf338c85532a61b59ca1152ed7a5d0;p=hope.git

diff --git a/src/hope_kv_list.erl b/src/hope_kv_list.erl
index 0b80a4a..431932f 100644
--- a/src/hope_kv_list.erl
+++ b/src/hope_kv_list.erl
@@ -48,19 +48,21 @@ set(T, K, V) ->
 update(T, K, F) ->
     V1Opt = get(T, K),
     V2 = F(V1Opt),
+    % 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(F1),
+    lists:foreach(F2, T).
 
-map(T, Map1) ->
-    Map2 = lift_map_into_list(Map1),
-    lists:map(Map2, T).
+map(T, F1) ->
+    F2 = lift(F1),
+    F3 = fun ({K, _}=X) -> {K, F2(X)} end,
+    lists:map(F3, T).
 
-filter(T, Map1) ->
-    Map2 = lift_map_into_list(Map1),
-    lists:filter(Map2, T).
+filter(T, F1) ->
+    F2 = lift(F1),
+    lists:filter(F2, T).
 
 fold(T, F1, Accumulator) ->
     F2 = fun ({K, V}, Acc) -> F1(K, V, Acc) end,
@@ -70,6 +72,7 @@ to_kv_list(T) ->
     T.
 
 of_kv_list(List) ->
+    % TODO: Decide if validation is to be done here. Do so if yes.
     List.
 
 
@@ -77,5 +80,5 @@ of_kv_list(List) ->
 %% Helpers
 %% ============================================================================
 
-lift_map_into_list(Map) ->
-    fun ({K, V}) -> {K, Map(K, V)} end.
+lift(F) ->
+    fun ({K, V}) -> F(K, V) end.