X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=src%2Fhope_kv_list.erl;h=3c392eec5473765ed943d96bc506eef4219a0f54;hb=8bbf6f4d400d79736e7866d67ecb3517b61bb1c1;hp=468c8d85fcd905ff777db07a086b4d15882fe8a4;hpb=d10156b093c1075d1b396386275f831e7af21190;p=hope.git

diff --git a/src/hope_kv_list.erl b/src/hope_kv_list.erl
index 468c8d8..3c392ee 100644
--- a/src/hope_kv_list.erl
+++ b/src/hope_kv_list.erl
@@ -14,6 +14,7 @@
     , get/2
     , set/3
     , update/3
+    , pop/2
     , iter/2
     , map/2
     , filter/2
@@ -51,6 +52,12 @@ update(T, K, F) ->
     % TODO: Eliminate the 2nd lookup.
     set(T, K, V2).
 
+pop(T1, K) ->
+    case lists:keytake(K, 1, T1)
+    of  {value, {K, V}, T2} -> {{some, V}, T2}
+    ;   false               -> {none     , T1}
+    end.
+
 iter(T, F1) ->
     F2 = lift_map(F1),
     lists:foreach(F2, T).
@@ -65,7 +72,7 @@ filter(T, F1) ->
 
 fold(T, F1, Accumulator) ->
     F2 = fun ({K, V}, Acc) -> F1(K, V, Acc) end,
-    lists:foldl(F2, T, Accumulator).
+    lists:foldl(F2, Accumulator, T).
 
 to_kv_list(T) ->
     T.
@@ -79,8 +86,15 @@ of_kv_list(List) ->
 %% Helpers
 %% ============================================================================
 
+-spec lift_map(F) ->
+    G
+    when F :: fun(( K, V1 ) -> V2)
+       , G :: fun(({K, V1}) -> V2)
+       .
 lift_map(F) ->
     fun (X) -> apply_map(F, X) end.
 
+-spec apply_map(fun((K, V1) -> V2), {K, V1}) ->
+    V2.
 apply_map(F, {K, V}) ->
     F(K, V).