adjust tests

Raku · Feb 17, 2013 · 4068cef · 4068cef
1 parent de66164
commit 4068cef
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/t/p5regex/01-p5regex.t b/t/p5regex/01-p5regex.t
@@ -39,7 +39,7 @@ sub test_line($line) {
 
     my $rxcomp := pir::compreg__Ps('QRegex::P5Regex');
     try {
-        my $rxsub  := $rxcomp.compile($regex).main_sub();
+        my $rxsub  := $rxcomp.compile($regex);
         my $cursor := NQPCursor."!cursor_init"($target, :c(0));
         my $match  := $rxsub($cursor).MATCH;
         if $expect_substr {

diff --git a/t/qast/pirt.t b/t/qast/pirt.t
@@ -6,7 +6,8 @@ sub is_pirt_result($producer, $expected, $desc) {
     my $pirt := $producer();
     my $pir := $pirt.pir();
     #say($pir);
-    my $sub := QAST::Compiler.compile_and_init($pir).main_sub();
+    my $pbc := QAST::Compiler.pbc($pir);
+    my $sub := QAST::Compiler.init($pbc);
     ok($sub() eq $expected, $desc);
 }
 

diff --git a/t/qast/qast.t b/t/qast/qast.t
@@ -7,7 +7,8 @@ sub compile_qast($qast) {
     my $*QAST_BLOCK_NO_CLOSE := 1;
     my $pirt := QAST::Compiler.as_post($qast);
     my $pir := $pirt.pir();
-    QAST::Compiler.compile_and_init($pir).main_sub();
+    my $pbc := QAST::Compiler.pbc($pir);
+    QAST::Compiler.init($pbc);
 }
 sub is_qast($qast, $value, $desc) {
     try {

diff --git a/t/qregex/01-qregex.t b/t/qregex/01-qregex.t
@@ -45,7 +45,7 @@ sub test_line($line) {
 
     my $rxcomp := pir::compreg__Ps('QRegex::P6Regex');
     try {
-        my $rxsub  := $rxcomp.compile($regex).main_sub();
+        my $rxsub  := $rxcomp.compile($regex);
         my $cursor := NQPCursor."!cursor_init"($target, :c(0));
         my $match  := $rxsub($cursor).MATCH;
         if $expect_substr {