From 77d8ab4720ca70e35d1cf732f17c48bd2ca26e61 Mon Sep 17 00:00:00 2001 From: William Harold Newman Date: Thu, 5 Sep 2002 11:42:17 +0000 Subject: [PATCH] 0.7.7.15: deleted unused SB-PCL machinery pointed out by Gerd Moellman on cmucl-imp: GF-MAKE-FUNCTION-FROM-EMF, CHECK-WRAPPER-VALIDITY1 --- src/pcl/boot.lisp | 24 ------------------------ src/pcl/cache.lisp | 7 ------- version.lisp-expr | 2 +- 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/src/pcl/boot.lisp b/src/pcl/boot.lisp index 69f7e17..0954011 100644 --- a/src/pcl/boot.lisp +++ b/src/pcl/boot.lisp @@ -968,30 +968,6 @@ bootstrapping. +slot-unbound+))))) (function (apply emf args)))) - -;; KLUDGE: A comment from the original PCL said "This can be improved alot." -(defun gf-make-function-from-emf (gf emf) - (etypecase emf - (fast-method-call (let* ((arg-info (gf-arg-info gf)) - (nreq (arg-info-number-required arg-info)) - (restp (arg-info-applyp arg-info))) - (lambda (&rest args) - (trace-emf-call emf t args) - (apply (fast-method-call-function emf) - (fast-method-call-pv-cell emf) - (fast-method-call-next-method-call emf) - (if restp - (let* ((rest-args (nthcdr nreq args)) - (req-args (ldiff args - rest-args))) - (nconc req-args rest-args)) - args))))) - (method-call (lambda (&rest args) - (trace-emf-call emf t args) - (apply (method-call-function emf) - args - (method-call-call-method-args emf)))) - (function emf))) (defmacro bind-fast-lexical-method-macros ((args rest-arg next-method-call) &body body) diff --git a/src/pcl/cache.lisp b/src/pcl/cache.lisp index 3ed4110..64b53a9 100644 --- a/src/pcl/cache.lisp +++ b/src/pcl/cache.lisp @@ -468,13 +468,6 @@ ((invalid-wrapper-p nwrapper) (error "wrapper returned from trap invalid"))) nwrapper)))) - -(defmacro check-wrapper-validity1 (object) - (let ((owrapper (gensym))) - `(let ((,owrapper (sb-kernel:layout-of object))) - (if (sb-kernel:layout-invalid ,owrapper) - (check-wrapper-validity ,object) - ,owrapper)))) (defvar *free-caches* nil) diff --git a/version.lisp-expr b/version.lisp-expr index 300a849..f23d203 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -18,4 +18,4 @@ ;;; for internal versions, especially for internal versions off the ;;; main CVS branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.7.7.14" +"0.7.7.15" -- 1.7.10.4