Changeset 03ac869

Timestamp:

May 8, 2024, 4:41:33 PM (3 weeks ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

41c8312

Parents:

0843ba6

Message:

Add GCC visibility push(default); Fix trait satisfaction problem

Location:

libcfa/src

Files:

• enum.cfa (modified) (2 diffs)
• enum.hfa (modified) (2 diffs)

libcfa/src/enum.cfa

@@ -2 +2 @@
 #include "fstream.hfa"
 
-forall(E, T| TypedEnum(E, T)) {
+#pragma GCC visibility push(default)
+
+forall(T, E| TypedEnum(T, E)) {
     // constructors
 
     // comparison
     int ?==?(E l, E r) { return posE(l) == posE(r); }
-    int ?!=?(E l, E r) { return !(l == r); }
+    int ?!=?(E l, E r) { return posE(l) != posE(r); }
     int ?!=?(E l, zero_t) { return !( posE(l) == 0 ); }
     int ?<?(E l, E r) { return posE(l) < posE(r); }
@@ -13 +15 @@
     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

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