Changeset 64eeb06 for libcfa/src/enum.cfa

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.cfa (modified) (2 diffs)

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 ) {
+forall( istype & | istream( istype ), E, V | CfaEnum( E, V ) )
+istype & ?|?( istype & is, E & e ) {
+        if ( eof( is ) ) throwResume ExceptionInst( missing_data );
+        char val[256];
+        int args = fmt( is, "%255s", val );
+        if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
+        for ( s; E ) {
+                if ( val == label( s ) ) { e = s; break; }
+        } else {
+                fprintf( stderr, "invalid enumeration constant\n" );
+                abort();                                                                        // cannot use abort stream
+        } // for
+        return is;
+}
+
+forall( ostype & | ostream( ostype ), E, V | CfaEnum( E, V ) ) {
+        ostype & ?|?( ostype & os, E e ) {
                 return os | label( e );
         }
@@ -11 +26 @@
 }
 
-forall( ostype & | basic_ostream(ostype), E | CfaEnum(E, quasi_void) )
-ostype & ?|?( ostype & os, E e ) {
-    return os | label( e );
+forall( ostype & | ostream( ostype ), E | CfaEnum( E, quasi_void ) ) {
+        ostype & ?|?( ostype & os, E e ) {
+                return os | label( e );
+        }
+        OSTYPE_VOID_IMPL( 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( 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 ); }
 
-    E ++?(E& l) { 
-        l = succ(l);
+    E ++?( E & l ) { 
+        l = succ( l );
         return l;
     }
     
-    E ?++(E& l) {
+    E ?++( E & l ) {
         E ret = l;
-        l = succ(l);
+        l = succ( l );
         return ret;
     }
 
-    E --?(E& l) {
-        l = pred(l);
+    E --?( E & l ) {
+        l = pred( l );
         return l;
     }
 
-    E ?--(E& l) {
+    E ?--( E & l ) {
         E ret = l;
-        l = pred(l);
+        l = pred( l );
         return ret;
     }