Changeset 062467b for libcfa/src/enum.cfa

Timestamp:

Jul 2, 2024, 3:18:37 PM (7 weeks ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

597f284

Parents:

bc48c0d

Message:

inline enum relational and increment operators, comment out loop causing compiler segment fault

File:

• libcfa/src/enum.cfa (modified) (2 diffs)

libcfa/src/enum.cfa

@@ -10 +10 @@
         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
+        // 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;
 }
@@ -32 +32 @@
         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 ); }
-
-    E ++?( E & l ) { 
-        l = succ( l );
-        return l;
-    }
-    
-    E ?++( E & l ) {
-        E ret = l;
-        l = succ( l );
-        return ret;
-    }
-
-    E --?( E & l ) {
-        l = pred( l );
-        return l;
-    }
-
-    E ?--( E & l ) {
-        E ret = l;
-        l = pred( l );
-        return ret;
-    }
-}