X-Git-Url: http://christophe.rhodes.io/gitweb/?p=specializable.git;a=blobdiff_plain;f=specializable.lisp;h=8d01319b1267e28a5da465263fbb8b4df27163c5;hp=c69f78606ee0cdfa6e45d4295b4e0f7fa1b701aa;hb=d55ebbbcbd77023c799d8d95dce5d3772aec5841;hpb=4f8b7a9cbde446b6576f81178534abe8b47659a1 diff --git a/specializable.lisp b/specializable.lisp index c69f786..8d01319 100644 --- a/specializable.lisp +++ b/specializable.lisp @@ -20,26 +20,52 @@ (in-package "SPECIALIZABLE") (defclass extended-specializer (sb-mop:specializer) - ((direct-methods :initform nil - :accessor %specializer-direct-methods - :reader specializer-direct-methods))) + ;; FIXME: this doesn't actually do quite what I wanted. + ((direct-methods-table :allocation :class + :initform nil :accessor direct-methods-table))) + +(defmethod sb-mop:add-direct-method ((specializer extended-specializer) method) + (let* ((table (direct-methods-table specializer)) + (cell (assoc specializer table :test #'sb-pcl::same-specializer-p))) + (unless cell + (setf cell (cons specializer nil)) + (push cell (direct-methods-table specializer))) + (push method (cdr cell)))) + +(defmethod sb-mop:remove-direct-method ((specializer extended-specializer) method) + (let* ((table (direct-methods-table specializer)) + (cell (assoc specializer table :test #'sb-pcl::same-specializer-p))) + (setf (cdr cell) (remove method (cdr cell))))) + +(defmethod sb-mop:specializer-direct-methods ((specializer extended-specializer)) + (cdr (assoc specializer (direct-methods-table specializer) + :test #'sb-pcl::same-specializer-p))) +(defmethod sb-mop:specializer-direct-generic-functions ((specializer extended-specializer)) + (remove-duplicates (mapcar #'sb-mop:method-generic-function (sb-mop:specializer-direct-methods specializer)))) (defclass specializable-generic-function (standard-generic-function) - ((extended-specializers :initform (make-hash-table :test 'equal) - :reader generic-function-extended-specializers) - (emf-table :initform (make-hash-table :test 'equal) :reader emf-table)) + ((emf-table :initform (make-hash-table :test 'equal) :reader emf-table) + (cacheingp :initform t :initarg :cacheingp) + (single-arg-cacheing-p :initform t :initarg :single-arg-cacheing-p)) (:metaclass sb-mop:funcallable-standard-class) (:default-initargs :method-class (find-class 'specializable-method))) -(defclass specializable-method (standard-method) - ((lambda-expression :initarg :lambda-expression - :accessor specializable-method-lambda-expression))) +;;; TODO: we don't use this class yet, but we might do later +(defclass specializable-method (standard-method) ()) + +;;; TODO use info? +(defun extended-specializer-name-p (name) + (and (symbolp name) + (get name 'extended-specializer-parser))) + +(deftype extended-specializer-name () + `(satisfies extended-specializer-name-p)) (defmacro define-extended-specializer (name (gf-var &rest args) &body body) ;; FIXME: unparser `(setf (get ',name 'extended-specializer-parser) - (lambda (,gf-var ,@args) - ,@body))) + (lambda (,gf-var ,@args) + ,@body))) ;; doesn't work, because we'd have to dump GF into the fasl for the macro ;; expansion @@ -52,12 +78,6 @@ ;;; gf ;;; args)))) -;;; FIXME: this (and add/remove-direct-method) don't actually work -;;; together, because two distinct calls to make-extended-specializer -;;; return two distinct specializer objects. We need either to make -;;; the extended specializers be interned, or to have them be -;;; arbitrarily ephemeral but adjust specializer-direct-methods (and -;;; implement specializer-direct-generic-functions) accordingly. (defun make-extended-specializer (sname) (destructuring-bind (kind &rest args) sname (apply (or (get kind 'extended-specializer-parser) @@ -66,25 +86,13 @@ '|This is not a generic function| ;fixme, see comment above args))) -(defmethod sb-mop:add-direct-method ((specializer extended-specializer) method) - (pushnew method (%specializer-direct-methods specializer))) - -(defmethod sb-mop:remove-direct-method ((specializer extended-specializer) method) - (setf (%specializer-direct-methods specializer) - (remove method (specializer-direct-methods specializer)))) - ;;; from SBCL: (defmethod sb-pcl:parse-specializer-using-class - ((gf specializable-generic-function) name) - (cond - ((typep name 'sb-mop:specializer) name) - ((symbolp name) (find-class name)) - ((consp name) - (case (car name) - (eql (sb-mop:intern-eql-specializer (cadr name))) - (t (make-extended-specializer name)))) - (t (error "unexpected specializer name")))) + ((gf specializable-generic-function) (specializer-name t)) + (if (typep specializer-name '(cons extended-specializer-name)) + (make-extended-specializer specializer-name) + (call-next-method))) (defmethod sb-pcl:make-method-specializers-form ((gf specializable-generic-function) method snames env) @@ -115,43 +123,76 @@ ((gf specializable-generic-function) (g class)) (sb-pcl::class-wrapper g)) +(defun first-arg-only-special-case (gf) + (let ((arg-info (sb-pcl::gf-arg-info gf))) + (and (slot-value gf 'single-arg-cacheing-p) + (>= (sb-pcl::arg-info-number-required arg-info) 1) + (every (lambda (x) (eql x t)) + (cdr (sb-pcl::arg-info-metatypes arg-info)))))) + ;;; FIXME: in some kind of order, the discriminating function needs to handle: ;;; - argument count checking; -;;; - keyword argument validity; +;;; - DONE (in effective method) keyword argument validity; ;;; - DONE flushing the emf cache on method addition/removal ;;; - DONE (sort of, using wrappers/g-e-h-k) flushing the cache on class redefinition; ;;; - cache thread-safety. +;;; - speed +;;; - DONE (in SBCL itself) interaction with TRACE et al. (defmethod sb-mop:compute-discriminating-function ((gf specializable-generic-function)) - (lambda (&rest args) - (let* ((generalizers (mapcar (lambda (x) (generalizer-of-using-class gf x)) - (required-portion gf args))) - (keys (mapcar (lambda (x) (generalizer-equal-hash-key gf x)) generalizers)) - (emfun (gethash keys (emf-table gf) nil))) - (if emfun - (sb-pcl::invoke-emf emfun args) - (slow-method-lookup gf args generalizers))))) + (cond + ((not (slot-value gf 'cacheingp)) + (lambda (&rest args) + (let ((generalizers (mapcar (lambda (x) (generalizer-of-using-class gf x)) + args))) + (slow-method-lookup-and-call gf args generalizers)))) + ((first-arg-only-special-case gf) + (lambda (&rest args) + (let* ((g (generalizer-of-using-class gf (car args))) + (k (generalizer-equal-hash-key gf g)) + (emfun (gethash k (emf-table gf) nil))) + (if emfun + (sb-pcl::invoke-emf emfun args) + (slow-method-lookup-and-call + gf args (cons g (mapcar (lambda (x) (generalizer-of-using-class gf x)) + (cdr (required-portion gf args))))))))) + (t + (lambda (&rest args) + (let* ((generalizers (mapcar (lambda (x) (generalizer-of-using-class gf x)) + (required-portion gf args))) + (keys (mapcar (lambda (x) (generalizer-equal-hash-key gf x)) generalizers)) + (emfun (gethash keys (emf-table gf) nil))) + (if emfun + (sb-pcl::invoke-emf emfun args) + (slow-method-lookup-and-call gf args generalizers))))))) (defmethod reinitialize-instance :after ((gf specializable-generic-function) &key) (clrhash (emf-table gf))) (defun slow-method-lookup (gf args generalizers) - ;; differs from closette (multiple-value-bind (applicable-methods definitivep) (compute-applicable-methods-using-generalizers gf generalizers) - (if definitivep - (let* ((emfun - (compute-effective-method-function gf applicable-methods)) - (keys (mapcar (lambda (x) (generalizer-equal-hash-key gf x)) generalizers))) - (setf (gethash keys (emf-table gf)) emfun) - (sb-pcl::invoke-emf emfun args)) - (sb-pcl::invoke-emf (compute-effective-method-function - gf (sb-mop:compute-applicable-methods gf args)) - args)))) + (unless definitivep + (setf applicable-methods (compute-applicable-methods gf args))) + (values (compute-effective-method-function gf applicable-methods) + definitivep))) + +(defun slow-method-lookup-and-call (gf args generalizers) + (multiple-value-bind (emf cacheablep) + (slow-method-lookup gf args generalizers) + (when cacheablep + (let ((keys (mapcar (lambda (x) (generalizer-equal-hash-key gf x)) generalizers))) + (if (first-arg-only-special-case gf) + (setf (gethash (car keys) (emf-table gf)) emf) + (setf (gethash keys (emf-table gf)) emf)))) + (sb-pcl::invoke-emf emf args))) (defun compute-effective-method-function (gf methods) - (let* ((mc (sb-mop:generic-function-method-combination gf)) - (em (sb-mop:compute-effective-method gf mc methods))) - (sb-pcl::make-effective-method-function gf em))) + (if (null methods) + (lambda (&rest args) (apply #'no-applicable-method gf args)) + (let* ((mc (sb-mop:generic-function-method-combination gf)) + (sb-pcl::*applicable-methods* methods) + (em (sb-mop:compute-effective-method gf mc methods))) + (sb-pcl::make-effective-method-function gf em)))) ;; new, not in closette (defgeneric generalizer-of-using-class (generic-function object))