Merge pull request #1506 from actonlang/1186-fix-EqOpt

Fixed naming and method table for the primitive EqOpt witness class. Resolves #1186
actonlang · Sep 22, 2023 · b68ac53 · b68ac53
2 parents 4ea0fa9 + 42677b9
commit b68ac53
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 16 deletions.
diff --git a/base/builtin/builtin_functions.c b/base/builtin/builtin_functions.c
@@ -309,27 +309,52 @@ B_Iterator B_zip (B_Iterable wit1, B_Iterable wit2, $WORD iter1, $WORD iter2) {
 
 // EqOpt //////////////////////////////////////////////////////
 
-void B_EqOptD___init__(B_EqOpt wit, B_Eq W_Eq$A) {
+extern struct $EqOptG_class $EqOptG_methods;
+
+void $EqOptD___init__($EqOpt wit, B_Eq W_Eq$A) {
     wit->W_Eq$A = W_Eq$A;
 }
 
-B_bool B_EqOptD___eq__(B_EqOpt wit, $WORD a, $WORD b) {
-    if (a && b)
+B_bool $EqOptD_bool($EqOpt self) {
+    return B_True;
+}
+
+B_str $EqOptD_str($EqOpt self) {
+    char *s;
+    asprintf(&s,"<EqOpt witness at %p>",self);
+    return to$str(s);
+}
+
+void $EqOptD_serialize($EqOpt self,$Serial$state state) {
+    $step_serialize(self->W_Eq$A,state);
+}
+
+$EqOpt $EqOptD_deserialize($EqOpt res, $Serial$state state) {
+    if (!res)
+        res = $DNEW($EqOpt,state);
+    res->W_Eq$A = $step_deserialize(state);
+    return res;
+}
+
+B_bool $EqOptD___eq__($EqOpt wit, $WORD a, $WORD b) {
+    if (a && b) {
         return wit->W_Eq$A->$class->__eq__(wit->W_Eq$A, a, b);
+    }
     return (!a && !b) ? B_True : B_False;
 }
 
-B_bool B_EqOptD___ne__(B_EqOpt wit, $WORD a, $WORD b) {
+B_bool $EqOptD___ne__($EqOpt wit, $WORD a, $WORD b) {
     if (a && b)
         return wit->W_Eq$A->$class->__ne__(wit->W_Eq$A, a, b);
     return (!a && !b) ? B_False : B_True;
 }
 
-struct B_EqOptG_class B_EqOptG_methods = {"B_EqOpt", UNASSIGNED, NULL, B_EqOptD___init__, B_EqOptD___eq__, B_EqOptD___ne__};
+struct $EqOptG_class $EqOptG_methods = {"$EqOpt", UNASSIGNED, NULL, $EqOptD___init__, $EqOptD_serialize, $EqOptD_deserialize, 
+                                         $EqOptD_bool, $EqOptD_str, $EqOptD_str, $EqOptD___eq__, $EqOptD___ne__};
 
 
-B_EqOpt B_EqOptG_new(B_Eq W_Eq$A) {
-    return $NEW(B_EqOpt, W_Eq$A);
+$EqOpt $EqOptG_new(B_Eq W_Eq$A) {
+    return $NEW($EqOpt, W_Eq$A);
 }
 
 

diff --git a/base/builtin/builtin_functions.h b/base/builtin/builtin_functions.h
@@ -120,24 +120,29 @@ B_Iterator B_zip(B_Iterable wit1, B_Iterable wit2, $WORD iter1, $WORD iter2);
 
 // EqOpt //////////////////////////////////////////////////////
 
-struct B_EqOpt;
-typedef struct B_EqOpt *B_EqOpt;
+struct $EqOpt;
+typedef struct $EqOpt *$EqOpt;
 
-struct B_EqOptG_class {
+struct $EqOptG_class {
     char *$GCINFO;
     int $class_id;
     $SuperG_class $superclass;
-    void (*__init__)(B_EqOpt, B_Eq);
-    B_bool (*__eq__)(B_EqOpt, $WORD, $WORD);
-    B_bool (*__ne__)(B_EqOpt, $WORD, $WORD);
+    void (*__init__)($EqOpt, B_Eq);
+    void (*__serialize__)($EqOpt,$Serial$state);
+    $EqOpt (*__deserialize__)($EqOpt,$Serial$state);
+    B_bool (*__bool__)($EqOpt);
+    B_str (*__str__)($EqOpt);
+    B_str (*__repr__)($EqOpt);
+    B_bool (*__eq__)($EqOpt, $WORD, $WORD);
+    B_bool (*__ne__)($EqOpt, $WORD, $WORD);
 };
 
-struct B_EqOpt {
-    struct B_EqOptG_class *$class;
+struct $EqOpt {
+    struct $EqOptG_class *$class;
     B_Eq W_Eq$A;
 };
 
-B_EqOpt B_EqOptG_new(B_Eq);
+$EqOpt $EqOptG_new(B_Eq);
 
 
 // Various small functions //////////////////////////////////////////////////////////