Changeset 2a301ff for libcfa/src/stdlib.cfa

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.cfa (modified) (4 diffs)

libcfa/src/stdlib.cfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 16:31:34 2023
-// Update Count     : 633
+// Last Modified On : Mon Aug 14 18:22:36 2023
+// Update Count     : 642
 //
 
@@ -65 +65 @@
 //---------------------------------------
 
-float _Complex strto( const char sptr[], char ** eptr ) {
+forall( T | { T strto( const char sptr[], char * eptr[], int ); } )
+T convert( const char sptr[] ) {
+        char * eptr;
+        errno = 0;                                                                                      // reset
+        T val = strto( sptr, &eptr, 10 );                                       // attempt conversion
+        if ( errno == ERANGE ) throw ExceptionInst( out_of_range );
+        if ( eptr == sptr ||                                                            // conversion failed, no characters generated
+                 *eptr != '\0' ) throw ExceptionInst( invalid_argument ); // not at end of str ?
+        return val;
+} // convert
+
+float _Complex strto( const char sptr[], char * eptr[] ) {
         float re, im;
         char * eeptr;
@@ -76 +87 @@
 } // strto
 
-double _Complex strto( const char sptr[], char ** eptr ) {
+double _Complex strto( const char sptr[], char * eptr[] ) {
         double re, im;
         char * eeptr;
@@ -87 +98 @@
 } // strto
 
-long double _Complex strto( const char sptr[], char ** eptr ) {
+long double _Complex strto( const char sptr[], char * eptr[] ) {
         long double re, im;
         char * eeptr;