Changeset 21971

Timestamp:

08/20/08 20:48:37 (3 months ago)

Author:

ruoso

Message:

[smop] YAY! We have code blocks working... with signature binding and all...

Location:

v6/smop

Files:

• CMakeLists.txt (modified) (1 diff)
• include/smop_mold.h (modified) (1 diff)
• src/idconst.c (modified) (2 diffs)
• src/smop_internal.h (modified) (1 diff)
• src/smop_mold.c (modified) (3 diffs)
• src/smop_s1p_code.sm0p (moved) (moved from v6/smop/src/smop_s1p_code.c) (5 diffs, 1 prop)
• test/21_code.m0ld (modified) (1 diff)

v6/smop/CMakeLists.txt

@@ -65 +65 @@
     src/p6opaque.sm0p
     src/smop_s1p_attribute.sm0p
+    src/smop_s1p_code.sm0p
 )
 compile_sm0p (${sm0p_file})

v6/smop/include/smop_mold.h

@@ -10 +10 @@
 */
 extern SMOP__Object* SMOP__Mold;
+extern SMOP__Object* SMOP__Mold__Frame;
 SMOP__Object* SMOP__Mold_create(int registers,SMOP__Object** constants,int opcodes_len,int *opcodes); 
 SMOP__Object* SMOP__Mold__Frame_create(SMOP__Object* interpreter,SMOP__Object* mold);

v6/smop/src/idconst.c

@@ -9 +9 @@
 #include <pthread.h>
 #include <stdio.h>
+#include <smop_s1p.h>
 #include "smop_internal.h"
 
@@ -57 +58 @@
                                      SMOP__Object* identifier,
                                      SMOP__Object* capture) {
-  // TODO
-  return NULL;
+  ___UNKNOWN_METHOD___;
 }
 

v6/smop/src/smop_internal.h

@@ -80 +80 @@
      smop_s1p_lexicalscope_mold_init();     \
      smop_s1p_defaultblocksignature_mold_init(); \
+     smop_s1p_code_mold_init();             \
 
 #define SMOP_BOOTSTRAP_DESTR_SEQUENCE       \
+     smop_s1p_code_mold_destr();            \
      smop_s1p_defaultblocksignature_mold_destr();\
      smop_s1p_lexicalscope_mold_destr();    \

v6/smop/src/smop_mold.c

@@ -8 +8 @@
 SMOP__Object* SMOP__Mold;
 SMOP__Object* SMOP__Mold__Frame;
