Changeset 12797

Timestamp:

07/10/10 20:08:43 (13 years ago)

Author:

Mark Evenson

Message:

Convert to a$$-backwards Pollock.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Pathname.java (modified) (7 diffs)
• ShellCommand.java (modified) (1 diff)

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

@@ -607 +607 @@
         if (host != NIL) {
             Debug.assertTrue(host instanceof AbstractString 
-                             || isURL());
-            if (isURL()) {
+                             || host instanceof Cons);
+            if (host instanceof Cons) {
                 LispObject scheme = Symbol.GETF.execute(host, SCHEME, NIL);
                 LispObject authority = Symbol.GETF.execute(host, AUTHORITY, NIL);
@@ -632 +632 @@
         if (device == NIL) {
         } else if (device == Keyword.UNSPECIFIC) {
-        } else if (isJar()) {
+        } else if (device instanceof Cons) {
             LispObject[] jars = ((Cons) device).copyToArray();
             StringBuilder prefix = new StringBuilder();
@@ -644 +644 @@
             }
             sb = prefix.append(sb);
+        } else if (device instanceof AbstractString
+          && device.getStringValue().startsWith("jar:")) {
+            sb.append(device.getStringValue());
         } else if (device instanceof AbstractString) {
             sb.append(device.getStringValue());
@@ -721 +724 @@
         }
         namestring = sb.toString();
-        // XXX Decide if this is necessary
+        // XXX Decide when this is necessary
         // if (isURL()) { 
         //     namestring = Utilities.uriEncode(namestring);
@@ -1234 +1237 @@
         } catch (IOException e) {
             Debug.trace("Failed to make a Pathname from "
-              + "'" + file + "'");
+              + "." + file + "'");
             return null;
         }
@@ -1288 +1291 @@
                 host = defaults.host;
             }
-            if (directory == NIL) {
+            if (directory == NIL && defaults != null) {
                 directory = defaults.directory;
             }
@@ -2082 +2085 @@
                 result = new URL(pathname.getNamestring());
             } else {
-                // XXX Properly encode Windows drive letters and UNC paths
-                // XXX ensure that we have cannonical path?
+                // XXX ensure that we have cannonical path.
                 result = new URL("file://" + pathname.getNamestring());
             }

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

@@ -236 +236 @@
     // run-shell-command command &key directory (output *standard-output*)
     // ### %run-shell-command command directory output => exit-code
-    private static final Primitive _RUN_SHELL_COMMAND =
-        new Primitive("%run-shell-command", PACKAGE_SYS, false)
-    {
+    private static final Primitive _RUN_SHELL_COMMAND = new pf_run_shell_command();
+    private static class pf_run_shell_command extends Primitive {
+        pf_run_shell_command() {
+            super("%run-shell-command", PACKAGE_SYS, false,
+                  "command directory output => exit-code");
+        }
+        
         @Override
         public LispObject execute(LispObject first, LispObject second,