Changes in libcfa/src/enum.hfa [07e9df1:85855b0]

File:

• libcfa/src/enum.hfa (modified) (1 diff)

libcfa/src/enum.hfa

@@ -1 +1 @@
 #pragma once
 
-forall( E ) trait Bounded {
-        E lowerBound();
-        E upperBound();
+#include "iostream.hfa"
+
+forall(E) trait Bounded {
+    E lowerBound();
+    E upperBound();
 };
 
-forall( E | Bounded( E ) ) trait Serial {
-        unsigned fromInstance( E e );
-        E fromInt( unsigned int posn );
-        E succ( E e );
-        E pred( E e );
+forall(E | Bounded(E)) trait Serial {
+    unsigned fromInstance(E e);
+    E fromInt(unsigned i);
+    E succ(E e);
+    E pred(E e);
 };
 
-forall( E, T ) trait TypedEnum {
-        T valueE( E e );
-        char * labelE( E e );
-        unsigned int posE( E e );
+// Design one
+forall(E, V | Serial(E)) trait CfaEnum {
+    char* labelE(E e);
+    unsigned int posE(E e);
+    V valueE(E e);
+    char* type_name(E e);
 };
 
-forall( E, T | TypedEnum( E, T ) ) {
-        // comparison
-        int ?==?( E l, E r );                                                           // true if l and r are same enumerators    
-        int ?!=?( E l, E r );                                                           // true if l and r are different enumerators
-        int ?!=?( E l, zero_t );                                                        // true if l is not the first enumerator           
-        int ?<?( E l, E r );                                                            // true if l is an enuemerator before r    
-        int ?<=?( E l, E r );                                                           // true if l before or the same as r               
-        int ?>?( E l, E r );                                                            // true if l is an enuemrator after r      
-        int ?>=?( E l, E r );                                                           // true if l after or the same as r         
-}
+forall(ostype & | basic_ostream(ostype), E, V| CfaEnum(E, V))
+ostype & ?|?(ostype&, E);
+
+forall(ostype & | basic_ostream(ostype), E| CfaEnum(E, quasi_void))
+ostype & ?|?(ostype&, E);
+
+// Design two <- should go for this if we have change the cost model
+// forall(E | Serial(E)) trait CfaEnum {
+//     char* labelE(E e);
+//     unsigned int posE(E e);
+// };
+
+// forall(E, V| CfaEnum(E)) trait TypedEnum {
+//     V valueE(E e);
+// };