Changeset 0c327ce for libcfa

Timestamp:

Jul 12, 2024, 3:30:06 PM (5 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

76b507d

Parents:

9c447e2

Message:

1. Add bound check to Serial function: now compiler generates the unchecked functions in ImplementEnumFunc?, and enum.hfa implements the bound check on top. Todo: Wrapped the checked version into a trait; 2. countof is now works on any type that implement Countof(). Because Countof() is implemented in enum.hfa for all CfaEnum?, we can call countof on { T | CfaEnum?(T) }

Location:

libcfa/src

Files:

• enum.cfa (modified) (1 diff)
• enum.hfa (modified) (3 diffs)

libcfa/src/enum.cfa

@@ -5 +5 @@
 
 #pragma GCC visibility push(default)
+
+forall( E | Serial( E ) ) {
+    E fromInt( unsigned i ) {
+        E upper = upperBound();
+        E lower = lowerBound();
+        // It is okay to overflow as overflow will be theoretically caught by the other bound
+        assert( i <= fromInstance(upper) && i >= fromInstance(lower) 
+            &&  "Not a valid value");
+        return fromInt_unsafe( i );
+    }
+
+    E succ( E e ) {
+        E upper = upperBound();
+        assert( (fromInstance(e) < fromInstance(upper)) 
+            && "Calling succ() on the last" );
+        return succ_unsafe(e);
+    }
+
+    E pred( E e ) {
+        E lower = lowerBound();
+        assert( (fromInstance(e) > fromInstance(lower)) 
+            && "Calling pred() on the first" );
+        return pred_unsafe(e);
+    }
+
+    int Countof( __attribute__((unused)) E e ) {
+        E upper = upperBound();
+        E lower = lowerBound();
+                return fromInstance( upper ) + fromInstance( lower ) + 1;
+    }
+}
 
 int scmp( const void * str1, const void * str2 ) {

libcfa/src/enum.hfa

@@ -1 +1 @@
 #pragma once
 
+#include <assert.h>
 #include "iostream.hfa"
 
@@ -10 +11 @@
 forall( E | Bounded( E ) ) trait Serial {
     unsigned fromInstance( E e );
+    E fromInt_unsafe( unsigned i );
+    E succ_unsafe( E e );
+    E pred_unsafe( E e );
+};
+
+forall( E | Serial( E ) ) {
     E fromInt( unsigned i );
     E succ( E e );
     E pred( E e );
-};
+    int Countof( E e );
+}
+
+// forall( E | Bounded(E) ) trait SafeSerial {
+//     // unsigned fromInstance( E e );
+//     E fromInt_unsafe( unsigned i );
+//     // E succ_unsafe( E e );
+//     //E pred_unsafe( E e );
+
+//     unsigned fromInstance( E e );
+//     E fromInt( unsigned i );
+//     E succ( E e );
+//     E pred( E e );
+// };
 
 forall( E | Serial( E ) ) trait CfaEnum {
@@ -33 +53 @@
         OSTYPE_VOID( E );
 }
-
-// forall( ostype & | ostream( ostype ), E | CfaEnum( E, quasi_void ) ) {
-//      ostype & ?|?( ostype &, E );
-//      OSTYPE_VOID( E );
-// }
-
-// Design two <- should go for this if we have change the cost model
-// forall( E | Serial( E ) ) trait CfaEnum {
-//     char * label( E e );
-//     unsigned int posn( E e );
-// };
-
-// forall( E, V| CfaEnum( E)) trait TypedEnum {
-//     V value( E e);
-// };
 
 static inline