diff --git a/grovel.lisp b/grovel.lisp index b50b55766b50ba499958b3ccff1096d802ad770a..f02990a7bed90798fc5e30bbd3d03f71b8485ebc 100644 --- a/grovel.lisp +++ b/grovel.lisp @@ -24,7 +24,7 @@ ;; Currently unused. (defmacro symbol-macroify (operator name &rest args &environment env) - (let ((new-name (gentemp (format nil "ASDF-DEPENDENCY-GROVEL-~A--~A" + (let* ((new-name (gensym (format nil "ASDF-DEPENDENCY-GROVEL-~A--~A" operator name)))) `(progn (define-symbol-macro ,name ,new-name) @@ -501,16 +501,6 @@ (defvar *asdf-has-sensible-component-names-p* (ignore-errors (<= 1.367 (read-from-string asdf::*asdf-revision*)))) -;; TODO: move that upstream into ASDF, so we can use it from there? -(defun merge-component-relative-pathname (pathname name type) - (multiple-value-bind (relative path filename) - (split-path-string name) - (merge-pathnames - (or pathname (make-pathname :directory `(,relative ,@path))) - (if type - (make-pathname :name filename :type type) - filename)))) - (defun strip/ (name) (subseq name (1+ (or (position #\/ name :from-end t) -1)))) (defun strip-extension (name extension) @@ -789,6 +779,7 @@ (defgeneric enclosing-file-constituent (constituent) (:method (x) + (declare (ignore x)) nil) (:method ((x asdf-component-constituent)) (when (typep (asdf-component-constituent-component x) diff --git a/handlers/00-standard-handlers.lisp b/handlers/00-standard-handlers.lisp index 312d897b2cf0ce59a67e4c9bef3dc90340625b93..154e3e9f86223da952e3940c6adf49478c8c4f57 100644 --- a/handlers/00-standard-handlers.lisp +++ b/handlers/00-standard-handlers.lisp @@ -269,7 +269,7 @@ :in (loop :for desc :in slot-descriptions :collect (if (listp desc) desc (list desc))) ;; Get the symbol for this slot's accessor. - :as accessor-name := + :for accessor-name = (let* ((slot-name-str (symbol-name slot-name)) (accessor-name-str (concatenate 'string prefix slot-name-str)))