X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-introspect%2Ftest-driver.lisp;h=f647fabacf1f53610a93dec719c0d79622170daa;hb=31f072311935e32751508ecf824905c6b58a1d95;hp=b93d3ded23ef8ca745ce53c6e8a8a5abab2bc615;hpb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;p=sbcl.git

diff --git a/contrib/sb-introspect/test-driver.lisp b/contrib/sb-introspect/test-driver.lisp
index b93d3de..f647fab 100644
--- a/contrib/sb-introspect/test-driver.lisp
+++ b/contrib/sb-introspect/test-driver.lisp
@@ -12,13 +12,14 @@
 (assert (equal (function-arglist 'the)
                '(type sb-c::value)))
 
-(let ((source (find-definition-source 'cl-user::one)))
+(let ((source (find-definition-source #'cl-user::one)))
   (assert (= (definition-source-file-write-date source)
              (file-write-date (merge-pathnames "test.lisp" *load-pathname*))))
   (assert (equal (getf (definition-source-plist source) :test-outer)
                  "OUT")))
 
-(let ((plist (definition-source-plist (find-definition-source 'cl-user::four))))
+(let ((plist (definition-source-plist
+                 (find-definition-source #'cl-user::four))))
   (assert (equal (getf plist :test-outer) "OUT"))
   (assert (equal (getf plist :test-inner) "IN")))
 
@@ -28,10 +29,45 @@
          (= form-number
             (first (sb-introspect:definition-source-form-path ds))))))
 
-(assert (matchp 'cl-user::one 2))
+(defun matchp-name (type object form-number)
+  (let ((ds (car (sb-introspect:find-definition-sources-by-name object type))))
+    (and (pathnamep (sb-introspect:definition-source-pathname ds))
+         (= form-number
+            (first (sb-introspect:definition-source-form-path ds))))))
+
+(defun matchp-length (type object form-numbers)
+  (let ((ds (sb-introspect:find-definition-sources-by-name object type)))
+    (= (length ds) form-numbers)))
+
+(assert (matchp-name :function 'cl-user::one 2))
 (assert (matchp #'cl-user::one 2))
-; (assert (matchp 'two 2)) ; defgenerics don't work yet
+(assert (matchp-name :generic-function 'cl-user::two 3))
 (assert (matchp (car (sb-pcl:generic-function-methods #'cl-user::two)) 4))
 
+(assert (matchp-name :variable 'cl-user::*a* 8))
+(assert (matchp-name :variable 'cl-user::*b* 9))
+(assert (matchp-name :class 'cl-user::a 10))
+(assert (matchp-name :condition 'cl-user::b 11))
+(assert (matchp-name :structure 'cl-user::c 12))
+(assert (matchp-name :function 'cl-user::make-c 12))
+(assert (matchp-name :function 'cl-user::c-e 12))
+(assert (matchp-name :structure 'cl-user::d 13))
+(assert (matchp-name :function 'cl-user::make-d 13))
+(assert (matchp-name :function 'cl-user::d-e 13))
+(assert (matchp-name :package 'cl-user::e 14))
+(assert (matchp-name :symbol-macro 'cl-user::f 15))
+(assert (matchp-name :type 'cl-user::g 16))
+(assert (matchp-name :constant 'cl-user::+h+ 17))
+(assert (matchp-length :method 'cl-user::j 2))
+(assert (matchp-name :macro 'cl-user::l 20))
+(assert (matchp-name :compiler-macro 'cl-user::m 21))
+(assert (matchp-name :setf-expander 'cl-user::n 22))
+(assert (matchp-name :function  '(setf cl-user::o) 23))
+(assert (matchp-name :method  '(setf cl-user::p) 24))
+(assert (matchp-name :macro  'cl-user::q 25))
+(assert (matchp-name :method-combination 'cl-user::r 26))
+(assert (matchp-name :setf-expander 'cl-user::s 27))
+
+
 ;;; Unix success convention for exit codes
 (sb-ext:quit :unix-status 0)