Modified:

 multi classloader support (I)
* Proxies retrieve classes for return-type conversions from their classloaders.
* BytecodeLoaders are setup with a set of referents and look for classes
  first through the sys.path loader and then through the loaders of the referents.
 makeup
* Added specific SyspathJavaLoader loader class.
* - python.options.extendedClassLoader

Author: Samuele Pedronis

org/python/compiler/ProxyMaker.java

@@ -380,11 +380,33 @@ public void callMethod(Code code, String name, Class[] parameters,
                 "org/python/core/PyObject", jcallName,
                 "([Ljava/lang/Object;)Lorg/python/core/PyObject;");
             code.invokevirtual(jcall);
-                        
+            /* catching exceptions is not vm mandatory
+            Label forname_start =code.getLabel();
+            Label forname_end = code.getLabel();
+            Label forname_exch_start = code.getLabel();
+            Label forname_exch_end = code.getLabel();
+            forname_start.setPosition();      
+            */  
+            int forname = code.pool.Methodref(
+                "java/lang/Class","forName",
+                "(Ljava/lang/String;)Ljava/lang/Class;");
             code.ldc(ret.getName());
+            code.invokestatic(forname);
+            /*
+            forname_end.setPosition();
+            code.goto_(forname_exch_end);
+            forname_exch_start.setPosition();
+            code.stack = 1;
+            code.pop(); // never reached, but this code keeps the verifier happy
+            code.aconst_null();
+            code.dup();
+            forname_exch_end.setPosition();
+            
+            code.addExceptionHandler(forname_start,forname_end,forname_exch_start,code.pool.Class("java/lang/ClassNotFoundException"));
+            */  
             int tojava = code.pool.Methodref(
                 "org/python/core/Py", "tojava",
-                "(Lorg/python/core/PyObject;Ljava/lang/String;)Ljava/lang/Object;");
+                "(Lorg/python/core/PyObject;Ljava/lang/Class;)Ljava/lang/Object;");
             code.invokestatic(tojava);
             // I guess I need this checkcast to keep the verifier happy
             code.checkcast(code.pool.Class(mapClass(ret)));

org/python/core/BytecodeLoader.java

@@ -4,118 +4,56 @@
 import java.io.*;
 import java.util.StringTokenizer;
 import java.util.Hashtable;
