More fixes to gather and package stubbing

sorear · Jun 10, 2011 · e21bfa2 · e21bfa2
1 parent e7fb127
commit e21bfa2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/CLRBackend.cs b/lib/CLRBackend.cs
@@ -216,6 +216,8 @@ class Unit {
             for (int i = 0; i < xref.Length; i++) {
                 if (xref[i] == null) continue;
                 object[] xr = (object[]) xref[i];
+                if (CLRBackend.Verbose > 0)
+                    Console.WriteLine("Loading {0} {1}...", JScalar.S(xr[0]),i);
                 if (JScalar.S(xr[0]) == "sub") {
                     xref[i] = new StaticSub(this, xr, (code != null &&
                             i < code.Length) ? (object[])code[i] : null);

diff --git a/src/niecza b/src/niecza
@@ -288,8 +288,8 @@ method open_package_def($, $/ = $*cursor) {
             if $scope eq 'our' {
                 $ourpkg = ($r<path>:exists) ?? $r<path> !! ['OUR'];
             }
-            try @ns = $*CURLEX<!sub>.outer.find_pkg(
-                [ @( $r<path> // ['MY'] ), $r<name> ]);
+            try @ns = @( $*CURLEX<!sub>.outer.find_pkg(
+                [ @( $r<path> // ['MY'] ), $r<name> ]) );
             $*CURLEX<!sub>.outervar = ($scope eq 'anon' || ($r<path>:exists))
                 ?? self.gensym !! $name;
         } else {
@@ -844,8 +844,8 @@ method statement_prefix:do ($/) {
 }
 method statement_prefix:gather ($/) {
     $<blast>.ast.gather_hack = True;
-    make ::Op::Gather.new(|node($/), var => self.block_expr($/, $<blast>.ast),
-        body => Any);
+    make ::Op::Gather.new(|node($/), body => Any, var =>
+        self.block_expr($/, $<blast>.ast).name);
 }
 method statement_prefix:try ($/) {
     make ::Op::Try.new(|node($/), body => self.inliney_call($/, $<blast>.ast));