Changes in src/libcfa/stdlib.c [f3fc631f:6065b3aa]

File:

• src/libcfa/stdlib.c (modified) (5 diffs)

src/libcfa/stdlib.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 30 09:07:56 2017
-// Update Count     : 237
+// Last Modified On : Thu Jun  1 21:52:57 2017
+// Update Count     : 280
 //
 
@@ -28 +28 @@
 
 // resize, non-array types
-forall( dtype T | sized(T) ) T * realloc( T * ptr, size_t size, char fill ) { // alternative realloc with fill value
-        //printf( "X6\n" );
+forall( dtype T | sized(T) ) T * alloc( T ptr[], size_t dim, char fill ) {
         size_t olen = malloc_usable_size( ptr );                        // current allocation
-    char * nptr = (void *)realloc( (void *)ptr, size ); // C realloc
+    char * nptr = (void *)realloc( (void *)ptr, dim * (size_t)sizeof(T) ); // C realloc
         size_t nlen = malloc_usable_size( nptr );                       // new allocation
         if ( nlen > olen ) {                                                            // larger ?
@@ -37 +36 @@
         } // 
     return (T *)nptr;
-} // realloc
-
-// allocation/deallocation and constructor/destructor
-forall( dtype T, ttype Params | sized(T) | { void ?{}( T *, Params ); } )
+} // alloc
+
+// allocation/deallocation and constructor/destructor, non-array types
+forall( dtype T | sized(T), ttype Params | { void ?{}( T *, Params ); } )
 T * new( Params p ) {
-        return ((T *)malloc()){ p };
+        return (malloc()){ p };                                                         // run constructor
 } // new
 
 forall( dtype T | { void ^?{}( T * ); } )
 void delete( T * ptr ) {
-        if ( ptr ) {
+        if ( ptr ) {                                                                            // ignore null
                 ^ptr{};                                                                                 // run destructor
                 free( ptr );
@@ -55 +54 @@
 forall( dtype T, ttype Params | { void ^?{}( T * ); void delete( Params ); } )
 void delete( T * ptr, Params rest ) {
-        if ( ptr ) {
+        if ( ptr ) {                                                                            // ignore null
                 ^ptr{};                                                                                 // run destructor
                 free( ptr );
@@ -61 +60 @@
         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 ) {
+        T *arr = alloc( dim );
+        for ( unsigned int i = 0; i < dim; i += 1 ) {
+                (&arr[i]){ p };                                                                 // run constructor
+        } // for
+        return arr;
+} // anew
+
+forall( dtype T | sized(T) | { void ^?{}( T * ); } )
+void adelete( size_t dim, T arr[] ) {
+        if ( arr ) {                                                                            // ignore null
+                for ( int i = dim - 1; i >= 0; i -= 1 ) {               // reverse allocation order, must be unsigned
+                        ^(&arr[i]){};                                                           // run destructor
+                } // for
+                free( arr );
+        } // if
+} // adelete
+
+forall( dtype T | sized(T) | { void ^?{}( T * ); }, ttype Params | { void adelete( Params ); } )
+void adelete( size_t dim, T arr[], Params rest ) {
+        if ( arr ) {                                                                            // ignore null
+                for ( int i = dim - 1; i >= 0; i -= 1 ) {               // reverse allocation order, must be unsigned
+                        ^(&arr[i]){};                                                           // run destructor
+                } // for
+                free( arr );
+        } // if
+        adelete( rest );
+} // adelete
 
 //---------------------------------------