Changes in src/libcfa/containers/result.c [58daf53:64fc0ba]

File:

• src/libcfa/containers/result.c (modified) (5 diffs)

src/libcfa/containers/result.c

@@ -8 +8 @@
 //
 // Author           : Andrew Beach
-// Created On       : Wed May 24 15:40:00 2017
+// Created On       : Wed May 25 15:40:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr May 25 15:27:00 2017
+// Last Modified On : Wed May 25 17:02:00 2017
 // Update Count     : 1
 //
@@ -27 +27 @@
 void ?{}(result(T, E) * this, one_t, T value) {
         this->has_value = true;
-        (&this->value){value};
+        this->value = value;
 }
 
@@ -33 +33 @@
 void ?{}(result(T, E) * this, zero_t, E error) {
         this->has_value = false;
-        (&this->error){error};
+        this->error = error;
 }
 
@@ -40 +40 @@
         this->has_value = other.has_value;
         if (other.has_value) {
-                (&this->value){other.value};
+                this->value = other.value;
         } else {
-                (&this->error){other.error};
-        }
-}
-
-forall(otype T, otype E)
-result(T, E) ?=?(result(T, E) * this, result(T, E) that) {
-        if (this->has_value & that.has_value) {
-                this->value = that.value;
-        } else if (this->has_value) {
-                ^(&this->value){};
-                this->has_value = false;
-                (&this->error){that.error};
-        } else if (that.has_value) {
-                ^(&this->error){};
-                this->has_value = true;
-                (&this->value){that.value};
-        } else {
-                this->error = that.error;
+                this->error = other.error;
         }
 }
@@ -103 +86 @@
         return this->error;
 }
-
-forall(otype T, otype E)
-void set(result(T, E) * this, T value) {
-        if (this->has_value) {
-                this->value = value;
-        } else {
-                ^(&this->error){};
-                this->has_value = true;
-                (&this->value){value};
-        }
-}
-
-forall(otype T, otype E)
-void set_error(result(T, E) * this, E error) {
-        if (this->has_value) {
-                ^(&this->value){};
-                this->has_value = false;
-                (&this->error){error};
-        } else {
-                this->error = error;
-        }
-}