Changeset 21201

Timestamp:

07/03/08 23:23:38 (3 months ago)

Author:

ruoso

Message:

[smop] still more work on p6opaque, few bugs fixed, some slime bugs still.

Location:

v6/smop

Files:

• src/Makefile.am (modified) (1 diff)
• src/p6opaque.sm0p (modified) (5 diffs)
• src/smop_interpreter.c (modified) (1 diff)
• src/smop_slime_frame.c (modified) (6 diffs)
• src/smop_slime_node.c (modified) (2 diffs)
• test/12_p6opaque.sm0p (modified) (3 diffs)

v6/smop/src/Makefile.am

@@ -2 +2 @@
         perl $(top_srcdir)/sm0p.pl $(top_srcdir) $< $@
 
-AM_CFLAGS = -Wall -D_GNU_SOURCE -DSMOP_LOWLEVEL_MEM_TRACE -I$(top_srcdir)/include
+AM_CFLAGS = -Wall -D_GNU_SOURCE -DSMOP_LOWLEVEL_MEM_TRACE -I$(top_srcdir)/include 
 AM_LDFLAGS = --no-undefined
 # use this to see alloc, refcnt_inc, refcnt_dec and destroys...    -DSMOP_LOWLEVEL_MEM_DEBUG 

v6/smop/src/p6opaque.sm0p

@@ -115 +115 @@
         fprintf(stderr, "[SMOP p6opaque] TODO: p6opaque RI's meta undefined yet\n");
         ret = SMOP__NATIVE__bool_false;
+      } else if (SMOP_RI(invocant) != (SMOP__ResponderInterface*)SMOP__p6opaque__RI) {
+        fprintf(stderr, "[SMOP p6opaque] call to repr method with non p6opaque invocant\n");
+        ret = SMOP__NATIVE__bool_false;
       } else {
         if (set)
@@ -140 +143 @@
           if (set) {
             fprintf(stderr, "[SMOP p6opaque] Can't set how on a instance\n");
+            SMOP_RELEASE(interpreter,set);
           } else {
 
@@ -145 +149 @@
             SMOP__Object* frame;
             SMOP__Object* continuation = SMOP_DISPATCH(interpreter, SMOP_RI(interpreter),
-                                                       SMOP__ID__continuation, interpreter);
+                                                       SMOP__ID__continuation, SMOP_REFERENCE(interpreter,interpreter));
             $frame = q:sm0p {
               $continuation;
@@ -161 +165 @@
         } else if (set) {
           // create the metadata struct and set the how.
-        
-
+          SMOP__p6opaque_LOWL_metadata* m = calloc(1,sizeof(SMOP__p6opaque_LOWL_metadata));
+          assert(m);
+          m->how = set;
+          ((SMOP__p6opaque_struct*)invocant)->metadata = m;
+          smop_lowlevel_unlock(invocant);
+
+          ret = SMOP_REFERENCE(interpreter, set);
         } else {
-
           fprintf(stderr,"[SMOP p6opaque] TODO: invalid .^!how call\n");
         }
@@ -182 +190 @@
     SMOP__Object* frame;
     SMOP__Object* continuation = SMOP_DISPATCH(interpreter, SMOP_RI(interpreter),
-                                               SMOP__ID__continuation, interpreter);
+                                               SMOP__ID__continuation, 
+                                               SMOP_REFERENCE(interpreter,interpreter));
     $frame = q:sm0p {
       $capture;

v6/smop/src/smop_interpreter.c

@@ -47 +47 @@
                     SMOP__NATIVE__capture_create(invocant, SMOP_REFERENCE(invocant,cont), NULL, NULL));
       
