added p6capturelex, which really needs reviewing

rakudo · Oct 28, 2013 · 6e556ae · 6e556ae
1 parent 753af50
commit 6e556ae
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/vm/moar/Perl6/Ops.nqp b/src/vm/moar/Perl6/Ops.nqp
@@ -48,6 +48,9 @@ MAST::ExtOpRegistry.register_extop('p6decontrv',
     $MVM_operand_obj   +| $MVM_operand_write_reg,
     $MVM_operand_obj   +| $MVM_operand_read_reg,
     $MVM_operand_obj   +| $MVM_operand_read_reg);
+MAST::ExtOpRegistry.register_extop('p6capturelex',
+    $MVM_operand_obj   +| $MVM_operand_write_reg,
+    $MVM_operand_obj   +| $MVM_operand_read_reg);
 MAST::ExtOpRegistry.register_extop('p6isbindable',
     $MVM_operand_int64 +| $MVM_operand_write_reg,
     $MVM_operand_obj   +| $MVM_operand_read_reg,
@@ -75,7 +78,7 @@ my $ops := nqp::getcomp('QAST').operations;
 $ops.add_hll_moarop_mapping('perl6', 'p6trialbind', 'p6trialbind');
 $ops.add_hll_moarop_mapping('perl6', 'p6typecheckrv', 'p6typecheckrv', 0);
 $ops.add_hll_moarop_mapping('perl6', 'p6decontrv', 'p6decontrv');
-#$ops.map_classlib_hll_op('perl6', 'p6capturelex', $TYPE_P6OPS, 'p6capturelex', [$RT_OBJ], $RT_OBJ, :tc, :!inlinable);
+$ops.add_hll_moarop_mapping('perl6', 'p6capturelex', 'p6capturelex');
 #$ops.map_classlib_hll_op('perl6', 'p6bindassert', $TYPE_P6OPS, 'p6bindassert', [$RT_OBJ, $RT_OBJ], $RT_OBJ, :tc);
 #$ops.map_classlib_hll_op('perl6', 'p6stateinit', $TYPE_P6OPS, 'p6stateinit', [], $RT_INT, :tc, :!inlinable);
 #$ops.map_classlib_hll_op('perl6', 'p6setpre', $TYPE_P6OPS, 'p6setpre', [], $RT_OBJ, :tc);

diff --git a/src/vm/moar/ops/perl6_ops.c b/src/vm/moar/ops/perl6_ops.c
@@ -65,11 +65,34 @@ static void p6decontrv(MVMThreadContext *tc) {
      GET_REG(tc, 0).o = GET_REG(tc, 4).o;
 }
 
+static MVMuint8 s_p6capturelex[] = {
+    MVM_operand_obj | MVM_operand_write_reg,
+    MVM_operand_obj | MVM_operand_read_reg,
+};
+static void p6capturelex(MVMThreadContext *tc) {
+    MVMCode *codeObj = (MVMCode *)GET_REG(tc, 2).o;
+    MVMCode *closure;
+    MVMStaticFrame *wantedStaticInfo;
+    if (REPR(codeObj)->ID != MVM_REPR_ID_MVMCode)
+        MVM_exception_throw_adhoc(tc, "p6capturelex needs a code ref");
+
+    closure = (MVMCode *)codeObj->body.code_object;
+
+    wantedStaticInfo = closure->body.sf->body.outer;
+    if (tc->cur_frame->static_info == wantedStaticInfo)
+        closure->body.outer = tc->cur_frame;
+    else if (tc->cur_frame->outer->static_info == wantedStaticInfo)
+        closure->body.outer = tc->cur_frame->outer;
+
+    GET_REG(tc, 0).o = (MVMObject *)codeObj;
+}
+
 /* Registers the extops with MoarVM. */
 MVM_DLL_EXPORT void Rakudo_ops_init(MVMThreadContext *tc) {
     MVM_ext_register_extop(tc, "p6init",  p6init, 0, NULL);
     MVM_ext_register_extop(tc, "p6settypes",  p6settypes, 1, s_p6settypes);
     MVM_ext_register_extop(tc, "p6bool",  p6bool, 2, s_p6bool);
     MVM_ext_register_extop(tc, "p6typecheckrv",  p6typecheckrv, 2, s_p6typecheckrv);
     MVM_ext_register_extop(tc, "p6decontrv",  p6decontrv, 3, s_p6decontrv);
+    MVM_ext_register_extop(tc, "p6capturelex",  p6capturelex, 2, s_p6capturelex);
 }