X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=src%2Fhope_kv_list.erl;h=7b25797ed3b9ef0b57c660e1f4665a1a45adaba8;hb=99fd18ae3aa61238700208a5f2b2959c1b1a2d80;hp=394e53d658638bf909fc58f5fef4285f1df990aa;hpb=e163be89d2e192e63fdc03b66146067d92b21e1f;p=hope.git

diff --git a/src/hope_kv_list.erl b/src/hope_kv_list.erl
index 394e53d..7b25797 100644
--- a/src/hope_kv_list.erl
+++ b/src/hope_kv_list.erl
@@ -28,6 +28,7 @@
     , find_unique_presence_violations/3  % Specify optional keys
     , validate_unique_presence/2  % No optional keys
     , validate_unique_presence/3  % Specify optional keys
+    , presence_violations_to_list/1
     ]).
 
 
@@ -130,14 +131,16 @@ of_kv_list(List) ->
     % TODO: Decide if validation is to be done here. Do so if yes.
     List.
 
--spec validate_unique_presence(t(K, _V), [K]) ->
-    hope_result:t(ok, [presence_error(K)]).
+-spec validate_unique_presence(T, [K]) ->
+    hope_result:t(T, [presence_error(K)])
+    when T :: t(K, _V).
 validate_unique_presence(T, KeysRequired) ->
     KeysOptional = [],
     validate_unique_presence(T, KeysRequired, KeysOptional).
 
 -spec validate_unique_presence(t(K, _V), [K], [K]) ->
-    hope_result:t(ok, [presence_error(K)]).
+    hope_result:t(T, [presence_error(K)])
+    when T :: t(K, _V).
 validate_unique_presence(T, KeysRequired, KeysOptional) ->
     case find_unique_presence_violations(T, KeysRequired, KeysOptional)
     of  #hope_kv_list_presence_violations
@@ -145,29 +148,9 @@ validate_unique_presence(T, KeysRequired, KeysOptional) ->
         , keys_duplicated  = []
         , keys_unsupported = []
         } ->
-            {ok, ok}
-    ;   #hope_kv_list_presence_violations
-        { keys_missing     = KeysMissing
-        , keys_duplicated  = KeysDuplicated
-        , keys_unsupported = KeysUnsupported
-        } ->
-            ErrorMissing =
-                case KeysMissing
-                of  []    -> []
-                ;   [_|_] -> [{keys_missing, KeysMissing}]
-                end,
-            ErrorDups =
-                case KeysDuplicated
-                of  []    -> []
-                ;   [_|_] -> [{keys_duplicated, KeysDuplicated}]
-                end,
-            ErrorUnsupported =
-                case KeysUnsupported
-                of  []    -> []
-                ;   [_|_] -> [{keys_unsupported, KeysUnsupported}]
-                end,
-            Errors = ErrorDups ++ ErrorMissing ++ ErrorUnsupported,
-            {error, Errors}
+            {ok, T}
+    ;   #hope_kv_list_presence_violations{}=Violations ->
+            {error, presence_violations_to_list(Violations)}
     end.
 
 -spec find_unique_presence_violations(t(K, _V), [K]) ->
@@ -191,6 +174,30 @@ find_unique_presence_violations(T, KeysRequired, KeysOptional) ->
     , keys_unsupported = KeysUnsupported
     }.
 
+-spec presence_violations_to_list(presence_violations(K)) ->
+    [presence_error(K)].
+presence_violations_to_list(#hope_kv_list_presence_violations
+{ keys_missing     = KeysMissing
+, keys_duplicated  = KeysDuplicated
+, keys_unsupported = KeysUnsupported
+}) ->
+    ErrorMissing =
+        case KeysMissing
+        of  []    -> []
+        ;   [_|_] -> [{keys_missing, KeysMissing}]
+        end,
+    ErrorDups =
+        case KeysDuplicated
+        of  []    -> []
+        ;   [_|_] -> [{keys_duplicated, KeysDuplicated}]
+        end,
+    ErrorUnsupported =
+        case KeysUnsupported
+        of  []    -> []
+        ;   [_|_] -> [{keys_unsupported, KeysUnsupported}]
+        end,
+    ErrorDups ++ ErrorMissing ++ ErrorUnsupported.
+
 
 %% ============================================================================
 %% Helpers