Changeset 14059

Timestamp:

08/05/12 20:40:13 (9 years ago)

Author:

ehuelsmann

Message:

Follow up to r14058: efficient binding of required vars.
Also:

• Fixes for r14058
• Removal of a macro no longer in use
• Code comments as to my opinion on the current state

File:

• trunk/abcl/src/org/armedbear/lisp/clos.lisp (modified) (6 diffs)

trunk/abcl/src/org/armedbear/lisp/clos.lisp

@@ -1166 +1166 @@
                     aux))))
 
-(defmacro getk (plist key init-form)
-  "Similar to getf except eval and return INIT-FORM if KEY has no value in PLIST."
-  (let ((not-exist (gensym))
-        (value (gensym)))
-    `(let ((,value (getf ,plist ,key ',not-exist)))
-       (if (eq ',not-exist ,value) ,init-form ,value))))
-
 (defun wrap-with-call-method-macro (gf args-var emf-form)
   `(macrolet
@@ -1276 +1269 @@
                               `((,whole ',args-var)))
                       ,@(when rest
+                              ;; ### TODO: use a fresh symbol for the rest
+                              ;;   binding being generated and pushed into binding-forms
                               `((,rest (progn
                                          (push `(,',rest
@@ -1282 +1277 @@
                                                ,binding-forms)
                                          ',rest))))
-                        ,@(loop for var in required
-                             and i upfrom 0
+                        ,@(loop for var in required and i upfrom 0
+                               for var-binding = (gensym)
                              collect `(,var (when (< ,i nreq)
-                                              `(nth ,,i ,',args-var))))
+                                              (push `(,',var-binding
+                                                      (nth ,,i ,',args-var))
+                                                    ,binding-forms)
+                                              ',var-binding)))
                         ,@(loop for (var initform supplied-var) in optional
                              and i upfrom 0
@@ -1303 +1301 @@
                                        (when (< ,i nopt)
                                          (setq ,needs-args-len-var t)
+                              ;; ### TODO: use a fresh symbol for the supplied binding
+                              ;;   binding being generated and pushed into binding-forms
                                          (push `(,',supplied-binding
                                                  (< ,(+ ,i nreq) ,',args-len-var))
@@ -1324 +1324 @@
                              collect `(,supplied-binding
                                        (progn
+                              ;; ### TODO: use a fresh symbol for the rest
+                              ;;   binding being generated and pushed into binding-forms
                                          (push `(,',supplied-binding
-                                                 (member ,',key ,',rest)))
+                                                 (member ,',key ,',rest))
+                                               ,binding-forms)
                                          ',supplied-binding))
                              collect `(,var (progn
@@ -1332 +1335 @@
                                                           (cadr ,',supplied-binding)
                                                           ,',initform))
-                                                    ,binding-forms))))
+                                                    ,binding-forms)
+                                              ',var-binding)))
                         ,@(loop for (var initform) in aux
                              for var-binding = (gensym)