Changeset bf1ee05 for src

Timestamp:

May 17, 2016, 6:34:14 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

21995bc

Parents:

19de7b70

Message:

test with single copy from return

Location:

src/examples/wrapper/src

Files:

• main.c (modified) (1 diff)
• pointer.h (modified) (3 diffs)

src/examples/wrapper/src/main.c

@@ -3 +3 @@
 int main(int argc, char const *argv[])
 {
-        wrapper_t p;
+        wrapper_t p = wrap(6);
         return 0;
 }

src/examples/wrapper/src/pointer.h

@@ -38 +38 @@
 }
 
-void ?{}(content_t* this)
-{
-        sout | "Constructing content" | endl;
-        this->count = 0;
-}
-
 void ^?{}(content_t* this)
 {
@@ -57 +51 @@
 };
 
-wrapper_t wrap(int val)
+void ?{}(wrapper_t* this)
 {
-        wrapper_t w;
-        content_t* c = malloc;
-        c{};
-        c->value = val;
-        reset(&w, c);
-        return w;
+        sout | "Constructing empty ref pointer" | endl;
+        this->ptr = NULL;
 }
 
-void ?{}(wrapper_t* this)
+void ?{}(wrapper_t* this, wrapper_t rhs)
 {
-        this->ptr = new();
+        sout | "Constructing ref pointer from copy" | endl;
+        this->ptr = rhs.ptr;
         this->ptr->count++;
-        sout | "Constructing empty ref pointer" | endl;
 }
 
 void ^?{}(wrapper_t* this)
 {
+        if(this->ptr)
         {
+                sout | "Destroying ref pointer" | endl;
                 this->ptr->count--;
+                sout | "Reference is " | (int)this->ptr->count | endl;
                 if(!this->ptr->count) delete(this->ptr);
-                sout | "Destroying ref pointer" | endl;
-                sout | "Reference is " | this->ptr->count | endl;
         }
         else
@@ -91 +82 @@
 {
         this->ptr = c;
+        this->ptr->count++;
         sout | "Setting ref pointer" | endl;
         sout | "Reference is " | this->ptr->count | endl;
 }
+
+wrapper_t wrap(int val)
+{
+        wrapper_t w;
+        content_t* c = malloc();
+        c{};
+        c->value = val;
+        set(&w, c);
+        return w;
+}