Changeset 301

Timestamp:

Jan 15, 2004, 12:29:51 AM (21 years ago)

Author:

Gary Byers

Message:

%%CHECK-KEYWORDS is (a) slow (b) wrong (c) probably unnecessary.
If (c) is true, there's a similar case where the same things are probably
true as well, and callers should be changed. (c) is certainly true in
some cases (when the "combined method" is a simple method.

File:

• trunk/ccl/level-1/l1-dcode.lisp (modified) (3 diffs)

trunk/ccl/level-1/l1-dcode.lisp

@@ -951 +951 @@
 
 ; vector arg is (vector key-index keyvect combined-method) ; the next combined method
+#|
 (defun %%check-keywords (vector-arg args)
   (flet ((do-it (vector-arg args)
@@ -964 +965 @@
                  (declare (fixnum  key-index keys-in keyvect-len))
                  (when (logbitp 0 keys-in) (odd-keys-error vector-arg (collect-lexpr-args args key-index args-len)))
+                 (setq aok (%cadr (pl-search args :allow-other-keys)))
                  (do ((i key-index (+ i 2))
                       (kargs (nthcdr key-index args) (cddr kargs)))
@@ -991 +993 @@
       (with-list-from-lexpr (args-list args)
         (do-it vector-arg args-list)))))
+|#
+
+(defun %%check-keywords (vector-arg args)
+  (let ((method (%svref vector-arg 2)))
+    (if (listp args)
+      (apply method args)
+      (%apply-lexpr-tail-wise method args))))
+  
+
 
 ; called from %%call-next-method-with-args - its the key-or-init-fn