Changeset d5efcb7 for libcfa/src/enum.cfa

Timestamp:

Jun 25, 2024, 10:53:13 PM (9 days ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

55ba259e, d3aa55e9

Parents:

343c8be

Message:

first attempt at updating enum auxiliary operations

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 | type_name(e) | "." | label(e);
+forall( ostype & | basic_ostream(ostype), E, V | CfaEnum(E, V) ) {
+        ostype & ?|?( ostype& os, E e ) {
+//              if ( scoped( e ) ) os | type_name( e ) | '.' | nonl;
+                return os | label( e );
+        }
+        OSTYPE_VOID_IMPL( E )
 }
 
-forall(ostype & | basic_ostream(ostype), E| CfaEnum(E, quasi_void))
-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 | type_name(e) | "." | label(e);
+//     return os | label( e );
+// }
+
+forall( E, V | CfaEnum(E, V) ) {                                                // relational operators
+    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); }
 }
-
-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); }
-}