Changeset f1e42c1 for src/examples/gc_no_raii

Timestamp:

May 12, 2016, 10:14:36 AM (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:

bf5a70da

Parents:

273080f

Message:

added some basic tests and modified compilation to support them

Location:

src/examples/gc_no_raii

Files:

• src/gc.h (modified) (1 diff)
• src/gcpointers.c (modified) (1 diff)
• src/gcpointers.h (modified) (2 diffs)
• src/test_include.c (modified) (1 diff)
• src/vector.h (modified) (1 diff)
• test/badlll.c (modified) (1 diff)
• test/operators.c (added)

src/examples/gc_no_raii/src/gc.h

@@ -2 +2 @@
 
 #include "gcpointers.h"
+#include "internal/collector.h"
 
-// forall( dtype T )
-// gcpointer_t gcmalloc()
-// {
-//
-// }
+forall(otype T)
+static inline gcpointer(T) gcmalloc()
+{
+    gcpointer(T) test;
+    // ctor(&test, gc_allocate(sizeof(T)));
+    // gc_conditional_collect();
+    return test;
+}

src/examples/gc_no_raii/src/gcpointers.c

@@ -84 +84 @@
 
 //Logical operators
-int gcpointer_equal(gcpointer_t* this, gcpointer_t* rhs)
+bool gcpointer_equal(gcpointer_t* this, gcpointer_t* rhs)
 {
         return this->ptr == rhs->ptr;
 }
 
-int gcpointer_not_equal(gcpointer_t* this, gcpointer_t* rhs)
+bool gcpointer_not_equal(gcpointer_t* this, gcpointer_t* rhs)
 {
         return this->ptr != rhs->ptr;
 }
 
-int gcpointer_null(gcpointer_t* this)
+bool gcpointer_null(gcpointer_t* this)
 {
         return this->ptr == (intptr_t)NULL;

src/examples/gc_no_raii/src/gcpointers.h

@@ -1 +1 @@
 #pragma once
 
+#include <stdbool.h>
 #include <stdint.h>
 
@@ -10 +11 @@
 
 void gcpointer_ctor(gcpointer_t* this);
-void gcpointer_ctor(gcpointer_t* ptr, int null);
 void gcpointer_ctor(gcpointer_t* this, void* address);
 void gcpointer_ctor(gcpointer_t* this, gcpointer_t* other);
-
 void gcpointer_dtor(gcpointer_t* this);
-
 gcpointer_t* gcpointer_assign(gcpointer_t* this, gcpointer_t* rhs);
 
 //Logical operators
-int gcpointer_equal(gcpointer_t* this, gcpointer_t* rhs);
-int gcpointer_not_equal(gcpointer_t* this, gcpointer_t* rhs);
-int gcpointer_null(gcpointer_t* this);
+bool gcpointer_equal(gcpointer_t* this, gcpointer_t* rhs);
+bool gcpointer_not_equal(gcpointer_t* this, gcpointer_t* rhs);
+bool gcpointer_null(gcpointer_t* this);
+
+forall(otype T)
+struct gcpointer
+{
+        gcpointer_t internal;
+};
+
+forall(otype T)
+static inline void ctor(gcpointer(T)* this)
+{
+        gcpointer_ctor(&this->internal);
+}
+
+// forall(otype T)
+// static inline void ctor(gcpointer(T)* this, int null)
+// {
+//      gcpointer_ctor(&this->internal, NULL);
+// }
+
+forall(otype T)
+static inline void ctor(gcpointer(T)* this, void* address)
+{
+        gcpointer_ctor(&this->internal, address);
+}
+
+forall(otype T)
+static inline void ctor(gcpointer(T)* this, gcpointer(T)* other)
+{
+        gcpointer_ctor(&this->internal, other);
+}
+
+forall(otype T)
+static inline void dtor(gcpointer(T)* this)
+{
+        gcpointer_dtor(&this->internal);
+}
+
+forall(otype T)
+static inline gcpointer(T)* ?=?(gcpointer(T)* this, gcpointer(T)* rhs)
+{
+        gcpointer_assign(&this->internal, &rhs->internal);
+        return this;
+}
+
+forall(otype T)
+static inline T *?(gcpointer(T) this)
+{
+        return *(T*)this.internal.ptr;
+}
+
+//Logical operators
+forall(otype T)
+static inline int ?!=?(gcpointer(T) this, gcpointer(T) rhs)
+{
+        return this.internal.ptr != rhs.internal.ptr;
+}
+
+forall(otype T)
+static inline int ?==?(gcpointer(T) this, gcpointer(T) rhs)
+{
+        return !(this == rhs);
+}
+
+forall(otype T)
+extern struct gcpointer(T) 0;

src/examples/gc_no_raii/src/test_include.c

@@ -2 +2 @@
 #define xstr(s) sstr(s)
 #define sstr(s) #s
-#error "test" # xstr(TEST_FILE.c)
-#include "test" # xstr(TEST_FILE.c)
+#include xstr(../test/TEST_FILE.c)

src/examples/gc_no_raii/src/vector.h

@@ -1 +1 @@
 #pragma once
 
+#include <stdbool.h>
 #include <stdlib>
 

src/examples/gc_no_raii/test/badlll.c

@@ -6 +6 @@
         int val;
 };
+
+typedef gcpointer(List_t) LLL;
+
+#define MAX (1024 * 1024)
+
+LLL buildLLL(int sz)
+{
+        int i;
+        LLL ll0, lll, llc;
+        ctor(&ll0);
+        ctor(&lll);
+        ctor(&llc);
+
+        ll0 = gcmalloc();
+        ll0->val = 0;
+        lll = ll0;
+
+        return ll0;
+}