Changeset aac5dfd for libcfa/src/stdlib.hfa

Timestamp:

Dec 12, 2020, 7:30:31 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

5d1aa2f

Parents:

6ce9a4f2 (diff), 4803a901 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/stdlib.hfa (modified) (7 diffs)

libcfa/src/stdlib.hfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec  8 18:27:22 2020
-// Update Count     : 524
+// Last Modified On : Sat Dec 12 13:52:34 2020
+// Update Count     : 536
 //
 
@@ -49 +49 @@
 
 static inline forall( dtype T | sized(T) ) {
-        // Cforall safe equivalents, i.e., implicit size specification
+        // CFA safe equivalents, i.e., implicit size specification
 
         T * malloc( void ) {
@@ -234 +234 @@
 
 static inline forall( dtype T | sized(T) ) {
-        // Cforall safe initialization/copy, i.e., implicit size specification, non-array types
+        // CFA safe initialization/copy, i.e., implicit size specification, non-array types
         T * memset( T * dest, char fill ) {
                 return (T *)memset( dest, fill, sizeof(T) );
@@ -243 +243 @@
         } // memcpy
 
-        // Cforall safe initialization/copy, i.e., implicit size specification, array types
+        // CFA safe initialization/copy, i.e., implicit size specification, array types
         T * amemset( T dest[], char fill, size_t dim ) {
                 return (T *)(void *)memset( dest, fill, dim * sizeof(T) ); // C memset
@@ -253 +253 @@
 } // distribution
 
-// Cforall deallocation for multiple objects
+// CFA deallocation for multiple objects
+static inline forall( dtype T )                                                 // FIX ME, problems with 0p in list
+void free( T * ptr ) {
+        free( (void *)ptr );                                                            // C free
+} // free
 static inline forall( dtype T, ttype TT | { void free( TT ); } )
-void free( T * addr, TT rest ) {
-        free( ( void *)addr );                                                          // use C free
+void free( T * ptr, TT rest ) {
+        free( ptr );
         free( rest );
 } // free
 
-// Cforall allocation/deallocation and constructor/destructor, non-array types
+// CFA allocation/deallocation and constructor/destructor, non-array types
 static inline forall( dtype T | sized(T), ttype TT | { void ?{}( T &, TT ); } )
 T * new( TT p ) {
@@ -272 +276 @@
                 ^(*ptr){};                                                                              // run destructor
         } // if
-        free( ptr );
+        free( ptr );                                                                            // always call free
 } // delete
-
 static inline forall( dtype T, ttype TT | { void ^?{}( T & ); void delete( TT ); } )
 void delete( T * ptr, TT rest ) {
@@ -281 +284 @@
 } // delete
 
-// Cforall allocation/deallocation and constructor/destructor, array types
+// CFA allocation/deallocation and constructor/destructor, array types
 forall( dtype T | sized(T), ttype TT | { void ?{}( T &, TT ); } ) T * anew( size_t dim, TT p );
 forall( dtype T | sized(T) | { void ^?{}( T & ); } ) void adelete( T arr[] );