Add HLL::Compiler switch --with-cu and use parent ClassLoaders.

This allows us to package nested jars with e.g. one-jar, which I will also
implement a flag for in HLL::Compiler.

Using parent ClassLoaders for IgnoreNameClassloader and ByteCodeClassLoader
is neccessary to chain into e.g. JarClassLoader (which one-jar uses) to find
nested jars.

Author: peschwa

src/HLL/Compiler.nqp

@@ -21,7 +21,7 @@ class HLL::Compiler does HLL::Backend::Default {
         @!stages     := nqp::split(' ', 'start parse ast ' ~ $!backend.stages());
 
         # Command options and usage.
-        @!cmdoptions := nqp::split(' ', 'e=s help|h target=s trace|t=s encoding=s output|o=s combine version|v show-config verbose-config|V stagestats=s? ll-exception rxtrace nqpevent=s profile profile-compile profile-filename=s');
+        @!cmdoptions := nqp::split(' ', 'e=s help|h target=s trace|t=s encoding=s output|o=s combine version|v show-config verbose-config|V stagestats=s? ll-exception rxtrace nqpevent=s profile profile-compile profile-filename=s with-cu=s');
         %!config     := nqp::hash();
     }
 
@@ -259,6 +259,12 @@ class HLL::Compiler does HLL::Backend::Default {
                         self.dumper($result, $target, |%adverbs);
                     }
                 }
+                elsif %adverbs<with-cu> && nqp::can($!backend, 'with_cu') {
+                    while self.stages()[0] ne $!backend.cu_start_stage() {
+                        self.removestage(self.stages()[0]);
+                    }
+                    $result := $!backend.with_cu(%adverbs<with-cu>);
+                }
                 elsif !@a { $result := self.interactive(|%adverbs) }
                 elsif %adverbs<combine> { $result := self.evalfiles(@a, |%adverbs) }
                 else { $result := self.evalfiles(@a[0], |@a, |%adverbs) }

src/vm/jvm/HLL/Backend.nqp

@@ -109,6 +109,15 @@ class HLL::Backend::JVM {
     method compunit_coderefs($cu) {
         nqp::compunitcodes($cu)
     }
+
+    method cu_start_stage() {
+        'jvm'
+    }
+
+    method with_cu($cu) {
+        my $*MAIN_CTX;
+        nqp::loadbytecode($cu);
+    }
 }
 
 # Role specifying the default backend for this build.

src/vm/jvm/QAST/Compiler.nqp