+import java.util.Vector;
 
 public class BytecodeLoader extends ClassLoader
 {
 
-    public InputStream getResourceAsStream(String res) {
-        ClassLoader classLoader = Py.getSystemState().getClassLoader();
-        if (classLoader != null) return classLoader.getResourceAsStream(res);
-
-        classLoader = this.getClass().getClassLoader();
-
-        InputStream ret;
-
-        if (classLoader != null) ret = classLoader.getResourceAsStream(res);
-        else ret = ClassLoader.getSystemResourceAsStream(res);
-
-        if (ret != null) return ret;
-
-        if(res.charAt(0) == '/') res = res.substring(1);
-
-        res.replace('/',File.separatorChar);
-
-        PyList path = Py.getSystemState().path;
-        for (int i=0; i < path.__len__(); i++) {
-            String dir = path.get(i).__str__().toString();
-            if (dir.length() == 0) dir = null;
-            try {
-                return new BufferedInputStream(new FileInputStream(new File(dir,res)));
-            }
-            catch (IOException e) {
-                continue;
+    private Vector parents;
+    
+    public BytecodeLoader() {
+        this(null);
+    }
+    
+    public BytecodeLoader(Vector referents) {
+        parents = new Vector();
+        
+        parents.addElement(imp.getSyspathJavaLoader());
+        
+        if (referents != null) {
+            for(int i = 0; i < referents.size(); i++) {
+                try {
+                    ClassLoader cur = ((Class)referents.elementAt(i)).getClassLoader();
+                    if (cur != null && !parents.contains(cur)) {
+                        parents.addElement(cur);
+                    }
+                } catch(SecurityException e) {
+                }
             }
         }
-
-        return null;
+        
     }
 
     // override from abstract base class
     protected Class loadClass(String name, boolean resolve)
         throws ClassNotFoundException
-    {
-//         System.err.println("loadClass("+name+", "+resolve+")");
-        // First, if the Python runtime system has a default class loader,
-        // defer to it.
-        ClassLoader classLoader = Py.getSystemState().getClassLoader();
-        if (classLoader != null)
-            return classLoader.loadClass(name);
-        // Search the sys.path for a .class file matching the named class.
-        // TBD: This registry option is temporary.
-        try {
-          return Class.forName(name);
-        } 
-        catch(ClassNotFoundException e) {
-        }
-        
+    {        
         Class c = findLoadedClass(name);
         if (c != null)
          return c;
 
-        /* previously: if
-            Options.extendedClassLoader &&
-            // KLUDGE ALERT: without this test, running jpython
-            // interactively from the build directory will fail with
-            // ClassCircularityError or LinkageError.  There's gotta be a
-            // better way.
-            !name.startsWith("org.python")
-        */
-        {
-            PyList path = Py.getSystemState().path;
-            for (int i=0; i < path.__len__(); i++) {
-                String dir = path.get(i).__str__().toString();
-                FileInputStream fis = open(dir, name);
-                if (fis == null)
-                    continue;
-                try {
-                    int size = fis.available();
-                    byte[] buffer = new byte[size];
-                    fis.read(buffer);
-                    fis.close();
-                    return loadClassFromBytes(name, buffer);
-                }
-                catch (IOException e) {
-                    continue;
-                }
+        for (int i = 0; i < parents.size(); i++) {
+            try {
+                return ((ClassLoader)parents.elementAt(i)).loadClass(name);
+            } catch(ClassNotFoundException e) {
             }
         }
+
 
         // couldn't find the .class file on sys.path        
         throw new ClassNotFoundException(name);
     }
 
-    private FileInputStream open(String dir, String name) {
-        String accum = "";
-        boolean first = true;
-        for (StringTokenizer t = new StringTokenizer(name, ".");
-             t.hasMoreTokens();)
-        {
-            String token = t.nextToken();
-            if (!first)
-                accum += File.separator;
-            accum += token;
-            first = false;
-        }
-        try {
-            if (dir.length() == 0)
-                dir = null;
-            return new FileInputStream(new File(dir, accum+".class"));
-        }
-        catch (FileNotFoundException e) {
-            return null;
-        }
-    }
-
     private Class loadClassFromBytes(String name, byte[] data) {
 //         System.err.println("loadClassFromBytes("+name+", byte[])");
         Class c = defineClass(name, data, 0, data.length);

org/python/core/MakeProxies.java

@@ -13,23 +13,24 @@
 
 class MakeProxies 
 {
-    private static Class makeClass(Class referent, String name,
+    private static Class makeClass(Class referent, Vector secondary,String name,
                                    ByteArrayOutputStream bytes)
     {
-        BytecodeLoader bcl;
-        ClassLoader cl;
-        // Use the superclass's class loader if it is a BytecodeLoader.
-        // referent might be null if we're deriving from an interface.  In
-        // that case, this may or may not be the RTTD.
-        if (referent != null &&
-            (cl = referent.getClassLoader()) != null &&
-            cl instanceof BytecodeLoader)
-        {
-            bcl = (BytecodeLoader)cl;
+        Vector referents = null;
+        
+        if (secondary != null) {
+            if (referent != null) {
+                secondary.insertElementAt(referent,0);
+                referents = secondary;
+            }
+        } else {
+            if (referent != null) {
+                referents = new Vector();
+                referents.addElement(referent);
+            }
         }
-        else
-            bcl = imp.getSyspathJavaLoader();
-        return bcl.makeClass(name, bytes.toByteArray());
+        
+        return new BytecodeLoader(referents).makeClass(name, bytes.toByteArray());
     }
 
     public static Class makeAdapter(Class c) {
@@ -44,7 +45,7 @@ public static Class makeAdapter(Class c) {
 
         Py.saveClassFile(name, bytes);
 
-        Class pc = makeClass(c, name, bytes);
+        Class pc = makeClass(c, null, name, bytes);
         return pc;
     }
 
@@ -77,7 +78,7 @@ public static synchronized Class makeProxy(Class superclass,
             jm.classfile.write(bytes);
             Py.saveClassFile(proxyName, bytes);
 
-            return makeClass(superclass, jm.myClass, bytes);
+            return makeClass(superclass, vinterfaces, jm.myClass, bytes);
         }
         catch (Exception exc) {
             throw Py.JavaError(exc);

org/python/core/Options.java

@@ -35,11 +35,13 @@ public class Options
     // accessible flag on the member.
     public static boolean respectJavaAccessibility = true;
 
+    /* no longer necessary
     // Allow JPython's classloader to find and load .class files on
     // sys.path.  This only happens for anonymous inner classes, but may
     // have unintended side-effects.  This option is temporary.
     public static boolean extendedClassLoader = true;
-
+    */
+    
     // TBD
     public static boolean importSite = true;
 
@@ -102,10 +104,6 @@ public static void setFromRegistry() {
             getBooleanOption("security.respectJavaAccessibility",
                              Options.respectJavaAccessibility);
 
-        Options.extendedClassLoader =
-            getBooleanOption("options.extendedClassLoader",
-                             Options.extendedClassLoader);
-
         Options.proxyDebugDirectory =
             getStringOption("options.proxyDebugDirectory",
                              Options.proxyDebugDirectory);

org/python/core/PySystemState.java

@@ -164,7 +164,7 @@ public PySystemState() {
         __stdin__ = stdin = new PyFile(getSystemIn(), "<stdin>");
 
         // This isn't quite right...
-        builtins = PyJavaClass.lookup(__builtin__.class).__dict__;
+        builtins = PyJavaClass.lookup(__builtin__.class).__getattr__("__dict__");
         PyModule __builtin__ = new PyModule("__builtin__", builtins);
         modules.__setitem__("__builtin__", __builtin__);