Changeset 14614

Timestamp:

01/26/14 11:25:50 (10 years ago)

Author:

Mark Evenson

Message:

abcl-contrib: Fix whitespace.

File:

• trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp (modified) (7 diffs)

trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp

@@ -3 +3 @@
 (require :asdf)
 
-(defconstant +get-classloader+ (java:jmethod "java.lang.Class" "getClassLoader"))
+(defconstant +get-classloader+ 
+  (java:jmethod "java.lang.Class" "getClassLoader"))
+
 (defun boot-classloader () 
   (let ((boot-class (java:jclass "org.armedbear.lisp.Main")))
-  (java:jcall +get-classloader+ boot-class)))
+    (java:jcall +get-classloader+ boot-class)))
 
 (defun system-jar-p (p)
@@ -17 +19 @@
   (and (pathnamep p)
        (equal (pathname-type p) "jar")
-     (or 
-    (java:jstatic "matches"
-            "java.util.regex.Pattern" 
-            (concatenate 'string name "(-[0-9]\\.[0-9]\\.[0-9]([+~-].+)?)?")
-            (pathname-name p))
-    (java:jstatic "matches"
-            "java.util.regex.Pattern" 
-            (concatenate 'string name "(-[0-9]\\.[0-9]\\.[0-9]\\.[0-9]([+~-]+)?)?")
-            (pathname-name p)))
-     (make-pathname :defaults p :name name)))
+       (or 
+        (java:jstatic "matches"
+                      "java.util.regex.Pattern" 
+                      (concatenate 'string name "(-[0-9]\\.[0-9]\\.[0-9]([+~-].+)?)?")
+                      (pathname-name p))
+        (java:jstatic "matches"
+                      "java.util.regex.Pattern" 
+                      (concatenate 'string name "(-[0-9]\\.[0-9]\\.[0-9]\\.[0-9]([+~-]+)?)?")
+                      (pathname-name p)))
+       (make-pathname :defaults p :name name)))
 
 (defun find-system ()
@@ -34 +36 @@
   (or 
    (ignore-errors 
-   (find-system-jar))
+     (find-system-jar))
    (ignore-errors
-   (some 
-    (lambda (u) 
-    (probe-file (make-pathname 
-           :defaults  (java:jcall "toString" u)
-           :name "abcl")))
-    (java:jcall "getURLs" (boot-classloader))))
+     (some 
+      (lambda (u) 
+        (probe-file (make-pathname 
+                     :defaults  (java:jcall "toString" u)
+                     :name "abcl")))
+      (java:jcall "getURLs" (boot-classloader))))
    (ignore-errors 
-   #p"http://abcl.org/releases/current/abcl.jar")))
+     #p"http://abcl.org/releases/current/abcl.jar")))
 
 (defun find-system-jar () 
@@ -54 +56 @@
 (defvar *abcl-contrib* nil
   "Pathname of the ABCL contrib.
-Initialized via SYSTEM:FIND-CONTRIB")
+Initialized via SYSTEM:FIND-CONTRIB.")
 
 (defparameter *verbose* t)
@@ -61 +63 @@
   "Introspects ABCL-CONTRIB-JAR for asdf systems to add to ASDF:*CENTRAL-REGISTRY*"
   (when abcl-contrib-jar
-  (dolist (asdf-file
-        (directory (make-pathname :device (list abcl-contrib-jar)
-                    :directory '(:absolute :wild)
-                    :name :wild
-                    :type "asd")))
-    (let ((asdf-directory (make-pathname :defaults asdf-file :name nil :type nil)))
-    (unless (find asdf-directory asdf:*central-registry* :test #'equal)
-      (push asdf-directory asdf:*central-registry*)
-      (format *verbose* "~&Added ~A to ASDF.~&" asdf-directory))))))
+    (dolist (asdf-file
+              (directory (make-pathname :device (list abcl-contrib-jar)
+                                        :directory '(:absolute :wild)
+                                        :name :wild
+                                        :type "asd")))
+      (let ((asdf-directory (make-pathname :defaults asdf-file :name nil :type nil)))
+        (unless (find asdf-directory asdf:*central-registry* :test #'equal)
+          (push asdf-directory asdf:*central-registry*)
+          (format *verbose* "~&Added ~A to ASDF.~&" asdf-directory))))))
 
 
@@ -76 +78 @@
 Returns the pathname of the contrib if it can be found."
   (if *abcl-contrib*
-    (format verbose "~&Using already initialized value of abcl-contrib:~&'~A'.~%"
-        *abcl-contrib*)
-    (progn 
-    (setf *abcl-contrib* (find-contrib))
-    (format verbose "~&Using probed value of abcl-contrib:~&'~A'.~%"
-        *abcl-contrib*)))
+      (format verbose "~&Using already initialized value of abcl-contrib:~&'~A'.~%"
+              *abcl-contrib*)
+      (progn 
+        (setf *abcl-contrib* (find-contrib))
+        (format verbose "~&Using probed value of abcl-contrib:~&'~A'.~%"
+                *abcl-contrib*)))
   (add-contrib *abcl-contrib*))
 
 (defun find-contrib ()
   "Introspect runtime classpaths to find a loadable ABCL-CONTRIB."
-  (or 
-   (ignore-errors (when (find-system-jar)
-          (probe-file 
-           (make-pathname :defaults (find-system-jar)
-                  :name "abcl-contrib"))))
-   (some 
-  (lambda (u) 
-    (probe-file (make-pathname 
-           :defaults  (java:jcall "toString" u)
-           :name "abcl-contrib")))
-  (java:jcall "getURLs" (boot-classloader)))))
+  (or (ignore-errors 
+    (when (find-system-jar)
+      (probe-file 
+       (make-pathname :defaults (find-system-jar)
+              :name "abcl-contrib"))))
+    (some 
+     (lambda (u) 
+     (probe-file (make-pathname 
+            :defaults  (java:jcall "toString" u)
+            :name "abcl-contrib")))
+     (java:jcall "getURLs" (boot-classloader)))))
 
 (export `(find-system 
-      find-contrib
-      *abcl-contrib*))
+          find-contrib
+          *abcl-contrib*))
 (when (find-and-add-contrib :verbose t)
   (provide :abcl-contrib))
@@ -110 +112 @@
 
 
-       
+