Changes in libcfa/src/enum.hfa [5eb3f65:259012e]

File:

• libcfa/src/enum.hfa (modified) (2 diffs)

libcfa/src/enum.hfa

@@ -3 +3 @@
 #include "iostream.hfa"
 
-forall(E) trait Bounded {
+forall( E ) trait Bounded {
     E lowerBound();
     E upperBound();
 };
 
-forall(E | Bounded(E)) trait Serial {
-    unsigned fromInstance(E e);
-    E fromInt(unsigned i);
-    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 );
 };
 
 // Design one
-forall(E, V | Serial(E)) trait CfaEnum {
-    char * label(E e);
-    unsigned int posn(E e);
-    V value(E e);
-    char * type_name(E e);
+forall( E, V | Serial(E) ) trait CfaEnum {
+    char * label( E e );
+    unsigned int posn( E e );
+    V value( E e );
 };
 
-forall(ostype & | basic_ostream(ostype), E, V | CfaEnum(E, V))
-ostype & ?|?(ostype&, E);
+// I/O
 
-forall(ostype & | basic_ostream(ostype), E| CfaEnum(E, quasi_void))
-ostype & ?|?(ostype&, E);
+forall( ostype & | basic_ostream(ostype), E, V | CfaEnum(E, V) ) {
+        ostype & ?|?( ostype &, E );
+        OSTYPE_VOID( 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
@@ -39 +42 @@
 // };
 
-forall(ostype & | basic_ostream(ostype), E, V| CfaEnum(E, V)) {
+forall( E, V | CfaEnum(E, V) ) {                                                // relational operators
     int ?==?(E, E);
+    int ?!=?(E, E);
+    int ?<?(E, E);
     int ?<=?(E, E);
+    int ?>?(E, E);
     int ?>=?(E, E);
-    int ?<?(E, E);
-    int ?>?(E, E);
-
-        // E ++?( E & lhs );
-        // E ?++( E & lhs );
 }