+      
       if (invocant != SMOP__INTPTR__InterpreterInstance) {
         smop_lowlevel_rdlock(invocant);

v6/smop/src/smop_slime_frame.c

@@ -174 +174 @@
       SMOP__Object* node = ((smop_slime_frame_struct*)frame)->nodes[pc];
       smop_lowlevel_unlock(frame);
-      SMOP_DISPATCH(interpreter,SMOP_RI(node),SMOP__ID__setr,
-                    SMOP__NATIVE__capture_create(interpreter,node,(SMOP__Object*[]){value, NULL},NULL));
+      SMOP_DISPATCH(interpreter,SMOP_RI(node),SMOP__ID__result,
+                    SMOP__NATIVE__capture_create(interpreter,SMOP_REFERENCE(interpreter,node),(SMOP__Object*[]){value, NULL},NULL));
       SMOP_RELEASE(interpreter,frame);
       ret = SMOP__NATIVE__bool_true;
@@ -253 +253 @@
       assert(SMOP_RI(count) == (SMOP__ResponderInterface*)SMOP__NATIVE__int);
       int c = SMOP__NATIVE__int_fetch(count);
+      SMOP_RELEASE(interpreter, count);
       smop_lowlevel_rdlock(frame);
       int pc = ((smop_slime_frame_struct*)frame)->pc;
@@ -260 +261 @@
       SMOP__Object* res = SMOP_DISPATCH(interpreter,SMOP_RI(node),SMOP__ID__result,
                                         SMOP__NATIVE__capture_create(interpreter,SMOP_REFERENCE(interpreter,node),NULL,NULL));
-      SMOP_DISPATCH(interpreter,SMOP_RI(thisnode),SMOP__ID__result,
-                    SMOP__NATIVE__capture_create(interpreter,thisnode,(SMOP__Object*[]){res,NULL},NULL));
+      SMOP_RELEASE(interpreter,
+                   SMOP_DISPATCH(interpreter,SMOP_RI(thisnode),SMOP__ID__result,
+                                 SMOP__NATIVE__capture_create(interpreter,
+                                                              SMOP_REFERENCE(interpreter,thisnode),(SMOP__Object*[]){res,NULL},NULL)));
       ret = SMOP__NATIVE__bool_true;
       SMOP_RELEASE(interpreter,frame);
@@ -277 +280 @@
       int c = SMOP__NATIVE__int_fetch(count);
       int t = SMOP__NATIVE__int_fetch(target);
+      SMOP_RELEASE(interpreter, count);
+      SMOP_RELEASE(interpreter, target);
       smop_lowlevel_rdlock(frame);
       int pc = ((smop_slime_frame_struct*)frame)->pc;
@@ -285 +290 @@
                                         SMOP__NATIVE__capture_create(interpreter,SMOP_REFERENCE(interpreter,node),NULL,NULL));
       SMOP_DISPATCH(interpreter,SMOP_RI(thisnode),SMOP__ID__responder,
-                    SMOP__NATIVE__capture_create(interpreter,thisnode,(SMOP__Object*[]){res,NULL},NULL));
+                    SMOP__NATIVE__capture_create(interpreter,
+                                                 SMOP_REFERENCE(interpreter,thisnode),
+                                                 (SMOP__Object*[]){(SMOP__Object*)SMOP_RI(res),NULL},NULL));
+      SMOP_RELEASE(interpreter, res);
       ret = SMOP__NATIVE__bool_true;
       SMOP_RELEASE(interpreter,frame);
@@ -325 +333 @@
                                         SMOP__NATIVE__capture_create(interpreter,SMOP_REFERENCE(interpreter,node),NULL,NULL));
       SMOP_DISPATCH(interpreter,SMOP_RI(thisnode),SMOP__ID__identifier,
-                    SMOP__NATIVE__capture_create(interpreter,thisnode,(SMOP__Object*[]){res,NULL},NULL));
+                    SMOP__NATIVE__capture_create(interpreter,SMOP_REFERENCE(interpreter,thisnode),(SMOP__Object*[]){res,NULL},NULL));
       SMOP_RELEASE(interpreter,count);
       SMOP_RELEASE(interpreter,target);

v6/smop/src/smop_slime_node.c

@@ -45 +45 @@
       old = ((smop_slime_node_struct*)node)->responder;
       ((smop_slime_node_struct*)node)->responder = set;
