Changeset 76acb60 for libcfa

Timestamp:

Aug 5, 2023, 1:08:10 PM (17 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

6d5790d

Parents:

419985c

Message:

remove static from Exception macro

Location:

libcfa/src

Files:

• common.hfa (modified) (2 diffs)
• stdlib.cfa (modified) (4 diffs)
• stdlib.hfa (modified) (3 diffs)

libcfa/src/common.hfa

@@ -10 +10 @@
 // Created On       : Wed Jul 11 17:54:36 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug  5 11:52:08 2023
-// Update Count     : 26
+// Last Modified On : Sat Aug  5 13:05:27 2023
+// Update Count     : 32
 //
 
@@ -17 +17 @@
 
 // TEMPORARY
-#define Exception( name ) exception name{}; static vtable( name ) name ## _vt
+#define Exception( name ) exception name{}; vtable( name ) name ## _vt
 #define Throw( name ) throw (name){ &name ## _vt }
 

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 : Sat Aug  5 11:53:43 2023
+// Update Count     : 637
 //
 
@@ -65 +65 @@
 //---------------------------------------
 
-float _Complex strto( const char sptr[], char ** eptr ) {
+static vtable(out_of_range) out_of_range_vt;
+static vtable(invalid_argument) invalid_argument_vt;
+
+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( out_of_range );
+        if ( eptr == sptr ||                                                            // conversion failed, no characters generated
+                 *eptr != '\0' ) Throw( invalid_argument );             // not at end of str ?
+        return val;
+} // convert
+
+float _Complex strto( const char sptr[], char * eptr[] ) {
         float re, im;
         char * eeptr;
@@ -76 +90 @@
 } // strto
 
-double _Complex strto( const char sptr[], char ** eptr ) {
+double _Complex strto( const char sptr[], char * eptr[] ) {
         double re, im;
         char * eeptr;
@@ -87 +101 @@
 } // 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;

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 : Sat Aug  5 11:53:42 2023
+// Update Count     : 774
 //
 
@@ -22 +22 @@
 #include <stdlib.h>                                                                             // *alloc, strto*, ato*
 #include <heap.hfa>
-
+#include <errno.h>
 
 // Reduce includes by explicitly defining these routines.
@@ -294 +294 @@
 
 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[] );
+
+exception out_of_range {};
+exception invalid_argument {};
+
+forall( T | { T strto( const char sptr[], char * eptr[], int ); } )
+T convert( const char sptr[] );
 
 static inline {