Changes in / [de7b7a5:10a9479d]

Location:

libcfa

Files:

• prelude/builtins.c (modified) (1 diff)
• src/enum.hfa (modified) (1 diff)

libcfa/prelude/builtins.c

@@ -185 +185 @@
 static inline quasi_void ?=?(quasi_void &, quasi_void & _src) { return _src; }
 
+forall( E ) trait Bounded {
+        E lowerBound(void);
+        E upperBound(void);
+};
+
+forall( E | Bounded( E ) ) trait Serial {
+        int fromInstance( E e );
+        E fromInt_unsafe( int i );
+        E succ_unsafe( E e );
+        E pred_unsafe( E e );
+};
+
+forall( E | Serial( E ) ) {
+        E fromInt( int i );
+        E succ( E e );
+        E pred( E e );
+        int Countof( E );
+}
+
+
+forall( E ) trait CfaEnum {
+        const char * label( E e );
+        int posn( E e );
+};
+
+forall( E, V | CfaEnum( E ) ) trait TypedEnum {
+        V value( E e );
+};
+
 // Local Variables: //
 // mode: c //

libcfa/src/enum.hfa

@@ -2 +2 @@
 
 #include "iostream.hfa"
-
-forall( E ) trait Bounded {
-        E lowerBound(void);
-        E upperBound(void);
-};
-
-forall( E | Bounded( E ) ) trait Serial {
-        int fromInstance( E e );
-        E fromInt_unsafe( int i );
-        E succ_unsafe( E e );
-        E pred_unsafe( E e );
-};
-
-forall( E | Serial( E ) ) {
-        E fromInt( int i );
-        E succ( E e );
-        E pred( E e );
-        int Countof( E );
-}
-
-// forall( E | Bounded(E) ) trait SafeSerial {
-//       // unsigned fromInstance( E e );
-//       E fromInt_unsafe( unsigned i );
-//       // E succ_unsafe( E e );
-//       //E pred_unsafe( E e );
-
-//       unsigned fromInstance( E e );
-//       E fromInt( unsigned i );
-//       E succ( E e );
-//       E pred( E e );
-// };
-
-forall( E ) trait CfaEnum {
-        const char * label( E e );
-        int posn( E e );
-};
-
-forall( E, V | CfaEnum( E ) ) trait TypedEnum {
-        V value( E e );
-};
-
-// I/O
 
 forall( istype & | istream( istype ), E | CfaEnum( E ) | Serial(E) )