Changeset 73d0c54a for libcfa/src/stdlib.hfa

Timestamp:

Apr 21, 2021, 3:39:14 PM (3 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:

b39e6566

Parents:

665edf40 (diff), 7711064 (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 : Thu Jan 21 22:02:13 2021
-// Update Count     : 574
+// Last Modified On : Tue Apr 20 21:20:03 2021
+// Update Count     : 575
 //
 
@@ -44 +44 @@
 
 // Macro because of returns
-#define $ARRAY_ALLOC( allocation, alignment, dim ) \
+#define ARRAY_ALLOC$( allocation, alignment, dim ) \
         if ( _Alignof(T) <= libAlign() ) return (T *)(void *)allocation( dim, (size_t)sizeof(T) ); /* C allocation */ \
         else return (T *)alignment( _Alignof(T), dim, sizeof(T) )
@@ -57 +57 @@
 
         T * aalloc( size_t dim ) {
-                $ARRAY_ALLOC( aalloc, amemalign, dim );
+                ARRAY_ALLOC$( aalloc, amemalign, dim );
         } // aalloc
 
         T * calloc( size_t dim ) {
-                $ARRAY_ALLOC( calloc, cmemalign, dim );
+                ARRAY_ALLOC$( calloc, cmemalign, dim );
         } // calloc
 
@@ -119 +119 @@
                 S_fill(T) ?`fill( T    a[], size_t nmemb )      { S_fill(T) ret = {'a', nmemb}; ret.fill.a = a; return ret; }
 
-        3. Replace the $alloc_internal function which is outside ttype forall-block with following function:
-                T * $alloc_internal( void * Resize, T * Realloc, size_t Align, size_t Dim, S_fill(T) Fill) {
+        3. Replace the alloc_internal$ function which is outside ttype forall-block with following function:
+                T * alloc_internal$( void * Resize, T * Realloc, size_t Align, size_t Dim, S_fill(T) Fill) {
                         T * ptr = NULL;
                         size_t size = sizeof(T);
@@ -145 +145 @@
 
                         return ptr;
-                } // $alloc_internal
+                } // alloc_internal$
 */
 
@@ -175 +175 @@
         S_realloc(T)    ?`realloc ( T * a )                             { return (S_realloc(T)){a}; }
 
-        T * $alloc_internal( void * Resize, T * Realloc, size_t Align, size_t Dim, S_fill(T) Fill ) {
+        T * alloc_internal$( void * Resize, T * Realloc, size_t Align, size_t Dim, S_fill(T) Fill ) {
                 T * ptr = NULL;
                 size_t size = sizeof(T);
@@ -206 +206 @@
 
                 return ptr;
-        } // $alloc_internal
-
-        forall( TT... | { T * $alloc_internal( void *, T *, size_t, size_t, S_fill(T), TT ); } ) {
-
-                T * $alloc_internal( void *       , T * Realloc, size_t Align, size_t Dim, S_fill(T) Fill, T_resize Resize, TT rest) {
-                return $alloc_internal( Resize, (T*)0p, Align, Dim, Fill, rest);
-                }
-
-                T * $alloc_internal( void * Resize, T *        , size_t Align, size_t Dim, S_fill(T) Fill, S_realloc(T) Realloc, TT rest) {
-                return $alloc_internal( (void*)0p, Realloc, Align, Dim, Fill, rest);
-                }
-
-                T * $alloc_internal( void * Resize, T * Realloc, size_t      , size_t Dim, S_fill(T) Fill, T_align Align, TT rest) {
-                return $alloc_internal( Resize, Realloc, Align, Dim, Fill, rest);
-                }
-
-                T * $alloc_internal( void * Resize, T * Realloc, size_t Align, size_t Dim, S_fill(T)     , S_fill(T) Fill, TT rest) {
-                return $alloc_internal( Resize, Realloc, Align, Dim, Fill, rest);
+        } // alloc_internal$
+
+        forall( TT... | { T * alloc_internal$( void *, T *, size_t, size_t, S_fill(T), TT ); } ) {
+
+                T * alloc_internal$( void *       , T * Realloc, size_t Align, size_t Dim, S_fill(T) Fill, T_resize Resize, TT rest) {
+                return alloc_internal$( Resize, (T*)0p, Align, Dim, Fill, rest);
+                }
+
+                T * alloc_internal$( void * Resize, T *        , size_t Align, size_t Dim, S_fill(T) Fill, S_realloc(T) Realloc, TT rest) {
+                return alloc_internal$( (void*)0p, Realloc, Align, Dim, Fill, rest);
+                }
+
+                T * alloc_internal$( void * Resize, T * Realloc, size_t      , size_t Dim, S_fill(T) Fill, T_align Align, TT rest) {
+                return alloc_internal$( Resize, Realloc, Align, Dim, Fill, rest);
+                }
+
+                T * alloc_internal$( void * Resize, T * Realloc, size_t Align, size_t Dim, S_fill(T)     , S_fill(T) Fill, TT rest) {
+                return alloc_internal$( Resize, Realloc, Align, Dim, Fill, rest);
                 }
 
             T * alloc( TT all ) {
-                return $alloc_internal( (void*)0p, (T*)0p, (_Alignof(T) > libAlign() ? _Alignof(T) : libAlign()), (size_t)1, (S_fill(T)){'0'}, all);
+                return alloc_internal$( (void*)0p, (T*)0p, (_Alignof(T) > libAlign() ? _Alignof(T) : libAlign()), (size_t)1, (S_fill(T)){'0'}, all);
             }
 
             T * alloc( size_t dim, TT all ) {
-                return $alloc_internal( (void*)0p, (T*)0p, (_Alignof(T) > libAlign() ? _Alignof(T) : libAlign()), dim, (S_fill(T)){'0'}, all);
+                return alloc_internal$( (void*)0p, (T*)0p, (_Alignof(T) > libAlign() ? _Alignof(T) : libAlign()), dim, (S_fill(T)){'0'}, all);
             }