hook I::P5's ModuleLoader to CUR, not P6::ML

rakudo · Sep 1, 2015 · ba2ade8 · ba2ade8
1 parent 269107e
commit ba2ade8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -3748,21 +3748,4 @@ class Perl6::World is HLL::World {
     }
 }
 
-my class Perl5ModuleLoaderStub {
-    method load_module($module_name, %opts, *@GLOBALish, :$line, :$file) {
-        {
-            self.find_symbol(['CompUnitRepo']).load_module('Inline::Perl5', {}, @GLOBALish, :$line, :$file);
-            CATCH {
-                $*W.find_symbol(nqp::list('X','NYI','Available')).new(
-                    :available('Inline::Perl5'), :feature('Perl 5')).throw;
-            }
-        }
-
-        # Inline::Perl5 has overwritten this module loader at this point
-        return Perl6::ModuleLoader.load_module($module_name, %opts, @GLOBALish, :$line, :$file);
-    }
-}
-
-nqp::gethllsym('perl6', 'ModuleLoader').register_language_module_loader('Perl5', Perl5ModuleLoaderStub);
-
 # vim: ft=perl6 expandtab sw=4
diff --git a/src/core/CompUnitRepo.pm b/src/core/CompUnitRepo.pm
@@ -2,6 +2,21 @@ role  CompUnitRepo::Locally             { ... }
 class CompUnitRepo::Local::File         { ... }
 class CompUnitRepo::Local::Installation { ... }
 
+my class Perl5ModuleLoaderStub {
+    method load_module($module_name, %opts, *@GLOBALish, :$line, :$file) {
+        {
+            CompUnitRepo.load_module('Inline::Perl5', {}, @GLOBALish, :$line, :$file);
+            CATCH {
+                $*W.find_symbol(nqp::list('X','NYI','Available')).new(
+                    :available('Inline::Perl5'), :feature('Perl 5')).throw;
+            }
+        }
+
+        # Inline::Perl5 has overwritten this module loader at this point
+        return CompUnitRepo.load_module($module_name, %opts, @GLOBALish, :$line, :$file);
+    }
+}
+
 class CompUnitRepo {
     my $lock     = Lock.new;
     my %modules_loaded;
@@ -10,6 +25,7 @@ class CompUnitRepo {
         # We're using Perl6::ModuleLoader instead of NQP's here,
         # so it can special-cases NQP wrt GLOBALish correctly.
         'NQP' => nqp::gethllsym('perl6', 'ModuleLoader'),
+        'Perl5' => Perl5ModuleLoaderStub,
     ;
 
     method register_language_module_loader($lang, $loader, :$force) {