Changeset aca65621 for src/libcfa/containers/maybe.c

Timestamp:

Jul 12, 2017, 4:40:02 PM (8 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:

0698aa1

Parents:

469f709

Message:

Convert several library files to use references

File:

• src/libcfa/containers/maybe.c (modified) (3 diffs)

src/libcfa/containers/maybe.c

@@ -19 +19 @@
 
 forall(otype T)
-void ?{}(maybe(T) * this) {
-        this->has_value = false;
+void ?{}(maybe(T) & this) {
+        this.has_value = false;
 }
 
 forall(otype T)
-void ?{}(maybe(T) * this, T value) {
-        this->has_value = true;
-        (&this->value){value};
+void ?{}(maybe(T) & this, T value) {
+        this.has_value = true;
+        (this.value){value};
 }
 
 forall(otype T)
-void ?{}(maybe(T) * this, maybe(T) other) {
-        this->has_value = other.has_value;
+void ?{}(maybe(T) & this, maybe(T) other) {
+        this.has_value = other.has_value;
         if (other.has_value) {
-                (&this->value){other.value};
+                (this.value){other.value};
         }
 }
 
 forall(otype T)
-maybe(T) ?=?(maybe(T) * this, maybe(T) that) {
-        if (this->has_value & that.has_value) {
-                this->value = that.value;
-        } else if (this->has_value) {
-                ^(&this->value){};
-                this->has_value = false;
+maybe(T) ?=?(maybe(T) & this, maybe(T) that) {
+        if (this.has_value & that.has_value) {
+                this.value = that.value;
+        } else if (this.has_value) {
+                ^(this.value){};
+                this.has_value = false;
         } else if (that.has_value) {
-                this->has_value = true;
-                (&this->value){that.value};
+                this.has_value = true;
+                (this.value){that.value};
         }
+        return this;
 }
 
 forall(otype T)
-void ^?{}(maybe(T) * this) {
-        if (this->has_value) {
-                ^(&this->value){};
+void ^?{}(maybe(T) & this) {
+        if (this.has_value) {
+                ^(this.value){};
         }
 }
@@ -89 +90 @@
         } else {
                 this->has_value = true;
-                (&this->value){value};
+                (this->value){value};
         }
 }
@@ -97 +98 @@
         if (this->has_value) {
                 this->has_value = false;
-                ^(&this->value){};
+                ^(this->value){};
         }
 }