From 5b839d75aa1050aa9d35b035c293e551799f68e4 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <fare@tunes.org> Date: Fri, 17 Sep 2010 11:54:28 -0400 Subject: [PATCH] 1.103: play nice with asdf:coerce-name being exported. --- asdf-ops.lisp | 4 ++-- grovel.lisp | 4 ++-- package.lisp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/asdf-ops.lisp b/asdf-ops.lisp index 97e9db0..27a4d11 100644 --- a/asdf-ops.lisp +++ b/asdf-ops.lisp @@ -174,8 +174,8 @@ to the base of the system." compspec system) (apply #'reinitialize-instance component args)))) (loop :for (system compspec . initargs) in additional-initargs :do - (assert (member (asdf::coerce-name system) systems - :key #'asdf::coerce-name + (assert (member (coerce-name system) systems + :key #'coerce-name :test #'equal) () "Component translation in System ~A which is not a member of the ~ diff --git a/grovel.lisp b/grovel.lisp index 6dca515..5a4474e 100644 --- a/grovel.lisp +++ b/grovel.lisp @@ -567,7 +567,7 @@ (enough-component-spec component))) ;; Used only by maybe-translated-component-class. -(defun coerce-name (maybe-class) +(defun coerce-class-name (maybe-class) (if (typep maybe-class 'standard-class) (class-name maybe-class) maybe-class)) @@ -583,7 +583,7 @@ :file) ((and (eql (class-of component) (find-class (or - (coerce-name + (coerce-class-name (asdf::module-default-component-class (asdf:component-parent component))) 'asdf:cl-source-file)))) diff --git a/package.lisp b/package.lisp index e0f936e..a697623 100644 --- a/package.lisp +++ b/package.lisp @@ -31,8 +31,8 @@ (in-package #:asdf-dependency-grovel) -(defparameter *asdf-dependency-grovel-version* "1.102") -(defparameter *asdf-version-required-by-adg* "2.000") +(defparameter *asdf-dependency-grovel-version* "1.103") +(defparameter *asdf-version-required-by-adg* "2.008") #-asdf2 (error "ASDF-DEPENDENCY-GROVEL requires ASDF2.") -- GitLab