Changes in / [88bc876:97f9619]

Location:

libcfa/src

Files:

• enum.cfa (modified) (1 diff)
• enum.hfa (modified) (3 diffs)

libcfa/src/enum.cfa

@@ -37 +37 @@
 }
 
-forall( istype & | istream( istype ), E | CfaEnum( E ) )
+forall( istype & | istream( istype ), E | CfaEnum( E )| Serial(E) )
 istype & ?|?( istype & is, E & e ) {
 //      fprintf( stderr, "here0\n" );

libcfa/src/enum.hfa

@@ -34 +34 @@
 // };
 
-forall( E | Serial( E ) ) trait CfaEnum {
+forall( E ) trait CfaEnum {
     const char * label( E e );
     unsigned int posn( E e );
@@ -45 +45 @@
 // I/O
 
-forall( istype & | istream( istype ), E | CfaEnum( E ) )
+forall( istype & | istream( istype ), E | CfaEnum( E ) | Serial(E) )
 istype & ?|?( istype &, E & );
 
@@ -54 +54 @@
 
 static inline
-forall( E | CfaEnum( E ) ) {
+forall( E | Serial(E) | CfaEnum(E) ) {
     int ?==?( E l, E r ) { return posn( l ) == posn( r ); }     // relational operators
     int ?!=?( E l, E r ) { return posn( l ) != posn( r ); }