Changeset 14621

Timestamp:

01/30/14 14:27:58 (10 years ago)

Author:

Mark Evenson

Message:

Untabify.

Location:

trunk/abcl

Files:

• src/org/armedbear/lisp/Pathname.java (modified) (4 diffs)
• src/org/armedbear/lisp/directory.lisp (modified) (1 diff)
• test/lisp/abcl/wild-pathnames.lisp (modified) (3 diffs)

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

@@ -1642 +1642 @@
                             File file = files[i];
                             Pathname p;
-              String path;
-              if (resolveSymlinks == NIL) {
-                path = file.getAbsolutePath();
-              } else {
-                path = file.getCanonicalPath();
-              }
-              URI pathURI = (new File(path)).toURI();
-              p = new Pathname(pathURI.toString());
+                            String path;
+                            if (resolveSymlinks == NIL) {
+                              path = file.getAbsolutePath();
+                            } else {
+                              path = file.getCanonicalPath();
+                            }
+                            URI pathURI = (new File(path)).toURI();
+                            p = new Pathname(pathURI.toString());
                             result = new Cons(p, result);
                         }
@@ -2037 +2037 @@
         }
         //  CLtLv2 MERGE-PATHNAMES 
-  
-  // "[T]he missing components in the given pathname are filled
-  // in from the defaults pathname, except that if no version is
-  // specified the default version is used."
-
-  // "The merging rules for the version are more complicated and
-  // depend on whether the pathname specifies a name. If the
-  // pathname doesn't specify a name, then the version, if not
-  // provided, will come from the defaults, just like the other
-  // components. However, if the pathname does specify a name,
-  // then the version is not affected by the defaults. The
-  // reason is that the version ``belongs to'' some other file
-  // name and is unlikely to have anything to do with the new
-  // one. Finally, if this process leaves the
-  // version missing, the default version is used."
+    
+    // "[T]he missing components in the given pathname are filled
+    // in from the defaults pathname, except that if no version is
+    // specified the default version is used."
+
+    // "The merging rules for the version are more complicated and
+    // depend on whether the pathname specifies a name. If the
+    // pathname doesn't specify a name, then the version, if not
+    // provided, will come from the defaults, just like the other
+    // components. However, if the pathname does specify a name,
+    // then the version is not affected by the defaults. The
+    // reason is that the version ``belongs to'' some other file
+    // name and is unlikely to have anything to do with the new
+    // one. Finally, if this process leaves the
+    // version missing, the default version is used."
 
         if (p.version != NIL) {
@@ -2203 +2203 @@
             Cons jars = (Cons) pathname.device;
             LispObject o = jars.car();
-      if (!(o instanceof Pathname)) {
-         return doTruenameExit(pathname, errorIfDoesNotExist);
-      }
+        if (!(o instanceof Pathname)) {
+           return doTruenameExit(pathname, errorIfDoesNotExist);
+        }
             if (o instanceof Pathname 
                 && !(((Pathname)o).isURL())
@@ -2283 +2283 @@
         }
         error:
-    return doTruenameExit(pathname, errorIfDoesNotExist);
+      return doTruenameExit(pathname, errorIfDoesNotExist);
     }
     

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

@@ -135 +135 @@
                       (matching-entries ()))
                   (dolist (entry entries)
-          (when 
-            (or 
-             (and 
-              (file-directory-p entry)
-              (pathname-match-p (file-namestring (pathname-as-file entry)) 
-                      (file-namestring pathname)))
-             (pathname-match-p (or (file-namestring entry) "") (file-namestring pathname)))
-            (push 
-             (if resolve-symlinks
-               (truename entry) 
-               entry)
-             matching-entries)))
+                    (when 
+                        (or 
+                         (and 
+                          (file-directory-p entry)
+                          (pathname-match-p (file-namestring (pathname-as-file entry)) 
+                                            (file-namestring pathname)))
+                         (pathname-match-p (or (file-namestring entry) "") (file-namestring pathname)))
+                      (push 
+                       (if resolve-symlinks
+                           (truename entry) 
+                           entry)
+                       matching-entries)))
                   matching-entries))))
         ;; Not wild.

trunk/abcl/test/lisp/abcl/wild-pathnames.lisp

@@ -14 +14 @@
     (let ((file (merge-pathnames file *temp-directory-root*)))
       (ensure-directories-exist (directory-namestring file))
-    (unless (probe-file file)
-    (touch file)))))
+      (unless (probe-file file)
+        (touch file)))))
 
 (defun remove-wild-test-hierarchy ()
   (ignore-errors
-  (delete-directory-and-files *temp-directory-root*)))
+    (delete-directory-and-files *temp-directory-root*)))
 
 (defmacro with-test-directories (&rest body)
@@ -33 +33 @@
     
 (deftest wild-pathnames.1
-  (with-test-directories
-    (let ((results
-         (directory (merge-pathnames "**/*.ext"
-                       *temp-directory-root*)))
-        (expected
-         (loop :for file :in *test-files*
-          :collecting (merge-pathnames file
-                         *temp-directory-root*))))
-    (values 
-     (eq (length results) (length expected))
-    ;; link --> file is not resolved by change in DIRECTORY to :RESOLVE-SYMLINKS nil
-     results
-     expected
-     (set-equal (mapcar #'truename results) 
-          (mapcar #'truename expected)))))
+    (with-test-directories
+        (let ((results
+               (directory (merge-pathnames "**/*.ext"
+                                           *temp-directory-root*)))
+              (expected
+               (loop :for file :in *test-files*
+                  :collecting (merge-pathnames file
+                                               *temp-directory-root*))))
+      (values 
+       (eq (length results) (length expected))
+      ;; link --> file is not resolved by change in DIRECTORY to :RESOLVE-SYMLINKS nil
+       results
+       expected
+       (set-equal (mapcar #'truename results) 
+                  (mapcar #'truename expected)))))
   t)
 
@@ -59 +59 @@
   t)
 
-  
+