@@ -2705,6 +2705,8 @@ QAST::OperationsJAST.add_core_op('getcodelocation', -> $qastcomp, $op {
 
 QAST::OperationsJAST.map_classlib_core_op('getuniname', $TYPE_OPS, 'getuniname', [$RT_INT], $RT_STR, :tc);
 
+QAST::OperationsJAST.map_classlib_core_op('getmoduleurl', $TYPE_OPS, 'getmoduleurl', [$RT_STR], $RT_STR, :tc);
+
 class QAST::CompilerJAST {
     # Responsible for handling issues around code references, building the
     # switch statement dispatcher, etc.

src/vm/jvm/runtime/org/perl6/nqp/runtime/GlobalContext.java

@@ -266,7 +266,7 @@ public GlobalContext()
 
         neverRepossess = new WeakHashMap<SixModelObject, Object>();
 
-        byteClassLoader = new ByteClassLoader();
+        byteClassLoader = new ByteClassLoader(GlobalContext.class.getClassLoader());
     }
 
     /**

src/vm/jvm/runtime/org/perl6/nqp/runtime/LibraryLoader.java

@@ -1,6 +1,7 @@
 package org.perl6.nqp.runtime;
 
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -10,23 +11,32 @@
 import java.util.HashMap;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
+import java.net.URL;
 
 public class LibraryLoader {
     static HashMap<String,Class<?>> sharedClassHash = new HashMap<String,Class<?>>();
 
     public void load(ThreadContext tc, String origFilename) {
+        String filename;
+        if( origFilename.indexOf("!") != -1 ) {
+            filename = origFilename.substring(origFilename.lastIndexOf("!") + 1);
+        }
+        else {
+            filename = origFilename;
+        }
         // Don't load the same thing multiple times.
         if (tc.gc.loaded.contains(origFilename))
             return;
 
         try {
             // Read in class data.
-            String filename = origFilename;
             File file = new File(filename);
             if (!file.exists() && filename.equals("ModuleLoader.class")) {
                 /* We special case the initial ModuleLoader loading. */
                 String[] cps = System.getProperty("java.class.path").split("[:;]");
                 for (int i = 0; i < cps.length; i++) {
+                    if(System.getenv("NQP_BUILD_DEBUG") != null)
+                        System.out.println("checking classpath: " + cps[i]);
                     file = new File(cps[i] + "/" + filename);
                     if (file.exists()) {
                         filename = cps[i] + "/" + filename;
@@ -40,7 +50,36 @@ public void load(ThreadContext tc, String origFilename) {
                 }
             }
 
-            Class<?> c = loadFile(filename, tc.gc.sharingHint);
+            // TODO: untangle the logic somewhat...
+            // "the filename wasn't changed" is a bad metric for "we didn't find the right file"...
+            Class<?> c = null;
+            if( filename.equals("ModuleLoader.class") ) {
+                if(System.getenv("NQP_BUILD_DEBUG") != null)
+                    System.out.println("first branch");
+                c = loadFile(LibraryLoader.class.getResource("/lib/ModuleLoader.jar"), tc.gc.sharingHint);
+            }
+            else if ( origFilename.indexOf("!") != -1 || origFilename.indexOf(":") != -1 ) {
+                if(System.getenv("NQP_BUILD_DEBUG") != null)
+                    System.out.println("second branch with " + origFilename);
+                c = loadFile(new URL(origFilename), tc.gc.sharingHint);
+            }
+            else if ( !(new File(filename)).exists() ) {
+                if(System.getenv("NQP_BUILD_DEBUG") != null)
+                    System.out.println("third branch, with " + origFilename);
+                URL res = LibraryLoader.class.getResource("/lib/" + filename);
+                if( res != null ) {
+                    c = loadFile(res, tc.gc.sharingHint);
+                }
+                else {
+                    res = LibraryLoader.class.getResource("/lib/" + filename + ".jar");
+                    c = loadFile(res, tc.gc.sharingHint);
+                }
+            }
+            else {
+                if(System.getenv("NQP_BUILD_DEBUG") != null)
+                    System.out.println("fourth branch, with " + origFilename);
+                c = loadFile(filename, tc.gc.sharingHint);
+            }
 
             // Load the class.
             CompilationUnit cu = (CompilationUnit)c.newInstance();
@@ -60,31 +99,65 @@ public void load(ThreadContext tc, String origFilename) {
     }
 
     public static Class<?> loadFile(String cf, boolean shared) throws Exception {
+        return loadFile(new URL("file:" + cf), shared);
+    }
+
+    public static Class<?> loadFile(URL cf, boolean shared) throws Exception {
         if (shared) {
+            if(System.getenv("NQP_BUILD_DEBUG") != null)
+                System.out.println("cf is shared, " + cf);
             synchronized(sharedClassHash) {
-                if (sharedClassHash.containsKey(cf))
-                    return sharedClassHash.get(cf);
+                if (sharedClassHash.containsKey(cf.getPath()))
+                    return sharedClassHash.get(cf.getPath());
 
                 Class<?> n = loadFile(cf, false);
-                sharedClassHash.put(cf, n);
+                sharedClassHash.put(cf.getPath(), n);
                 return n;
             }
         }
 
-        byte[] b = Files.readAllBytes( FileSystems.getDefault().getPath(cf) );
-        long sig = b.length < 4 ? 0 :
-            (b[3] & 0xFF) | ((b[2] & 0xFF) << 8) | ((b[1] & 0xFF) << 16) | ((b[0] & 0xFFL) << 24);
+        byte[] bs = null;
+
+        if(System.getenv("NQP_BUILD_DEBUG") != null)
+            System.out.println("cf is " + cf);
+        if(cf.getProtocol().equals("jar")) {
+            // XXX: this is a bit gnarly, currently.
+            // basically, before we only ever loaded files from disk, but self-executable jars
+            // have our libs as jar inside of a jar, and getResource gets us an URL
+            // so instead of properly untangling this i'm taking a shortcut (for now)
+            // and assume that URLs always point to jars, so we read the resource instead 
+            // of reading the file
+            String res = cf.getPath();
+            res = res.substring(res.lastIndexOf("!") + 1);
+            InputStream is = LibraryLoader.class.getResourceAsStream(res);
+            if(is == null) {
+                throw new RuntimeException("Couldn't find resource " + res);
+            }
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            int b = is.read();
+            while( b != -1 ) {
+                baos.write(b);
+                b = is.read();
+            }
+            bs = baos.toByteArray();
+        }
+        else {
+            bs = Files.readAllBytes( FileSystems.getDefault().getPath(cf.getPath()) );
+        }
+
+        long sig = bs.length < 4 ? 0 :
+            (bs[3] & 0xFF) | ((bs[2] & 0xFF) << 8) | ((bs[1] & 0xFF) << 16) | ((bs[0] & 0xFFL) << 24);
 
         if (sig == 0xCAFEBABEL) {
             // This is a class file
 
-            return loadNew(b, null);
+            return loadNew(bs, null);
         } else if (sig == 0x504B0304) {
             // This is a (non-empty, non-self-extracting) zip file
             // These are quite constrained for now
 
             JarEntry je;
-            JarInputStream jis = new JarInputStream(new ByteArrayInputStream(b));
+            JarInputStream jis = new JarInputStream(new ByteArrayInputStream(bs));
             byte[] kl = null;
             byte[] ser = null;
 
@@ -106,14 +179,15 @@ public static Class<?> loadFile(String cf, boolean shared) throws Exception {
     }
 
     public static Class<?> loadNew(byte[] bytes, byte[] serial) {
-        return new IgnoreNameClassLoader(bytes, serial).loadClass();
+        return new IgnoreNameClassLoader(bytes, serial, LibraryLoader.class.getClassLoader()).loadClass();
     }
 
     private static class IgnoreNameClassLoader extends ClassLoader {
         private byte[] bytes;
         private byte[] serial;
 
-        public IgnoreNameClassLoader(byte[] bytes, byte[] serial) {
+        public IgnoreNameClassLoader(byte[] bytes, byte[] serial, ClassLoader parent) {
+            super(parent);
             this.bytes = bytes;
             this.serial = serial;
         }

src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java

@@ -13,6 +13,7 @@
 import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.net.InetAddress;
+import java.net.URL;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.nio.file.DirectoryStream;
@@ -6276,4 +6277,15 @@ public static String getuniname(long codePoint, ThreadContext tc) {
         }
         return name;
     }
+
+    public static String getmoduleurl(String filename, ThreadContext tc) {
+        URL fileurl = Ops.class.getResource("/" + filename);
+        if( fileurl == null ) {
+            fileurl = Ops.class.getResource("/lib/" + filename);
+        }
+        if( fileurl == null ) {
+            fileurl = Ops.class.getResource("/lib/" + filename + ".jar");
+        }
+        return fileurl.toString();
+    }
 }

src/vm/jvm/runtime/org/perl6/nqp/tools/EvalServer.java

@@ -44,20 +44,21 @@ public class EvalServer {
     private WritableByteChannel tokenCh;
     private Path tokenPath;
 
+    public String run(Class<?> cuType, String code) throws Exception {
+        String[] argv = new String[2];
+        argv[0] = "-e";
+        argv[1] = code;
+        return run(cuType, argv);
+    }
+
     public String run(String appPath, String code) throws Exception {
         String[] argv = new String[2];
         argv[0] = "-e";
         argv[1] = code;
         return run(appPath, argv);
     }
 
-    public String run(String appPath, String[] argv) throws Exception {
-        try {
-            cuType = LibraryLoader.loadFile( appPath, true );
-        } catch (ThreadDeath td) {
-            throw new RuntimeException("Couldn't loadFile. Your CLASSPATH might not be set up correctly.");
-        }
-
+    public String run(Class<?> cuType, String[] argv) throws Exception {
         GlobalContext gc = new GlobalContext();
         gc.in = new ByteArrayInputStream(new byte[0]);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -78,6 +79,16 @@ public String run(String appPath, String[] argv) throws Exception {
         return baos.toString("UTF-8");
     }
 
+    public String run(String appPath, String[] argv) throws Exception {
+        try {
+            cuType = LibraryLoader.loadFile( appPath, true );
+        } catch (ThreadDeath td) {
+            throw new RuntimeException("Couldn't loadFile. Your CLASSPATH might not be set up correctly.");
+        }
+
+        return run(cuType, argv);
+    }
+
     public static void main(String[] args) throws Exception {
 
         String executableName = System.getProperty("perl6.execname");