X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler.lisp;h=d8e9b6df2529be2ec7475cf6c6b7ad2711476c40;hb=0965c7f2cbc0491cd56054ac7e7f096edce0a391;hp=ef66b1fe9f94a706132810a0b4b6ebc841b907d8;hpb=38c784adec0e2cdcc15b35d3d793333856071bcb;p=jscl.git

diff --git a/src/compiler.lisp b/src/compiler.lisp
index ef66b1f..d8e9b6d 100644
--- a/src/compiler.lisp
+++ b/src/compiler.lisp
@@ -18,11 +18,23 @@
 
 ;;;; Compiler
 
+(/debug "loading compiler.lisp!")
+
 ;;; Translate the Lisp code to Javascript. It will compile the special
 ;;; forms. Some primitive functions are compiled as special forms
 ;;; too. The respective real functions are defined in the target (see
 ;;; the beginning of this file) as well as some primitive functions.
 
+(defun interleave (list element &optional after-last-p)
+  (unless (null list)
+    (with-collect
+      (collect (car list))
+      (dolist (x (cdr list))
+        (collect element)
+        (collect x))
+      (when after-last-p
+        (collect element)))))
+
 (defun code (&rest args)
   (mapconcat (lambda (arg)
                (cond
@@ -30,13 +42,15 @@
                  ((integerp arg) (integer-to-string arg))
                  ((floatp arg) (float-to-string arg))
                  ((stringp arg) arg)
-                 (t (error "Unknown argument `~S'." arg))))
+                 (t
+                  (with-output-to-string (*standard-output*)
+                    (js-expr arg)))))
              args))
 
 ;;; Wrap X with a Javascript code to convert the result from
 ;;; Javascript generalized booleans to T or NIL.
 (defun js!bool (x)
-  (code "(" x "?" (ls-compile t) ": " (ls-compile nil) ")"))
+  `(if ,x ,(ls-compile t) ,(ls-compile nil)))
 
 ;;; Concatenate the arguments and wrap them with a self-calling
 ;;; Javascript anonymous function. It is used to make some Javascript
@@ -44,41 +58,16 @@
 ;;; It could be defined as function, but we could do some
 ;;; preprocessing in the future.
 (defmacro js!selfcall (&body body)
-  `(code "(function(){" *newline* (indent ,@body) "})()"))
+  ``(call (function nil (code ,,@body))))
+
+(defmacro js!selfcall* (&body body)
+  ``(call (function nil ,,@body)))
+
 
 ;;; Like CODE, but prefix each line with four spaces. Two versions
 ;;; of this function are available, because the Ecmalisp version is
 ;;; very slow and bootstraping was annoying.
 
