Ticket #35: ikvm-existing.patch

src/org/armedbear/lisp/Complex.java

@@ -304 +304 @@
 
   private static Method hypotMethod = null;
   static { try {
+    if (!IkvmSite.isIKVM())
       hypotMethod = 
           Class.forName("java.lang.Math")
           .getMethod("hypot", new Class[] { Double.TYPE, Double.TYPE });

src/org/armedbear/lisp/Nil.java

@@ -35 +35 @@
 
 public final class Nil extends Symbol
 {
+  static final Nil NIL =  new Nil(PACKAGE_CL);
     public Nil(Package pkg)
     {
         super("NIL", pkg);

src/org/armedbear/lisp/Lisp.java

@@ -80 +80 @@
   // ### nil
   // Constructing NIL forces the Symbol class to be loaded (since Nil extends
   // Symbol).
-  public static final LispObject NIL = new Nil(PACKAGE_CL);
+  public static final LispObject NIL = Nil.NIL;
 
   // We need NIL before we can call usePackage().
   static
@@ -1023 +1023 @@
                               zipFileName = zipFileName.substring(1);
         }
       zipFileName = URLDecoder.decode(zipFileName, "UTF-8");
-                        ZipFile zipFile = new ZipFile(zipFileName);
+                        ZipFile zipFile = new ZipFile(IkvmSite.ikvmFile(zipFileName));
                         try
                           {
                             ZipEntry entry = zipFile.getEntry(entryName);
@@ -1059 +1059 @@
         return error(new LispError("Unable to load " + namestring));
       }
     Pathname pathname = new Pathname(namestring);
-    final File file = Utilities.getFile(pathname, defaultPathname);
+    File file = Utilities.getFile(pathname, defaultPathname);
+    if (file != null && !file.isFile()) {
+       // maybe IKVM?
+       file = IkvmSite.ikvmFileSafe(file);
+    }
     if (file != null && file.isFile())
       {
         // The .cls file exists.
@@ -1087 +1091 @@
       {
         LispObject loadTruename = Symbol.LOAD_TRUENAME.symbolValue(thread);
         String zipFileName = ((Pathname)loadTruename).getNamestring();
-        ZipFile zipFile = new ZipFile(zipFileName);
+        ZipFile zipFile = new ZipFile(IkvmSite.ikvmFile(zipFileName));
         try
           {
             ZipEntry entry = zipFile.getEntry(namestring);

src/org/armedbear/lisp/Load.java

@@ -64 +64 @@
       String extension = getExtension(filename);
       if (extension == null) {
     // No extension specified. Try appending ".lisp" or ".abcl".
-    File lispFile = new File(dir, filename.concat(".lisp"));
-    File abclFile = new File(dir, filename.concat(".abcl"));
+    File lispFile = IkvmSite.ikvmFileSafe(new File(dir, filename.concat(".lisp")));
+    File abclFile = IkvmSite.ikvmFileSafe(new File(dir, filename.concat(".abcl")));
     if (lispFile.isFile() && abclFile.isFile()) {
         if (abclFile.lastModified() > lispFile.lastModified()) {
       return abclFile;
@@ -246 +246 @@
             final String dir = Site.getLispHome();
             try {
                 if (dir != null) {
-                    File file = new File(dir, s);
+                    File file = IkvmSite.ikvmFileSafe(new File(dir, s));
                     if (file.isFile()) {
                         // File exists. For system files, we know the extension
                         // will be .abcl if it is a compiled file.
@@ -336 +336 @@
         }
         return error(new LispError("File not found: " + filename));
     }
-
+        
     // ### *fasl-version*
     // internal symbol
     private static final Symbol _FASL_VERSION_ =

src/org/armedbear/lisp/Pathname.java

@@ -88 +88 @@
                 init(s.substring(5));
                 return;
             }
+        } else if ("ikvmres".equals(protocol)) {
+            String s = url.getPath();
+            if (s != null && s.startsWith("file:")) {
+                init(s.substring(5));
+                return;
+            } //Else
+           init(s);
+           return;
         }
         error(new LispError("Unsupported URL: \"" + url.toString() + '"'));
     }
@@ -1330 +1338 @@
             if (originalNamestring != null && newNamestring != null) {
                 final File source = new File(originalNamestring);
                 final File destination = new File(newNamestring);
-                if (Utilities.isPlatformWindows) {
+                if (Utilities.isPlatformWindows || IkvmSite.isIKVM()) {
                     if (destination.isFile())
                         destination.delete();
                 }