Changeset 21216

Timestamp:

07/04/08 14:43:10 (3 months ago)

Author:

ruoso

Message:

[smop] p6opaque still breaks... but now pmurias++ sm0p parser is used by default

Location:

v6/smop

Files:

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

v6/smop/sm0p.pl

@@ -43 +43 @@
     my ($writer, $reader, $error) = map { gensym } 1..3;
     my $pid;
-    if ($ENV{SM0P_FASTER}) {
-        $pid = open3($writer, $reader, $error, 'perl',"-I$base/../../src/perl6",'-I'.$base.'/../../misc/sm0p', $base.'/../../misc/sm0p/sm0p_with_actions') || die "$@";
+    unless ($ENV{SM0P_SLOWISH_KP6}) {
+        $pid = open3($writer, $reader, $error,
+                     'perl',"-I$base/../../src/perl6",
+                     '-I'.$base.'/../../misc/sm0p',
+                     $base.'/../../misc/sm0p/sm0p_with_actions') || die "$@";
     } else {
-        $pid = open3($writer, $reader, $error, 'perl', '-I'.$base.'/../v6-KindaPerl6/compiled/perl5-kp6-mp6/lib',$base.'/sm0p/KP6sm0p.pl');
+        $pid = open3($writer, $reader, $error,
+                     'perl', '-I'.$base.'/../v6-KindaPerl6/compiled/perl5-kp6-mp6/lib',
+                     $base.'/sm0p/KP6sm0p.pl') || die $@;
     }
     print {$writer} $code;

v6/smop/src/p6opaque.sm0p

@@ -231 +231 @@
         SMOP__NATIVE__bool_true.SMOP__ID__dispatch();
         $invocant.SMOP__ID__REPR_DESTROY();
+        SMOP__SLIME__CurrentFrame.forget();
         $interpreter.goto(|$continuation);
       };
@@ -250 +251 @@
         SMOP__SLIME__CurrentFrame.move_capturize(SMOP__SLIME__Capturize.new(1,(),(),1));
         SMOP__p6opaque__RI.SMOP__ID__REPR_DESTROY();
+        SMOP__SLIME__CurrentFrame.forget();
         $interpreter.goto(|$continuation);
       };

v6/smop/test/12_p6opaque.sm0p

@@ -75 +75 @@
   printf("ok 2 - goto frame.\n");
 
-  SMOP_RELEASE(interpreter,p6opaque);
   SMOP_DISPATCH(interpreter, SMOP_RI(interpreter),
                 SMOP__ID__loop, SMOP__NATIVE__capture_create(interpreter,
                                                              SMOP_REFERENCE(interpreter,interpreter),
+
                                                              NULL, NULL));
+
   printf("ok 5 - interpreter loop.\n");
 
-
+  SMOP_RELEASE(SMOP__INTPTR__InterpreterInstance,how);
+  SMOP_RELEASE(SMOP__INTPTR__InterpreterInstance,p6opaque);
   SMOP_RELEASE(SMOP__INTPTR__InterpreterInstance,interpreter);