From: David Vázquez <davazp@gmail.com>
Date: Sun, 23 Jun 2013 13:29:06 +0000 (+0200)
Subject: Migrate LAMBDA-NAME/DOCSTRING-WRAPPER
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=72e973cf04cbeb9a46f420bda3d593adee470e0f;p=jscl.git

Migrate LAMBDA-NAME/DOCSTRING-WRAPPER
---

diff --git a/src/compiler.lisp b/src/compiler.lisp
index 6605dde..1f14de5 100644
--- a/src/compiler.lisp
+++ b/src/compiler.lisp
@@ -246,16 +246,14 @@
           (ll-optional-arguments-canonical lambda-list))))
     (remove nil (mapcar #'third args))))
 
-(defun lambda-name/docstring-wrapper (name docstring &rest code)
+(defun lambda-name/docstring-wrapper (name docstring code)
   (if (or name docstring)
-      (js!selfcall
-        "var func = " `(code ,@code) ";"
-        (when name
-          `(code "func.fname = " ,(js-escape-string name) ";"))
-        (when docstring
-          `(code "func.docstring = " ,(js-escape-string docstring) ";"))
-        "return func;")
-      `(code ,@code)))
+      (js!selfcall*
+        `(var (func ,code))
+        (when name      `(= (get func |fname|) ,name))
+        (when docstring `(= (get func |docstring|) ,docstring))
+        `(return func))
+      `(code ,code)))
 
 (defun lambda-check-argument-count
     (n-required-arguments n-optional-arguments rest-p)