complex numbers in native factor, all of test suite except html and httpd tests runs...

[factor.git] / factor / compiler / FactorClassLoader.java

diff --git a/factor/compiler/FactorClassLoader.java b/factor/compiler/FactorClassLoader.java
index dc633e90e9b68b6f8fcfa7cbf9dcf28dcf7406d4..210179196cba244fd33c933a2dceeaf5f1773d58 100644 (file)
--- a/factor/compiler/FactorClassLoader.java
+++ b/factor/compiler/FactorClassLoader.java
@@ -42,6 +42,13 @@ public class FactorClassLoader extends ClassLoader
 {
        private long id;
        private FactorNamespace table = new FactorNamespace();
+       private ClassLoader delegate;
+
+       //{{{ FactorClassLoader constructor
+       public FactorClassLoader(ClassLoader delegate)
+       {
+               this.delegate = delegate;
+       } //}}}
 
        //{{{ addDependency() method
        public void addDependency(String name, FactorClassLoader loader)
@@ -88,7 +95,15 @@ public class FactorClassLoader extends ClassLoader
                                System.err.println("WARNING: unknown object in class loader table for " + this + ": " + obj);
                        }
 
-                       return super.loadClass(name,resolve);
+                       if(delegate == null)
+                               return super.loadClass(name,resolve);
+                       else
+                       {
+                               c = delegate.loadClass(name);
+                               if(resolve)
+                                       resolveClass(c);
+                               return c;
+                       }
                }
                catch(ClassNotFoundException e)
                {