Fix handling of eval "use Foo" when Foo has INIT blocks

sorear · Oct 25, 2011 · 4494faa · 4494faa
1 parent 2664568
commit 4494faa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/Kernel.cs b/lib/Kernel.cs
@@ -677,7 +677,7 @@ public sealed class RuntimeUnit : IFreeze {
             if (prepared) return;
             prepared = true;
 
-            foreach (RuntimeUnit d in depended_units)
+            foreach (RuntimeUnit d in Kernel.containerRootUnit.depended_units)
                 d.PrepareEval(); // would loop without above assignment
 
             if (type == null) {
@@ -697,7 +697,7 @@ public sealed class RuntimeUnit : IFreeze {
             Kernel.FirePhasers(this, Kernel.PHASER_UNIT_INIT, false);
             Kernel.FirePhasers(this, Kernel.PHASER_INIT, false);
 
-            if (!is_mainish && bottom == null)
+            if (!is_mainish && bottom == null && filename != "(eval)")
                 RunMainline();
         }
 

diff --git a/lib/Test.pm6 b/lib/Test.pm6
@@ -77,8 +77,10 @@ class Builder {
     }
 }
 
-$GLOBAL::TEST-BUILDER = Builder.bless(*);
-$GLOBAL::TEST-BUILDER.reset;
+INIT {
+    $GLOBAL::TEST-BUILDER = Builder.bless(*);
+    $GLOBAL::TEST-BUILDER.reset;
+}
 
 sub cmp_ok(\$a, $fn, \$b, $tag?) is export { ok($fn($a, $b), $tag); }
 sub ok(\$bool, $tag?) is export { $*TEST-BUILDER.ok(?$bool, $tag) }