-#+jscl
-(defun indent (&rest string)
-  (let ((input (apply #'code string)))
-    (let ((output "")
-          (index 0)
-          (size (length input)))
-      (when (plusp (length input)) (concatf output "    "))
-      (while (< index size)
-        (let ((str
-               (if (and (char= (char input index) #\newline)
-                        (< index (1- size))
-                        (not (char= (char input (1+ index)) #\newline)))
-                   (concat (string #\newline) "    ")
-                   (string (char input index)))))
-          (concatf output str))
-        (incf index))
-      output)))
-
-#-jscl
-(defun indent (&rest string)
-  (with-output-to-string (*standard-output*)
-    (with-input-from-string (input (apply #'code string))
-      (loop
-         for line = (read-line input nil)
-         while line
-         do (write-string "    ")
-         do (write-line line)))))
-
-
 ;;; A Form can return a multiple values object calling VALUES, like
 ;;; values(arg1, arg2, ...). It will work in any context, as well as
 ;;; returning an individual object. However, if the special variable
@@ -146,11 +135,8 @@
 (defun toplevel-compilation (string)
   (push string *toplevel-compilations*))
 
-(defun null-or-empty-p (x)
-  (zerop (length x)))
-
 (defun get-toplevel-compilations ()
-  (reverse (remove-if #'null-or-empty-p *toplevel-compilations*)))
+  (reverse *toplevel-compilations*))
 
 (defun %compile-defmacro (name lambda)
   (toplevel-compilation (ls-compile `',name))
@@ -208,10 +194,9 @@
          *compilations*))
 
 (define-compilation if (condition true &optional false)
-  (code "(" (ls-compile condition) " !== " (ls-compile nil)
-        " ? " (ls-compile true *multiple-value-p*)
-        " : " (ls-compile false *multiple-value-p*)
-        ")"))
+  `(if (!== ,(ls-compile condition) ,(ls-compile nil))
+       ,(ls-compile true *multiple-value-p*)
+       ,(ls-compile false *multiple-value-p*)))
 
 (defvar *ll-keywords* '(&optional &rest &key))
 
@@ -261,16 +246,14 @@
           (ll-optional-arguments-canonical lambda-list))))
     (remove nil (mapcar #'third args))))
 
-(defun lambda-name/docstring-wrapper (name docstring &rest strs)
+(defun lambda-name/docstring-wrapper (name docstring code)
   (if (or name docstring)
-      (js!selfcall
-        "var func = " (join strs) ";" *newline*
-        (when name
-          (code "func.fname = " (js-escape-string name) ";" *newline*))
-        (when docstring
-          (code "func.docstring = " (js-escape-string docstring) ";" *newline*))
-        "return func;" *newline*)
-      (apply #'code strs)))
+      (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)
@@ -281,39 +264,39 @@
     (block nil
       ;; Special case: a positive exact number of arguments.
       (when (and (< 0 min) (eql min max))
-        (return (code "checkArgs(nargs, " min ");" *newline*)))
+        (return `(code "checkArgs(nargs, " ,min ");")))
       ;; General case:
-      (code
-       (when (< 0 min)
-         (code "checkArgsAtLeast(nargs, " min ");" *newline*))
-       (when (numberp max)
-         (code "checkArgsAtMost(nargs, " max ");" *newline*))))))
+      `(code
+        ,(when (< 0 min)
+           `(code "checkArgsAtLeast(nargs, " ,min ");"))
+        ,(when (numberp max)
+           `(code "checkArgsAtMost(nargs, " ,max ");"))))))
 
 (defun compile-lambda-optional (ll)
   (let* ((optional-arguments (ll-optional-arguments-canonical ll))
 	 (n-required-arguments (length (ll-required-arguments ll)))
 	 (n-optional-arguments (length optional-arguments)))
     (when optional-arguments
-      (code "switch(nargs){" *newline*
-            (let ((cases nil)
-                  (idx 0))
-              (progn
-                (while (< idx n-optional-arguments)
-                  (let ((arg (nth idx optional-arguments)))
-                    (push (code "case " (+ idx n-required-arguments) ":" *newline*
-                                (indent (translate-variable (car arg))
-                                        "="
-                                        (ls-compile (cadr arg)) ";" *newline*)
-                                (when (third arg)
-                                  (indent (translate-variable (third arg))
-                                          "="
-                                          (ls-compile nil)
-                                          ";" *newline*)))
-                          cases)
-                    (incf idx)))
-                (push (code "default: break;" *newline*) cases)
-                (join (reverse cases))))
-            "}" *newline*))))
+      `(code "switch(nargs){"
+             ,(let ((cases nil)
+                    (idx 0))
+                   (progn
+                     (while (< idx n-optional-arguments)
+                       (let ((arg (nth idx optional-arguments)))
+                         (push `(code "case " ,(+ idx n-required-arguments) ":"
+                                      (code ,(translate-variable (car arg))
+                                            "="
+                                            ,(ls-compile (cadr arg)) ";")
+                                      ,(when (third arg)
+                                         `(code ,(translate-variable (third arg))
+                                                "="
+                                                ,(ls-compile nil)
+                                                ";")))
+                               cases)
+                         (incf idx)))
+                     (push `(code "default: break;") cases)
+                     `(code ,@(reverse cases))))
+             "}"))))
 
 (defun compile-lambda-rest (ll)
   (let ((n-required-arguments (length (ll-required-arguments ll)))
@@ -321,10 +304,10 @@
 	(rest-argument (ll-rest-argument ll)))
     (when rest-argument
       (let ((js!rest (translate-variable rest-argument)))
-        (code "var " js!rest "= " (ls-compile nil) ";" *newline*
-              "for (var i = nargs-1; i>=" (+ n-required-arguments n-optional-arguments)
-              "; i--)" *newline*
-              (indent js!rest " = {car: arguments[i+2], cdr: " js!rest "};" *newline*))))))
+        `(code "var " ,js!rest "= " ,(ls-compile nil) ";"
+               "for (var i = nargs-1; i>=" ,(+ n-required-arguments n-optional-arguments)
+               "; i--)"
+               (code ,js!rest " = {car: arguments[i+2], cdr: " ,js!rest "};"))))))
 
 (defun compile-lambda-parse-keywords (ll)
   (let ((n-required-arguments
@@ -333,55 +316,55 @@
 	 (length (ll-optional-arguments ll)))
 	(keyword-arguments
 	 (ll-keyword-arguments-canonical ll)))
-    (code
-     ;; Declare variables
-     (mapconcat (lambda (arg)
-		  (let ((var (second (car arg))))
-		    (code "var " (translate-variable var) "; " *newline*
-                          (when (third arg)
-                            (code "var " (translate-variable (third arg))
-                                  " = " (ls-compile nil)
-                                  ";" *newline*)))))
-		keyword-arguments)
-     ;; Parse keywords
-     (flet ((parse-keyword (keyarg)
-	      ;; ((keyword-name var) init-form)
-	      (code "for (i=" (+ n-required-arguments n-optional-arguments)
-                    "; i<nargs; i+=2){" *newline*
-                    (indent
-                     "if (arguments[i+2] === " (ls-compile (caar keyarg)) "){" *newline*
-                     (indent (translate-variable (cadr (car keyarg)))
-                             " = arguments[i+3];"
-                             *newline*
-                             (let ((svar (third keyarg)))
-                               (when svar
-                                 (code (translate-variable svar) " = " (ls-compile t) ";" *newline*)))
-                             "break;" *newline*)
-                     "}" *newline*)
-                    "}" *newline*
-                    ;; Default value
-                    "if (i == nargs){" *newline*
-                    (indent (translate-variable (cadr (car keyarg))) " = " (ls-compile (cadr keyarg)) ";" *newline*)
-                    "}" *newline*)))
-       (when keyword-arguments
-         (code "var i;" *newline*
-               (mapconcat #'parse-keyword keyword-arguments))))
-     ;; Check for unknown keywords
-     (when keyword-arguments
-       (code "var start = " (+ n-required-arguments n-optional-arguments) ";" *newline*
-             "if ((nargs - start) % 2 == 1){" *newline*
-             (indent "throw 'Odd number of keyword arguments';" *newline*)
-             "}" *newline*
-             "for (i = start; i<nargs; i+=2){" *newline*
-             (indent "if ("
-                     (join (mapcar (lambda (x)
-                                     (concat "arguments[i+2] !== " (ls-compile (caar x))))
-                                   keyword-arguments)
-                           " && ")
-                     ")" *newline*
-                     (indent
-                      "throw 'Unknown keyword argument ' + xstring(arguments[i+2].name);" *newline*))
-             "}" *newline*)))))
+    `(code
+      ;; Declare variables
+      ,@(mapcar (lambda (arg)
+                  (let ((var (second (car arg))))
+                    `(code "var " ,(translate-variable var) "; "
+                           ,(when (third arg)
+                              `(code "var " ,(translate-variable (third arg))
+                                     " = " ,(ls-compile nil)
+                                     ";" )))))
+                keyword-arguments)
+      ;; Parse keywords
+      ,(flet ((parse-keyword (keyarg)
+               ;; ((keyword-name var) init-form)
+               `(code "for (i=" ,(+ n-required-arguments n-optional-arguments)
+                      "; i<nargs; i+=2){"
+                      "if (arguments[i+2] === " ,(ls-compile (caar keyarg)) "){"
+                      ,(translate-variable (cadr (car keyarg)))
+                      " = arguments[i+3];"
+                      ,(let ((svar (third keyarg)))
+                            (when svar
+                              `(code ,(translate-variable svar) " = " ,(ls-compile t) ";" )))
+                      "break;"
+                      "}"
+                      "}"
+                      ;; Default value
+                      "if (i == nargs){"
+                      ,(translate-variable (cadr (car keyarg)))
+                      " = "
+                      ,(ls-compile (cadr keyarg))
+                      ";"
+                      "}")))
+        (when keyword-arguments
+          `(code "var i;"
+                 ,@(mapcar #'parse-keyword keyword-arguments))))
+      ;; Check for unknown keywords
+      ,(when keyword-arguments
+        `(code "var start = " ,(+ n-required-arguments n-optional-arguments) ";"
+               "if ((nargs - start) % 2 == 1){"
+               "throw 'Odd number of keyword arguments';" 
+               "}"
+               "for (i = start; i<nargs; i+=2){"
+               "if ("
+               ,@(interleave (mapcar (lambda (x)
+                                       `(code "arguments[i+2] !== " ,(ls-compile (caar x))))
+                                     keyword-arguments)
+                            " && ")
+               ")"
+               "throw 'Unknown keyword argument ' + xstring(arguments[i+2].name);" 
+               "}" )))))
 
 (defun parse-lambda-list (ll)
   (values (ll-required-arguments ll)
@@ -433,26 +416,26 @@
                                     keyword-arguments
                                     (ll-svars ll)))))
         (lambda-name/docstring-wrapper name documentation
-         "(function ("
-         (join (list* "values"
-                      "nargs"
-                      (mapcar #'translate-variable
-                              (append required-arguments optional-arguments)))
-               ",")
-         "){" *newline*
-         (indent
-          ;; Check number of arguments
-          (lambda-check-argument-count n-required-arguments
-                                       n-optional-arguments
-                                       (or rest-argument keyword-arguments))
-                                        (compile-lambda-optional ll)
-                                        (compile-lambda-rest ll)
-                                        (compile-lambda-parse-keywords ll)
-                                        (let ((*multiple-value-p* t))
-                                          (if block
-                                              (ls-compile-block `((block ,block ,@body)) t)
-                                              (ls-compile-block body t))))
-         "})")))))
+         `(code
+           "(function ("
+           ,(join (list* "values"
+                         "nargs"
+                         (mapcar #'translate-variable
+                                 (append required-arguments optional-arguments)))
+                  ",")
+           "){"
+           ;; Check number of arguments
+           ,(lambda-check-argument-count n-required-arguments
+                                         n-optional-arguments
+                                         (or rest-argument keyword-arguments))
+           ,(compile-lambda-optional ll)
+           ,(compile-lambda-rest ll)
+           ,(compile-lambda-parse-keywords ll)
+           ,(let ((*multiple-value-p* t))
+                 (if block
+                     (ls-compile-block `((block ,block ,@body)) t)
+                     (ls-compile-block body t)))
+           "})"))))))
 
 
 (defun setq-pair (var val)
@@ -462,7 +445,9 @@
             (eq (binding-type b) 'variable)
             (not (member 'special (binding-declarations b)))
             (not (member 'constant (binding-declarations b))))
-       (code (binding-value b) " = " (ls-compile val)))
+       ;; TODO: Unnecesary make-symbol when codegen migration is
+       ;; finished.
+       `(= ,(make-symbol (binding-value b)) ,(ls-compile val)))
       ((and b (eq (binding-type b) 'macro))
        (ls-compile `(setf ,var ,val)))
       (t
@@ -470,7 +455,7 @@
 
 
 (define-compilation setq (&rest pairs)
-  (let ((result ""))
+  (let ((result nil))
     (when (null pairs)
       (return-from setq (ls-compile nil)))
     (while t
@@ -480,76 +465,13 @@
 	((null (cdr pairs))
 	 (error "Odd pairs in SETQ"))
 	(t
-	 (concatf result
-	   (concat (setq-pair (car pairs) (cadr pairs))
-		   (if (null (cddr pairs)) "" ", ")))
+         (push `,(setq-pair (car pairs) (cadr pairs)) result)
 	 (setq pairs (cddr pairs)))))
-    (code "(" result ")")))
+    `(progn ,@(reverse result))))
 
 
 ;;; Compilation of literals an object dumping
 
-;;; Two seperate functions are needed for escaping strings:
-;;;  One for producing JavaScript string literals (which are singly or
-;;;   doubly quoted)
-;;;  And one for producing Lisp strings (which are only doubly quoted)
-;;;
-;;; The same function would suffice for both, but for javascript string
-;;; literals it is neater to use either depending on the context, e.g:
-;;;  foo's => "foo's"
-;;;  "foo" => '"foo"'
-;;; which avoids having to escape quotes where possible
-(defun js-escape-string (string)
-  (let ((index 0)
-        (size (length string))
-        (seen-single-quote nil)
-        (seen-double-quote nil))
-    (flet ((%js-escape-string (string escape-single-quote-p)
-             (let ((output "")
-                   (index 0))
-               (while (< index size)
-                 (let ((ch (char string index)))
-                   (when (char= ch #\\)
-                     (setq output (concat output "\\")))
-                   (when (and escape-single-quote-p (char= ch #\'))
-                     (setq output (concat output "\\")))
-                   (when (char= ch #\newline)
-                     (setq output (concat output "\\"))
-                     (setq ch #\n))
-                   (setq output (concat output (string ch))))
-                 (incf index))
-               output)))
-      ;; First, scan the string for single/double quotes
-      (while (< index size)
-        (let ((ch (char string index)))
-          (when (char= ch #\')
-            (setq seen-single-quote t))
-          (when (char= ch #\")
-            (setq seen-double-quote t)))
-        (incf index))
-      ;; Then pick the appropriate way to escape the quotes
-      (cond
-        ((not seen-single-quote)
-         (concat "'"   (%js-escape-string string nil) "'"))
-        ((not seen-double-quote)
-         (concat "\""  (%js-escape-string string nil) "\""))
-        (t (concat "'" (%js-escape-string string t)   "'"))))))
-
-(defun lisp-escape-string (string)
-  (let ((output "")
-        (index 0)
-        (size (length string)))
-    (while (< index size)
-      (let ((ch (char string index)))
-        (when (or (char= ch #\") (char= ch #\\))
-          (setq output (concat output "\\")))
-        (when (or (char= ch #\newline))
-          (setq output (concat output "\\"))
-          (setq ch #\n))
-        (setq output (concat output (string ch))))
-      (incf index))
-    (concat "\"" output "\"")))
-
 ;;; BOOTSTRAP MAGIC: We record the macro definitions as lists during
 ;;; the bootstrap. Once everything is compiled, we want to dump the
 ;;; whole global environment to the output file to reproduce it in the
@@ -579,30 +501,29 @@
   #-jscl
   (let ((package (symbol-package symbol)))
     (if (eq package (find-package "KEYWORD"))
-        (code "(new Symbol(" (dump-string (symbol-name symbol)) ", " (dump-string (package-name package)) "))")
-        (code "(new Symbol(" (dump-string (symbol-name symbol)) "))")))
+        `(new (call |Symbol| ,(dump-string (symbol-name symbol)) ,(dump-string (package-name package))))
+        `(new (call |Symbol| ,(dump-string (symbol-name symbol))))))
   #+jscl
   (let ((package (symbol-package symbol)))
     (if (null package)
-        (code "(new Symbol(" (dump-string (symbol-name symbol)) "))")
+        `(new (call |Symbol| ,(dump-string (symbol-name symbol))))
         (ls-compile `(intern ,(symbol-name symbol) ,(package-name package))))))
 
 (defun dump-cons (cons)
   (let ((head (butlast cons))
         (tail (last cons)))
-    (code "QIList("
-          (join-trailing (mapcar (lambda (x) (literal x t)) head) ",")
-          (literal (car tail) t)
-          ","
-          (literal (cdr tail) t)
-          ")")))
+    `(call |QIList|
+           ,@(mapcar (lambda (x) `(code ,(literal x t))) head)
+           (code ,(literal (car tail) t))
+           (code ,(literal (cdr tail) t)))))
 
 (defun dump-array (array)
   (let ((elements (vector-to-list array)))
-    (concat "[" (join (mapcar #'literal elements) ", ") "]")))
+    (list-to-vector (mapcar (lambda (x) `(code ,(literal x)))
+                            elements))))
 
 (defun dump-string (string)
-  (code "make_lisp_string(" (js-escape-string string) ")"))
+  `(call |make_lisp_string| ,string))
 
 (defun literal (sexp &optional recursive)
   (cond
@@ -627,9 +548,9 @@
                dumped
                (let ((jsvar (genlit)))
                  (push (cons sexp jsvar) *literal-table*)
-                 (toplevel-compilation (code "var " jsvar " = " dumped))
+                 (toplevel-compilation `(code "var " ,jsvar " = " ,dumped))
                  (when (keywordp sexp)
-                   (toplevel-compilation (code jsvar ".value = " jsvar)))
+                   (toplevel-compilation `(code ,jsvar ".value = " ,jsvar)))
                  jsvar)))))))
 
 
@@ -637,11 +558,13 @@
   (literal sexp))
 
 (define-compilation %while (pred &rest body)
-  (js!selfcall
-    "while(" (ls-compile pred) " !== " (ls-compile nil) "){" *newline*
-    (indent (ls-compile-block body))
-    "}"
-    "return " (ls-compile nil) ";" *newline*))
+  (js!selfcall*
+    `(while (!== ,(ls-compile pred) ,(ls-compile nil))
+       0                                ; TODO: Force
+                                        ; braces. Unnecesary when code
+                                        ; is gone
+       ,(ls-compile-block body))
+   `(return ,(ls-compile nil))))
 
 (define-compilation function (x)
   (cond
@@ -684,12 +607,11 @@
           (extend-lexenv (mapcar #'make-function-binding fnames)
                          *environment*
                          'function)))
-    (code "(function("
-          (join (mapcar #'translate-function fnames) ",")
-          "){" *newline*
-          (let ((body (ls-compile-block body t)))
-            (indent body))
-          "})(" (join cfuncs ",") ")")))
+    `(code "(function("
+           ,@(interleave (mapcar #'translate-function fnames) ",")
+           "){"
+           ,(ls-compile-block body t)
+           "})(" ,@(interleave cfuncs ",") ")")))
 
 (define-compilation labels (definitions &rest body)
   (let* ((fnames (mapcar #'car definitions))
@@ -698,12 +620,12 @@
                          *environment*
                          'function)))
     (js!selfcall
-      (mapconcat (lambda (func)
-		   (code "var " (translate-function (car func))
-                         " = " (compile-lambda (cadr func)
-                                               `((block ,(car func) ,@(cddr func))))
-                         ";" *newline*))
-		 definitions)
+      `(code ,@(mapcar (lambda (func)
+                         `(code "var " ,(translate-function (car func))
+                                " = " ,(compile-lambda (cadr func)
+                                                       `((block ,(car func) ,@(cddr func))))
+                                ";" ))
+                       definitions))
       (ls-compile-block body t))))
 
 
@@ -712,7 +634,7 @@
   (if *compiling-file*
       (progn
         (eval (cons 'progn body))
-        nil)
+        (ls-compile 0))
       (ls-compile `(progn ,@body))))
 
 (defmacro define-transformation (name args form)
@@ -722,14 +644,9 @@
 (define-compilation progn (&rest body)
   (if (null (cdr body))
       (ls-compile (car body) *multiple-value-p*)
-      (code "("
-            (join
-             (remove-if #'null-or-empty-p
-                        (append
-                         (mapcar #'ls-compile (butlast body))
-                         (list (ls-compile (car (last body)) t))))
-                  ",")
-            ")")))
+      `(progn
+         ,@(append (mapcar #'ls-compile (butlast body))
+                   (list (ls-compile (car (last body)) t))))))
 
 (define-compilation macrolet (definitions &rest body)
   (let ((*environment* (copy-lexenv *environment*)))
@@ -755,25 +672,26 @@
 (defun let-binding-wrapper (bindings body)
   (when (null bindings)
     (return-from let-binding-wrapper body))
-  (code
-   "try {" *newline*
-   (indent "var tmp;" *newline*
-           (mapconcat
-            (lambda (b)
-              (let ((s (ls-compile `(quote ,(car b)))))
-                (code "tmp = " s ".value;" *newline*
-                      s ".value = " (cdr b) ";" *newline*
-                      (cdr b) " = tmp;" *newline*)))
-            bindings)
-           body *newline*)
-   "}" *newline*
-   "finally {"  *newline*
-   (indent
-    (mapconcat (lambda (b)
+  `(code
+    "try {"
+    (code "var tmp;"
+          ,@(mapcar
+             (lambda (b)
+               (let ((s (ls-compile `(quote ,(car b)))))
+                 `(code "tmp = " ,s ".value;"
+                        ,s ".value = " ,(cdr b) ";"
+                        ,(cdr b) " = tmp;" )))
+             bindings)
+          ,body
+          )
+    "}"
+    "finally {"
+    (code
+     ,@(mapcar (lambda (b)
                  (let ((s (ls-compile `(quote ,(car b)))))
-                   (code s ".value" " = " (cdr b) ";" *newline*)))
+                   `(code ,s ".value" " = " ,(cdr b) ";" )))
                bindings))
-   "}" *newline*))
+    "}" ))
 
 (define-compilation let (bindings &rest body)
   (let* ((bindings (mapcar #'ensure-list bindings))
@@ -781,19 +699,20 @@
          (cvalues (mapcar #'ls-compile (mapcar #'second bindings)))
          (*environment* (extend-local-env (remove-if #'special-variable-p variables)))
          (dynamic-bindings))
-    (code "(function("
-          (join (mapcar (lambda (x)
-                          (if (special-variable-p x)
-                              (let ((v (gvarname x)))
-                                (push (cons x v) dynamic-bindings)
-                                v)
-                              (translate-variable x)))
-                        variables)
-                ",")
-          "){" *newline*
-          (let ((body (ls-compile-block body t t)))
-            (indent (let-binding-wrapper dynamic-bindings body)))
-          "})(" (join cvalues ",") ")")))
+    `(code "(function("
+           ,@(interleave
+              (mapcar (lambda (x)
+                        (if (special-variable-p x)
+                            (let ((v (gvarname x)))
+                              (push (cons x v) dynamic-bindings)
+                              v)
+                            (translate-variable x)))
+                      variables)
+              ",")
+           "){"
+           ,(let ((body (ls-compile-block body t t)))
+             `(code ,(let-binding-wrapper dynamic-bindings body)))
+           "})(" ,@(interleave cvalues ",") ")")))
 
 
 ;;; Return the code to initialize BINDING, and push it extending the
@@ -802,10 +721,10 @@
   (let ((var (first binding))
         (value (second binding)))
     (if (special-variable-p var)
-        (code (ls-compile `(setq ,var ,value)) ";" *newline*)
+        `(code ,(ls-compile `(setq ,var ,value)) ";" )
         (let* ((v (gvarname var))
                (b (make-binding :name var :type 'variable :value v)))
-          (prog1 (code "var " v " = " (ls-compile value) ";" *newline*)
+          (prog1 `(code "var " ,v " = " ,(ls-compile value) ";" )
             (push-to-lexenv b *environment* 'variable))))))
 
 ;;; Wrap BODY to restore the symbol values of SYMBOLS after body. It
@@ -816,30 +735,30 @@
     (return-from let*-binding-wrapper body))
   (let ((store (mapcar (lambda (s) (cons s (gvarname s)))
                        (remove-if-not #'special-variable-p symbols))))
-    (code
-     "try {" *newline*
-     (indent
-      (mapconcat (lambda (b)
+    `(code
+      "try {"
+      (code
+       ,@(mapcar (lambda (b)
                    (let ((s (ls-compile `(quote ,(car b)))))
-                     (code "var " (cdr b) " = " s ".value;" *newline*)))
+                     `(code "var " ,(cdr b) " = " ,s ".value;" )))
                  store)
-      body)
-     "}" *newline*
-     "finally {" *newline*
-     (indent
-      (mapconcat (lambda (b)
+       ,body)
+      "}"
+      "finally {"
+      (code
+       ,@(mapcar (lambda (b)
                    (let ((s (ls-compile `(quote ,(car b)))))
-                     (code s ".value" " = " (cdr b) ";" *newline*)))
+                     `(code ,s ".value" " = " ,(cdr b) ";" )))
                  store))
-     "}" *newline*)))
+      "}" )))
 
 (define-compilation let* (bindings &rest body)
   (let ((bindings (mapcar #'ensure-list bindings))
         (*environment* (copy-lexenv *environment*)))
     (js!selfcall
       (let ((specials (remove-if-not #'special-variable-p (mapcar #'first bindings)))
-            (body (concat (mapconcat #'let*-initialize-value bindings)
-                          (ls-compile-block body t t))))
+            (body `(code ,@(mapcar #'let*-initialize-value bindings)
+                         ,(ls-compile-block body t t))))
         (let*-binding-wrapper specials body)))))
 
 
@@ -858,19 +777,19 @@
            (cbody (ls-compile-block body t)))
       (if (member 'used (binding-declarations b))
           (js!selfcall
-            "try {" *newline*
-            "var " idvar " = [];" *newline*
-            (indent cbody)
-            "}" *newline*
-            "catch (cf){" *newline*
-            "    if (cf.type == 'block' && cf.id == " idvar ")" *newline*
+            "try {"
+            "var " idvar " = [];"
+            `(code ,cbody)
+            "}"
+            "catch (cf){"
+            "    if (cf.type == 'block' && cf.id == " idvar ")"
             (if *multiple-value-p*
                 "        return values.apply(this, forcemv(cf.values));"
                 "        return cf.values;")
-            *newline*
-            "    else" *newline*
-            "        throw cf;" *newline*
-            "}" *newline*)
+
+            "    else"
+            "        throw cf;"
+            "}" )
           (js!selfcall cbody)))))
 
 (define-compilation return-from (name &optional value)
@@ -884,7 +803,7 @@
     ;; variable name itself, because it could not to be unique, so we
     ;; capture it in a closure.
     (js!selfcall
-      (when multiple-value-p (code "var values = mv;" *newline*))
+      (when multiple-value-p `(code "var values = mv;" ))
       "throw ({"
       "type: 'block', "
       "id: " (binding-value b) ", "
@@ -893,30 +812,30 @@
       "})")))
 
 (define-compilation catch (id &rest body)
-  (js!selfcall
-    "var id = " (ls-compile id) ";" *newline*
-    "try {" *newline*
-    (indent (ls-compile-block body t)) *newline*
-    "}" *newline*
-    "catch (cf){" *newline*
-    "    if (cf.type == 'catch' && cf.id == id)" *newline*
-    (if *multiple-value-p*
-        "        return values.apply(this, forcemv(cf.values));"
-        "        return pv.apply(this, forcemv(cf.values));")
-    *newline*
-    "    else" *newline*
-    "        throw cf;" *newline*
-    "}" *newline*))
+  (js!selfcall*
+    `(var (|id| ,(ls-compile id)))
+    `(try
+      ,(ls-compile-block body t))
+    `(catch (|cf|)
+       (if (and (== (get |cf| |type|) "catch")
+                (== (get |cf| |id|) |id|))
+           ,(if *multiple-value-p*
+                `(return (call (get |values| |apply|)
+                               this
+                               (call |forcemv| (get |cf| |values|))))
+                `(return (call (get |pv| |apply|)
+                               this
+                               (call |forcemv| (get |cf| |values|)))))
+           (throw |cf|)))))
 
 (define-compilation throw (id value)
-  (js!selfcall
-    "var values = mv;" *newline*
-    "throw ({"
-    "type: 'catch', "
-    "id: " (ls-compile id) ", "
-    "values: " (ls-compile value t) ", "
-    "message: 'Throw uncatched.'"
-    "})"))
+  (js!selfcall*
+    `(var (|values| |mv|))
+    `(throw (object
+             |type| "catch"
+             |id| ,(ls-compile id)
+             |values| ,(ls-compile value t)
+             |message| "Throw uncatched."))))
 
 (defun go-tag-p (x)
   (or (integerp x) (symbolp x)))
@@ -948,32 +867,32 @@
         (setq initag (second (binding-value b))))
       (js!selfcall
         ;; TAGBODY branch to take
-        "var " branch " = " initag ";" *newline*
-        "var " tbidx " = [];" *newline*
-        "tbloop:" *newline*
-        "while (true) {" *newline*
-        (indent "try {" *newline*
-                (indent (let ((content ""))
-                          (code "switch(" branch "){" *newline*
-                                "case " initag ":" *newline*
-                                (dolist (form (cdr body) content)
-                                  (concatf content
-                                    (if (not (go-tag-p form))
-                                        (indent (ls-compile form) ";" *newline*)
-                                        (let ((b (lookup-in-lexenv form *environment* 'gotag)))
-                                          (code "case " (second (binding-value b)) ":" *newline*)))))
-                                "default:" *newline*
-                                "    break tbloop;" *newline*
-                                "}" *newline*)))
-                "}" *newline*
-                "catch (jump) {" *newline*
-                "    if (jump.type == 'tagbody' && jump.id == " tbidx ")" *newline*
-                "        " branch " = jump.label;" *newline*
-                "    else" *newline*
-                "        throw(jump);" *newline*
-                "}" *newline*)
-        "}" *newline*
-        "return " (ls-compile nil) ";" *newline*))))
+        "var " branch " = " initag ";"
+        "var " tbidx " = [];"
+        "tbloop:"
+        "while (true) {"
+        `(code "try {"
+               ,(let ((content nil))
+                  `(code "switch(" ,branch "){"
+                        "case " ,initag ":"
+                        ,@(dolist (form (cdr body) (reverse content))
+                          (push (if (not (go-tag-p form))
+                                    `(code ,(ls-compile form) ";" )
+                                    (let ((b (lookup-in-lexenv form *environment* 'gotag)))
+                                      `(code "case " ,(second (binding-value b)) ":" )))
+                                content))
+                           "default:"
+                           "    break tbloop;"
+                           "}" ))
+               "}"
+               "catch (jump) {"
+               "    if (jump.type == 'tagbody' && jump.id == " ,tbidx ")"
+               "        " ,branch " = jump.label;"
+               "    else"
+               "        throw(jump);"
+               "}" )
+        "}"
+        "return " (ls-compile nil) ";" ))))
 
 (define-compilation go (label)
   (let ((b (lookup-in-lexenv label *environment* 'gotag))
@@ -988,41 +907,41 @@
       "id: " (first (binding-value b)) ", "
       "label: " (second (binding-value b)) ", "
       "message: 'Attempt to GO to non-existing tag " n "'"
-      "})" *newline*)))
+      "})" )))
 
 (define-compilation unwind-protect (form &rest clean-up)
-  (js!selfcall
-    "var ret = " (ls-compile nil) ";" *newline*
-    "try {" *newline*
-    (indent "ret = " (ls-compile form) ";" *newline*)
-    "} finally {" *newline*
-    (indent (ls-compile-block clean-up))
-    "}" *newline*
-    "return ret;" *newline*))
+  (js!selfcall*
+    `(var (|ret| ,(ls-compile nil)))
+    `(try
+       (= |ret| ,(ls-compile form)))
+    `(finally
+      ,(ls-compile-block clean-up))
+    `(return |ret|)))
 
 (define-compilation multiple-value-call (func-form &rest forms)
   (js!selfcall
-    "var func = " (ls-compile func-form) ";" *newline*
-    "var args = [" (if *multiple-value-p* "values" "pv") ", 0];" *newline*
+    "var func = " (ls-compile func-form) ";"
+    "var args = [" (if *multiple-value-p* "values" "pv") ", 0];"
     "return "
     (js!selfcall
-      "var values = mv;" *newline*
-      "var vs;" *newline*
-      (mapconcat (lambda (form)
-                   (code "vs = " (ls-compile form t) ";" *newline*
-                         "if (typeof vs === 'object' && 'multiple-value' in vs)" *newline*
-                         (indent "args = args.concat(vs);" *newline*)
-                         "else" *newline*
-                         (indent "args.push(vs);" *newline*)))
-                 forms)
-      "args[1] = args.length-2;" *newline*
-      "return func.apply(window, args);" *newline*) ";" *newline*))
+      "var values = mv;"
+      "var vs;"
+      `(code
+        ,@(mapcar (lambda (form)
+                    `(code "vs = " ,(ls-compile form t) ";"
+                           "if (typeof vs === 'object' && 'multiple-value' in vs)"
+                           (code " args = args.concat(vs);" )
+                           " else "
+                           (code "args.push(vs);" )))
+                  forms))
+      "args[1] = args.length-2;"
+      "return func.apply(window, args);" ) ";" ))
 
 (define-compilation multiple-value-prog1 (first-form &rest forms)
   (js!selfcall
-    "var args = " (ls-compile first-form *multiple-value-p*) ";" *newline*
+    "var args = " (ls-compile first-form *multiple-value-p*) ";"
     (ls-compile-block forms)
-    "return args;" *newline*))
+    "return args;" ))
 
 (define-transformation backquote (form)
   (bq-completely-process form))
@@ -1048,18 +967,22 @@
 (defmacro type-check (decls &body body)
   `(js!selfcall
      ,@(mapcar (lambda (decl)
-                 `(code "var " ,(first decl) " = " ,(third decl) ";" *newline*))
+                 `(let ((name ,(first decl))
+                        (value ,(third decl)))
+                    `(code "var " ,name " = " ,value ";" )))
                decls)
      ,@(mapcar (lambda (decl)
-                 `(code "if (typeof " ,(first decl) " != '" ,(second decl) "')" *newline*
-                        (indent "throw 'The value ' + "
-                                ,(first decl)
-                                " + ' is not a type "
-                                ,(second decl)
-                                ".';"
-                                *newline*)))
+                 `(let ((name ,(first decl))
+                        (type ,(second decl)))
+                    `(code "if (typeof " ,name " != '" ,type "')"
+                           (code "throw 'The value ' + "
+                                 ,name
+                                 " + ' is not a type "
+                                 ,type
+                                 ".';"
+                                 ))))
                decls)
-     (code "return " (progn ,@body) ";" *newline*)))
+     `(code "return " ,,@body ";" )))
 
 ;;; VARIABLE-ARITY compiles variable arity operations. ARGS stands for
 ;;; a variable which holds a list of forms. It will compile them and
@@ -1072,18 +995,18 @@
     (error "ARGS must be a non-empty list"))
   (let ((counter 0)
         (fargs '())
-        (prelude ""))
+        (prelude '()))
     (dolist (x args)
       (cond
-        ((floatp x) (push (float-to-string x) fargs))
-        ((numberp x) (push (integer-to-string x) fargs))
-        (t (let ((v (code "x" (incf counter))))
+        ((or (floatp x) (numberp x)) (push x fargs))
+        (t (let ((v (make-symbol (code "x" (incf counter)))))
              (push v fargs)
-             (concatf prelude
-               (code "var " v " = " (ls-compile x) ";" *newline*
-                     "if (typeof " v " !== 'number') throw 'Not a number!';"
-                     *newline*))))))
-    (js!selfcall prelude (funcall function (reverse fargs)))))
+             (push `(code "var " ,v " = " ,(ls-compile x) ";"
+                          "if (typeof " ,v " !== 'number') throw 'Not a number!';")
+                   prelude)))))
+    (js!selfcall
+      `(code ,@(reverse prelude))
+      (funcall function (reverse fargs)))))
 
 
 (defmacro variable-arity (args &body body)
@@ -1091,37 +1014,34 @@
     (error "`~S' is not a symbol." args))
   `(variable-arity-call ,args
                         (lambda (,args)
-                          (code "return " ,@body ";" *newline*))))
+                          `(code "return " ,,@body ";" ))))
 
 (defun num-op-num (x op y)
   (type-check (("x" "number" x) ("y" "number" y))
-    (code "x" op "y")))
+    `(code "x" ,op "y")))
 
 (define-raw-builtin + (&rest numbers)
   (if (null numbers)
-      "0"
+      0
       (variable-arity numbers
-	(join numbers "+"))))
+        `(+ ,@numbers))))
 
 (define-raw-builtin - (x &rest others)
   (let ((args (cons x others)))
-    (variable-arity args
-      (if (null others)
-	  (concat "-" (car args))
-	  (join args "-")))))
+    (variable-arity args `(- ,@args))))
 
 (define-raw-builtin * (&rest numbers)
   (if (null numbers)
-      "1"
-      (variable-arity numbers
-	(join numbers "*"))))
+      1
+      (variable-arity numbers `(* ,@numbers))))
 
 (define-raw-builtin / (x &rest others)
   (let ((args (cons x others)))
     (variable-arity args
       (if (null others)
-	  (concat "1 /" (car args))
-	  (join args "/")))))
+          `(/ 1 ,(car args))
+          (reduce (lambda (x y) `(/ ,x ,y))
+                  args)))))
 
 (define-builtin mod (x y) (num-op-num x "%" y))
 
@@ -1129,29 +1049,28 @@
 (defun comparison-conjuntion (vars op)
   (cond
     ((null (cdr vars))
-     "true")
+     'true)
     ((null (cddr vars))
-     (concat (car vars) op (cadr vars)))
+     `(,op ,(car vars) ,(cadr vars)))
     (t
-     (concat (car vars) op (cadr vars)
-	     " && "
-	     (comparison-conjuntion (cdr vars) op)))))
+     `(and (,op ,(car vars) ,(cadr vars))
+           ,(comparison-conjuntion (cdr vars) op)))))
 
 (defmacro define-builtin-comparison (op sym)
   `(define-raw-builtin ,op (x &rest args)
      (let ((args (cons x args)))
        (variable-arity args
-	 (js!bool (comparison-conjuntion args ,sym))))))
+	 (js!bool (comparison-conjuntion args ',sym))))))
 
-(define-builtin-comparison > ">")
-(define-builtin-comparison < "<")
-(define-builtin-comparison >= ">=")
-(define-builtin-comparison <= "<=")
-(define-builtin-comparison = "==")
-(define-builtin-comparison /= "!=")
+(define-builtin-comparison > >)
+(define-builtin-comparison < <)
+(define-builtin-comparison >= >=)
+(define-builtin-comparison <= <=)
+(define-builtin-comparison = ==)
+(define-builtin-comparison /= !=)
 
 (define-builtin numberp (x)
-  (js!bool (code "(typeof (" x ") == \"number\")")))
+  (js!bool `(== (typeof ,x) "number")))
 
 (define-builtin floor (x)
   (type-check (("x" "number" x))
@@ -1167,79 +1086,81 @@
     "make_lisp_string(x.toString())"))
 
 (define-builtin cons (x y)
-  (code "({car: " x ", cdr: " y "})"))
+  `(object "car" ,x "cdr" ,y))
 
 (define-builtin consp (x)
   (js!bool
    (js!selfcall
-     "var tmp = " x ";" *newline*
-     "return (typeof tmp == 'object' && 'car' in tmp);" *newline*)))
+     "var tmp = " x ";"
+     "return (typeof tmp == 'object' && 'car' in tmp);" )))
 
 (define-builtin car (x)
-  (js!selfcall
-    "var tmp = " x ";" *newline*
-    "return tmp === " (ls-compile nil)
-    "? " (ls-compile nil)
-    ": tmp.car;" *newline*))
+  (js!selfcall*
+    `(var (tmp ,x))
+    `(return (if (=== tmp ,(ls-compile nil))
+                 ,(ls-compile nil)
+                 (get tmp "car")))))
 
 (define-builtin cdr (x)
-  (js!selfcall
-    "var tmp = " x ";" *newline*
-    "return tmp === " (ls-compile nil) "? "
-    (ls-compile nil)
-    ": tmp.cdr;" *newline*))
+  (js!selfcall*
+    `(var (tmp ,x))
+    `(return (if (=== tmp ,(ls-compile nil))
+                 ,(ls-compile nil)
+                 (get tmp "cdr")))))
 
 (define-builtin rplaca (x new)
   (type-check (("x" "object" x))
-    (code "(x.car = " new ", x)")))
+    `(code "(x.car = " ,new ", x)")))
 
 (define-builtin rplacd (x new)
   (type-check (("x" "object" x))
-    (code "(x.cdr = " new ", x)")))
+    `(code "(x.cdr = " ,new ", x)")))
 
 (define-builtin symbolp (x)
-  (js!bool (code "(" x " instanceof Symbol)")))
+  (js!bool `(instanceof ,x |Symbol|)))
 
 (define-builtin make-symbol (name)
-  (code "(new Symbol(" name "))"))
+  `(new (call |Symbol| ,name)))
 
 (define-builtin symbol-name (x)
-  (code "(" x ").name"))
+  `(get ,x "name"))
 
 (define-builtin set (symbol value)
-  (code "(" symbol ").value = " value))
+  `(= (get ,symbol "value") ,value))
 
 (define-builtin fset (symbol value)
-  (code "(" symbol ").fvalue = " value))
+  `(= (get ,symbol "fvalue") ,value))
 
 (define-builtin boundp (x)
-  (js!bool (code "(" x ".value !== undefined)")))
+  (js!bool `(!== (get ,x "value") undefined)))
 
 (define-builtin fboundp (x)
-  (js!bool (code "(" x ".fvalue !== undefined)")))
+  (js!bool `(!== (get ,x "fvalue") undefined)))
 
 (define-builtin symbol-value (x)
-  (js!selfcall
-    "var symbol = " x ";" *newline*
-    "var value = symbol.value;" *newline*
-    "if (value === undefined) throw \"Variable `\" + xstring(symbol.name) + \"' is unbound.\";" *newline*
-    "return value;" *newline*))
+  (js!selfcall*
+    `(var (symbol ,x)
+          (value (get symbol "value")))
+    `(if (=== value undefined)
+         (throw (+ "Variable `" (call |xstring| (get symbol "name")) "' is unbound.")))
+    `(return value)))
 
 (define-builtin symbol-function (x)
-  (js!selfcall
-    "var symbol = " x ";" *newline*
-    "var func = symbol.fvalue;" *newline*
-    "if (func === undefined) throw \"Function `\" + xstring(symbol.name) + \"' is undefined.\";" *newline*
-    "return func;" *newline*))
+  (js!selfcall*
+    `(var (symbol ,x)
+          (func (get symbol "fvalue")))
+    `(if (=== func undefined)
+         (throw (+ "Function `" (call |xstring| (get symbol "name")) "' is undefined.")))
+    `(return func)))
 
 (define-builtin symbol-plist (x)
-  (code "((" x ").plist || " (ls-compile nil) ")"))
+  `(or (get ,x "plist") ,(ls-compile nil)))
 
 (define-builtin lambda-code (x)
-  (code "make_lisp_string((" x ").toString())"))
+  `(call |make_lisp_string| (call (get ,x "toString"))))
 
 (define-builtin eq (x y)
-  (js!bool (code "(" x " === " y ")")))
+  (js!bool `(=== ,x ,y)))
 
 (define-builtin char-code (x)
   (type-check (("x" "string" x))
@@ -1252,66 +1173,73 @@
 (define-builtin characterp (x)
   (js!bool
    (js!selfcall
-     "var x = " x ";" *newline*
+     "var x = " x ";"
      "return (typeof(" x ") == \"string\") && (x.length == 1 || x.length == 2);")))
 
 (define-builtin char-upcase (x)
-  (code "safe_char_upcase(" x ")"))
+  `(call |safe_char_upcase| ,x))
 
 (define-builtin char-downcase (x)
-  (code "safe_char_downcase(" x ")"))
+  `(call |safe_char_downcase| ,x))
 
 (define-builtin stringp (x)
   (js!bool
-   (js!selfcall
-     "var x = " x ";" *newline*
-     "return typeof(x) == 'object' && 'length' in x && x.stringp == 1;")))
+   (js!selfcall*
+     `(var (x ,x))
+     `(return (and (and (===(typeof x) "object")
+                        (in "length" x))
+                   (== (get x "stringp") 1))))))
 
 (define-raw-builtin funcall (func &rest args)
   (js!selfcall
-    "var f = " (ls-compile func) ";" *newline*
+    "var f = " (ls-compile func) ";"
     "return (typeof f === 'function'? f: f.fvalue)("
-    (join (list* (if *multiple-value-p* "values" "pv")
-                 (integer-to-string (length args))
-                 (mapcar #'ls-compile args))
-          ", ")
+    `(code
+     ,@(interleave (list* (if *multiple-value-p* "values" "pv")
+                          (integer-to-string (length args))
+                          (mapcar #'ls-compile args))
+                   ", "))
     ")"))
 
 (define-raw-builtin apply (func &rest args)
   (if (null args)
-      (code "(" (ls-compile func) ")()")
+      `(code "(" ,(ls-compile func) ")()")
       (let ((args (butlast args))
             (last (car (last args))))
         (js!selfcall
-          "var f = " (ls-compile func) ";" *newline*
-          "var args = [" (join (list* (if *multiple-value-p* "values" "pv")
-                                      (integer-to-string (length args))
-                                      (mapcar #'ls-compile args))
-                               ", ")
-          "];" *newline*
-          "var tail = (" (ls-compile last) ");" *newline*
-          "while (tail != " (ls-compile nil) "){" *newline*
-          "    args.push(tail.car);" *newline*
-          "    args[1] += 1;" *newline*
-          "    tail = tail.cdr;" *newline*
-          "}" *newline*
-          "return (typeof f === 'function'? f : f.fvalue).apply(this, args);" *newline*))))
+          "var f = " (ls-compile func) ";"
+          "var args = [" `(code
+                           ,@(interleave (list* (if *multiple-value-p* "values" "pv")
+                                                (integer-to-string (length args))
+                                                (mapcar #'ls-compile args))
+                                         ", "))
+          "];"
+          "var tail = (" (ls-compile last) ");"
+          "while (tail != " (ls-compile nil) "){"
+          "    args.push(tail.car);"
+          "    args[1] += 1;"
+          "    tail = tail.cdr;"
+          "}"
+          "return (typeof f === 'function'? f : f.fvalue).apply(this, args);" ))))
 
 (define-builtin js-eval (string)
   (if *multiple-value-p*
       (js!selfcall
-        "var v = globalEval(xstring(" string "));" *newline*
-        "return values.apply(this, forcemv(v));" *newline*)
-      (code "globalEval(xstring(" string "))")))
+        "var v = globalEval(xstring(" string "));"
+        "return values.apply(this, forcemv(v));" )
+      `(code "globalEval(xstring(" ,string "))")))
 
 (define-builtin %throw (string)
-  (js!selfcall "throw " string ";" *newline*))
+  (js!selfcall* `(throw ,string)))
 
 (define-builtin functionp (x)
-  (js!bool (code "(typeof " x " == 'function')")))
+  (js!bool `(=== (typeof ,x) "function")))
+
+(define-builtin %write-string (x)
+  `(call (get |lisp| "write") ,x))
 
-(define-builtin write-string (x)
-  (code "lisp.write(" x ")"))
+(define-builtin /debug (x)
+  `(call (get |console| "log") (call |xstring| ,x)))
 
 
 ;;; Storage vectors. They are used to implement arrays and (in the
@@ -1319,55 +1247,56 @@
 
 (define-builtin storage-vector-p (x)
   (js!bool
-   (js!selfcall
-     "var x = " x ";" *newline*
-     "return typeof x === 'object' && 'length' in x;")))
+   (js!selfcall*
+     `(var (x ,x))
+     `(return (and (=== (typeof x) "object") (in "length" x))))))
 
 (define-builtin make-storage-vector (n)
-  (js!selfcall
-    "var r = [];" *newline*
-    "r.length = " n ";" *newline*
-    "return r;" *newline*))
+  (js!selfcall*
+    `(var (r #()))
+    `(= (get r "length") ,n)
+    `(return r)))
 
 (define-builtin storage-vector-size (x)
-  (code x ".length"))
+  `(get ,x "length"))
 
 (define-builtin resize-storage-vector (vector new-size)
-  (code "(" vector ".length = " new-size ")"))
+  `(= (get ,vector "length") ,new-size))
 
 (define-builtin storage-vector-ref (vector n)
-  (js!selfcall
-    "var x = " "(" vector ")[" n "];" *newline*
-    "if (x === undefined) throw 'Out of range';" *newline*
-    "return x;" *newline*))
+  (js!selfcall*
+    `(var (x (get ,vector ,n)))
+    `(if (=== x undefined) (throw "Out of range."))
+    `(return x)))
 
 (define-builtin storage-vector-set (vector n value)
-  (js!selfcall
-    "var x = " vector ";" *newline*
-    "var i = " n ";" *newline*
-    "if (i < 0 || i >= x.length) throw 'Out of range';" *newline*
-    "return x[i] = " value ";" *newline*))
+  (js!selfcall*
+    `(var (x ,vector))
+    `(var (i ,n))
+    `(if (or (< i 0) (>= i (get x "length")))
+         (throw "Out of range."))
+    `(return (= (property x i) ,value))))
 
 (define-builtin concatenate-storage-vector (sv1 sv2)
-  (js!selfcall
-    "var sv1 = " sv1 ";" *newline*
-    "var r = sv1.concat(" sv2 ");" *newline*
-    "r.type = sv1.type;" *newline*
-    "r.stringp = sv1.stringp;" *newline*
-    "return r;" *newline*))
+  (js!selfcall*
+    `(var (sv1 ,sv1))
+    `(var (r (call (get sv1 "concat") ,sv2)))
+    `(= (get r "type") (get sv1 "type"))
+    `(= (get r "stringp") (get sv1 "stringp"))
+    `(return r)))
 
 (define-builtin get-internal-real-time ()
   "(new Date()).getTime()")
 
 (define-builtin values-array (array)
   (if *multiple-value-p*
-      (code "values.apply(this, " array ")")
-      (code "pv.apply(this, " array ")")))
+      `(code "values.apply(this, " ,array ")")
+      `(code "pv.apply(this, " ,array ")")))
 
 (define-raw-builtin values (&rest args)
   (if *multiple-value-p*
-      (code "values(" (join (mapcar #'ls-compile args) ", ") ")")
-      (code "pv(" (join (mapcar #'ls-compile args) ", ") ")")))
+      `(code "values(" ,@(interleave (mapcar #'ls-compile args) ",") ")")
+      `(code "pv(" ,@(interleave (mapcar #'ls-compile args) ", ") ")")))
 
 
 ;;; Javascript FFI
@@ -1376,55 +1305,56 @@
 
 (define-raw-builtin oget* (object key &rest keys)
   (js!selfcall
-    "var tmp = (" (ls-compile object) ")[xstring(" (ls-compile key) ")];" *newline*
-    (mapconcat (lambda (key)
-                 (code "if (tmp === undefined) return " (ls-compile nil) ";" *newline*
-                       "tmp = tmp[xstring(" (ls-compile key) ")];" *newline*))
-               keys)
-    "return tmp === undefined? " (ls-compile nil) " : tmp;" *newline*))
+    "var tmp = (" (ls-compile object) ")[xstring(" (ls-compile key) ")];"
+    `(code
+      ,@(mapcar (lambda (key)
+                  `(code "if (tmp === undefined) return " ,(ls-compile nil) ";"
+                         "tmp = tmp[xstring(" ,(ls-compile key) ")];" ))
+                keys))
+    "return tmp === undefined? " (ls-compile nil) " : tmp;" ))
 
 (define-raw-builtin oset* (value object key &rest keys)
   (let ((keys (cons key keys)))
     (js!selfcall
-      "var obj = " (ls-compile object) ";" *newline*
-      (mapconcat (lambda (key)
-                   (code "obj = obj[xstring(" (ls-compile key) ")];"
-                         "if (obj === undefined) throw 'Impossible to set Javascript property.';" *newline*))
-                 (butlast keys))
-      "var tmp = obj[xstring(" (ls-compile (car (last keys))) ")] = " (ls-compile value) ";" *newline*
-      "return tmp === undefined? " (ls-compile nil) " : tmp;" *newline*)))
+      "var obj = " (ls-compile object) ";"
+      `(code ,@(mapcar (lambda (key)
+                         `(code "obj = obj[xstring(" ,(ls-compile key) ")];"
+                                "if (obj === undefined) throw 'Impossible to set Javascript property.';" ))
+                       (butlast keys)))
+      "var tmp = obj[xstring(" (ls-compile (car (last keys))) ")] = " (ls-compile value) ";"
+      "return tmp === undefined? " (ls-compile nil) " : tmp;" )))
 
 (define-raw-builtin oget (object key &rest keys)
-  (code "js_to_lisp(" (ls-compile `(oget* ,object ,key ,@keys)) ")"))
+  `(call |js_to_lisp| ,(ls-compile `(oget* ,object ,key ,@keys))))
 
 (define-raw-builtin oset (value object key &rest keys)
   (ls-compile `(oset* (lisp-to-js ,value) ,object ,key ,@keys)))
 
 (define-builtin objectp (x)
-  (js!bool (code "(typeof (" x ") === 'object')")))
+  (js!bool `(=== (typeof ,x) "object")))
 
-(define-builtin lisp-to-js (x) (code "lisp_to_js(" x ")"))
-(define-builtin js-to-lisp (x) (code "js_to_lisp(" x ")"))
+(define-builtin lisp-to-js (x) `(call |lisp_to_js| ,x))
+(define-builtin js-to-lisp (x) `(call |js_to_lisp| ,x))
 
 
 (define-builtin in (key object)
-  (js!bool (code "(xstring(" key ") in (" object "))")))
+  (js!bool `(in (call |xstring| ,key) ,object)))
 
 (define-builtin map-for-in (function object)
   (js!selfcall
-   "var f = " function ";" *newline*
-   "var g = (typeof f === 'function' ? f : f.fvalue);" *newline*
-   "var o = " object ";" *newline*
-   "for (var key in o){" *newline*
-   (indent "g(" (if *multiple-value-p* "values" "pv") ", 1, o[key]);" *newline*)
+   "var f = " function ";"
+   "var g = (typeof f === 'function' ? f : f.fvalue);"
+   "var o = " object ";"
+   "for (var key in o){"
+   `(code "g(" ,(if *multiple-value-p* "values" "pv") ", 1, o[key]);" )
    "}"
-   " return " (ls-compile nil) ";" *newline*))
+   " return " (ls-compile nil) ";" ))
 
 (define-compilation %js-vref (var)
-  (code "js_to_lisp(" var ")"))
+  `(code "js_to_lisp(" ,var ")"))
 
 (define-compilation %js-vset (var val)
-  (code "(" var " = lisp_to_js(" (ls-compile val) "))"))
+  `(code "(" ,var " = lisp_to_js(" ,(ls-compile val) "))"))
 
 (define-setf-expander %js-vref (var)
   (let ((new-value (gensym)))
@@ -1483,26 +1413,28 @@
 
 (defun compile-funcall (function args)
   (let* ((values-funcs (if *multiple-value-p* "values" "pv"))
-         (arglist (concat "(" (join (list* values-funcs
-                                           (integer-to-string (length args))
-                                           (mapcar #'ls-compile args)) ", ") ")")))
+         (arglist `(code "(" ,@(interleave (list* values-funcs
+                                                  (integer-to-string (length args))
+                                                  (mapcar #'ls-compile args))
+                                           ", ")
+                         ")")))
     (unless (or (symbolp function)
                 (and (consp function)
                      (member (car function) '(lambda oget))))
       (error "Bad function designator `~S'" function))
     (cond
       ((translate-function function)
-       (concat (translate-function function) arglist))
+       `(code ,(translate-function function) ,arglist))
       ((and (symbolp function)
             #+jscl (eq (symbol-package function) (find-package "COMMON-LISP"))
             #-jscl t)
-       (code (ls-compile `',function) ".fvalue" arglist))
+       `(code ,(ls-compile `',function) ".fvalue" ,arglist))
       #+jscl((symbolp function)
-       (code (ls-compile `#',function) arglist))
+       `(code ,(ls-compile `#',function) ,arglist))
       ((and (consp function) (eq (car function) 'lambda))
-       (code (ls-compile `#',function) arglist))
+       `(code ,(ls-compile `#',function) ,arglist))
       ((and (consp function) (eq (car function) 'oget))
-       (code (ls-compile function) arglist))
+       `(code ,(ls-compile function) ,arglist))
       (t
        (error "Bad function descriptor")))))
 
@@ -1511,16 +1443,17 @@
       (parse-body sexps :declarations decls-allowed-p)
     (declare (ignore decls))
     (if return-last-p
-        (code (ls-compile-block (butlast sexps) nil decls-allowed-p)
-              "return " (ls-compile (car (last sexps)) *multiple-value-p*) ";")
-        (join-trailing
-         (remove-if #'null-or-empty-p (mapcar #'ls-compile sexps))
-         (concat ";" *newline*)))))
-
-(defun ls-compile (sexp &optional multiple-value-p)
+        `(code ,(ls-compile-block (butlast sexps) nil decls-allowed-p)
+               "return " ,(ls-compile (car (last sexps)) *multiple-value-p*) ";")
+        `(code
+          ,@(interleave (mapcar #'ls-compile sexps) ";
+" *newline*)
+          ";" ,*newline*))))
+
+(defun ls-compile* (sexp &optional multiple-value-p)
   (multiple-value-bind (sexp expandedp) (!macroexpand-1 sexp)
     (when expandedp
-      (return-from ls-compile (ls-compile sexp multiple-value-p)))
+      (return-from ls-compile* (ls-compile sexp multiple-value-p)))
     ;; The expression has been macroexpanded. Now compile it!
     (let ((*multiple-value-p* multiple-value-p))
       (cond
@@ -1531,7 +1464,7 @@
               (binding-value b))
              ((or (keywordp sexp)
                   (and b (member 'constant (binding-declarations b))))
-              (code (ls-compile `',sexp) ".value"))
+              `(code ,(ls-compile `',sexp) ".value"))
              (t
               (ls-compile `(symbol-value ',sexp))))))
         ((or (integerp sexp) (floatp sexp) (characterp sexp) (stringp sexp) (arrayp sexp))
@@ -1554,6 +1487,9 @@
         (t
          (error "How should I compile `~S'?" sexp))))))
 
+(defun ls-compile (sexp &optional multiple-value-p)
+  `(code "(" ,(ls-compile* sexp multiple-value-p) ")"))
+
 
 (defvar *compile-print-toplevels* nil)
 
@@ -1562,20 +1498,27 @@
                (min width (length string)))))
     (subseq string 0 n)))
 
-(defun ls-compile-toplevel (sexp &optional multiple-value-p)
+(defun convert-toplevel (sexp &optional multiple-value-p)
   (let ((*toplevel-compilations* nil))
     (cond
-      ((and (consp sexp) (eq (car sexp) 'progn))
-       (let ((subs (mapcar (lambda (s)
-                             (ls-compile-toplevel s t))
-                           (cdr sexp))))
-         (join (remove-if #'null-or-empty-p subs))))
+      ;; Non-empty toplevel progn
+      ((and (consp sexp)
+            (eq (car sexp) 'progn)
+            (cdr sexp))
+       `(progn
+          ,@(mapcar (lambda (s) (convert-toplevel s t))
+                    (cdr sexp))))
       (t
        (when *compile-print-toplevels*
          (let ((form-string (prin1-to-string sexp)))
            (format t "Compiling ~a..." (truncate-string form-string))))
        (let ((code (ls-compile sexp multiple-value-p)))
-         (code (join-trailing (get-toplevel-compilations)
-                              (code ";" *newline*))
-               (when code
-                 (code code ";" *newline*))))))))
+         `(code
+           ,@(interleave (get-toplevel-compilations) ";
+" t)
+           ,(when code
+                  `(code ,code ";"))))))))
+
+(defun ls-compile-toplevel (sexp &optional multiple-value-p)
+  (with-output-to-string (*standard-output*)
+    (js (convert-toplevel sexp multiple-value-p))))