Changeset 21970

Timestamp:

08/20/08 18:52:17 (3 months ago)

Author:

pmurias

Message:

[smop]
fixed Makefile adding garbage to the output;
back and friends are passed to Code.mold during postcircumfix:<( )>

Location:

v6/smop

Files:

• Makefile (modified) (1 diff)
• src/smop_s1p_code.c (modified) (1 diff)
• test/21_code.m0ld (modified) (1 diff)
• tools/dsl (modified) (1 diff)

v6/smop/Makefile

@@ -1 +1 @@
 all:
-        mkdir build;cd build;cmake ..;make
+        mkdir build;cd build;cmake ..;MAKELEVEL=0 make
 .PHONY : test all
 test: all
         perl -MTest::Harness -e '@tests=<build/test/*.t>;$$Test::Harness::switches="-e \"system(shift)\"";runtests(@tests)'
+env:
+        env
 
 

v6/smop/src/smop_s1p_code.c

@@ -49 +49 @@
     SMOP__S1P__Code_struct* code = (SMOP__S1P__Code_struct*) invocant;
 
-    smop_lowlevel_rdlock(code);
+    smop_lowlevel_rdlock(invocant);
+    SMOP__Object* outer = code->outer;
     SMOP__Object* mold = code->mold;
-    smop_lowlevel_unlock(code);
+    smop_lowlevel_unlock(invocant);
 
     SMOP__Object* frame = SMOP__Mold__Frame_create(interpreter,SMOP_REFERENCE(interpreter,mold));
+    SMOP__Object* back = SMOP_DISPATCH(interpreter, SMOP_RI(interpreter),
+      SMOP__ID__continuation,
+      SMOP__NATIVE__capture_create(interpreter,SMOP_REFERENCE(interpreter,interpreter),
+        NULL,NULL));
 
+    mold_reg_set(interpreter,frame,0,SMOP_REFERENCE(interpreter,interpreter));
+    mold_reg_set(interpreter,frame,1,SMOP_REFERENCE(interpreter,capture));
+    mold_reg_set(interpreter,frame,2,SMOP_REFERENCE(interpreter,outer));
+    mold_reg_set(interpreter,frame,3,SMOP_REFERENCE(interpreter,back));
     SMOP_DISPATCH(interpreter,SMOP_RI(interpreter),SMOP__ID__goto,frame);
 

v6/smop/test/21_code.m0ld

@@ -2 +2 @@
 my $out_scalar = ¢SMOP__S1P__RootNamespace."postcircumfix:{ }"("$*OUT");
 my $out = $out_scalar."FETCH"();
-$void = $out."print"("1..1\n");
+$void = $out."print"("1..2\n");
 
 my $Code_scalar = ¢SMOP__S1P__RootNamespace."postcircumfix:{ }"("::Code");
 my $Code = $Code_scalar."FETCH"();
 my $code1 = $Code."new"(:"outer"("...outer..."),:"signature"("...signature..."),:"mold"(mold {
+    my $interpreter;
+    my $capture;
+    my $outer;
+    my $back;
+
     my $void;
     my $out_scalar = ¢SMOP__S1P__RootNamespace."postcircumfix:{ }"("$*OUT");
     my $out = $out_scalar."FETCH"();
-    $void = $out."print"("ok 1\n");
+    $void = $out."print"("ok\n");
+    my $void = $interpreter."goto"($back);
 }));
 $void = $code1."postcircumfix:( )"();
-
+$void = $code1."postcircumfix:( )"();

v6/smop/tools/dsl

@@ -3 +3 @@
 use warnings;
 my ($dsl,$base,$m0ld,$in, $out) = @ARGV;
-warn "dsl:$dsl base:$base in:$in out:$out\n";
+#warn "dsl:$dsl base:$base in:$in out:$out\n";
 my $elfX = "$base/../../misc/elfish/elfX/elfX";
 if ($dsl eq 'm0ld') {