Changeset 45444c3

Timestamp:

Nov 2, 2020, 10:04:57 AM (4 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

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

Children:

ea3fa25

Parents:

3100754

Message:

Removed dimension parameter from adelete.

Files:

• libcfa/src/concurrency/clib/cfathread.cfa (modified) (1 diff)
• libcfa/src/stdlib.cfa (modified) (2 diffs)
• libcfa/src/stdlib.hfa (modified) (1 diff)
• tests/alloc.cfa (modified) (1 diff)

libcfa/src/concurrency/clib/cfathread.cfa

@@ -59 +59 @@
         void cfathread_setproccnt( int ncnt ) {
                 assert( ncnt >= 1 );
-                adelete(proc_cnt, procs);
+                adelete( procs );
 
                 proc_cnt = ncnt - 1;

libcfa/src/stdlib.cfa

@@ -58 +58 @@
 
 forall( dtype T | sized(T) | { void ^?{}( T & ); } )
-void adelete( size_t dim, T arr[] ) {
+void adelete( T arr[] ) {
         if ( arr ) {                                                                            // ignore null
+                size_t dim = malloc_size( arr ) / sizeof( T );
                 for ( int i = dim - 1; i >= 0; i -= 1 ) {               // reverse allocation order, must be unsigned
                         ^(arr[i]){};                                                            // run destructor
@@ -68 +69 @@
 
 forall( dtype T | sized(T) | { void ^?{}( T & ); }, ttype Params | { void adelete( Params ); } )
-void adelete( size_t dim, T arr[], Params rest ) {
+void adelete( T arr[], Params rest ) {
         if ( arr ) {                                                                            // ignore null
+                size_t dim = malloc_size( arr ) / sizeof( T );
                 for ( int i = dim - 1; i >= 0; i -= 1 ) {               // reverse allocation order, must be unsigned
                         ^(arr[i]){};                                                            // run destructor

libcfa/src/stdlib.hfa

@@ -263 +263 @@
 // Cforall allocation/deallocation and constructor/destructor, array types
 forall( dtype T | sized(T), ttype Params | { void ?{}( T &, Params ); } ) T * anew( size_t dim, Params p );
-forall( dtype T | sized(T) | { void ^?{}( T & ); } ) void adelete( size_t dim, T arr[] );
-forall( dtype T | sized(T) | { void ^?{}( T & ); }, ttype Params | { void adelete( Params ); } ) void adelete( size_t dim, T arr[], Params rest );
+forall( dtype T | sized(T) | { void ^?{}( T & ); } ) void adelete( T arr[] );
+forall( dtype T | sized(T) | { void ^?{}( T & ); }, ttype Params | { void adelete( Params ); } ) void adelete( T arr[], Params rest );
 
 //---------------------------------------

tests/alloc.cfa

@@ -342 +342 @@
         for ( i; dim ) { printf( "%d %g, ", stp1[i].x, stp1[i].y ); }
         printf( "\n" );
-        adelete( dim, stp, dim, stp1 );
+        adelete( stp, stp1 );
 
         // extras