Commit c7d1ce63 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

More cleanups:

* Add some comments on TRAVERSE-ACTION; expand those on SOURCE-FILE-TYPE.
* Remove a few unnecessary input-files or output-files methods
* Remove (declare (ignorable ...)) for specialized arguments. Specialize a few arguments to T.
* Remove most when-upgrading methods, since we drop data on old incompatible ASDFs.
parent d722ad15
......@@ -267,7 +267,6 @@ The class needs to be updated for ASDF 3.1 and specify appropriate propagation m
(define-convenience-action-methods operation-done-p (operation component))
(defmethod operation-done-p ((o operation) (c component))
(declare (ignorable o c))
t)
(defmethod output-files :around (operation component)
......@@ -289,7 +288,6 @@ The class needs to be updated for ASDF 3.1 and specify appropriate propagation m
(mapcar *output-translation-function* absolute-pathnames))))
t)))
(defmethod output-files ((o operation) (c component))
(declare (ignorable o c))
nil)
(defun output-file (operation component)
"The unique output file of performing OPERATION on COMPONENT"
......@@ -303,7 +301,6 @@ The class needs to be updated for ASDF 3.1 and specify appropriate propagation m
(call-next-method)))
(defmethod input-files ((o operation) (c component))
(declare (ignorable o c))
nil)
(defmethod input-files ((o selfward-operation) (c component))
......@@ -369,7 +366,6 @@ in some previous image, or T if it needs to be done.")
(defmethod perform :after ((o operation) (c component))
(mark-operation-done o c))
(defmethod perform ((o operation) (c parent-component))
(declare (ignorable o c))
nil)
(defmethod perform ((o operation) (c source-file))
(sysdef-error
......
......@@ -43,13 +43,13 @@
(defgeneric (setf operation-on-warnings) (x operation))
(defgeneric (setf operation-on-failure) (x operation))
(defmethod operation-on-warnings ((o operation))
(declare (ignorable o)) *compile-file-warnings-behaviour*)
*compile-file-warnings-behaviour*)
(defmethod operation-on-failure ((o operation))
(declare (ignorable o)) *compile-file-failure-behaviour*)
*compile-file-failure-behaviour*)
(defmethod (setf operation-on-warnings) (x (o operation))
(declare (ignorable o)) (setf *compile-file-warnings-behaviour* x))
(setf *compile-file-warnings-behaviour* x))
(defmethod (setf operation-on-failure) (x (o operation))
(declare (ignorable o)) (setf *compile-file-failure-behaviour* x))
(setf *compile-file-failure-behaviour* x))
(defun system-definition-pathname (x)
;; As of 2.014.8, we mean to make this function obsolete,
......@@ -119,7 +119,7 @@ processed in order by OPERATE."))
:ignore-inherited-configuration))))
(defmethod operate :before (operation-class system &rest args &key &allow-other-keys)
(declare (ignorable operation-class system args))
(declare (ignore operation-class system args))
(when (find-symbol* '#:output-files-for-system-and-operation :asdf nil)
(error "ASDF 2 is not compatible with ASDF-BINARY-LOCATIONS, which you are using.
ASDF 2 now achieves the same purpose with its builtin ASDF-OUTPUT-TRANSLATIONS,
......
......@@ -157,7 +157,7 @@
(defmethod initialize-instance :after ((instance bundle-op) &rest initargs
&key (name-suffix nil name-suffix-p)
&allow-other-keys)
(declare (ignorable initargs name-suffix))
(declare (ignore initargs name-suffix))
(unless name-suffix-p
(setf (slot-value instance 'name-suffix)
(unless (typep instance 'program-op)
......@@ -178,7 +178,6 @@
(operation-original-initargs instance))))
(defmethod bundle-op-build-args :around ((o no-ld-flags-op))
(declare (ignorable o))
(let ((args (call-next-method)))
(remf args :ld-flags)
args))
......@@ -223,7 +222,6 @@
,@(call-next-method)))
(defmethod component-depends-on :around ((o bundle-op) (c component))
(declare (ignorable o c))
(if-let (op (and (eq (type-of o) 'bundle-op) (component-build-operation c)))
`((,op ,c))
(call-next-method)))
......@@ -285,7 +283,6 @@
;;;
(with-upgradability ()
(defmethod component-depends-on ((o load-fasl-op) (c system))
(declare (ignorable o))
`((,o ,@(loop :for dep :in (component-sideway-dependencies c)
:collect (resolve-dependency-spec c dep)))
(,(if (user-system-p c) 'fasl-op 'load-op) ,c)
......@@ -295,10 +292,6 @@
(when (user-system-p c)
(output-files (find-operation o 'fasl-op) c)))
(defmethod perform ((o load-fasl-op) c)
(declare (ignorable o c))
nil)
(defmethod perform ((o load-fasl-op) (c system))
(when (input-files o c)
(perform-lisp-load-fasl o c)))
......@@ -316,11 +309,7 @@
(defmethod trivial-system-p ((s system))
(every #'(lambda (c) (typep c 'compiled-file)) (component-children s)))
(defmethod output-files (o (c compiled-file))
(declare (ignorable o c))
nil)
(defmethod input-files (o (c compiled-file))
(declare (ignorable o))
(defmethod input-files ((o operation) (c compiled-file))
(component-pathname c))
(defmethod perform ((o load-op) (c compiled-file))
(perform-lisp-load-fasl o c))
......@@ -329,7 +318,6 @@
(defmethod perform ((o load-fasl-op) (c compiled-file))
(perform (find-operation o 'load-op) c))
(defmethod perform ((o operation) (c compiled-file))
(declare (ignorable o c))
nil))
;;;
......@@ -337,19 +325,15 @@
;;;
(with-upgradability ()
(defmethod trivial-system-p ((s prebuilt-system))
(declare (ignorable s))
t)
(defmethod perform ((o lib-op) (c prebuilt-system))
(declare (ignorable o c))
nil)
(defmethod component-depends-on ((o lib-op) (c prebuilt-system))
(declare (ignorable o c))
nil)
(defmethod component-depends-on ((o monolithic-lib-op) (c prebuilt-system))
(declare (ignorable o))
nil))
......@@ -422,14 +406,12 @@
(combine-fasls fasl-files output-file)))))
(defmethod input-files ((o load-op) (s precompiled-system))
(declare (ignorable o))
(bundle-output-files (find-operation o 'fasl-op) s))
(defmethod perform ((o load-op) (s precompiled-system))
(perform-lisp-load-fasl o s))
(defmethod component-depends-on ((o load-fasl-op) (s precompiled-system))
(declare (ignorable o))
`((load-op ,s) ,@(call-next-method))))
#| ;; Example use:
......@@ -496,8 +478,9 @@
#+(and (not asdf-use-unsafe-mac-bundle-op)
(or (and ecl darwin) (and abcl darwin)))
(defmethod perform :before ((op basic-fasl-op) c)
(declare (ignorable op c))
(unless (uiop:featurep :asdf-use-unsafe-mac-bundle-op)
(defmethod perform :before ((o basic-fasl-op) (c component))
(unless (featurep :asdf-use-unsafe-mac-bundle-op)
(cerror "Continue after modifying *FEATURES*."
"BASIC-FASL-OP bundle operations are not supported on Mac OSX for this lisp.~%~TTo continue, push :asdf-use-unsafe-mac-bundle-op on *FEATURES*.~%~TPlease report to ASDF-DEVEL if this works for you.")))
"BASIC-FASL-OP bundle operations are not supported on Mac OS X for this lisp.~%~T~
To continue, push :asdf-use-unsafe-mac-bundle-op onto *FEATURES*.~%~T~
Please report to ASDF-DEVEL if this works for you.")))
......@@ -61,7 +61,7 @@ another pathname in a degenerate way."))
(defgeneric component-version (component))
(defgeneric (setf component-version) (new-version component))
(defgeneric component-parent (component))
(defmethod component-parent ((component null)) (declare (ignorable component)) nil)
(defmethod component-parent ((component null)) nil)
;; Backward compatible way of computing the FILE-TYPE of a component.
;; TODO: find users, have them stop using that, remove it for ASDF4.
......@@ -83,11 +83,6 @@ another pathname in a degenerate way."))
(duplicate-names-name c))))))
(when-upgrading (:when (find-class 'component nil))
(defmethod reinitialize-instance :after ((c component) &rest initargs &key)
(declare (ignorable c initargs)) (values)))
(with-upgradability ()
(defclass component ()
((name :accessor component-name :initarg :name :type string :documentation
......@@ -203,19 +198,6 @@ another pathname in a degenerate way."))
(setf (gethash name hash) c))
hash))))
(when-upgrading (:when (find-class 'module nil))
(defmethod reinitialize-instance :after ((m module) &rest initargs &key)
(declare (ignorable m initargs)) (values))
(defmethod update-instance-for-redefined-class :after
((m module) added deleted plist &key)
(declare (ignorable m added deleted plist))
(when (and (member 'children added) (member 'components deleted))
(setf (slot-value m 'children)
;; old ECLs provide an alist instead of a plist(!)
(if (or #+ecl (consp (first plist))) (or #+ecl (cdr (assoc 'components plist)))
(getf plist 'components)))
(compute-children-by-name m))))
(with-upgradability ()
(defclass module (child-component parent-component)
(#+clisp (components)))) ;; backward compatibility during upgrade only
......@@ -241,9 +223,10 @@ another pathname in a degenerate way."))
pathname)))
(defmethod component-relative-pathname ((component component))
;; source-file-type is backward-compatibility with ASDF1;
;; we ought to be able to extract this from the component alone with COMPONENT-TYPE.
;; TODO: track who uses it, and have them not use it anymore.
;; SOURCE-FILE-TYPE below is strictly for backward-compatibility with ASDF1.
;; We ought to be able to extract this from the component alone with COMPONENT-TYPE.
;; TODO: track who uses it, and have them not use it anymore;
;; maybe issue a WARNING (then eventually CERROR) if the two methods diverge?
(parse-unix-namestring
(or (and (slot-boundp component 'relative-pathname)
(slot-value component 'relative-pathname))
......@@ -252,12 +235,10 @@ another pathname in a degenerate way."))
:type (source-file-type component (component-system component))
:defaults (component-parent-pathname component)))
(defmethod source-file-type ((component parent-component) system)
(declare (ignorable component system))
(defmethod source-file-type ((component parent-component) (system parent-component))
:directory)
(defmethod source-file-type ((component file-component) system)
(declare (ignorable system))
(defmethod source-file-type ((component file-component) (system parent-component))
(file-type component)))
......
......@@ -79,8 +79,7 @@
(defmethod find-component ((c component) (name cons))
(find-component (find-component c (car name)) (cdr name)))
(defmethod find-component (base (actual component))
(declare (ignorable base))
(defmethod find-component ((base t) (actual component))
actual)
(defun resolve-dependency-name (component name &optional version)
......@@ -120,11 +119,9 @@
(cons combinator arguments) component))
(defmethod resolve-dependency-combination (component (combinator (eql :feature)) arguments)
(declare (ignorable combinator))
(when (featurep (first arguments))
(resolve-dependency-spec component (second arguments))))
(defmethod resolve-dependency-combination (component (combinator (eql :version)) arguments)
(declare (ignorable combinator)) ;; See https://bugs.launchpad.net/asdf/+bug/527788
(resolve-dependency-name component (first arguments) (second arguments))))
(resolve-dependency-name component (first arguments) (second arguments)))) ;; See lp#527788
......@@ -246,7 +246,6 @@ Going forward, we recommend new users should be using the source-registry.
(register-preloaded-system s :version *asdf-version*))
(defmethod find-system ((name null) &optional (error-p t))
(declare (ignorable name))
(when error-p
(sysdef-error (compatfmt "~@<NIL is not a valid system name~@:>"))))
......
......@@ -60,22 +60,17 @@
;;; prepare-op
(with-upgradability ()
(defmethod action-description ((o prepare-op) (c component))
(declare (ignorable o))
(format nil (compatfmt "~@<loading dependencies of ~3i~_~A~@:>") c))
(defmethod perform ((o prepare-op) (c component))
(declare (ignorable o c))
nil)
(defmethod input-files ((o prepare-op) (s system))
(declare (ignorable o))
(if-let (it (system-source-file s)) (list it))))
;;; compile-op
(with-upgradability ()
(defmethod action-description ((o compile-op) (c component))
(declare (ignorable o))
(format nil (compatfmt "~@<compiling ~3i~_~A~@:>") c))
(defmethod action-description ((o compile-op) (c parent-component))
(declare (ignorable o))
(format nil (compatfmt "~@<completing compilation for ~3i~_~A~@:>") c))
(defgeneric call-with-around-compile-hook (component thunk))
(defmethod call-with-around-compile-hook ((c component) function)
......@@ -141,10 +136,6 @@
(defmethod output-files ((o compile-op) (c cl-source-file))
(lisp-compilation-output-files o c))
(defmethod perform ((o compile-op) (c static-file))
(declare (ignorable o c))
nil)
(defmethod output-files ((o compile-op) (c static-file))
(declare (ignorable o c))
nil)
(defmethod perform ((o compile-op) (c system))
(when (and *warnings-file-type* (not (builtin-system-p c)))
......@@ -164,15 +155,11 @@
;;; load-op
(with-upgradability ()
(defmethod action-description ((o load-op) (c cl-source-file))
(declare (ignorable o))
(format nil (compatfmt "~@<loading FASL for ~3i~_~A~@:>") c))
(defmethod action-description ((o load-op) (c parent-component))
(declare (ignorable o))
(format nil (compatfmt "~@<completing load for ~3i~_~A~@:>") c))
(defmethod action-description ((o load-op) component)
(declare (ignorable o))
(format nil (compatfmt "~@<loading ~3i~_~A~@:>")
component))
(defmethod action-description ((o load-op) (c component))
(format nil (compatfmt "~@<loading ~3i~_~A~@:>") c))
(defmethod perform-with-restarts ((o load-op) (c cl-source-file))
(loop
(restart-case
......@@ -188,7 +175,6 @@
(defmethod perform ((o load-op) (c cl-source-file))
(perform-lisp-load-fasl o c))
(defmethod perform ((o load-op) (c static-file))
(declare (ignorable o c))
nil))
......@@ -197,25 +183,17 @@
;;; prepare-source-op
(with-upgradability ()
(defmethod action-description ((o prepare-source-op) (c component))
(declare (ignorable o))
(format nil (compatfmt "~@<loading source for dependencies of ~3i~_~A~@:>") c))
(defmethod input-files ((o prepare-source-op) (c component))
(declare (ignorable o c))
nil)
(defmethod input-files ((o prepare-source-op) (s system))
(declare (ignorable o))
(if-let (it (system-source-file s)) (list it)))
(defmethod perform ((o prepare-source-op) (c component))
(declare (ignorable o c))
nil))
;;; load-source-op
(with-upgradability ()
(defmethod action-description ((o load-source-op) c)
(declare (ignorable o))
(defmethod action-description ((o load-source-op) (c component))
(format nil (compatfmt "~@<Loading source of ~3i~_~A~@:>") c))
(defmethod action-description ((o load-source-op) (c parent-component))
(declare (ignorable o))
(format nil (compatfmt "~@<Loaded source of ~3i~_~A~@:>") c))
(defun perform-lisp-load-source (o c)
(call-with-around-compile-hook
......@@ -226,20 +204,14 @@
(defmethod perform ((o load-source-op) (c cl-source-file))
(perform-lisp-load-source o c))
(defmethod perform ((o load-source-op) (c static-file))
(declare (ignorable o c))
nil)
(defmethod output-files ((o load-source-op) (c component))
(declare (ignorable o c))
nil))
;;;; test-op
(with-upgradability ()
(defmethod perform ((o test-op) (c component))
(declare (ignorable o c))
nil)
(defmethod operation-done-p ((o test-op) (c system))
"Testing a system is _never_ done."
(declare (ignorable o c))
nil))
......@@ -53,7 +53,6 @@ The :FORCE or :FORCE-NOT argument to OPERATE can be:
&key verbose
(on-warnings *compile-file-warnings-behaviour*)
(on-failure *compile-file-failure-behaviour*) &allow-other-keys)
(declare (ignorable operation component))
(let* ((systems-being-operated *systems-being-operated*)
(*systems-being-operated* (or systems-being-operated (make-hash-table :test 'equal)))
(operation-name (reify-symbol (etypecase operation
......@@ -160,18 +159,15 @@ for how to load or compile stuff")
((module :initarg :module :initform nil :accessor required-module)))
(defmethod perform ((o compile-op) (c require-system))
(declare (ignorable o c))
nil)
(defmethod perform ((o load-op) (s require-system))
(declare (ignorable o))
(let* ((module (or (required-module s) (coerce-name s)))
(*modules-being-required* (cons module *modules-being-required*)))
(assert (null (component-children s)))
(require module)))
(defmethod resolve-dependency-combination (component (combinator (eql :require)) arguments)
(declare (ignorable component combinator))
(unless (length=n-p arguments 1)
(error (compatfmt "~@<Bad dependency ~S for ~S. ~S takes only one argument~@:>")
(cons combinator arguments) component combinator))
......
......@@ -14,8 +14,9 @@
;;; Operation Classes
(when-upgrading (:when (find-class 'operation nil))
(defmethod shared-initialize :after ((o operation) slot-names &rest initargs &key)
(declare (ignorable o slot-names initargs)) (values)))
;; override any obsolete shared-initialize method when upgrading from ASDF2.
(defmethod shared-initialize :after ((o operation) (slot-names t) &key)
(values)))
(with-upgradability ()
(defclass operation ()
......@@ -26,7 +27,7 @@
;; already bound.
(defmethod initialize-instance :after ((o operation) &rest initargs
&key force force-not system verbose &allow-other-keys)
(declare (ignorable force force-not system verbose))
(declare (ignore force force-not system verbose))
(unless (slot-boundp o 'original-initargs)
(setf (operation-original-initargs o) initargs)))
......@@ -46,8 +47,7 @@
(defgeneric find-operation (context spec)
(:documentation "Find an operation by resolving the SPEC in the CONTEXT"))
(defmethod find-operation (context (spec operation))
(declare (ignorable context))
(defmethod find-operation ((context t) (spec operation))
spec)
(defmethod find-operation (context (spec symbol))
(unless (member spec '(nil feature))
......@@ -55,7 +55,6 @@
;; FEATURE is the ASDF1 misfeature that comes with IF-COMPONENT-DEP-FAILS
(apply 'make-operation spec (operation-original-initargs context))))
(defmethod operation-original-initargs ((context symbol))
(declare (ignorable context))
nil)
(defclass build-op (operation) ()))
......
......@@ -222,7 +222,6 @@ and the order is by decreasing length of namestring of the source pathname.")
(process-output-translations (parse-output-translations-string string)
:inherit inherit :collect collect))
(defmethod process-output-translations ((x null) &key inherit collect)
(declare (ignorable x))
(inherit-output-translations inherit :collect collect))
(defmethod process-output-translations ((form cons) &key inherit collect)
(dolist (directive (cdr (validate-output-translations-form form)))
......
......@@ -143,7 +143,7 @@
do-first if-component-dep-fails version
;; list ends
&allow-other-keys) options
(declare (ignorable perform explain output-files operation-done-p builtin-system-p))
(declare (ignore perform explain output-files operation-done-p builtin-system-p))
(check-component-input type name weakly-depends-on depends-on components)
(when (and parent
(find-component parent name)
......
......@@ -68,9 +68,8 @@ the action of OPERATION on COMPONENT in the PLAN"))
(with-slots (stamp done-p planned-p index) status
(format stream "~@{~S~^ ~}" :stamp stamp :done-p done-p :planned-p planned-p :index index))))
(defmethod action-planned-p (action-status)
(declare (ignorable action-status)) ; default method for non planned-action-status objects
t)
(defmethod action-planned-p ((action-status t))
t) ; default method for non planned-action-status objects
;; TODO: eliminate NODE-FOR, use CONS.
;; Supposes cleaner protocol for operation initargs passed to MAKE-OPERATION.
......@@ -81,12 +80,10 @@ the action of OPERATION on COMPONENT in the PLAN"))
(action-done-p (plan-action-status plan operation component)))
(defmethod plan-action-status ((plan null) (o operation) (c component))
(declare (ignorable plan))
(multiple-value-bind (stamp done-p) (component-operation-time o c)
(make-instance 'action-status :stamp stamp :done-p done-p)))
(defmethod (setf plan-action-status) (new-status (plan null) (o operation) (c component))
(declare (ignorable plan))
(let ((to (type-of o))
(times (component-operation-times c)))
(if (action-done-p new-status)
......@@ -107,7 +104,7 @@ the action of OPERATION on COMPONENT in the PLAN"))
((eql t) (when system (list-to-hash-set (list (coerce-name system)))))))
(defun action-override-p (plan operation component override-accessor)
(declare (ignorable operation))
(declare (ignore operation))
(let* ((override (funcall override-accessor plan)))
(and override
(if (typep override 'hash-table)
......@@ -131,12 +128,10 @@ the action of OPERATION on COMPONENT in the PLAN"))
;; Force takes precedence over force-not
(not (action-forced-p plan operation component))))
(defmethod action-forced-p ((plan null) operation component)
(declare (ignorable plan operation component))
(defmethod action-forced-p ((plan null) (operation operation) (component component))
nil)
(defmethod action-forced-not-p ((plan null) operation component)
(declare (ignorable plan operation component))
(defmethod action-forced-not-p ((plan null) (operation operation) (component component))
nil))
......@@ -144,14 +139,11 @@ the action of OPERATION on COMPONENT in the PLAN"))
(with-upgradability ()
(defgeneric action-valid-p (plan operation component)
(:documentation "Is this action valid to include amongst dependencies?"))
(defmethod action-valid-p (plan operation (c component))
(declare (ignorable plan operation))
(defmethod action-valid-p ((plan plan-traversal) (o operation) (c component))
(if-let (it (component-if-feature c)) (featurep it) t))
(defmethod action-valid-p (plan (o null) c) (declare (ignorable plan o c)) nil)
(defmethod action-valid-p (plan o (c null)) (declare (ignorable plan o c)) nil)
(defmethod action-valid-p ((plan null) operation component)
(declare (ignorable plan operation component))
(and operation component t)))
(defmethod action-valid-p ((plan t) (o null) (c t)) nil)
(defmethod action-valid-p ((plan t) (o t) (c null)) nil)
(defmethod action-valid-p ((plan null) (o operation) (c component)) t))
;;;; Is the action needed in this image?
......@@ -313,6 +305,15 @@ the action of OPERATION on COMPONENT in the PLAN"))
(defgeneric traverse-action (plan operation component needed-in-image-p))
;; TRAVERSE-ACTION, in the context of a given PLAN object that accumulates dependency data,
;; visits the action defined by its OPERATION and COMPONENT arguments,
;; and all its transitive dependencies (unless already visited),
;; in the context of the action being (or not) NEEDED-IN-IMAGE-P,
;; i.e. needs to be done in the current image vs merely have been done in a previous image.
;; For actions that are up-to-date, it returns a STAMP identifying the state of the action
;; (that's timestamp, but it could be a cryptographic digest in some ASDF extension),
;; or T if the action needs to be done again.
(defmethod traverse-action (plan operation component needed-in-image-p)
(block nil
(unless (action-valid-p plan operation component) (return nil))
......@@ -362,9 +363,7 @@ the action of OPERATION on COMPONENT in the PLAN"))
(defmethod plan-actions ((plan sequential-plan))
(reverse (plan-actions-r plan)))
(defmethod plan-record-dependency ((plan sequential-plan)
(operation operation) (component component))
(declare (ignorable plan operation component))
(defmethod plan-record-dependency ((plan sequential-plan) (o operation) (c component))
(values))
(defmethod (setf plan-action-status) :after
......
......@@ -235,7 +235,6 @@ system names to pathnames of .asd files")
(process-source-registry (parse-source-registry-string string)
:inherit inherit :register register))
(defmethod process-source-registry ((x null) &key inherit register)
(declare (ignorable x))
(inherit-source-registry inherit :register register))
(defmethod process-source-registry ((form cons) &key inherit register)
(let ((*source-registry-exclusions* *default-source-registry-exclusions*))
......
......@@ -29,7 +29,6 @@
(defgeneric component-entry-point (component))
(defmethod component-entry-point ((c component))
(declare (ignorable c))
nil))
......@@ -106,6 +105,5 @@ in which the system specification (.asd file) is located."
(system-source-directory system))
(defmethod component-build-pathname ((c component))
(declare (ignorable c))
nil))
......@@ -185,35 +185,27 @@ Programmers are encouraged to define their own methods for this generic function
:linewise linewise :prefix prefix :element-type element-type :buffer-size buffer-size))
(defmethod slurp-input-stream ((x (eql 'string)) stream &key stripped)
(declare (ignorable x))
(slurp-stream-string stream :stripped stripped))
(defmethod slurp-input-stream ((x (eql :string)) stream &key stripped)
(declare (ignorable x))
(slurp-stream-string stream :stripped stripped))
(defmethod slurp-input-stream ((x (eql :lines)) stream &key count)
(declare (ignorable x))
(slurp-stream-lines stream :count count))
(defmethod slurp-input-stream ((x (eql :line)) stream &key (at 0))
(declare (ignorable x))
(slurp-stream-line stream :at at))
(defmethod slurp-input-stream ((x (eql :forms)) stream &key count)
(declare (ignorable x))
(slurp-stream-forms stream :count count))
(defmethod slurp-input-stream ((x (eql :form)) stream &key (at 0))
(declare (ignorable x))
(slurp-stream-form stream :at at))
(defmethod slurp-input-stream ((x (eql t)) stream &rest keys &key &allow-other-keys)
(declare (ignorable x))
(apply 'slurp-input-stream *standard-output* stream keys))
(defmethod slurp-input-stream ((x null) stream &key)
(declare (ignorable x stream))
(defmethod slurp-input-stream ((x null) (stream t) &key)
nil)
(defmethod slurp-input-stream ((pathname pathname) input
......@@ -288,11 +280,9 @@ Programmers are encouraged to define their own methods for this generic function
(values))
(defmethod vomit-output-stream ((x (eql t)) stream &rest keys &key &allow-other-keys)
(declare (ignorable x))
(apply 'vomit-output-stream *standard-input* stream keys))
(defmethod vomit-output-stream ((x null) stream &key)
(declare (ignorable x stream))
(values))
(defmethod vomit-output-stream ((pathname pathname) input
......
......@@ -98,8 +98,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO
#:component-self-dependencies
#:resolve-relative-location-component #:resolve-absolute-location-component
#:output-files-for-system-and-operation))) ; obsolete ASDF-BINARY-LOCATION function
(declare (ignorable redefined-functions uninterned-symbols))
(loop :for name :in (append redefined-functions)
(loop :for name :in redefined-functions
:for sym = (find-symbol* name :asdf nil) :do
(when sym
;; On CLISP we seem to be unable to fmakunbound and define a function in the same fasl. Sigh.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment