Changes in libcfa/src/enum.hfa [72713e5:c333ed2]

File:

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

libcfa/src/enum.hfa

@@ -6 +6 @@
 };
 
-forall(E | Bounded(E)) trait Serial {
+forall(E, T| Bounded(E)) trait Serial {
     unsigned fromInstance(E e);
     E fromInt(unsigned i);
@@ -13 +13 @@
 };
 
-forall(E, T) trait TypedEnum {
-    T valueE(E e);
+// Opague Enum + TypedEnum
+forall(E, T | Serial(E, T)) trait CfaEnum { 
     char * labelE(E e);
     unsigned int posE(E e);
+};
+
+forall(E, T | CfaEnum(E, T)) trait TypedEnum {
+    T valueE(E e);
 };
 
@@ -28 +32 @@
     int ?>?(E l, E r);
     int ?>=?(E l, E r);
+
+    // for testing; To be removed
+    char * typeEnumString(E e);
 }