Changeset a4943d8c for src/libcfa/containers

Timestamp:

May 25, 2017, 12:55:12 PM (8 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:

58daf53, 84d58c5, cc38669

Parents:

bc37a83 (diff), e883a4b (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

Location:

src/libcfa/containers

Files:

• maybe (modified) (3 diffs)
• maybe.c (modified) (1 diff)
• result (modified) (3 diffs)
• result.c (modified) (4 diffs)

src/libcfa/containers/maybe

@@ -18 +18 @@
 #define MAYBE_H
 
+#include <stdbool.h>
 
 // DO NOT USE DIRECTLY!
 forall(otype T)
 struct maybe {
-    _Bool has_value;
+    bool has_value;
     T value;
 };
@@ -40 +41 @@
 
 forall(otype T)
-_Bool ?!=?(result(T, E) this, zero_t);
+bool ?!=?(maybe(T) this, zero_t);
 
 forall(otype T)
@@ -49 +50 @@
 
 forall(otype T)
-_Bool has_value(maybe(T) * this);
+bool has_value(maybe(T) * this);
 
 forall(otype T)

src/libcfa/containers/maybe.c

@@ -40 +40 @@
 void ^?{}(maybe(T) * this) {
         if (this->has_value) {
-                ^(this->value){};
+                ^(&this->value){};
         }
 }
 
 forall(otype T)
-_Bool ?!=?(result(T, E) this, zero_t) {
-        return !this->has_value;
+bool ?!=?(maybe(T) this, zero_t) {
+        return !this.has_value;
 }
 
 forall(otype T)
 maybe(T) maybe_value(T value) {
-        return (Maybe(T)){value};
+        return (maybe(T)){value};
 }
 
 forall(otype T)
 maybe(T) maybe_none() {
-        return (Maybe(T)){};
+        return (maybe(T)){};
 }
 
 forall(otype T)
-_Bool has_value(maybe(T) * this) {
+bool has_value(maybe(T) * this) {
         return this->has_value;
 }

src/libcfa/containers/result

@@ -18 +18 @@
 #define RESULT_H
 
+#include <stdbool.h>
 
 // DO NOT USE DIRECTLY!
 forall(otype T, otype E)
+union inner_result{
+        T value;
+        E error;
+};
+
+forall(otype T, otype E)
 struct result {
-        _Bool has_value;
-        union {
-                T value;
-                E error;
-        };
+        bool has_value;
+        inner_result(T, E);
 };
 
@@ -46 +50 @@
 
 forall(otype T, otype E)
-_Bool ?!=?(result(T, E) this, zero_t);
+bool ?!=?(result(T, E) this, zero_t);
 
 forall(otype T, otype E)
@@ -55 +59 @@
 
 forall(otype T, otype E)
-_Bool has_value(result(T, E) * this);
+bool has_value(result(T, E) * this);
 
 forall(otype T, otype E)

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;
 }