Changeset 12797


Ignore:
Timestamp:
07/10/10 20:08:43 (12 years ago)
Author:
Mark Evenson
Message:

Convert to a$$-backwards Pollock.

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/Pathname.java

    r12780 r12797  
    607607        if (host != NIL) {
    608608            Debug.assertTrue(host instanceof AbstractString
    609                              || isURL());
    610             if (isURL()) {
     609                             || host instanceof Cons);
     610            if (host instanceof Cons) {
    611611                LispObject scheme = Symbol.GETF.execute(host, SCHEME, NIL);
    612612                LispObject authority = Symbol.GETF.execute(host, AUTHORITY, NIL);
     
    632632        if (device == NIL) {
    633633        } else if (device == Keyword.UNSPECIFIC) {
    634         } else if (isJar()) {
     634        } else if (device instanceof Cons) {
    635635            LispObject[] jars = ((Cons) device).copyToArray();
    636636            StringBuilder prefix = new StringBuilder();
     
    644644            }
    645645            sb = prefix.append(sb);
     646        } else if (device instanceof AbstractString
     647          && device.getStringValue().startsWith("jar:")) {
     648            sb.append(device.getStringValue());
    646649        } else if (device instanceof AbstractString) {
    647650            sb.append(device.getStringValue());
     
    721724        }
    722725        namestring = sb.toString();
    723         // XXX Decide if this is necessary
     726        // XXX Decide when this is necessary
    724727        // if (isURL()) {
    725728        //     namestring = Utilities.uriEncode(namestring);
     
    12341237        } catch (IOException e) {
    12351238            Debug.trace("Failed to make a Pathname from "
    1236               + "'" + file + "'");
     1239              + "." + file + "'");
    12371240            return null;
    12381241        }
     
    12881291                host = defaults.host;
    12891292            }
    1290             if (directory == NIL) {
     1293            if (directory == NIL && defaults != null) {
    12911294                directory = defaults.directory;
    12921295            }
     
    20822085                result = new URL(pathname.getNamestring());
    20832086            } else {
    2084                 // XXX Properly encode Windows drive letters and UNC paths
    2085                 // XXX ensure that we have cannonical path?
     2087                // XXX ensure that we have cannonical path.
    20862088                result = new URL("file://" + pathname.getNamestring());
    20872089            }
  • trunk/abcl/src/org/armedbear/lisp/ShellCommand.java

    r12513 r12797  
    236236    // run-shell-command command &key directory (output *standard-output*)
    237237    // ### %run-shell-command command directory output => exit-code
    238     private static final Primitive _RUN_SHELL_COMMAND =
    239         new Primitive("%run-shell-command", PACKAGE_SYS, false)
    240     {
     238    private static final Primitive _RUN_SHELL_COMMAND = new pf_run_shell_command();
     239    private static class pf_run_shell_command extends Primitive {
     240        pf_run_shell_command() {
     241            super("%run-shell-command", PACKAGE_SYS, false,
     242                  "command directory output => exit-code");
     243        }
     244       
    241245        @Override
    242246        public LispObject execute(LispObject first, LispObject second,
Note: See TracChangeset for help on using the changeset viewer.