Abstract -I logic into Rakudo::Internals

rakudo · Jan 13, 2016 · 007f027 · 007f027
1 parent 9463bd9
commit 007f027
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/src/core/CompUnit/RepositoryRegistry.pm b/src/core/CompUnit/RepositoryRegistry.pm
@@ -42,19 +42,9 @@ class CompUnit::RepositoryRegistry {
         # normal start up
         else {
             $raw-specs := nqp::list();
-            my $I := nqp::atkey(nqp::atkey(%*COMPILING, '%?OPTIONS'), 'I');
-            if nqp::defined($I) {
-                if nqp::islist($I) {
-                    my Mu $iter := nqp::iterator($I);
-                    while $iter {
-                        nqp::push($raw-specs,nqp::unbox_s($_))
-                          for parse-include-specS(nqp::shift($iter));
-                    }
-                }
-                else {
-                    nqp::push($raw-specs,nqp::unbox_s($_))
-                      for parse-include-specS($I);
-                }
+            for Rakudo::Internals.INCLUDE -> $specs {
+               nqp::push($raw-specs,nqp::unbox_s($_))
+                 for parse-include-specS($specs);
             }
 
             if nqp::existskey($ENV,'RAKUDOLIB') {

diff --git a/src/core/Rakudo/Internals.pm b/src/core/Rakudo/Internals.pm
@@ -731,6 +731,15 @@ my class Rakudo::Internals {
           ?? '--profile'
           !! Empty
     }
+    # whatever specified with -I
+    method INCLUDE() {
+        nqp::existskey($compiling-options,'I')
+          ?? do {
+                my $I := nqp::atkey($compiling-options,'I');
+                nqp::islist($I) ?? $I !! nqp::list($I)
+             }
+          !! nqp::list()
+    }
 
 #?if moar
     method PRECOMP-EXT()    { "moarvm" }