Changeset 242a902 for src/libcfa/containers

Timestamp:

Jul 18, 2017, 4:35:52 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

f19339e

Parents:

795d450

Message:

Convert more library files to use references

Location:

src/libcfa/containers

Files:

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

src/libcfa/containers/result

@@ -35 +35 @@
 
 forall(otype T, otype E)
-void ?{}(result(T, E) * this);
+void ?{}(result(T, E) & this);
 
 forall(otype T, otype E)
-void ?{}(result(T, E) * this, one_t, T value);
+void ?{}(result(T, E) & this, one_t, T value);
 
 forall(otype T, otype E)
-void ?{}(result(T, E) * this, zero_t, E error);
+void ?{}(result(T, E) & this, zero_t, E error);
 
 forall(otype T, otype E)
-void ?{}(result(T, E) * this, result(T, E) other);
+void ?{}(result(T, E) & this, result(T, E) other);
 
 forall(otype T, otype E)
-void ^?{}(result(T, E) * this);
+void ^?{}(result(T, E) & this);
 
 forall(otype T, otype E)
-result(T, E) ?=?(result(T, E) * this, result(T, E) other);
+result(T, E) ?=?(result(T, E) & this, result(T, E) other);
 
 forall(otype T, otype E)

src/libcfa/containers/result.c

@@ -19 +19 @@
 
 forall(otype T, otype E)
-void ?{}(result(T, E) * this) {
-        this->has_value = false;
-        (&this->error){};
+void ?{}(result(T, E) & this) {
+        this.has_value = false;
+        (this.error){};
 }
 
 forall(otype T, otype E)
-void ?{}(result(T, E) * this, one_t, T value) {
-        this->has_value = true;
-        (&this->value){value};
+void ?{}(result(T, E) & this, one_t, T value) {
+        this.has_value = true;
+        (this.value){value};
 }
 
 forall(otype T, otype E)
-void ?{}(result(T, E) * this, zero_t, E error) {
-        this->has_value = false;
-        (&this->error){error};
+void ?{}(result(T, E) & this, zero_t, E error) {
+        this.has_value = false;
+        (this.error){error};
 }
 
 forall(otype T, otype E)
-void ?{}(result(T, E) * this, result(T, E) other) {
-        this->has_value = other.has_value;
+void ?{}(result(T, E) & this, result(T, E) other) {
+        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};
+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};
+                ^(this.error){};
+                this.has_value = true;
+                (this.value){that.value};
         } else {
-                this->error = that.error;
+                this.error = that.error;
         }
 }
 
 forall(otype T, otype E)
-void ^?{}(result(T, E) * this) {
-        if (this->has_value) {
-                ^(&this->value){};
+void ^?{}(result(T, E) & this) {
+        if (this.has_value) {
+                ^(this.value){};
         } else {
-                ^(&this->error){};
+                ^(this.error){};
         }
 }
@@ -109 +109 @@
                 this->value = value;
         } else {
-                ^(&this->error){};
+                ^(this->error){};
                 this->has_value = true;
-                (&this->value){value};
+                (this->value){value};
         }
 }
@@ -118 +118 @@
 void set_error(result(T, E) * this, E error) {
         if (this->has_value) {
-                ^(&this->value){};
+                ^(this->value){};
                 this->has_value = false;
-                (&this->error){error};
+                (this->error){error};
         } else {
                 this->error = error;