Changeset 12799
- Timestamp:
- 07/10/10 20:37:04 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abcl/src/org/armedbear/lisp/Pathname.java
r12798 r12799 581 581 if (host != NIL) { 582 582 Debug.assertTrue(host instanceof AbstractString 583 || host instanceof Cons);584 if ( host instanceof Cons) {583 || isURL()); 584 if (isURL()) { 585 585 LispObject scheme = Symbol.GETF.execute(host, SCHEME, NIL); 586 586 LispObject authority = Symbol.GETF.execute(host, AUTHORITY, NIL); … … 606 606 if (device == NIL) { 607 607 } else if (device == Keyword.UNSPECIFIC) { 608 } else if ( device instanceof Cons) {608 } else if (isJar()) { 609 609 LispObject[] jars = ((Cons) device).copyToArray(); 610 610 StringBuilder prefix = new StringBuilder(); … … 618 618 } 619 619 sb = prefix.append(sb); 620 } else if (device instanceof AbstractString621 && device.getStringValue().startsWith("jar:")) {622 sb.append(device.getStringValue());623 620 } else if (device instanceof AbstractString) { 624 621 sb.append(device.getStringValue()); … … 698 695 } 699 696 namestring = sb.toString(); 700 // XXX Decide whenthis is necessary697 // XXX Decide if this is necessary 701 698 // if (isURL()) { 702 699 // namestring = Utilities.uriEncode(namestring); … … 1262 1259 host = defaults.host; 1263 1260 } 1264 if (directory == NIL && defaults != null) {1261 if (directory == NIL) { 1265 1262 directory = defaults.directory; 1266 1263 } … … 2057 2054 result = new URL(pathname.getNamestring()); 2058 2055 } else { 2059 // XXX ensure that we have cannonical path. 2056 // XXX Properly encode Windows drive letters and UNC paths 2057 // XXX ensure that we have cannonical path? 2060 2058 result = new URL("file://" + pathname.getNamestring()); 2061 2059 }
Note: See TracChangeset
for help on using the changeset viewer.