Changeset 627f585

Timestamp:

Jan 10, 2017, 2:32:33 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:

dd0c97b

Parents:

f831177

Message:

moved new and delete to stdlib

Location:

src

Files:

• InitTweak/FixInit.cc (modified) (1 diff)
• libcfa/stdlib (modified) (2 diffs)
• libcfa/stdlib.c (modified) (1 diff)
• tests/avltree/avl.h (modified) (1 diff)
• tests/avltree/avl0.c (modified) (1 diff)
• tests/tupleVariadic.c (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -1100 +1100 @@
                         addDeclaration( tmp );
 
+                        // xxx - this can be TupleAssignExpr now. Need to properly handle this case.
                         ApplicationExpr * callExpr = safe_dynamic_cast< ApplicationExpr * > ( ctorExpr->get_callExpr() );
                         TypeSubstitution * env = ctorExpr->get_env();

src/libcfa/stdlib

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// stdlib -- 
+// stdlib --
 //
 // Author           : Peter A. Buhr
@@ -44 +44 @@
 void free( void * ptr );
 } // extern "C"
+
+forall( otype T, ttype Params | { void ?{}(T *, Params); } ) T * new( Params p );
+forall( dtype T | { void ^?{}(T *); } ) void delete( T * ptr );
+
 
 //---------------------------------------

src/libcfa/stdlib.c

@@ -78 +78 @@
 } // posix_memalign
 
+forall( otype T, ttype Params | { void ?{}(T *, Params); } )
+T * new( Params p ) {
+        return ((T*)malloc()){ p };
+}
+
+forall( dtype T | { void ^?{}(T *); } )
+void delete( T * ptr ) {
+  if ( ptr ) {
+    ^ptr{};
+    free( ptr );
+  }
+}
+
 //---------------------------------------
 

src/tests/avltree/avl.h

@@ -19 +19 @@
 forall(otype T | Comparable(T))
 int ?>?(T t1, T t2);
+
+// xxx - unbound type variable problems when trying to use new instead of create
+// forall( otype T, ttype Params | { void ?{}(T *, Params); } ) T * new( Params p );
 
 forall(dtype T | { void ^?{}(T *); })

src/tests/avltree/avl0.c

@@ -10 +10 @@
   return t2 < t1;
 }
-
-forall(dtype T | { void ^?{}(T *); })
-void delete(T * x) {
-  if (x) {
-    ^?{}(x);
-    free(x);
-  }
-}

src/tests/tupleVariadic.c

@@ -29 +29 @@
 }
 
-forall(otype T) T * malloc();
-
-forall(otype T, ttype Params | sized(T) | { void ?{}(T *, Params); })
-T * new(Params p) {
-        return ((T*)malloc()){ p };
-}
+forall(otype T, ttype Params | { void ?{}(T *, Params); })
+T * new(Params p);
 
 struct array {