Changeset 21218

Timestamp:

07/04/08 15:39:24 (3 months ago)

Author:

ruoso

Message:

[SMOP] YAY! p6opaque succesfully delegates the methods to the metaclass... including the DESTROYALL call...

Location:

v6/smop

Files:

• src/p6opaque.sm0p (modified) (1 diff)
• test/12_p6opaque.sm0p (modified) (7 diffs)

v6/smop/src/p6opaque.sm0p

@@ -203 +203 @@
         ((SMOP__p6opaque_struct*)invocant)->metadata = NULL;
         smop_lowlevel_unlock(invocant);
-        SMOP_RELEASE(interpreter,m->how);
-        free(m);
+        if (m) {
+          if (m->how) SMOP_RELEASE(interpreter,m->how);
+          free(m);
+        }
       }
 

v6/smop/test/12_p6opaque.sm0p

@@ -11 +11 @@
                                   SMOP__Object* capture) {
   if (identifier == SMOP__ID__dispatch) {
-    printf("ok 3 - called dispatch\n");
+    SMOP__Object* called = SMOP__NATIVE__capture_positional(interpreter,capture,1);
+    if (called == SMOP__ID__STORE) {
+      printf("ok 3 - called dispatch\n");
+    } else if (called == SMOP__ID__DESTROYALL) {
+      printf("ok 4 - called DESTROYALL on the metaclass\n");
+    } else {
+      printf("not ok - unkown method to dispatch\n");
+    }
+    SMOP_RELEASE(interpreter, called);
     SMOP_RELEASE(interpreter, capture);
   } else if (identifier == SMOP__ID__DESTROYALL) {
@@ -25 +33 @@
                                   SMOP__ResponderInterface* responder,
                                   SMOP__Object* obj) {
-  printf("-");
   smop_lowlevel_refcnt_dec(interpreter, responder, obj);
   return obj;
@@ -33 +40 @@
                                     SMOP__ResponderInterface* responder,
                                     SMOP__Object* obj) {
-  printf("+");
   smop_lowlevel_refcnt_inc(interpreter, responder, obj);
   return obj;
@@ -41 +47 @@
   smop_init();
 
-  printf("1..6\n");
+  printf("1..7\n");
 
 
@@ -64 +70 @@
     $p6opaque.SMOP__ID__REPR_how($how);
     $p6opaque.SMOP__ID__STORE();
+    SMOP__SLIME__CurrentFrame.forget();
   };
 
@@ -75 +82 @@
   printf("ok 2 - goto frame.\n");
 
+  printf("# before freeing how\n");
+  SMOP_RELEASE(interpreter,how);
+
+  printf("# before freeing p6opaque\n");
+  SMOP_RELEASE(interpreter,p6opaque);
+
   SMOP_DISPATCH(interpreter, SMOP_RI(interpreter),
                 SMOP__ID__loop, SMOP__NATIVE__capture_create(interpreter,
@@ -81 +94 @@
                                                              NULL, NULL));
 
-  printf("ok 5 - interpreter loop.\n");
+  printf("ok 6 - interpreter loop.\n");
 
-  SMOP_RELEASE(SMOP__INTPTR__InterpreterInstance,how);
-  SMOP_RELEASE(SMOP__INTPTR__InterpreterInstance,p6opaque);
+  printf("# before freeing the interpreter\n");
   SMOP_RELEASE(SMOP__INTPTR__InterpreterInstance,interpreter);
 
-  printf("ok 6 - Scalar destroyed should free the p6opaque object also.\n");
+  printf("ok 7 - Scalar destroyed should free the p6opaque object also.\n");
 
   smop_destr();