From: David Vázquez <davazp@gmail.com>
Date: Sat, 29 Jun 2013 16:29:09 +0000 (+0200)
Subject: Migrate VALUES-ARRAY and VALUES
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=7cd5a30e614913f8b5af476ef6ac52ec21fbedfc;p=jscl.git

Migrate VALUES-ARRAY and VALUES
---

diff --git a/src/compiler.lisp b/src/compiler.lisp
index 0a01e5d..71e74f8 100644
--- a/src/compiler.lisp
+++ b/src/compiler.lisp
@@ -1293,14 +1293,13 @@
 
 (define-builtin values-array (array)
   (if *multiple-value-p*
-      `(code "values.apply(this, " ,array ")")
-      `(code "pv.apply(this, " ,array ")")))
+      `(call (get |values| "apply") this ,array)
+      `(call (get |pv| "apply") this ,array)))
 
 (define-raw-builtin values (&rest args)
   (if *multiple-value-p*
-      `(code "values(" ,@(interleave (mapcar #'ls-compile args) ",") ")")
-      `(code "pv(" ,@(interleave (mapcar #'ls-compile args) ", ") ")")))
-
+      `(call |values| ,@(mapcar #'ls-compile args))
+      `(call |pv| ,@(mapcar #'ls-compile args))))
 
 ;;; Javascript FFI