un-hang qregex tests due to indexnat op

Test is not clean though. There seems to be three issues:a) a heisenbug b) an issue resolving frame labels and c) a problem with "baabbbb" ~~ /a**2..4/
Raku · Oct 9, 2013 · da02211 · da02211
1 parent ca7e1b9
commit da02211
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 11 deletions.
diff --git a/src/vm/moar/QAST/QASTOperationsMAST.nqp b/src/vm/moar/QAST/QASTOperationsMAST.nqp
@@ -962,6 +962,7 @@ QAST::MASTOperations.add_core_op('call', sub ($qastcomp, $op) {
         return $qastcomp.as_mast(QAST::Op.new( :op($realname), |$op.list ));
     }
 
+    # heisenbug!!!
     # Work out what callee is.
     my $callee;
     my @args := $op.list;

diff --git a/src/vm/moar/QAST/QASTRegexCompilerMAST.nqp b/src/vm/moar/QAST/QASTRegexCompilerMAST.nqp
@@ -432,17 +432,8 @@ class QAST::MASTRegexCompiler {
 
     method enumcharlist($node) {
         my @ins;
-        if $node.negate {
-            my $ok := label(self.unique($*RXPREFIX ~ '_enumcharlist'));
-            nqp::push(@ins,
-                op('indexat_scb', %*REG<tgt>, %*REG<pos>, sval($node[0]), $ok));
-            nqp::push(@ins, op('goto', %*REG<fail>));
-            nqp::push(@ins, $ok);
-        }
-        else {
-            nqp::push(@ins,
-                op('indexat_scb', %*REG<tgt>, %*REG<pos>, sval($node[0]), %*REG<fail>));
-        }
+        my $op := $node.negate ?? 'indexnat' !! 'indexat';
+        nqp::push(@ins, op($op, %*REG<tgt>, %*REG<pos>, sval($node[0]), %*REG<fail>));
         nqp::push(@ins, op('inc_i', %*REG<pos>))
             unless $node.subtype eq 'zerowidth';
         @ins

diff --git a/src/vm/moar/stage0/ModuleLoader.moarvm b/src/vm/moar/stage0/ModuleLoader.moarvm
diff --git a/src/vm/moar/stage0/NQPCOREMoar.setting.moarvm b/src/vm/moar/stage0/NQPCOREMoar.setting.moarvm
diff --git a/src/vm/moar/stage0/NQPHLLMoar.moarvm b/src/vm/moar/stage0/NQPHLLMoar.moarvm
diff --git a/src/vm/moar/stage0/NQPP6QRegexMoar.moarvm b/src/vm/moar/stage0/NQPP6QRegexMoar.moarvm
diff --git a/src/vm/moar/stage0/QASTMoar.moarvm b/src/vm/moar/stage0/QASTMoar.moarvm
diff --git a/src/vm/moar/stage0/QASTNodesMoar.moarvm b/src/vm/moar/stage0/QASTNodesMoar.moarvm
diff --git a/src/vm/moar/stage0/QRegexMoar.moarvm b/src/vm/moar/stage0/QRegexMoar.moarvm
diff --git a/src/vm/moar/stage0/nqp-mo.moarvm b/src/vm/moar/stage0/nqp-mo.moarvm
diff --git a/src/vm/moar/stage0/nqp.moarvm b/src/vm/moar/stage0/nqp.moarvm
diff --git a/t/qregex/01-qregex.t b/t/qregex/01-qregex.t
@@ -46,6 +46,7 @@ sub test_line($line) {
 
     my $rxcomp := nqp::getcomp('QRegex::P6Regex');
     try {
+        # heisenbug!!!
         my $rxsub  := $rxcomp.compile($regex);
         my $cursor := NQPCursor."!cursor_init"($target, :c(0));
         my $match  := $rxsub($cursor).MATCH;