+
+static SMOP__Object* SMOP__ID__set_reg;
+static SMOP__Object* SMOP__ID__set_back;
 
 typedef struct smop_mold {
@@ -143 +146 @@
     SMOP__Object* mold = SMOP__NATIVE__capture_positional(interpreter, capture, 0);
     ret = SMOP__Mold__Frame_create(interpreter,mold);
+  } else if (SMOP__ID__set_reg == identifier) {
+
+    SMOP__Object* reg_pos = SMOP__NATIVE__capture_positional(interpreter, capture, 0);
+    SMOP__Object* value = SMOP__NATIVE__capture_positional(interpreter, capture, 1);
+    mold_reg_set(interpreter, invocant, SMOP__NATIVE__int_fetch(reg_pos), value);
+
+  } else if (SMOP__ID__back == identifier) {
+
+    SMOP__Object* value = SMOP__NATIVE__capture_positional(interpreter, capture, 0);
+    if (frame->back) {
+      ret = SMOP_REFERENCE(interpreter,frame->back);
+    }
+
+  } else if (SMOP__ID__set_back == identifier) {
+
+    SMOP__Object* value = SMOP__NATIVE__capture_positional(interpreter, capture, 0);
+    if (!frame->back) {
+      frame->back = value;
+    } else {
+      printf("trying to set a new back to the frame\n");
+      abort();
+    }
+
   } else if (SMOP__ID__has_next == identifier) {
     if (mold->opcodes[frame->position]) {
@@ -289 +315 @@
 
 void smop_mold_init() {
+  SMOP__ID__set_reg = SMOP__NATIVE__idconst_create("set_reg");
+  SMOP__ID__set_back = SMOP__NATIVE__idconst_create("set_back");
+
   SMOP__Mold = calloc(1,sizeof(SMOP__ResponderInterface));
   ((SMOP__ResponderInterface*)SMOP__Mold)->MESSAGE = smop_mold_message;

v6/smop/src/smop_s1p_code.sm0p

@@ -2 +2 @@
 #include <smop_lowlevel.h>
 #include <smop_identifiers.h>
+#include <smop_mold.h>
 #include <smop_s1p.h>
 #include <stdlib.h>
@@ -8 +9 @@
 
 SMOP__Object* SMOP__S1P__Code;
+
+static SMOP__Object* smop_s1p_code_mold;
 
 /*
@@ -52 +55 @@
     SMOP__Object* outer = code->outer;
     SMOP__Object* mold = code->mold;
+    SMOP__Object* signature = code->signature;
     smop_lowlevel_unlock(invocant);
 
-    SMOP__Object* frame = SMOP__Mold__Frame_create(interpreter,SMOP_REFERENCE(interpreter,mold));
+    SMOP__Object* frame = SMOP__Mold__Frame_create(interpreter,SMOP_REFERENCE(interpreter,smop_s1p_code_mold));
     SMOP__Object* back = SMOP_DISPATCH(interpreter, SMOP_RI(interpreter),
       SMOP__ID__continuation,
@@ -62 +66 @@
     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));
+    mold_reg_set(interpreter,frame,2,SMOP_REFERENCE(interpreter,back));
+    mold_reg_set(interpreter,frame,3,SMOP_REFERENCE(interpreter,code));
+    mold_reg_set(interpreter,frame,4,SMOP_REFERENCE(interpreter,outer));
+    mold_reg_set(interpreter,frame,5,SMOP_REFERENCE(interpreter,signature));
+    mold_reg_set(interpreter,frame,6,SMOP_REFERENCE(interpreter,mold));
+
     SMOP_DISPATCH(interpreter,SMOP_RI(interpreter),SMOP__ID__goto,frame);
 
@@ -99 +107 @@
   free(SMOP__S1P__Code);
 }
+
+void smop_s1p_code_mold_init() {
+  SMOP__Object* interpreter = SMOP__GlobalInterpreter;
+  smop_s1p_code_mold = q:m0ld {
+    my $interpreter;
+    my $capture;
+    my $back;
+    my $code;
+    my $outer;
+    my $signature;
+    my $mold;
+
+    my $void;
+
+    my $lexical_proto = ¢SMOP__S1P__LexicalScope;
+    my $lexical = $lexical_proto."new"();
+    my $lexical_outer_container = $lexical."outer"();
+    $void = $lexical_outer_container."STORE"($outer);
+
+    $void = $signature."BIND"($capture,$lexical);
+    my $frame_proto = ¢SMOP__Mold__Frame;
+    my $frame = $frame_proto."new"($mold);
+    $void = $frame."set_reg"(0, $interpreter);
+    $void = $frame."set_reg"(1, $lexical);
+    $void = $frame."set_back"($back);
+    $void = $interpreter."goto"($frame);
+  };
+}
+
+void smop_s1p_code_mold_destr() {
+  SMOP__Object* interpreter = SMOP__GlobalInterpreter;
+  SMOP_RELEASE(interpreter, smop_s1p_code_mold);
+}

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..2\n");
+$void = $out."print"("1..3\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 $lexicalscope = ¢SMOP__S1P__LexicalScope."new"();
+
+my $it_var_slot = $lexicalscope."postcircumfix:{ }"("$_");
+my $it_var_cont = ¢SMOP__S1P__Scalar."new"();
+$void = $it_var_slot."STORE"($it_var_cont);
+$void = $it_var_cont."STORE"("ok 3\n");
+
+my $code1 = $Code."new"(:"outer"($lexicalscope),:"signature"(¢SMOP__S1P__DefaultBlockSignature),:"mold"(mold {
     my $interpreter;
-    my $capture;
-    my $outer;
-    my $back;
+    my $lexical;
 
+
+    my $it_var_slot = $lexical."postcircumfix:{ }"("$_");
+    my $it_var = $it_var_slot."FETCH"();
+    my $it  = $it_var."FETCH"();
+   
     my $void;
     my $out_scalar = ¢SMOP__S1P__RootNamespace."postcircumfix:{ }"("$*OUT");
     my $out = $out_scalar."FETCH"();
-    $void = $out."print"("ok\n");
-    my $void = $interpreter."goto"($back);
+    $void = $out."print"($it);
+
+    my $continuation = $interpreter."continuation"();
+    my $back = $continuation."back"();
+    $void = $interpreter."goto"($back);
 }));
+$void = $code1."postcircumfix:( )"("ok 1\n");
+$void = $code1."postcircumfix:( )"("ok 2\n");
 $void = $code1."postcircumfix:( )"();
-$void = $code1."postcircumfix:( )"();