Changeset 8ca26d5 for libcfa/src/stdlib.cfa

Timestamp:

Nov 12, 2020, 1:26:38 PM (3 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

0989e79, 9d264e18, f2ccbfd

Parents:

3746f777 (diff), 0b996a1 (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.cfa (modified) (3 diffs)

libcfa/src/stdlib.cfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jul 19 15:05:28 2020
-// Update Count     : 501
+// Last Modified On : Thu Nov 12 07:46:09 2020
+// Update Count     : 503
 //
 
@@ -26 +26 @@
 //---------------------------------------
 
-// allocation/deallocation and constructor/destructor, non-array types
-forall( dtype T | sized(T), ttype Params | { void ?{}( T &, Params ); } )
-T * new( Params p ) {
-        return &(*malloc()){ p };                                                       // run constructor
-} // new
-
-forall( dtype T | { void ^?{}( T & ); } )
-void delete( T * ptr ) {
-        if ( ptr ) {                                                                            // ignore null
-                ^(*ptr){};                                                                              // run destructor
-                free( ptr );
-        } // if
-} // delete
-
-forall( dtype T, ttype Params | { void ^?{}( T & ); void delete( Params ); } )
-void delete( T * ptr, Params rest ) {
-        delete( ptr );
-        delete( rest );
-} // delete
-
-
-// allocation/deallocation and constructor/destructor, array types
-forall( dtype T | sized(T), ttype Params | { void ?{}( T &, Params ); } )
-T * anew( size_t dim, Params p ) {
+// Cforall allocation/deallocation and constructor/destructor, array types
+
+forall( dtype T | sized(T), ttype TT | { void ?{}( T &, TT ); } )
+T * anew( size_t dim, TT p ) {
         T * arr = alloc( dim );
         for ( unsigned int i = 0; i < dim; i += 1 ) {
@@ -68 +48 @@
 } // adelete
 
-forall( dtype T | sized(T) | { void ^?{}( T & ); }, ttype Params | { void adelete( Params ); } )
-void adelete( T arr[], Params rest ) {
+forall( dtype T | sized(T) | { void ^?{}( T & ); }, ttype TT | { void adelete( TT ); } )
+void adelete( T arr[], TT rest ) {
         if ( arr ) {                                                                            // ignore null
                 size_t dim = malloc_size( arr ) / sizeof( T );