Changeset 6803ff1 for libcfa/src

Timestamp:

Jun 25, 2024, 12:09:43 PM (16 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

d96d4f0

Parents:

f3b67b6 (diff), 5eb3f65 (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

@@ -6 +6 @@
 forall(ostype & | basic_ostream(ostype), E, V| CfaEnum(E, V))
 ostype & ?|?(ostype& os, E e) {
-    return os | type_name(e) | "." | labelE(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 | type_name(e) | "." | labelE(e);
+    return os | type_name(e) | "." | label(e);
 }
 
 forall(ostype & | basic_ostream(ostype), E, V| CfaEnum(E, V)) {
-    int ?==?(E l, E r) { return posE(l) == posE(r); }
-    int ?<=?(E l, E r) { return posE(l) <= posE(r); }
-    int ?>=?(E l, E r) { return posE(l) >= posE(r); }
-    int ?<?(E l, E r) { return posE(l) < posE(r); }
-    int ?>?(E l, E r) { return posE(l) > posE(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

@@ -17 +17 @@
 // Design one
 forall(E, V | Serial(E)) trait CfaEnum {
-    char* labelE(E e);
-    unsigned int posE(E e);
-    V valueE(E e);
-    char* type_name(E e);
+    char * label(E e);
+    unsigned int posn(E e);
+    V value(E e);
+    char * type_name(E e);
 };
 
-forall(ostype & | basic_ostream(ostype), E, V| CfaEnum(E, V))
+forall(ostype & | basic_ostream(ostype), E, V | CfaEnum(E, V))
 ostype & ?|?(ostype&, E);
 
@@ -31 +31 @@
 // Design two <- should go for this if we have change the cost model
 // forall(E | Serial(E)) trait CfaEnum {
-//     char* labelE(E e);
-//     unsigned int posE(E e);
+//     char * label(E e);
+//     unsigned int posn(E e);
 // };
 
 // forall(E, V| CfaEnum(E)) trait TypedEnum {
-//     V valueE(E e);
+//     V value(E e);
 // };