Changeset c333ed2 for libcfa

Timestamp:

May 7, 2024, 7:04:17 PM (17 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

0b6c1c9

Parents:

164a6b6

Message:

Remove intermeidate type (enum attribute type); remove replacePseudoFunc (has been migrated to resolver)

Location:

libcfa/src

Files:

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

libcfa/src/enum.cfa

@@ +1 @@
+#include "enum.hfa"
+#include "fstream.hfa"
+
+forall(E, T| TypedEnum(E, T)) {
+    // constructors
+
+    // comparison
+    int ?==?(E l, E r) { return posE(l) == posE(r); }
+    int ?!=?(E l, E r) { return !(l == r); }
+    int ?!=?(E l, zero_t) { return !( posE(l) == 0 ); }
+    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); }
+
+    // for testing; To be removed
+    // #include <string.h>
+    char * typeEnumString(E e) {
+        // char* out = malloc(sizeof(char) * (5 + strlen(labelE(e) + 1)));
+        // return strcat(strcat(out, "Enum "), labelE(e));
+        return labelE(e);
+    }
+}

libcfa/src/enum.hfa

@@ -6 +6 @@
 };
 
-forall(E | Bounded(E)) trait Serial {
+forall(E, T| Bounded(E)) trait Serial {
     unsigned fromInstance(E e);
     E fromInt(unsigned i);
@@ -13 +13 @@
 };
 
-forall(E, T) trait TypedEnum {
-    T valueE(E e);
+// Opague Enum + TypedEnum
+forall(E, T | Serial(E, T)) trait CfaEnum { 
     char * labelE(E e);
     unsigned int posE(E e);
+};
+
+forall(E, T | CfaEnum(E, T)) trait TypedEnum {
+    T valueE(E e);
 };
 
@@ -28 +32 @@
     int ?>?(E l, E r);
     int ?>=?(E l, E r);
+
+    // for testing; To be removed
+    char * typeEnumString(E e);
 }