Changeset b5e725a

Timestamp:

Aug 14, 2023, 9:28:00 PM (9 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

6264087

Parents:

7baff35

git-author:

Peter A. Buhr <pabuhr@…> (08/14/23 21:24:33)

git-committer:

Peter A. Buhr <pabuhr@…> (08/14/23 21:28:00)

Message:

move setting the default random-generator size from PRNG.cfa to stdlib.hfa, change to the exception macros

Files:

• libcfa/src/parseconfig.cfa (modified) (3 diffs)
• libcfa/src/parseconfig.hfa (modified) (2 diffs)
• libcfa/src/stdlib.cfa (modified) (3 diffs)
• libcfa/src/stdlib.hfa (modified) (4 diffs)
• tests/PRNG.cfa (modified) (2 diffs)

libcfa/src/parseconfig.cfa

@@ -16 +16 @@
 #pragma GCC visibility push(default)
 
+
 // *********************************** exceptions ***********************************
 
-
-// TODO: Add names of missing config entries to exception (see further below)
-vtable(Missing_Config_Entries) Missing_Config_Entries_vt;
 
 [ void ] ?{}( & Missing_Config_Entries this, unsigned int num_missing ) {
@@ -33 +31 @@
 
 
-vtable(Parse_Failure) Parse_Failure_vt;
-
 [ void ] ?{}( & Parse_Failure this, [] char failed_key, [] char failed_value ) {
         this.virtual_table = &Parse_Failure_vt;
@@ -54 +50 @@
 }
 
-
-vtable(Validation_Failure) Validation_Failure_vt;
 
 [ void ] ?{}( & Validation_Failure this, [] char failed_key, [] char failed_value ) {

libcfa/src/parseconfig.hfa

@@ -2 +2 @@
 
 #include <math.trait.hfa>
+#include <Exception.hfa>
 
 
@@ -62 +63 @@
 
 
-exception Missing_Config_Entries {
+ExceptionDecl( Missing_Config_Entries,
         unsigned int num_missing;
-};
+);
 
 [ void ] msg( * Missing_Config_Entries ex );
 
-exception Parse_Failure {
+ExceptionDecl( Parse_Failure,
         * char failed_key;
         * char failed_value;
-};
+);
 
 [ void ] msg( * Parse_Failure ex );
 
-exception Validation_Failure {
+ExceptionDecl( Validation_Failure,
         * char failed_key;
         * char failed_value;
-};
+);
 
 [ void ] msg( * Validation_Failure ex );

libcfa/src/stdlib.cfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug  5 11:53:43 2023
-// Update Count     : 637
+// Last Modified On : Mon Aug 14 18:22:36 2023
+// Update Count     : 642
 //
 
@@ -65 +65 @@
 //---------------------------------------
 
-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[] ) {
@@ -73 +70 @@
         errno = 0;                                                                                      // reset
         T val = strto( sptr, &eptr, 10 );                                       // attempt conversion
-        if ( errno == ERANGE ) Throw( out_of_range );
+        if ( errno == ERANGE ) throw ExceptionInst( out_of_range );
         if ( eptr == sptr ||                                                            // conversion failed, no characters generated
-                 *eptr != '\0' ) Throw( invalid_argument );             // not at end of str ?
+                 *eptr != '\0' ) throw ExceptionInst( invalid_argument ); // not at end of str ?
         return val;
 } // convert

libcfa/src/stdlib.hfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug  5 11:53:42 2023
-// Update Count     : 774
+// 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>
 
@@ -310 +311 @@
 long double _Complex strto( const char sptr[], char * eptr[] );
 
-exception out_of_range {};
-exception invalid_argument {};
+ExceptionDecl( out_of_range );
+ExceptionDecl( invalid_argument );
 
 forall( T | { T strto( const char sptr[], char * eptr[], int ); } )
@@ -460 +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.
 //

tests/PRNG.cfa

@@ -10 +10 @@
 // Created On       : Wed Dec 29 09:38:12 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun 29 10:18:35 2023
-// Update Count     : 424
+// Last Modified On : Mon Aug 14 08:49:53 2023
+// Update Count     : 425
 // 
 
@@ -27 +27 @@
 #define str(s) #s
 
-#if defined( __x86_64__ ) || defined( __aarch64__ )             // 64-bit architecture
-#define PRNG PRNG64
-#else                                                                                                   // 32-bit architecture
-#define PRNG PRNG32
-#endif // __x86_64__
-
 //#define TIME