Changeset 1eeab94 for src/libcfa/containers/result.c

Timestamp:

May 25, 2017, 3:39:02 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

41634098, 8712514

Parents:

7f612112 (diff), f851015 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

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

src/libcfa/containers/result.c

@@ -8 +8 @@
 //
 // Author           : Andrew Beach
-// Created On       : Wed May 25 15:40:00 2017
+// Created On       : Wed May 24 15:40:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May 25 17:02:00 2017
+// Last Modified On : Thr May 25 15:27: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;
+                (&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;
         }
 }
@@ -86 +103 @@
         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;
+        }
+}