Changeset 15447

Timestamp:

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

Author:

Mark Evenson

Message:

SYS:MAKE-FILE-STREAM doesn't need a namestring

Manipulation of pathnames should happen (mostly) with the objects
themselves rather than their namestring.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• FileStream.java (modified) (7 diffs)
• JarStream.java (modified) (1 diff)
• URLStream.java (modified) (1 diff)
• open.lisp (modified) (8 diffs)

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

@@ -53 +53 @@
     private final int bytesPerUnit;
 
-    public FileStream(Pathname pathname, String namestring,
+    public FileStream(Pathname pathname, 
                       LispObject elementType, LispObject direction,
                       LispObject ifExists, LispObject format)
@@ -72 +72 @@
          */
         super(Symbol.FILE_STREAM);
-        final File file = new File(namestring);
+        final File file = pathname.getFile();
         String mode = null;
         if (direction == Keyword.INPUT) {
@@ -271 +271 @@
     }
 
-    // ### make-file-stream pathname namestring element-type direction if-exists external-format => stream
+    // ### make-file-stream pathname element-type direction if-exists external-format => stream
     private static final Primitive MAKE_FILE_STREAM =
         new Primitive("make-file-stream", PACKAGE_SYS, true,
-                      "pathname namestring element-type direction if-exists external-format")
+                      "pathname element-type direction if-exists external-format")
     {
         @Override
         public LispObject execute(LispObject first, LispObject second,
                                   LispObject third, LispObject fourth,
-                                  LispObject fifth, LispObject sixth)
+                                  LispObject fifth)
 
         {
@@ -289 +289 @@
                 return type_error(first, Symbol.PATHNAME);
             }
-            final LispObject namestring = checkString(second);
-            LispObject elementType = third;
-            LispObject direction = fourth;
-            LispObject ifExists = fifth;
-            LispObject externalFormat = sixth;
+            LispObject elementType = second;
+            LispObject direction = third;
+            LispObject ifExists = fourth;
+            LispObject externalFormat = fifth;
             
             if (direction != Keyword.INPUT && direction != Keyword.OUTPUT &&
@@ -304 +303 @@
                 }
                 try { 
-                    return new JarStream(pathname, namestring.getStringValue(),
+                    return new JarStream(pathname, 
                                          elementType, direction, ifExists,
                                          externalFormat);
@@ -310 +309 @@
                     return error(new StreamError(null, e));
                 }
-            } else if (pathname.isURL()) {
+            } else if (pathname instanceof URLPathname
+                       && !(URLPathname.isFile(pathname))) {
                 if (direction != Keyword.INPUT) {
                     error(new FileError("Only direction :INPUT is supported for URLs.", pathname));
                 }
                 try { 
-                    return new URLStream(pathname, namestring.getStringValue(),
+                    return new URLStream(pathname,
                                          elementType, direction, ifExists,
                                          externalFormat);
@@ -323 +323 @@
             } else {
                 try {
-                    return new FileStream(pathname, namestring.getStringValue(),
+                    return new FileStream(pathname, 
                                           elementType, direction, ifExists,
                                           externalFormat);

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

@@ -56 +56 @@
     private final int bytesPerUnit;
 
-    public JarStream(Pathname pathname, String namestring,
-                          LispObject elementType, LispObject direction,
-                          LispObject ifExists, LispObject format)
+    public JarStream(Pathname pathname, 
+                     LispObject elementType, LispObject direction,
+                     LispObject ifExists, LispObject format)
         throws IOException
     {

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

@@ -56 +56 @@
     private final int bytesPerUnit;
 
-    public URLStream(Pathname pathname, String namestring,
+    public URLStream(Pathname pathname, 
                      LispObject elementType, LispObject direction,
                      LispObject ifExists, LispObject format)

trunk/abcl/src/org/armedbear/lisp/open.lisp

@@ -115 +115 @@
                        (t
                         (upgraded-element-type element-type))))
-  (let* ((pathname (merge-pathnames filename))
-         (namestring (namestring (if (typep pathname 'logical-pathname)
-                                     (translate-logical-pathname pathname)
-                                     pathname))))
+  (let* ((p (merge-pathnames filename))
+         (pathname (if (typep p 'logical-pathname)
+                       (translate-logical-pathname p)
+                       p)))
     (when (wild-pathname-p pathname)
       (error 'file-error
@@ -147 +147 @@
                    :pathname pathname
                    :format-control "The file ~S does not exist."
-                   :format-arguments (list namestring))))
+                   :format-arguments (list pathname))))
          (:create
           ;; CREATE-NEW-FILE "atomically creates a new, empty file named by
           ;; this abstract pathname if and only if a file with this name does
           ;; not yet exist." See java.io.File.createNewFile().
-          (create-new-file namestring)))
-       (make-file-stream pathname namestring element-type :input nil external-format))
+          (create-new-file (namestring pathname))))
+       (make-file-stream pathname element-type :input nil external-format))
       (:probe
        (case if-does-not-exist
@@ -161 +161 @@
                    :pathname pathname
                    :format-control "The file ~S does not exist."
-                   :format-arguments (list namestring))))
+                   :format-arguments (list pathname))))
          (:create
           ;; CREATE-NEW-FILE "atomically creates a new, empty file named by
           ;; this abstract pathname if and only if a file with this name does
           ;; not yet exist." See java.io.File.createNewFile().
-          (create-new-file namestring)))
-       (let ((stream (make-file-stream pathname namestring element-type
+          (create-new-file (namestring pathname))))
+       (let ((stream (make-file-stream pathname element-type
                                        :input nil external-format)))
          (when stream
@@ -179 +179 @@
                    :pathname pathname
                    :format-control "The file ~S does not exist."
-                   :format-arguments (list namestring))))
+                   :format-arguments (list pathname))))
          ((nil)
           (unless (probe-file pathname)
@@ -189 +189 @@
                    :pathname pathname
                    :format-control "The file ~S already exists."
-                   :format-arguments (list namestring))))
+                   :format-arguments (list pathname))))
          ((nil)
           (when (probe-file pathname)
@@ -200 +200 @@
                      :pathname pathname
                      :format-control "The file ~S is a directory."
-                     :format-arguments (list namestring)))
-            (let ((backup-name (concatenate 'string namestring ".bak")))
+                     :format-arguments (list pathname)))
+            (let ((backup-name (concatenate 'string (namestring pathname) ".bak")))
               (when (probe-file backup-name)
                 (when (probe-directory backup-name)
                   (error 'file-error
                          :pathname pathname
-                         :format-control "Unable to rename ~S."
-                         :format-arguments (list namestring)))
+                         :format-control "Unable to rename ~S to ~S."
+                         :format-arguments (list pathname backup-name)))
                 (delete-file backup-name))
               (rename-file pathname backup-name))))
@@ -215 +215 @@
                  :format-control "Option not supported: ~S."
                  :format-arguments (list if-exists))))
-       (let ((stream (make-file-stream pathname namestring element-type
+       (let ((stream (make-file-stream pathname element-type
                                        direction if-exists external-format)))
          (unless stream
@@ -221 +221 @@
                   :pathname pathname
                   :format-control "Unable to open ~S."
-                  :format-arguments (list namestring)))
+                  :format-arguments (list pathname)))
          stream))
       (t