Changeset 15455

Timestamp:

10/29/20 16:54:53 (3 years ago)

Author:

Mark Evenson

Message:

Fix logic for binding *LOAD-TRUENAME*

LOAD from stream creates pathname of appropiate type.

When OPEN is passed a simple filepath *LOAD-TRUENAME* shouldn't
contain a URL-PATHNAME.

TODO how to stop fighting the Java type system with such boilerplate?

TODO go over the bindings of *LOAD-TRUENAME-FASL* as I think this can
be dramatically simplified further.

File:

• trunk/abcl/src/org/armedbear/lisp/Load.java (modified) (4 diffs)

trunk/abcl/src/org/armedbear/lisp/Load.java

@@ -259 +259 @@
 
     private static final Symbol FASL_LOADER = PACKAGE_SYS.intern("*FASL-LOADER*");
+  /** A file with this type in a packed FASL denotes the initial loader */
     static final LispObject COMPILE_FILE_INIT_FASL_TYPE = new SimpleString("_");
 
@@ -524 +525 @@
             if (!truename.equals(NIL)) {
                 if (truename instanceof Pathname) {
-                    truePathname = Pathname.create((Pathname)truename);
+                  if (truename instanceof JarPathname) {
+                    truePathname = new JarPathname();
+                  } else if (truename instanceof URLPathname) {
+                    truePathname = new URLPathname();
+                  } else {
+                    truePathname = new Pathname();
+                  }
+                  truePathname.copyFrom((Pathname)truename);
                 } else if (truename instanceof AbstractString) {
                   truePathname = (Pathname)Pathname.create(truename.getStringValue());
@@ -530 +538 @@
                     Debug.assertTrue(false);
                 }
-                String type = truePathname.getType().getStringValue();
-                if (type.equals(Lisp._COMPILE_FILE_TYPE_.symbolValue(thread).getStringValue())
-                    || type.equals(COMPILE_FILE_INIT_FASL_TYPE.toString())) {
+                if (truePathname.getType().equal(Lisp._COMPILE_FILE_TYPE_.symbolValue(thread))
+                    || truePathname.getType().equal(COMPILE_FILE_INIT_FASL_TYPE)) {
                     Pathname truenameFasl = Pathname.create(truePathname);
                     thread.bindSpecial(Symbol.LOAD_TRUENAME_FASL, truenameFasl);
                 }
-                if (truePathname.getType().getStringValue()
-                    .equals(COMPILE_FILE_INIT_FASL_TYPE.getStringValue())
+                if (truePathname.getType().equal(COMPILE_FILE_INIT_FASL_TYPE)
                     && truePathname.isJar()) {
-                    if (truePathname.getDevice().cdr() != NIL ) {
-                        // We set *LOAD-TRUENAME* to the argument that
-                        // a user would pass to LOAD.
-                        Pathname enclosingJar = (Pathname)truePathname.getDevice().cdr().car();
-                        truePathname.setDevice(new Cons(truePathname.getDevice().car(), NIL));
-                        truePathname.setHost(NIL);
-                        truePathname.setDirectory(enclosingJar.getDirectory());
-                        if (truePathname.getDirectory().car().equals(Keyword.RELATIVE)) {
-                            truePathname.getDirectory().setCar(Keyword.ABSOLUTE);
-                        }
-                        truePathname.setName(enclosingJar.getName());
-                        truePathname.setType(enclosingJar.getType());
+                  // We set *LOAD-TRUENAME* to the argument that a
+                  // user would pass to LOAD.
+                  truePathname = (Pathname)probe_file.PROBE_FILE.execute(pathname);
+                  /*
+                  if (truePathname.getDevice().cdr() != NIL ) {
+                    Pathname enclosingJar = (Pathname)truePathname.getDevice().cdr().car();
+                    truePathname.setDevice(new Cons(truePathname.getDevice().car(), NIL));
+                    truePathname.setHost(NIL);
+                    truePathname.setDirectory(enclosingJar.getDirectory());
+                    if (truePathname.getDirectory().car().equals(Keyword.RELATIVE)) {
+                      truePathname.getDirectory().setCar(Keyword.ABSOLUTE);
+                    }
+                    truePathname.setName(enclosingJar.getName());
+                    truePathname.setType(enclosingJar.getType());
                     } else {
                         // XXX There is something fishy in the asymmetry
@@ -556 +564 @@
                         // cases but this currently passes the tests.
                         if (!(truePathname.device.car() instanceof AbstractString)) {
-                          assert truePathname.getDevice().car() instanceof Pathname;
-                          Pathname p = Pathname.create((Pathname)truePathname.getDevice().car());
+                          //                          assert truePathname.getDevice().car() instanceof Pathname;
+                          //                          Pathname p = Pathname.create((Pathname)truePathname.getDevice().car());
                           truePathname 
-                            = (Pathname) probe_file.PROBE_FILE.execute(p);
+                            = (Pathname) probe_file.PROBE_FILE.execute(pathname);
                         }
                     }
-                    thread.bindSpecial(Symbol.LOAD_TRUENAME, truePathname);
+                  */
+                  thread.bindSpecial(Symbol.LOAD_TRUENAME, truePathname);
                 } else {
                     thread.bindSpecial(Symbol.LOAD_TRUENAME, truename);