Changeset bc07190 for libcfa

Timestamp:

Jun 29, 2024, 7:33:28 AM (4 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

011c29e

Parents:

62a38e7 (diff), 115ac1ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src

Files:

• enum.cfa (modified) (1 diff)
• enum.hfa (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) {
-    return os | type_name(e) | "." | label(e);
+forall( ostype & | basic_ostream(ostype), E, V | CfaEnum(E, V) ) {
+        ostype & ?|?( ostype& os, E e ) {
+                return os | label( e );
+        }
+        OSTYPE_VOID_IMPL( E )
 }
 
-forall(ostype & | basic_ostream(ostype), E| CfaEnum(E, quasi_void))
-ostype & ?|?(ostype& os, E e) {
-    return os | type_name(e) | "." | label(e);
+forall( ostype & | basic_ostream(ostype), E | CfaEnum(E, quasi_void) )
+ostype & ?|?( ostype & os, E e ) {
+    return os | label( e );
 }
 
-forall(ostype & | basic_ostream(ostype), E, V| CfaEnum(E, V)) {
+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); }
-    int ?<?(E l, E r) { return posn(l) < posn(r); }
-    int ?>?(E l, E r) { return posn(l) > posn(r); }
 }

libcfa/src/enum.hfa

@@ -3 +3 @@
 #include "iostream.hfa"
 
-forall(E) trait Bounded {
+forall( E ) trait Bounded {
     E lowerBound();
     E upperBound();
 };
 
-forall(E | Bounded(E)) trait Serial {
-    unsigned fromInstance(E e);
-    E fromInt(unsigned i);
-    E succ(E e);
-    E pred(E e);
+forall( E | Bounded(E) ) trait Serial {
+    unsigned fromInstance( E e );
+    E fromInt( unsigned i );
+    E succ( E e );
+    E pred( E e );
 };
 
 // Design one
-forall(E, V | Serial(E)) trait CfaEnum {
-    char * label(E e);
-    unsigned int posn(E e);
-    V value(E e);
-    char * type_name(E e);
+forall( E, V | Serial(E) ) trait CfaEnum {
+    char * label( E e );
+    unsigned int posn( E e );
+    V value( E e );
 };
 
-forall(ostype & | basic_ostream(ostype), E, V | CfaEnum(E, V))
-ostype & ?|?(ostype&, E);
+// I/O
 
-forall(ostype & | basic_ostream(ostype), E| CfaEnum(E, quasi_void))
-ostype & ?|?(ostype&, E);
+forall( ostype & | basic_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 );
 
 // Design two <- should go for this if we have change the cost model
@@ -39 +42 @@
 // };
 
-forall(ostype & | basic_ostream(ostype), E, V| CfaEnum(E, V)) {
+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, E);
-    int ?>?(E, E);
-
-        // E ++?( E & lhs );
-        // E ?++( E & lhs );
 }