Index: src/libcfa/stdlib =================================================================== --- src/libcfa/stdlib (revision bbe1a87944804b0f3c9e486087ca6af21340e747) +++ src/libcfa/stdlib (revision ac4ebc1ee0bb93fcfdc496fa748147cebe635cab) @@ -10,6 +10,6 @@ // Created On : Thu Jan 28 17:12:35 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Jul 3 08:17:28 2018 -// Update Count : 324 +// Last Modified On : Thu Jul 5 07:41:03 2018 +// Update Count : 332 // @@ -18,7 +18,7 @@ #include // allocation, strto*, *abs extern "C" { - void * memalign( size_t align, size_t size ); - void * aligned_alloc( size_t align, size_t size ); - void * memset( void * dest, int c, size_t size ); + void * memalign( size_t align, size_t size ); // malloc.h + void * memset( void * dest, int c, size_t size ); // string.h + void * memcpy( void * dest, const void * src, size_t size ); // string.h } // extern "C" @@ -140,6 +140,4 @@ } // memset - extern "C" { void * memcpy( void * dest, const void * src, size_t size ); } // use default C routine for void * - T * memcpy( T * dest, const T * src ) { //printf( "X18\n" ); @@ -174,14 +172,16 @@ //--------------------------------------- -static inline int strto( const char * sptr, char ** eptr, int base ) { return (int)strtol( sptr, eptr, base ); } -static inline unsigned int strto( const char * sptr, char ** eptr, int base ) { return (unsigned int)strtoul( sptr, eptr, base ); } -static inline long int strto( const char * sptr, char ** eptr, int base ) { return strtol( sptr, eptr, base ); } -static inline unsigned long int strto( const char * sptr, char ** eptr, int base ) { return strtoul( sptr, eptr, base ); } -static inline long long int strto( const char * sptr, char ** eptr, int base ) { return strtoll( sptr, eptr, base ); } -static inline unsigned long long int strto( const char * sptr, char ** eptr, int base ) { return strtoull( sptr, eptr, base ); } - -static inline float strto( const char * sptr, char ** eptr ) { return strtof( sptr, eptr ); } -static inline double strto( const char * sptr, char ** eptr ) { return strtod( sptr, eptr ); } -static inline long double strto( const char * sptr, char ** eptr ) { return strtold( sptr, eptr ); } +static inline { + int strto( const char * sptr, char ** eptr, int base ) { return (int)strtol( sptr, eptr, base ); } + unsigned int strto( const char * sptr, char ** eptr, int base ) { return (unsigned int)strtoul( sptr, eptr, base ); } + long int strto( const char * sptr, char ** eptr, int base ) { return strtol( sptr, eptr, base ); } + unsigned long int strto( const char * sptr, char ** eptr, int base ) { return strtoul( sptr, eptr, base ); } + long long int strto( const char * sptr, char ** eptr, int base ) { return strtoll( sptr, eptr, base ); } + unsigned long long int strto( const char * sptr, char ** eptr, int base ) { return strtoull( sptr, eptr, base ); } + + float strto( const char * sptr, char ** eptr ) { return strtof( sptr, eptr ); } + double strto( const char * sptr, char ** eptr ) { return strtod( sptr, eptr ); } + long double strto( const char * sptr, char ** eptr ) { return strtold( sptr, eptr ); } +} // distribution float _Complex strto( const char * sptr, char ** eptr ); @@ -189,18 +189,20 @@ long double _Complex strto( const char * sptr, char ** eptr ); -static inline int ato( const char * sptr ) {return (int)strtol( sptr, 0, 10 ); } -static inline unsigned int ato( const char * sptr ) { return (unsigned int)strtoul( sptr, 0, 10 ); } -static inline long int ato( const char * sptr ) { return strtol( sptr, 0, 10 ); } -static inline unsigned long int ato( const char * sptr ) { return strtoul( sptr, 0, 10 ); } -static inline long long int ato( const char * sptr ) { return strtoll( sptr, 0, 10 ); } -static inline unsigned long long int ato( const char * sptr ) { return strtoull( sptr, 0, 10 ); } - -static inline float ato( const char * sptr ) { return strtof( sptr, 0 ); } -static inline double ato( const char * sptr ) { return strtod( sptr, 0 ); } -static inline long double ato( const char * sptr ) { return strtold( sptr, 0 ); } - -static inline float _Complex ato( const char * sptr ) { return strto( sptr, NULL ); } -static inline double _Complex ato( const char * sptr ) { return strto( sptr, NULL ); } -static inline long double _Complex ato( const char * sptr ) { return strto( sptr, NULL ); } +static inline { + int ato( const char * sptr ) {return (int)strtol( sptr, 0, 10 ); } + unsigned int ato( const char * sptr ) { return (unsigned int)strtoul( sptr, 0, 10 ); } + long int ato( const char * sptr ) { return strtol( sptr, 0, 10 ); } + unsigned long int ato( const char * sptr ) { return strtoul( sptr, 0, 10 ); } + long long int ato( const char * sptr ) { return strtoll( sptr, 0, 10 ); } + unsigned long long int ato( const char * sptr ) { return strtoull( sptr, 0, 10 ); } + + float ato( const char * sptr ) { return strtof( sptr, 0 ); } + double ato( const char * sptr ) { return strtod( sptr, 0 ); } + long double ato( const char * sptr ) { return strtold( sptr, 0 ); } + + float _Complex ato( const char * sptr ) { return strto( sptr, NULL ); } + double _Complex ato( const char * sptr ) { return strto( sptr, NULL ); } + long double _Complex ato( const char * sptr ) { return strto( sptr, NULL ); } +} // distribution //--------------------------------------- @@ -236,26 +238,32 @@ //--------------------------------------- -static inline unsigned char abs( signed char v ) { return abs( (int)v ); } extern "C" { int abs( int ); } // use default C routine for int -static inline unsigned long int abs( long int v ) { return labs( v ); } -static inline unsigned long long int abs( long long int v ) { return llabs( v ); } - -extern "C" { -double fabs( double ); -float fabsf( float ); -long double fabsl( long double ); +static inline { + unsigned char abs( signed char v ) { return abs( (int)v ); } + unsigned long int abs( long int v ) { return labs( v ); } + unsigned long long int abs( long long int v ) { return llabs( v ); } +} // distribution + +extern "C" { // use default C routine for int + double fabs( double ); + float fabsf( float ); + long double fabsl( long double ); } // extern "C" -static inline float abs( float x ) { return fabsf( x ); } -static inline double abs( double x ) { return fabs( x ); } -static inline long double abs( long double x ) { return fabsl( x ); } - -extern "C" { -double cabs( double _Complex ); -float cabsf( float _Complex ); -long double cabsl( long double _Complex ); +static inline { + float abs( float x ) { return fabsf( x ); } + double abs( double x ) { return fabs( x ); } + long double abs( long double x ) { return fabsl( x ); } +} // distribution + +extern "C" { // use default C routine for int + double cabs( double _Complex ); + float cabsf( float _Complex ); + long double cabsl( long double _Complex ); } // extern "C" -static inline float abs( float _Complex x ) { return cabsf( x ); } -static inline double abs( double _Complex x ) { return cabs( x ); } -static inline long double abs( long double _Complex x ) { return cabsl( x ); } +static inline { + float abs( float _Complex x ) { return cabsf( x ); } + double abs( double _Complex x ) { return cabs( x ); } + long double abs( long double _Complex x ) { return cabsl( x ); } +} // distribution forall( otype T | { void ?{}( T &, zero_t ); int ??( T, T ); } ) -static inline T max( T t1, T t2 ) { return t1 > t2 ? t1 : t2; } - -forall( otype T | { T min( T, T ); T max( T, T ); } ) -static inline T clamp( T value, T min_val, T max_val ) { return max( min_val, min( value, max_val ) ); } - -forall( otype T ) -static inline void swap( T & v1, T & v2 ) { T temp = v1; v1 = v2; v2 = temp; } +static inline { + forall( otype T | { int ??( T, T ); } ) + T max( T t1, T t2 ) { return t1 > t2 ? t1 : t2; } + + forall( otype T | { T min( T, T ); T max( T, T ); } ) + T clamp( T value, T min_val, T max_val ) { return max( min_val, min( value, max_val ) ); } + + forall( otype T ) + void swap( T & v1, T & v2 ) { T temp = v1; v1 = v2; v2 = temp; } +} // distribution // Local Variables: //