-    } else {
-      smop_lowlevel_rdlock(node);
-    }
-    ret = ((smop_slime_node_struct*)node)->responder;
-    smop_lowlevel_unlock(node);
-    SMOP_REFERENCE(interpreter,ret);
+      ret = ((smop_slime_node_struct*)node)->responder;
+    } else {
+      smop_lowlevel_rdlock(node);
+      ret = ((smop_slime_node_struct*)node)->responder;
+      SMOP_REFERENCE(interpreter,ret);
+    }
+    smop_lowlevel_unlock(node);
     if (old) SMOP_RELEASE(interpreter, old);
     SMOP_RELEASE(interpreter,node);
@@ -160 +161 @@
     smop_lowlevel_unlock(node);
 
-    //if (identifier && SMOP_RI(identifier) == SMOP_RI(SMOP__ID__new))
-    //fprintf(stderr,"[SMOP__SLIME__Node:DEBUG] eval %s.\n", (char*)(identifier->data));
+    //fprintf(stderr,"[SMOP__SLIME__Node:DEBUG] eval\n");
 
     if (responder) {

v6/smop/test/12_p6opaque.sm0p

@@ -8 +8 @@
   smop_init();
 
-  printf("1..5\n");
+  printf("1..4\n");
 
 
@@ -16 +16 @@
                                                                          SMOP__INTPTR__InterpreterInstance,NULL,NULL));
   SMOP__Object* frame;
-  SMOP__Object* scalar1 = SMOP__S1P__Scalar_create(SMOP__NATIVE__bool_true);
-  
+  SMOP__Object* how = SMOP__NATIVE__bool_true;
+  SMOP__Object* p6opaque = 
+    SMOP_DISPATCH(SMOP__INTPTR__InterpreterInstance, SMOP__p6opaque__RI,
+                  SMOP__ID__REPR_CREATE, SMOP__NATIVE__capture_create(SMOP__INTPTR__InterpreterInstance,
+                                                                      SMOP__INTPTR__InterpreterInstance,NULL,NULL));
+
   $frame = q:sm0p {
-    $scalar1;
-    SMOP__p6opaque__RI.SMOP__ID__REPR_CREATE();
-    SMOP__SLIME__CurrentFrame.move_capturize(SMOP__SLIME__Capturize.new(2,(1),(),1));
-    $scalar1.SMOP__ID__STORE();
+    ;
+    $p6opaque.SMOP__ID__new();
   };
+  //  SMOP__SLIME__CurrentFrame.move_responder(7,2);
+  //  SMOP__SLIME__CurrentFrame.move_capturize(SMOP__SLIME__Capturize.new(9,(),(),1));
+  //  SMOP__p6opaque__RI.SMOP__ID__new();
+  //};
 
   if (!frame) printf("not ");
   printf("ok 1 - frame created.\n");
 
+  SMOP_RELEASE(interpreter,p6opaque);
   SMOP_DISPATCH(interpreter, SMOP_RI(interpreter),
                 SMOP__ID__goto,
@@ -41 +48 @@
 
 
-  SMOP__Object* r1 = SMOP__S1P__Scalar_FETCH(scalar1);
-  if (SMOP_RI(r1) != (SMOP__ResponderInterface*)SMOP__p6opaque__RI) printf("not ");
-  printf("ok 4 - P6 Opaque created inside the interpreter loop\n");
-
-  SMOP_RELEASE(interpreter,scalar1);
-
-  SMOP_DISPATCH(interpreter, SMOP_RI(interpreter),
-                SMOP__ID__loop, SMOP__NATIVE__capture_create(interpreter,
-                                                             SMOP_REFERENCE(interpreter,interpreter),
-                                                             NULL, NULL));
-
   SMOP_RELEASE(SMOP__INTPTR__InterpreterInstance,interpreter);
 
-  printf("ok 5 - Scalar destroyed should free the p6opaque object also.\n");
+  printf("ok 4 - Scalar destroyed should free the p6opaque object also.\n");
 
   smop_destr();