unused stuff

[specializable.git] / accept-specializer.lisp

diff --git a/accept-specializer.lisp b/accept-specializer.lisp
index 97311c51fa7404b8cec01789d03fbf6d8a6c3d3e..a72b1595918ca6b30b7a065e508ad62e5eafdfc5 100644 (file)
--- a/accept-specializer.lisp
+++ b/accept-specializer.lisp
@@ -43,6 +43,10 @@
         (and type-node (accept-node-q type-node))
         (accept-node-q accept-tree))))
 
+(defun q-ok (media-type accept-tree)
+  (let ((q (q media-type accept-tree)))
+    (and q (> q 0) q)))
+
 (defun insert (range q tree)
   (labels ((ensure-node (range tree)
              (cond
@@ -78,7 +82,7 @@
 \f
 ;;; FIXME: tiebreaker predicate (maybe defaulting to string<)?
 (defclass accept-specializer (extended-specializer)
-  ((media-type :initarg :media-type :reader media-type)))
+  ((media-type :initarg :media-type :type string :reader media-type)))
 (defmethod print-object ((o accept-specializer) s)
   (print-unreadable-object (o s :type t)
     (format s "~S" (media-type o))))
@@ -101,6 +105,7 @@
   (:metaclass sb-mop:funcallable-standard-class))
 
 (define-extended-specializer accept (gf arg)
+  (declare (ignore gf))
   (make-instance 'accept-specializer :media-type arg))
 (defmethod sb-pcl:unparse-specializer-using-class
     ((gf accept-generic-function) (specializer accept-specializer))
@@ -117,7 +122,7 @@
     ((gf accept-generic-function) (g accept-generalizer))
   `(accept-generalizer ,(header g)))
 (defmethod specializer-accepts-generalizer-p ((gf accept-generic-function) (s accept-specializer) (generalizer accept-generalizer))
-  (values (q (media-type s) (tree generalizer)) t))
+  (values (q-ok (media-type s) (tree generalizer)) t))
 (defmethod specializer-accepts-generalizer-p ((gf accept-generic-function) (s accept-specializer) generalizer)
   (values nil t))
 (defmethod specializer-accepts-generalizer-p ((gf accept-generic-function) (s sb-mop:specializer) (generalizer accept-generalizer))
@@ -126,7 +131,7 @@
 (defmethod specializer-accepts-p ((specializer accept-specializer) obj)
   nil)
 (defmethod specializer-accepts-p ((specializer accept-specializer) (obj tbnl:request))
-  (q (media-type specializer) (parse-accept-string (tbnl:header-in :accept obj))))
+  (q-ok (media-type specializer) (parse-accept-string (tbnl:header-in :accept obj))))
 
 (defmethod specializer< ((gf accept-generic-function) (s1 accept-specializer) (s2 accept-specializer) generalizer)
   (cond
@@ -190,7 +195,7 @@
                  :header s
                  :next (class-of s)))
 (defmethod specializer-accepts-p ((s accept-specializer) (string string))
-  (q (media-type s) (parse-accept-string string)))
+  (q-ok (media-type s) (parse-accept-string string)))
 
 (defmethod handle-content-type ((x tbnl:request))
   (setf (tbnl:content-type*) *actual-content-type*))