Changeset 13488ca

Timestamp:

May 17, 2016, 5:51:20 PM (9 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:

19de7b70

Parents:

58440ce

Message:

more testing done

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[])
 {
-        content_t c;
-
-        content_t* cp = (content_t*)malloc();
+        wrapper_t p;
         return 0;
 }

src/examples/wrapper/src/pointer.h

@@ -3 +3 @@
 #include <fstream>
 #include <stddef.h>
-#include <stdlib.h>
+#include <stdlib>
+
+//==============================================================================
+// type safe malloc / free
+
+forall(otype T)
+T* new()
+{
+        T* p = malloc();
+        p{};
+        return p;
+}
+
+forall(otype T)
+void delete(T* p)
+{
+        ^p{};
+        free(p);
+}
+
+//==============================================================================
+// ref counter content
 
 struct content_t
@@ -17 +38 @@
 }
 
+void ?{}(content_t* this)
+{
+        sout | "Constructing content" | endl;
+        this->count = 0;
+}
+
 void ^?{}(content_t* this)
 {
@@ -22 +49 @@
 }
 
-// struct wrapper_t
-// {
-//      content_t* ptr;
-// };
-//
-// void ?{}(wrapper_t* this)
-// {
-//      //content_t** cp = &this->ptr;
-//      //*cp = malloc();
-//      this->ptr->count++;
-//      sout | "Constructing ref pointer" | endl;
-//      sout | "Reference is " | this->ptr->count | endl;
-// }
-//
-// void ^?{}(wrapper_t* this)
-// {
-//      this->ptr->count--;
-//      if(!this->ptr->count) free(this->ptr);
-//      sout | "Destroying ref pointer" | endl;
-//      sout | "Reference is " | this->ptr->count | endl;
-// }
+//==============================================================================
+// ref counter wrapper
+
+struct wrapper_t
+{
+        content_t* ptr;
+};
+
+wrapper_t wrap(int val)
+{
+        wrapper_t w;
+        content_t* c = malloc;
+        c{};
+        c->value = val;
+        reset(&w, c);
+        return w;
+}
+
+void ?{}(wrapper_t* this)
+{
+        this->ptr = new();
+        this->ptr->count++;
+        sout | "Constructing empty ref pointer" | endl;
+}
+
+void ^?{}(wrapper_t* this)
+{
+        {
+                this->ptr->count--;
+                if(!this->ptr->count) delete(this->ptr);
+                sout | "Destroying ref pointer" | endl;
+                sout | "Reference is " | this->ptr->count | endl;
+        }
+        else
+        {
+                sout | "Destroying empty ref pointer" | endl;
+        }
+}
+
+void set(wrapper_t* this, content_t* c)
+{
+        this->ptr = c;
+        sout | "Setting ref pointer" | endl;
+        sout | "Reference is " | this->ptr->count | endl;
+}