Changeset 2a301ff for libcfa/src/stdlib.hfa

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

• libcfa/src/stdlib.hfa (modified) (4 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 Feb  2 11:30:04 2023
-// Update Count     : 766
+// Last Modified On : Mon Aug 14 18:19:12 2023
+// Update Count     : 777
 //
 
@@ -19 +19 @@
 #include "bits/align.hfa"                                                               // libAlign
 #include "bits/random.hfa"                                                              // prng
+#include <Exception.hfa>
+#include <heap.hfa>
 
 #include <stdlib.h>                                                                             // *alloc, strto*, ato*
-#include <heap.hfa>
-
+#include <errno.h>
 
 // Reduce includes by explicitly defining these routines.
@@ -294 +295 @@
 
 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 );
-double _Complex strto( const char sptr[], char ** eptr );
-long double _Complex strto( const char sptr[], char ** eptr );
+        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[] );
+double _Complex strto( const char sptr[], char * eptr[] );
+long double _Complex strto( const char sptr[], char * eptr[] );
+
+ExceptionDecl( out_of_range );
+ExceptionDecl( invalid_argument );
+
+forall( T | { T strto( const char sptr[], char * eptr[], int ); } )
+T convert( const char sptr[] );
 
 static inline {
@@ -454 +461 @@
 } // distribution
 
+// Set default random-generator size.
+#if defined( __x86_64__ ) || defined( __aarch64__ )             // 64-bit architecture
+#define PRNG PRNG64
+#else                                                                                                   // 32-bit architecture
+#define PRNG PRNG32
+#endif // __x86_64__
+
 // Concurrent Pseudo Random-Number Generator : generate repeatable sequence of values that appear random.
 //