[armedbear-cvs] r14040 - trunk/abcl/src/org/armedbear/lisp

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Thu Aug  2 08:35:18 2012
New Revision: 14040

Log:
Rename argument name and type to improve self-documentation of the code
and make more clear in which situation it's used.

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

Modified: trunk/abcl/src/org/armedbear/lisp/clos.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/clos.lisp	Thu Aug  2 03:32:07 2012	(r14039)
+++ trunk/abcl/src/org/armedbear/lisp/clos.lisp	Thu Aug  2 08:35:18 2012	(r14040)
@@ -1167,7 +1167,7 @@
     `(let ((,value (getf ,plist ,key ,not-exist)))
        (if (eq ,not-exist ,value) ,init-form ,value))))
 
-(defun wrap-with-call-method-macro (gf args-var forms)
+(defun wrap-with-call-method-macro (gf args-var emf-form)
   `(macrolet
        ((call-method (method &optional next-method-list)
           `(funcall
@@ -1193,7 +1193,7 @@
                      (compute-effective-method
                       ,gf (generic-function-method-combination ,gf)
                       (process-next-method-list next-method-list))))))
-     , at forms))
+     ,emf-form))
 
 (defmacro with-args-lambda-list (args-lambda-list
                                  generic-function-symbol
@@ -1285,12 +1285,12 @@
        (with-method-groups ,method-group-specs
            ,methods
          ,(if (null args-lambda-list)
-              `(let ((result (progn , at forms)))
+              `(let ((emf-form (progn , at forms)))
                  `(lambda (,',args-var)
                     ,(wrap-with-call-method-macro ,generic-function-symbol
-                                                  ',args-var (list result))))
+                                                  ',args-var emf-form)))
               `(lambda (,args-var)
-                 (let* ((result
+                 (let* ((emf-form
                          (with-args-lambda-list ,args-lambda-list
                              ,generic-function-symbol ,args-var
                            , at forms))
@@ -1298,8 +1298,7 @@
                          `(lambda (,',args-var) ;; ugly: we're reusing it
                           ;; to prevent calling gensym on every EMF invocation
                           ,(wrap-with-call-method-macro ,generic-function-symbol
-                                                        ',args-var
-                                                        (list result)))))
+                                                        ',args-var emf-form))))
                    (funcall function ,args-var))))))))
 
 (defun declarationp (expr)