Detect and carp at circular module loading

rakudo · Aug 7, 2012 · 78c5c17 · 78c5c17
1 parent fefacce
commit 78c5c17
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/docs/ChangeLog b/docs/ChangeLog
@@ -13,6 +13,7 @@ New in 2012.08
 + simple implementation of the 'soft' pragma
 + fixed over-eager treatment of numeric literals as int rather than Int in cases
   where they appeared each side of an infix operator
++ detect circularities in module loading
 
 New in 2012.07
 + Deprecated SAFE.setting in favor of RESTRICTED.setting

diff --git a/src/Perl6/ModuleLoader.pm b/src/Perl6/ModuleLoader.pm
@@ -111,6 +111,12 @@ class Perl6::ModuleLoader {
         my %chosen := @candidates[0];
 
         my @MODULES := nqp::clone(@*MODULES);
+        for @MODULES -> $m {
+            if $m<module> eq $module_name {
+                nqp::die("Circular module loading detected involving module '$module_name'");
+            }
+        }
+
         # If we didn't already do so, load the module and capture
         # its mainline. Otherwise, we already loaded it so go on
         # with what we already have.