Changes in src/libcfa/containers/result.c [79308c8e:64fc0ba]

File:

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

src/libcfa/containers/result.c

@@ -21 +21 @@
 void ?{}(result(T, E) * this) {
         this->has_value = false;
-        (this->error){};
+        (&this->error){};
 }
 
@@ -49 +49 @@
 void ^?{}(result(T, E) * this) {
         if (this->has_value) {
-                ^(this->value){};
+                ^(&this->value){};
         } else {
-                ^(this->error){};
+                ^(&this->error){};
         }
 }
 
 forall(otype T, otype E)
-_Bool ?!=?(result(T, E) this, zero_t) {
-        return !this->has_value;
+bool ?!=?(result(T, E) this, zero_t) {
+        return !this.has_value;
 }
 
 forall(otype T, otype E)
 result(T, E) result_value(T value) {
-        return (Result(T, E)){1, value};
+        return (result(T, E)){1, value};
 }
 
 forall(otype T, otype E)
 result(T, E) result_error(E error) {
-        return (Result(T, E)){0, value};
+        return (result(T, E)){0, error};
 }
 
 forall(otype T, otype E)
-_Bool has_value(result(T, E) * this) {
+bool has_value(result(T, E) * this) {
         return this->has_value;
 }
@@ -77 +77 @@
 forall(otype T, otype E)
 T get(result(T, E) * this) {
-    assertf(this->has_value, "attempt to get from result without value");
+        assertf(this->has_value, "attempt to get from result without value");
         return this->value;
 }
@@ -83 +83 @@
 forall(otype T, otype E)
 E get_error(result(T, E) * this) {
-    assertf(this->has_value, "attempt to get from result without error");
+        assertf(this->has_value, "attempt to get from result without error");
         return this->error;
 }