From 79a018893873fc35eb19096bb09866c79a63b7b0 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Wed, 2 Jul 2014 14:28:04 -0400 Subject: [PATCH] Expand all tabs. Will make SBCL happier. --- cache.lisp | 2 +- find-component.lisp | 8 ++++---- test/dll-test.lisp | 4 ++-- test/monodll-1.lisp | 4 ++-- test/monodll.lisp | 4 ++-- uiop/pathname.lisp | 2 +- upgrade.lisp | 40 ++++++++++++++++++++-------------------- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/cache.lisp b/cache.lisp index dac44e2f..86a63175 100644 --- a/cache.lisp +++ b/cache.lisp @@ -5,7 +5,7 @@ (:use :uiop/common-lisp :uiop :asdf/upgrade) (:export #:get-file-stamp #:compute-file-stamp #:register-file-stamp #:set-asdf-cache-entry #:unset-asdf-cache-entry #:consult-asdf-cache - #:do-asdf-cache #:normalize-namestring + #:do-asdf-cache #:normalize-namestring #:call-with-asdf-cache #:with-asdf-cache #:*asdf-cache*)) (in-package :asdf/cache) diff --git a/find-component.lisp b/find-component.lisp index 4395648b..19360783 100644 --- a/find-component.lisp +++ b/find-component.lisp @@ -107,10 +107,10 @@ (and (typep c 'missing-dependency) (eq (missing-required-by c) component) (equal (missing-requires c) name)))) - (unless (component-parent component) - (let ((name (coerce-name name))) - (unset-asdf-cache-entry `(find-system ,name)) - (unset-asdf-cache-entry `(locate-system ,name)))))))) + (unless (component-parent component) + (let ((name (coerce-name name))) + (unset-asdf-cache-entry `(find-system ,name)) + (unset-asdf-cache-entry `(locate-system ,name)))))))) (defun resolve-dependency-spec (component dep-spec) diff --git a/test/dll-test.lisp b/test/dll-test.lisp index 590bfef3..ab2a3e36 100644 --- a/test/dll-test.lisp +++ b/test/dll-test.lisp @@ -6,7 +6,7 @@ extern int sample_function(); int sample_function() { - return 42; + return 42; } ") @@ -16,6 +16,6 @@ extern MKCL_DLLEXPORT int sample_function(void); int sample_function(void) { - return 42; + return 42; } ") diff --git a/test/monodll-1.lisp b/test/monodll-1.lisp index c49d4817..6251610d 100644 --- a/test/monodll-1.lisp +++ b/test/monodll-1.lisp @@ -6,7 +6,7 @@ extern int always_7(); int always_7() { - return 7; + return 7; } ") @@ -16,6 +16,6 @@ extern MKCL_DLLEXPORT int always_7(void); int always_7(void) { - return 7; + return 7; } ") diff --git a/test/monodll.lisp b/test/monodll.lisp index 0859b675..8e00be0c 100644 --- a/test/monodll.lisp +++ b/test/monodll.lisp @@ -6,7 +6,7 @@ extern int always_42(); int always_42() { - return 6*always_7(); + return 6*always_7(); } ") @@ -16,6 +16,6 @@ extern MKCL_DLLEXPORT int always_42(void); int always_42(void) { - return 6*always_7(); + return 6*always_7(); } ") diff --git a/uiop/pathname.lisp b/uiop/pathname.lisp index 8bb82ac8..7d89b755 100644 --- a/uiop/pathname.lisp +++ b/uiop/pathname.lisp @@ -580,7 +580,7 @@ when used with MERGE-PATHNAMES* with defaults BASE-PATHNAME, returns MAYBE-SUBPA "if MAYBE-SUBPATH is a pathname that is under BASE-PATHNAME, return a pathname object that when used with MERGE-PATHNAMES* with defaults BASE-PATHNAME, returns MAYBE-SUBPATH." (let ((sub (when maybe-subpath (pathname maybe-subpath))) - (base (when base-pathname (ensure-absolute-pathname (pathname base-pathname))))) + (base (when base-pathname (ensure-absolute-pathname (pathname base-pathname))))) (or (and base (subpathp sub base)) sub))) (defun call-with-enough-pathname (maybe-subpath defaults-pathname thunk) diff --git a/upgrade.lisp b/upgrade.lisp index 35267684..389fbfea 100644 --- a/upgrade.lisp +++ b/upgrade.lisp @@ -79,26 +79,26 @@ previously-loaded version of ASDF." (when-upgrading () (let ((redefined-functions ;; gf signature and/or semantics changed incompatibly. Oops. - ;; NB: it's too late to do anything about functions in UIOP! - ;; If you introduce some critically incompatibility there, you must change name. + ;; NB: it's too late to do anything about functions in UIOP! + ;; If you introduce some critically incompatibility there, you must change name. '(#:component-relative-pathname #:component-parent-pathname ;; component #:source-file-type #:find-system #:system-source-file #:system-relative-pathname ;; system - #:find-component ;; find-component - #:explain #:perform #:perform-with-restarts #:input-files #:output-files ;; action - #:component-depends-on #:operation-done-p #:component-depends-on - #:traverse ;; backward-interface + #:find-component ;; find-component + #:explain #:perform #:perform-with-restarts #:input-files #:output-files ;; action + #:component-depends-on #:operation-done-p #:component-depends-on + #:traverse ;; backward-interface #:map-direct-dependencies #:reduce-direct-dependencies #:direct-dependencies ;; plan - #:operate ;; operate - #:parse-component-form ;; defsystem - #:apply-output-translations ;; output-translations - #:process-output-translations-directive - #:inherit-source-registry #:process-source-registry ;; source-registry - #:process-source-registry-directive - #:trivial-system-p)) ;; bundle - (redefined-classes + #:operate ;; operate + #:parse-component-form ;; defsystem + #:apply-output-translations ;; output-translations + #:process-output-translations-directive + #:inherit-source-registry #:process-source-registry ;; source-registry + #:process-source-registry-directive + #:trivial-system-p)) ;; bundle + (redefined-classes ;; redefining the classes causes interim circularities - ;; with the old ASDF during upgrade, and many implementations bork + ;; with the old ASDF during upgrade, and many implementations bork '((#:compile-concatenated-source-op (#:operation) ())))) (loop :for name :in redefined-functions :for sym = (find-symbol* name :asdf nil) :do @@ -106,12 +106,12 @@ previously-loaded version of ASDF." ;; On CLISP we seem to be unable to fmakunbound and define a function in the same fasl. Sigh. #-clisp (fmakunbound sym))) (labels ((asym (x) (multiple-value-bind (s p) (if (consp x) (values (car x) (cadr x)) (values x :asdf)) - (find-symbol* s p nil))) - (asyms (l) (mapcar #'asym l))) + (find-symbol* s p nil))) + (asyms (l) (mapcar #'asym l))) (loop* :for (name superclasses slots) :in redefined-classes - :for sym = (find-symbol* name :asdf nil) - :when (and sym (find-class sym)) - :do (eval `(defclass ,sym ,(asyms superclasses) ,(asyms slots))))))) + :for sym = (find-symbol* name :asdf nil) + :when (and sym (find-class sym)) + :do (eval `(defclass ,sym ,(asyms superclasses) ,(asyms slots))))))) ;;; Self-upgrade functions -- GitLab