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

File:

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

libcfa/src/enum.cfa

@@ -4 +4 @@
 #pragma GCC visibility push(default)
 
-forall( ostype & | basic_ostream(ostype), E, V | CfaEnum(E, V) ) {
-        ostype & ?|?( ostype& os, E e ) {
-                return os | label( e );
-        }
-        OSTYPE_VOID_IMPL( E )
+forall(ostype & | basic_ostream(ostype), E, V| CfaEnum(E, V))
+ostype & ?|?(ostype& os, E e) {
+    return os | type_name(e) | "." | label(e);
 }
 
-forall( ostype & | basic_ostream(ostype), E | CfaEnum(E, quasi_void) )
-ostype & ?|?( ostype & os, E e ) {
-    return os | label( e );
+forall(ostype & | basic_ostream(ostype), E| CfaEnum(E, quasi_void))
+ostype & ?|?(ostype& os, E e) {
+    return os | type_name(e) | "." | label(e);
 }
 
-forall( E, V | CfaEnum(E, V) ) {                                                // relational operators
+forall(ostype & | basic_ostream(ostype), E, V| CfaEnum(E, V)) {
     int ?==?(E l, E r) { return posn(l) == posn(r); }
-    int ?!=?(E l, E r) { return posn(l) != posn(r); }
+    int ?<=?(E l, E r) { return posn(l) <= posn(r); }
+    int ?>=?(E l, E r) { return posn(l) >= posn(r); }
     int ?<?(E l, E r) { return posn(l) < posn(r); }
-    int ?<=?(E l, E r) { return posn(l) <= posn(r); }
     int ?>?(E l, E r) { return posn(l) > posn(r); }
-    int ?>=?(E l, E r) { return posn(l) >= posn(r); }
 }