From: David Vázquez <davazp@gmail.com>
Date: Mon, 24 Jun 2013 11:18:17 +0000 (+0200)
Subject: Migrate JS-EVAL
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=42137426ae8959291f52dee156ee27c1d13ce90d;p=jscl.git

Migrate JS-EVAL
---

diff --git a/src/compiler.lisp b/src/compiler.lisp
index d8e9b6d..e9ee752 100644
--- a/src/compiler.lisp
+++ b/src/compiler.lisp
@@ -1224,10 +1224,10 @@
 
 (define-builtin js-eval (string)
   (if *multiple-value-p*
-      (js!selfcall
-        "var v = globalEval(xstring(" string "));"
-        "return values.apply(this, forcemv(v));" )
-      `(code "globalEval(xstring(" ,string "))")))
+      (js!selfcall*
+        `(var (v (call |globalEval| (call |xstring| ,string))))
+        `(return (call (get |values| "apply") this (call |forcemv| v))))
+      `(call |globalEval| (call |xstring| ,string))))
 
 (define-builtin %throw (string)
   (js!selfcall* `(throw ,string)))