Changeset 76af36f for src/examples/gc_no_raii/src/gcpointers.c

Timestamp:

Sep 13, 2016, 4:21:26 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

4c1403c

Parents:

4ed70597

Message:

many small fixes in garbage collector, mostly RAII related

File:

• src/examples/gc_no_raii/src/gcpointers.c (modified) (4 diffs)

src/examples/gc_no_raii/src/gcpointers.c

@@ -25 +25 @@
                 check(obj);
                 check(is_valid(obj));
-                check(gc_is_managed(this) == gc_is_managed(obj->root_chain) || !obj->root_chain);
+                check(!obj->root_chain || this->ptr == obj->root_chain->ptr);
+                check(!obj->root_chain || gc_is_managed(this) == gc_is_managed(obj->root_chain));
                 this->next = obj->root_chain;
                 obj->root_chain = this;
@@ -69 +70 @@
 }
 
-gcpointer_t* gcpointer_assign(gcpointer_t* this, gcpointer_t* rhs)
+gcpointer_t ?=?(gcpointer_t* this, gcpointer_t rhs)
 {
-        if(this != rhs)
-        {
-                unregister_ptr(this);
+        unregister_ptr(this);
+        this->ptr = rhs.ptr;
+        register_ptr(this);
 
-                this->ptr = rhs->ptr;
-
-                register_ptr(this);
-        }
-
-        return this;
+        return *this;
 }
 
@@ -107 +103 @@
 }
 
-forall(otype T) void ?{}(gcpointer(T)* this, gcpointer(T)* other) {
-        (&this->internal) { other->internal };
+forall(otype T) void ?{}(gcpointer(T)* this, gcpointer(T) other) {
+        (&this->internal) { other.internal };
 }
 
@@ -115 +111 @@
 }
 
-// forall(otype T) gcpointer(T) ?=?(gcpointer(T) this, gcpointer(T) rhs);
+forall(otype T) gcpointer(T) ?=?(gcpointer(T)* this, gcpointer(T) rhs) {
+        this->internal = rhs.internal;
+        return *this;
+}
 //
 // forall(otype T) T *?(gcpointer(T) this);