Changes in libcfa/src/stdlib.hfa [d1b70d4:09ee131]
- File:
-
- 1 edited
-
libcfa/src/stdlib.hfa (modified) (15 diffs)
Legend:
- Unmodified
- Added
- Removed
-
libcfa/src/stdlib.hfa
rd1b70d4 r09ee131 10 10 // Created On : Thu Jan 28 17:12:35 2016 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Jan 21 22:02:13 202113 // Update Count : 5 7412 // Last Modified On : Mon Jan 18 21:51:13 2021 13 // Update Count : 569 14 14 // 15 15 … … 48 48 else return (T *)alignment( _Alignof(T), dim, sizeof(T) ) 49 49 50 static inline forall( T &| sized(T) ) {50 static inline forall( dtype T | sized(T) ) { 51 51 // CFA safe equivalents, i.e., implicit size specification 52 52 … … 108 108 109 109 1. Replace the current forall-block that contains defintions of S_fill and S_realloc with following: 110 forall( T &| sized(T) ) {110 forall( dtype T | sized(T) ) { 111 111 union U_fill { char c; T * a; T t; }; 112 112 struct S_fill { char tag; U_fill(T) fill; }; … … 151 151 typedef struct S_resize { inline void *; } T_resize; 152 152 153 forall( T &) {153 forall( dtype T ) { 154 154 struct S_fill { char tag; char c; size_t size; T * at; char t[50]; }; 155 155 struct S_realloc { inline T *; }; … … 159 159 static inline T_resize ?`resize ( void * a ) { return (T_resize){a}; } 160 160 161 static inline forall( T &| sized(T) ) {161 static inline forall( dtype T | sized(T) ) { 162 162 S_fill(T) ?`fill ( T t ) { 163 163 S_fill(T) ret = { 't' }; … … 195 195 #pragma GCC diagnostic push 196 196 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" 197 assert( size <= sizeof(Fill.t) ); 198 memcpy( (char *)ptr + i, &Fill.t, size ); 197 memcpy( (char *)ptr + i, &Fill.t, sizeof(Fill.t) ); 199 198 #pragma GCC diagnostic pop 200 199 } … … 208 207 } // $alloc_internal 209 208 210 forall( TT...| { T * $alloc_internal( void *, T *, size_t, size_t, S_fill(T), TT ); } ) {209 forall( ttype TT | { T * $alloc_internal( void *, T *, size_t, size_t, S_fill(T), TT ); } ) { 211 210 212 211 T * $alloc_internal( void * , T * Realloc, size_t Align, size_t Dim, S_fill(T) Fill, T_resize Resize, TT rest) { … … 237 236 } // distribution T 238 237 239 static inline forall( T &| sized(T) ) {238 static inline forall( dtype T | sized(T) ) { 240 239 // CFA safe initialization/copy, i.e., implicit size specification, non-array types 241 240 T * memset( T * dest, char fill ) { … … 258 257 259 258 // CFA deallocation for multiple objects 260 static inline forall( T &) // FIX ME, problems with 0p in list259 static inline forall( dtype T ) // FIX ME, problems with 0p in list 261 260 void free( T * ptr ) { 262 261 free( (void *)ptr ); // C free 263 262 } // free 264 static inline forall( T &, TT...| { void free( TT ); } )263 static inline forall( dtype T, ttype TT | { void free( TT ); } ) 265 264 void free( T * ptr, TT rest ) { 266 265 free( ptr ); … … 269 268 270 269 // CFA allocation/deallocation and constructor/destructor, non-array types 271 static inline forall( T & | sized(T), TT...| { void ?{}( T &, TT ); } )270 static inline forall( dtype T | sized(T), ttype TT | { void ?{}( T &, TT ); } ) 272 271 T * new( TT p ) { 273 272 return &(*(T *)malloc()){ p }; // run constructor 274 273 } // new 275 274 276 static inline forall( T &| { void ^?{}( T & ); } )275 static inline forall( dtype T | { void ^?{}( T & ); } ) 277 276 void delete( T * ptr ) { 278 277 // special case for 0-sized object => always call destructor … … 282 281 free( ptr ); // always call free 283 282 } // delete 284 static inline forall( T &, TT...| { void ^?{}( T & ); void delete( TT ); } )283 static inline forall( dtype T, ttype TT | { void ^?{}( T & ); void delete( TT ); } ) 285 284 void delete( T * ptr, TT rest ) { 286 285 delete( ptr ); … … 289 288 290 289 // CFA allocation/deallocation and constructor/destructor, array types 291 forall( T & | sized(T), TT...| { void ?{}( T &, TT ); } ) T * anew( size_t dim, TT p );292 forall( T &| sized(T) | { void ^?{}( T & ); } ) void adelete( T arr[] );293 forall( T & | sized(T) | { void ^?{}( T & ); }, TT...| { void adelete( TT ); } ) void adelete( T arr[], TT rest );290 forall( dtype T | sized(T), ttype TT | { void ?{}( T &, TT ); } ) T * anew( size_t dim, TT p ); 291 forall( dtype T | sized(T) | { void ^?{}( T & ); } ) void adelete( T arr[] ); 292 forall( dtype T | sized(T) | { void ^?{}( T & ); }, ttype TT | { void adelete( TT ); } ) void adelete( T arr[], TT rest ); 294 293 295 294 //--------------------------------------- … … 331 330 //--------------------------------------- 332 331 333 forall( E | { int ?<?( E, E ); } ) {332 forall( otype E | { int ?<?( E, E ); } ) { 334 333 E * bsearch( E key, const E * vals, size_t dim ); 335 334 size_t bsearch( E key, const E * vals, size_t dim ); … … 340 339 } // distribution 341 340 342 forall( K,E | { int ?<?( K, K ); K getKey( const E & ); } ) {341 forall( otype K, otype E | { int ?<?( K, K ); K getKey( const E & ); } ) { 343 342 E * bsearch( K key, const E * vals, size_t dim ); 344 343 size_t bsearch( K key, const E * vals, size_t dim ); … … 349 348 } // distribution 350 349 351 forall( E | { int ?<?( E, E ); } ) {350 forall( otype E | { int ?<?( E, E ); } ) { 352 351 void qsort( E * vals, size_t dim ); 353 352 } // distribution
Note:
See TracChangeset
for help on using the changeset viewer.