Use class path as default module search path.

Will (hopefully) be useful during bootstrapping.
jnthn · Apr 14, 2013 · d26aaf7 · d26aaf7
1 parent 7a47938
commit d26aaf7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/lib/QAST/JASTCompiler.nqp b/lib/QAST/JASTCompiler.nqp
@@ -1908,6 +1908,7 @@ QAST::OperationsJAST.map_classlib_core_op('loadcompunit', $TYPE_OPS, 'loadcompun
 QAST::OperationsJAST.map_classlib_core_op('iscompunit', $TYPE_OPS, 'iscompunit', [$RT_OBJ], $RT_INT, :tc);
 QAST::OperationsJAST.map_classlib_core_op('compunitmainline', $TYPE_OPS, 'compunitmainline', [$RT_OBJ], $RT_OBJ, :tc);
 QAST::OperationsJAST.map_classlib_core_op('compunitcodes', $TYPE_OPS, 'compunitcodes', [$RT_OBJ], $RT_OBJ, :tc);
+QAST::OperationsJAST.map_classlib_core_op('jvmclasspaths', $TYPE_OPS, 'jvmclasspaths', [], $RT_OBJ, :tc);
 
 class QAST::CompilerJAST {
     # Responsible for handling issues around code references, building the

diff --git a/nqp-src/ModuleLoader.pm b/nqp-src/ModuleLoader.pm
@@ -7,11 +7,17 @@ knowhow ModuleLoader {
 
         # Put any explicitly specified path on the start of the list.
         my $explicit;
-        # XXX TODO: Exceptions.
-        #try { $explicit := %*COMPILING<%?OPTIONS>{$explicit_path}; }
-        if !nqp::isnull($explicit) && nqp::defined($explicit) {
+        if !nqp::isnull($explicit) {
+            try { $explicit := %*COMPILING<%?OPTIONS>{$explicit_path}; }
+        }
+        if nqp::defined($explicit) {
             nqp::push(@search_paths, $explicit);
         }
+        else {
+            for nqp::jvmclasspaths() {
+                nqp::push(@search_paths, $_)
+            }
+        }
 
         # Add CWD.
         nqp::push(@search_paths, '.');

diff --git a/src/org/perl6/nqp/runtime/Ops.java b/src/org/perl6/nqp/runtime/Ops.java
@@ -3376,4 +3376,15 @@ public static SixModelObject compunitcodes(SixModelObject obj, ThreadContext tc)
     		result.bind_pos_boxed(tc, i, res.cu.codeRefs[i]);
     	return result;
     }
+    public static SixModelObject jvmclasspaths(ThreadContext tc) {
+    	SixModelObject Array = tc.curFrame.codeRef.staticInfo.compUnit.hllConfig.listType;
+    	SixModelObject Str = tc.curFrame.codeRef.staticInfo.compUnit.hllConfig.strBoxType;
+    	SixModelObject result = Array.st.REPR.allocate(tc, Array.st);
+    	result.initialize(tc);
+    	String cpStr = System.getProperty("java.class.path");
+    	String[] cps = cpStr.split("[:;]");
+    	for (int i = 0; i < cps.length; i++)
+    		result.push_boxed(tc, box_s(cps[i], Str, tc));
+    	return result;
+    }
 }