X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-introspect%2Ftest-driver.lisp;h=2e82fe0f033e5a471780aa61c5f18bffc9d4d833;hb=c0578d9893429c9c0da80ea5920360e4621fddab;hp=03fdeddb8a2b4514a241592772bf67c61b58f94d;hpb=cb83aa22932bf4b9bc74ac6f0fcd91db1702ad33;p=sbcl.git

diff --git a/contrib/sb-introspect/test-driver.lisp b/contrib/sb-introspect/test-driver.lisp
index 03fdedd..2e82fe0 100644
--- a/contrib/sb-introspect/test-driver.lisp
+++ b/contrib/sb-introspect/test-driver.lisp
@@ -7,10 +7,13 @@
 (with-compilation-unit (:source-plist (list :test-outer "OUT"))
   (load (compile-file (merge-pathnames "test.lisp" *load-pathname*))))
 
-(assert (equal (function-arglist 'cl-user::one)
+(assert (equal (function-lambda-list 'cl-user::one)
                '(cl-user::a cl-user::b cl-user::c)))
-(assert (equal (function-arglist 'the)
-               '(type sb-c::value)))
+(assert (equal (function-lambda-list 'the)
+               '(sb-c::value-type sb-c::form)))
+
+(assert (equal (function-lambda-list #'(sb-pcl::slow-method cl-user::j (t)))
+               '(sb-pcl::method-args sb-pcl::next-methods)))
 
 (let ((source (find-definition-source #'cl-user::one)))
   (assert (= (definition-source-file-write-date source)
@@ -68,13 +71,79 @@
 (assert (matchp-name :method-combination 'cl-user::r 26))
 (assert (matchp-name :setf-expander 'cl-user::s 27))
 
+(let ((fin (make-instance 'sb-mop:funcallable-standard-object)))
+  (sb-mop:set-funcallable-instance-function fin #'cl-user::one)
+  (assert (matchp fin 2)))
+
 (sb-profile:profile cl-user::one)
 (assert (matchp-name :function 'cl-user::one 2))
 (sb-profile:unprofile cl-user::one)
 
-;;; Test the xref facility
+
+;;;; Check correctness of FUNCTION-LAMBDA-LIST.
+
+(assert (equal (function-lambda-list 'cl-user::one)
+               '(cl-user::a cl-user::b cl-user::c)))
+(assert (equal (function-lambda-list 'the)
+               '(sb-c::value-type sb-c::form)))
+
+;;; Check wrt. interplay of generic functions and their methods.
+
+(defgeneric xuuq (gf.a gf.b          &rest gf.rest &key gf.k-X))
+(defmethod  xuuq ((m1.a number) m1.b &rest m1.rest &key gf.k-X m1.k-Y m1.k-Z)
+  (declare (ignore m1.a m1.b m1.rest gf.k-X m1.k-Y m1.k-Z))
+  'm1)
+(defmethod  xuuq ((m2.a string) m2.b &rest m2.rest &key gf.k-X m1.k-Y m2.k-Q)
+  (declare (ignore m2.a m2.b m2.rest gf.k-X m1.k-Y m2.k-Q))
+  'm2)
+
+;; XUUQ's lambda list should look similiar to
+;;
+;;    (GF.A GF.B &REST GF.REST &KEY GF.K-X M1.K-Z M1.K-Y M2.K-Q)
+;;
+(multiple-value-bind (required optional restp rest keyp keys allowp
+                      auxp aux morep more-context more-count)
+    (sb-int:parse-lambda-list (function-lambda-list #'xuuq))
+  (assert (equal required '(gf.a gf.b)))
+  (assert (null optional))
+  (assert (and restp (eql rest 'gf.rest)))
+  (assert (and keyp
+               (member 'gf.k-X keys)
+               (member 'm1.k-Y keys)
+               (member 'm1.k-Z keys)
+               (member 'm2.k-Q keys)))
+  (assert (not allowp))
+  (assert (and (not auxp) (null aux)))
+  (assert (and (not morep) (null more-context) (not more-count))))
+
+;;; Check what happens when there's no explicit DEFGENERIC.
+
+(defmethod kroolz (r1 r2 &optional opt &aux aux)
+  (declare (ignore r1 r2 opt aux))
+  'kroolz)
+(assert (equal (function-lambda-list #'kroolz) '(r1 r2 &optional opt)))
+
+;;;; Test finding a type that isn't one
+(assert (not (find-definition-sources-by-name 'fboundp :type)))
+
+;;;; Check correctness of DEFTYPE-LAMBDA-LIST.
+(deftype foobar-type
+    (&whole w &environment e r1 r2 &optional o &rest rest &key k1 k2 k3)
+  (declare (ignore w e r1 r2 o rest k1 k2 k3))
+  nil)
+
+(assert (multiple-value-bind (arglist found?) (deftype-lambda-list 'foobar-type)
+          (and found?
+               (equal arglist '(&whole w &environment e
+                                r1 r2 &optional o &rest rest &key k1 k2 k3)))))
+
+(assert (equal (multiple-value-list (deftype-lambda-list (gensym)))
+               '(nil nil)))
+
+
+;;;; Test the xref facility
 
 (load (merge-pathnames "xref-test.lisp" *load-pathname*))
 
-;;; Unix success convention for exit codes
+;;;; Unix success convention for exit codes
 (sb-ext:quit :unix-status 0)