X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=src%2Fhope_option.erl;h=29836f768668a507931dd10572984b8c22755f63;hb=4744fed98ce752dde11c03aeaf8d90983efe5ea6;hp=180c41687cd7ea5582c8c6901b5fba7dbba8e72e;hpb=4af0774b16181c76d0deedf0911d53409c8f1078;p=hope.git

diff --git a/src/hope_option.erl b/src/hope_option.erl
index 180c416..29836f7 100644
--- a/src/hope_option.erl
+++ b/src/hope_option.erl
@@ -1,19 +1,25 @@
 -module(hope_option).
 
--behavior(hope_monad).
+-behavior(hope_gen_monad).
 
 -export_type(
     [ t/1
     ]).
 
 -export(
-    [ put/2
-    , get/2
-    , return/1
+    % Generic monad interface
+    [ return/1
     , map/2
-    , iter/2
     , pipe/2
+
+    % Specific to hope_option:t()
+    , return/2
+    , put/2
+    , get/2
+    , iter/2
     , of_result/1
+    , of_undefined/1
+    , validate/2
     ]).
 
 
@@ -26,10 +32,7 @@
 -spec put(A, fun((A) -> boolean())) ->
     t(A).
 put(X, F) ->
-    case F(X)
-    of  true  -> {some, X}
-    ;   false -> none
-    end.
+    return(X, F).
 
 -spec get(t(A), Default :: A) ->
     A.
@@ -41,15 +44,26 @@ get(none     , Y) -> Y.
 return(X) ->
     {some, X}.
 
+-spec return(A, fun((A) -> boolean())) ->
+    t(A).
+return(X, Condition) ->
+    case Condition(X)
+    of  true  -> {some, X}
+    ;   false -> none
+    end.
+
 -spec map(t(A), fun((A) -> (B))) ->
     t(B).
 map({some, X}, F) -> {some, F(X)};
 map(none     , _) -> none.
 
--spec iter(t(A), fun((A) -> (ok))) ->
-    ok.
-iter({some, X}, F) -> ok = F(X);
-iter(none     , _) -> ok.
+-spec iter(t(A), fun((A) -> (any()))) ->
+    {}.
+iter({some, X}, F) ->
+    _ = F(X),
+    {};
+iter(none, _) ->
+    {}.
 
 -spec pipe([fun((A) -> t(B))], A) ->
     t(B).
@@ -65,3 +79,18 @@ pipe([F|Fs], X) ->
     t(A).
 of_result({ok, X})    -> {some, X};
 of_result({error, _}) -> none.
+
+-spec of_undefined(undefined | A) ->
+    t(A).
+of_undefined(undefined) -> none;
+of_undefined(X)         -> {some, X}.
+
+-spec validate(t(A), fun((A) -> boolean())) ->
+    t(A).
+validate(none, _) ->
+    none;
+validate({some, X}=T, F) ->
+    case F(X)
+    of  false -> none
+    ;   true  -> T
+    end.