Changeset 236f133 for libcfa

Timestamp:

Jul 11, 2024, 3:04:34 PM (4 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

9c447e2

Parents:

9d5eacb

Message:

Remove quasi_void for enums. The idea of quasi_void from Mike was to get around some resolution problem that enum pick function defines for Bounded over CfaEnum/TypedEnum?. But it is not clear that how often this can happen, and cfa might change the cast function scheme in the future. (change cost comparison scheme) Deprecate quasi_void for now so that enum traits looks cleaner without the dummy type for opaque enums

Location:

libcfa/src

Files:

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

libcfa/src/enum.cfa

@@ -10 +10 @@
 } // scmp
 
-forall( istype & | istream( istype ), E, V | CfaEnum( E, V ) )
+forall( istype & | istream( istype ), E | CfaEnum( E ) )
 istype & ?|?( istype & is, E & e ) {
 //      printf( "here0\n" );
@@ -70 +70 @@
 }
 
-forall( ostype & | ostream( ostype ), E, V | CfaEnum( E, V ) ) {
+// forall( ostype & | ostream( ostype ), E | CfaEnum( E, quasi_void ) ) {
+//      ostype & ?|?( ostype & os, E e ) {
+//              return os | label( e );
+//      }
+//      OSTYPE_VOID_IMPL( E )
+// }
+
+forall( ostype & | ostream( ostype ), E | CfaEnum( E ) ) {
         ostype & ?|?( ostype & os, E e ) {
                 return os | label( e );
@@ -77 +84 @@
 }
 
-forall( ostype & | ostream( ostype ), E | CfaEnum( E, quasi_void ) ) {
-        ostype & ?|?( ostype & os, E e ) {
-                return os | label( e );
-        }
-        OSTYPE_VOID_IMPL( E )
-}
+// 

libcfa/src/enum.hfa

@@ -15 +15 @@
 };
 
-// Design one
-forall( E, V | Serial( E ) ) trait CfaEnum {
+forall( E | Serial( E ) ) trait CfaEnum {
     const char * label( E e );
     unsigned int posn( E e );
+};
+
+forall( E, V | CfaEnum( E ) ) trait TypedEnum {
     V value( E e );
 };
@@ -24 +26 @@
 // I/O
 
-forall( istype & | istream( istype ), E, V | CfaEnum( E, V ) )
+forall( istype & | istream( istype ), E | CfaEnum( E ) )
 istype & ?|?( istype &, E & );
 
-forall( ostype & | ostream( ostype ), E, V | CfaEnum( E, V ) ) {
+forall( ostype & | ostream( ostype ), E | CfaEnum( E ) ) {
         ostype & ?|?( ostype &, E );
         OSTYPE_VOID( E );
 }
 
-forall( ostype & | ostream( ostype ), E | CfaEnum( E, quasi_void ) ) {
-        ostype & ?|?( ostype &, E );
-        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
@@ -48 +50 @@
 
 static inline
-forall( E, V | CfaEnum( E, V ) ) {
+forall( E | CfaEnum( E ) ) {
     int ?==?( E l, E r ) { return posn( l ) == posn( r ); }     // relational operators
     int ?!=?( E l, E r ) { return posn( l ) != posn( r ); }