Changeset 64eeb06 for libcfa/src/enum.hfa

Timestamp:

Jul 2, 2024, 2:27:57 PM (5 days ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

72abc90a

Parents:

011c29e

Message:

change basic_ostream to ostream, first attempt of enumeration input

File:

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

libcfa/src/enum.hfa

@@ -8 +8 @@
 };
 
-forall( E | Bounded(E) ) trait Serial {
+forall( E | Bounded( E ) ) trait Serial {
     unsigned fromInstance( E e );
     E fromInt( unsigned i );
@@ -16 +16 @@
 
 // Design one
-forall( E, V | Serial(E) ) trait CfaEnum {
+forall( E, V | Serial( E ) ) trait CfaEnum {
     char * label( E e );
     unsigned int posn( E e );
@@ -24 +24 @@
 // I/O
 
-forall( ostype & | basic_ostream(ostype), E, V | CfaEnum(E, V) ) {
+forall( istype & | istream( istype ), E, V | CfaEnum( E, V ) )
+istype & ?|?( istype &, E );
+
+forall( ostype & | 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 );
+forall( ostype & | ostream( ostype ), E | CfaEnum( E, quasi_void ) ) {
+        ostype & ?|?( ostype &, E );
+        OSTYPE_VOID( E );
+}
 
 // Design two <- should go for this if we have change the cost model
-// forall(E | Serial(E)) trait CfaEnum {
-//     char * label(E e);
-//     unsigned int posn(E e);
+// forall( E | Serial( E ) ) trait CfaEnum {
+//     char * label( E e );
+//     unsigned int posn( E e );
 // };
 
-// forall(E, V| CfaEnum(E)) trait TypedEnum {
-//     V value(E e);
+// forall( E, V| CfaEnum( E)) trait TypedEnum {
+//     V value( E e);
 // };
 
-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);
+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&);
-    int ?++(E&);
-    int --?(E&);
-    int ?--(E&);
+    int ++?( E &);
+    int ?++( E &);
+    int --?( E &);
+    int ?--( E &);
 }