X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler.lisp;h=09abdebd9ed8a9c6c22893bf0a21512f5e4cf1a9;hb=99252fafa2c1bd2933787ca25cc16f5fd19364eb;hp=7d0a09669ae9ca40bc5fcb658cf55ce5be04d75e;hpb=7709a56a5467d8d78e1a2d86588be7dd60de3679;p=jscl.git

diff --git a/src/compiler.lisp b/src/compiler.lisp
index 7d0a096..09abdeb 100644
--- a/src/compiler.lisp
+++ b/src/compiler.lisp
@@ -1,4 +1,4 @@
-;;; compiler.lisp --- 
+;;; compiler.lisp ---
 
 ;; copyright (C) 2012, 2013 David Vazquez
 ;; Copyright (C) 2012 Raimon Grau
@@ -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,12 @@
 ;;; 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))))
 
 ;;; 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)))
-
-#+common-lisp
-(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
@@ -87,62 +72,6 @@
 ;;; function call.
 (defvar *multiple-value-p* nil)
 
-;; A very simple defstruct built on lists. It supports just slot with
-;; an optional default initform, and it will create a constructor,
-;; predicate and accessors for you.
-(defmacro def!struct (name &rest slots)
-  (unless (symbolp name)
-    (error "It is not a full defstruct implementation."))
-  (let* ((name-string (symbol-name name))
-         (slot-descriptions
-          (mapcar (lambda (sd)
-                    (cond
-                      ((symbolp sd)
-                       (list sd))
-                      ((and (listp sd) (car sd) (cddr sd))
-                       sd)
-                      (t
-                       (error "Bad slot description `~S'." sd))))
-                  slots))
-         (predicate (intern (concat name-string "-P"))))
-    `(progn
-       ;; Constructor
-       (defun ,(intern (concat "MAKE-" name-string)) (&key ,@slot-descriptions)
-         (list ',name ,@(mapcar #'car slot-descriptions)))
-       ;; Predicate
-       (defun ,predicate (x)
-         (and (consp x) (eq (car x) ',name)))
-       ;; Copier
-       (defun ,(intern (concat "COPY-" name-string)) (x)
-         (copy-list x))
-       ;; Slot accessors
-       ,@(with-collect
-          (let ((index 1))
-            (dolist (slot slot-descriptions)
-              (let* ((name (car slot))
-                     (accessor-name (intern (concat name-string "-" (string name)))))
-                (collect
-                    `(defun ,accessor-name (x)
-                       (unless (,predicate x)
-                         (error "The object `~S' is not of type `~S'" x ,name-string))
-                       (nth ,index x)))
-                ;; TODO: Implement this with a higher level
-                ;; abstraction like defsetf or (defun (setf ..))
-                (collect
-                    `(define-setf-expander ,accessor-name (x)
-                       (let ((object (gensym))
-                             (new-value (gensym)))
-                         (values (list object)
-                                 (list x)
-                                 (list new-value)
-                                 `(progn
-                                    (rplaca (nthcdr ,',index ,object) ,new-value) 
-                                    ,new-value)
-                                 `(,',accessor-name ,object)))))
-                (incf index)))))
-       ',name)))
-
-
 ;;; Environment
 
 (def!struct binding
@@ -202,11 +131,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))
@@ -263,11 +189,11 @@
   `(push (list ',name (lambda ,args (block ,name ,@body)))
          *compilations*))
 
-(define-compilation if (condition true false)
-  (code "(" (ls-compile condition) " !== " (ls-compile nil)
-        " ? " (ls-compile true *multiple-value-p*)
-        " : " (ls-compile false *multiple-value-p*)
-        ")"))
+(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*)
+         ")"))
 
 (defvar *ll-keywords* '(&optional &rest &key))
 
@@ -317,16 +243,16 @@
           (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 &rest code)
   (if (or name docstring)
       (js!selfcall
-        "var func = " (join strs) ";" *newline*
+        "var func = " `(code ,@code) ";"
         (when name
-          (code "func.fname = '" (escape-string name) "';" *newline*))
+          `(code "func.fname = " ,(js-escape-string name) ";"))
         (when docstring
-          (code "func.docstring = '" (escape-string docstring) "';" *newline*))
-        "return func;" *newline*)
-      (apply #'code strs)))
+          `(code "func.docstring = " ,(js-escape-string docstring) ";"))
+        "return func;")
+      `(code ,@code)))
 
 (defun lambda-check-argument-count
     (n-required-arguments n-optional-arguments rest-p)
@@ -337,39 +263,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)))
@@ -377,10 +303,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
@@ -389,52 +315,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 "for (i=" (+ n-required-arguments n-optional-arguments)
-             "; 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 ' + arguments[i].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)
@@ -486,26 +415,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)
@@ -515,7 +444,7 @@
             (eq (binding-type b) 'variable)
             (not (member 'special (binding-declarations b)))
             (not (member 'constant (binding-declarations b))))
-       (code (binding-value b) " = " (ls-compile val)))
+       `(code ,(binding-value b) " = " ,(ls-compile val)))
       ((and b (eq (binding-type b) 'macro))
        (ls-compile `(setf ,var ,val)))
       (t
@@ -523,36 +452,43 @@
 
 
 (define-compilation setq (&rest pairs)
-  (let ((result ""))
+  (let ((result nil))
+    (when (null pairs)
+      (return-from setq (ls-compile nil)))
     (while t
       (cond
-	((null pairs) (return))
+	((null pairs)
+         (return))
 	((null (cdr pairs))
 	 (error "Odd pairs in SETQ"))
 	(t
-	 (concatf result
-	   (concat (setq-pair (car pairs) (cadr pairs))
-		   (if (null (cddr pairs)) "" ", ")))
+         (push `(code ,(setq-pair (car pairs) (cadr pairs))
+                      ,(if (null (cddr pairs)) "" ", "))
+               result)
 	 (setq pairs (cddr pairs)))))
-    (code "(" result ")")))
-
-
-;;; Literals
-(defun 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))
-    output))
+    `(code "(" ,@(reverse result) ")")))
+
+
+;;; Compilation of literals an object dumping
 
+;;; 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
+;;; run-time. However, the environment must contain expander functions
+;;; rather than lists. We do not know how to dump function objects
+;;; itself, so we mark the list definitions with this object and the
+;;; compiler will be called when this object has to be dumped.
+;;; Backquote/unquote does a similar magic, but this use is exclusive.
+;;;
+;;; Indeed, perhaps to compile the object other macros need to be
+;;; evaluated. For this reason we define a valid macro-function for
+;;; this symbol.
+(defvar *magic-unquote-marker* (gensym "MAGIC-UNQUOTE"))
+#-jscl
+(setf (macro-function *magic-unquote-marker*)
+      (lambda (form &optional environment)
+        (declare (ignore environment))
+        (second form)))
 
 (defvar *literal-table* nil)
 (defvar *literal-counter* 0)
@@ -561,59 +497,71 @@
   (code "l" (incf *literal-counter*)))
 
 (defun dump-symbol (symbol)
-  #+common-lisp
+  #-jscl
   (let ((package (symbol-package symbol)))
     (if (eq package (find-package "KEYWORD"))
-        (code "{name: \"" (escape-string (symbol-name symbol))
-              "\", 'package': '" (package-name package) "'}")
-        (code "{name: \"" (escape-string (symbol-name symbol)) "\"}")))
+        `(code "(new Symbol(" ,(dump-string (symbol-name symbol)) ", " ,(dump-string (package-name package)) "))")
+        `(code "(new Symbol(" ,(dump-string (symbol-name symbol)) "))")))
   #+jscl
   (let ((package (symbol-package symbol)))
     (if (null package)
-        (code "{name: \"" (escape-string (symbol-name symbol)) "\"}")
+        `(code "(new 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)
-          ")")))
+    `(code "QIList("
+           ,@(interleave (mapcar (lambda (x) (literal x t)) head) "," t)
+           ,(literal (car tail) t)
+           ","
+           ,(literal (cdr tail) t)
+           ")")))
 
 (defun dump-array (array)
   (let ((elements (vector-to-list array)))
-    (concat "[" (join (mapcar #'literal elements) ", ") "]")))
+    `(code "[" ,(join (mapcar #'literal elements) ", ") "]")))
+
+(defun dump-string (string)
+  `(code "make_lisp_string(" ,(js-escape-string string) ")"))
 
 (defun literal (sexp &optional recursive)
   (cond
     ((integerp sexp) (integer-to-string sexp))
     ((floatp sexp) (float-to-string sexp))
-    ((characterp sexp) (code "\"" (escape-string (string sexp)) "\""))
-    ((stringp sexp) (code "\"" (escape-string sexp) "\""))
+    ((characterp sexp) (js-escape-string (string sexp)))
     (t
-     (or (cdr (assoc sexp *literal-table*))
+     (or (cdr (assoc sexp *literal-table* :test #'eql))
          (let ((dumped (typecase sexp
                          (symbol (dump-symbol sexp))
-                         (cons (dump-cons sexp))
+                         (string (dump-string sexp))
+                         (cons
+                          ;; BOOTSTRAP MAGIC: See the root file
+                          ;; jscl.lisp and the function
+                          ;; `dump-global-environment' for futher
+                          ;; information.
+                          (if (eq (car sexp) *magic-unquote-marker*)
+                              (ls-compile (second sexp))
+                              (dump-cons sexp)))
                          (array (dump-array sexp)))))
            (if (and recursive (not (symbolp sexp)))
                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)))
                  jsvar)))))))
 
+
 (define-compilation quote (sexp)
   (literal sexp))
 
 (define-compilation %while (pred &rest body)
   (js!selfcall
     "while(" (ls-compile pred) " !== " (ls-compile nil) "){" *newline*
-    (indent (ls-compile-block body))
-    "}"
+    `(code ,(ls-compile-block body))
+    "}" *newline*
     "return " (ls-compile nil) ";" *newline*))
 
 (define-compilation function (x)
@@ -657,12 +605,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))
@@ -671,12 +618,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))))
 
 
@@ -685,7 +632,7 @@
   (if *compiling-file*
       (progn
         (eval (cons 'progn body))
-        nil)
+        (ls-compile 0))
       (ls-compile `(progn ,@body))))
 
 (defmacro define-transformation (name args form)
@@ -695,7 +642,25 @@
 (define-compilation progn (&rest body)
   (if (null (cdr body))
       (ls-compile (car body) *multiple-value-p*)
-      (js!selfcall (ls-compile-block body t))))
+      `(code "("
+             ,@(interleave
+                (append (mapcar #'ls-compile (butlast body))
+                        (list (ls-compile (car (last body)) t)))
+                ",")
+             ")")))
+
+(define-compilation macrolet (definitions &rest body)
+  (let ((*environment* (copy-lexenv *environment*)))
+    (dolist (def definitions)
+      (destructuring-bind (name lambda-list &body body) def
+        (let ((binding (make-binding :name name :type 'macro :value
+                                     (let ((g!form (gensym)))
+                                       `(lambda (,g!form)
+                                          (destructuring-bind ,lambda-list ,g!form
+                                            ,@body))))))
+          (push-to-lexenv binding  *environment* 'function))))
+    (ls-compile `(progn ,@body) *multiple-value-p*)))
+
 
 (defun special-variable-p (x)
   (and (claimp x 'variable 'special) t))
@@ -708,25 +673,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))
@@ -734,19 +700,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)))
-            (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
@@ -755,10 +722,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
@@ -769,30 +736,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))))
+            (body `(code ,@(mapcar #'let*-initialize-value bindings)
+                         ,(ls-compile-block body t t))))
         (let*-binding-wrapper specials body)))))
 
 
@@ -811,19 +778,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)
@@ -837,7 +804,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) ", "
@@ -847,23 +814,23 @@
 
 (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*
+    "var id = " (ls-compile id) ";"
+    "try {"
+    `(code ,(ls-compile-block body t))
+    "}"
+    "catch (cf){"
+    "    if (cf.type == 'catch' && cf.id == id)"
     (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*))
+
+    "    else"
+    "        throw cf;"
+    "}" ))
 
 (define-compilation throw (id value)
   (js!selfcall
-    "var values = mv;" *newline*
+    "var values = mv;"
     "throw ({"
     "type: 'catch', "
     "id: " (ls-compile id) ", "
@@ -901,32 +868,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))
@@ -941,307 +908,42 @@
       "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*))
+    "var ret = " (ls-compile nil) ";"
+    "try {"
+    `(code "ret = " ,(ls-compile form) ";" )
+    "} finally {"
+    `(code ,(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*))
-
-
-;;; Javascript FFI
-
-(define-compilation %js-vref (var) var)
-
-(define-compilation %js-vset (var val)
-  (code "(" var " = " (ls-compile val) ")"))
-
-(define-setf-expander %js-vref (var)
-  (let ((new-value (gensym)))
-    (unless (stringp var)
-      (error "`~S' is not a string." var))
-    (values nil
-            (list var)
-            (list new-value)
-            `(%js-vset ,var ,new-value)
-            `(%js-vref ,var))))
-
-
-;;; Backquote implementation.
-;;;
-;;;    Author: Guy L. Steele Jr.     Date: 27 December 1985
-;;;    Tested under Symbolics Common Lisp and Lucid Common Lisp.
-;;;    This software is in the public domain.
-
-;;;    The following are unique tokens used during processing.
-;;;    They need not be symbols; they need not even be atoms.
-(defvar *comma* 'unquote)
-(defvar *comma-atsign* 'unquote-splicing)
-
-(defvar *bq-list* (make-symbol "BQ-LIST"))
-(defvar *bq-append* (make-symbol "BQ-APPEND"))
-(defvar *bq-list** (make-symbol "BQ-LIST*"))
-(defvar *bq-nconc* (make-symbol "BQ-NCONC"))
-(defvar *bq-clobberable* (make-symbol "BQ-CLOBBERABLE"))
-(defvar *bq-quote* (make-symbol "BQ-QUOTE"))
-(defvar *bq-quote-nil* (list *bq-quote* nil))
-
-;;; BACKQUOTE is an ordinary macro (not a read-macro) that processes
-;;; the expression foo, looking for occurrences of #:COMMA,
-;;; #:COMMA-ATSIGN, and #:COMMA-DOT.  It constructs code in strict
-;;; accordance with the rules on pages 349-350 of the first edition
-;;; (pages 528-529 of this second edition).  It then optionally
-;;; applies a code simplifier.
-
-;;; If the value of *BQ-SIMPLIFY* is non-NIL, then BACKQUOTE
-;;; processing applies the code simplifier.  If the value is NIL,
-;;; then the code resulting from BACKQUOTE is exactly that
-;;; specified by the official rules.
-(defparameter *bq-simplify* t)
-
-(defmacro backquote (x)
-  (bq-completely-process x))
-
-;;; Backquote processing proceeds in three stages:
-;;;
-;;; (1) BQ-PROCESS applies the rules to remove occurrences of
-;;; #:COMMA, #:COMMA-ATSIGN, and #:COMMA-DOT corresponding to
-;;; this level of BACKQUOTE.  (It also causes embedded calls to
-;;; BACKQUOTE to be expanded so that nesting is properly handled.)
-;;; Code is produced that is expressed in terms of functions
-;;; #:BQ-LIST, #:BQ-APPEND, and #:BQ-CLOBBERABLE.  This is done
-;;; so that the simplifier will simplify only list construction
-;;; functions actually generated by BACKQUOTE and will not involve
-;;; any user code in the simplification.  #:BQ-LIST means LIST,
-;;; #:BQ-APPEND means APPEND, and #:BQ-CLOBBERABLE means IDENTITY
-;;; but indicates places where "%." was used and where NCONC may
-;;; therefore be introduced by the simplifier for efficiency.
-;;;
-;;; (2) BQ-SIMPLIFY, if used, rewrites the code produced by
-;;; BQ-PROCESS to produce equivalent but faster code.  The
-;;; additional functions #:BQ-LIST* and #:BQ-NCONC may be
-;;; introduced into the code.
-;;;
-;;; (3) BQ-REMOVE-TOKENS goes through the code and replaces
-;;; #:BQ-LIST with LIST, #:BQ-APPEND with APPEND, and so on.
-;;; #:BQ-CLOBBERABLE is simply eliminated (a call to it being
-;;; replaced by its argument).  #:BQ-LIST* is replaced by either
-;;; LIST* or CONS (the latter is used in the two-argument case,
-;;; purely to make the resulting code a tad more readable).
-
-(defun bq-completely-process (x)
-  (let ((raw-result (bq-process x)))
-    (bq-remove-tokens (if *bq-simplify*
-                          (bq-simplify raw-result)
-                          raw-result))))
-
-(defun bq-process (x)
-  (cond ((atom x)
-         (list *bq-quote* x))
-        ((eq (car x) 'backquote)
-         (bq-process (bq-completely-process (cadr x))))
-        ((eq (car x) *comma*) (cadr x))
-        ((eq (car x) *comma-atsign*)
-         (error ",@~S after `" (cadr x)))
-        ;; ((eq (car x) *comma-dot*)
-        ;;  ;; (error ",.~S after `" (cadr x))
-        ;;  (error "ill-formed"))
-        (t (do ((p x (cdr p))
-                (q '() (cons (bracket (car p)) q)))
-               ((atom p)
-                (cons *bq-append*
-                      (nreconc q (list (list *bq-quote* p)))))
-             (when (eq (car p) *comma*)
-               (unless (null (cddr p))
-                 (error "Malformed ,~S" p))
-               (return (cons *bq-append*
-                             (nreconc q (list (cadr p))))))
-             (when (eq (car p) *comma-atsign*)
-               (error "Dotted ,@~S" p))
-             ;; (when (eq (car p) *comma-dot*)
-             ;;   ;; (error "Dotted ,.~S" p)
-             ;;   (error "Dotted"))
-             ))))
-
-;;; This implements the bracket operator of the formal rules.
-(defun bracket (x)
-  (cond ((atom x)
-         (list *bq-list* (bq-process x)))
-        ((eq (car x) *comma*)
-         (list *bq-list* (cadr x)))
-        ((eq (car x) *comma-atsign*)
-         (cadr x))
-        ;; ((eq (car x) *comma-dot*)
-        ;;  (list *bq-clobberable* (cadr x)))
-        (t (list *bq-list* (bq-process x)))))
-
-;;; This auxiliary function is like MAPCAR but has two extra
-;;; purposes: (1) it handles dotted lists; (2) it tries to make
-;;; the result share with the argument x as much as possible.
-(defun maptree (fn x)
-  (if (atom x)
-      (funcall fn x)
-      (let ((a (funcall fn (car x)))
-            (d (maptree fn (cdr x))))
-        (if (and (eql a (car x)) (eql d (cdr x)))
-            x
-            (cons a d)))))
-
-;;; This predicate is true of a form that when read looked
-;;; like %@foo or %.foo.
-(defun bq-splicing-frob (x)
-  (and (consp x)
-       (or (eq (car x) *comma-atsign*)
-           ;; (eq (car x) *comma-dot*)
-           )))
-
-;;; This predicate is true of a form that when read
-;;; looked like %@foo or %.foo or just plain %foo.
-(defun bq-frob (x)
-  (and (consp x)
-       (or (eq (car x) *comma*)
-           (eq (car x) *comma-atsign*)
-           ;; (eq (car x) *comma-dot*)
-           )))
-
-;;; The simplifier essentially looks for calls to #:BQ-APPEND and
-;;; tries to simplify them.  The arguments to #:BQ-APPEND are
-;;; processed from right to left, building up a replacement form.
-;;; At each step a number of special cases are handled that,
-;;; loosely speaking, look like this:
-;;;
-;;;  (APPEND (LIST a b c) foo) => (LIST* a b c foo)
-;;;       provided a, b, c are not splicing frobs
-;;;  (APPEND (LIST* a b c) foo) => (LIST* a b (APPEND c foo))
-;;;       provided a, b, c are not splicing frobs
-;;;  (APPEND (QUOTE (x)) foo) => (LIST* (QUOTE x) foo)
-;;;  (APPEND (CLOBBERABLE x) foo) => (NCONC x foo)
-(defun bq-simplify (x)
-  (if (atom x)
-      x
-      (let ((x (if (eq (car x) *bq-quote*)
-                   x
-                   (maptree #'bq-simplify x))))
-        (if (not (eq (car x) *bq-append*))
-            x
-            (bq-simplify-args x)))))
-
-(defun bq-simplify-args (x)
-  (do ((args (reverse (cdr x)) (cdr args))
-       (result
-         nil
-         (cond ((atom (car args))
-                (bq-attach-append *bq-append* (car args) result))
-               ((and (eq (caar args) *bq-list*)
-                     (notany #'bq-splicing-frob (cdar args)))
-                (bq-attach-conses (cdar args) result))
-               ((and (eq (caar args) *bq-list**)
-                     (notany #'bq-splicing-frob (cdar args)))
-                (bq-attach-conses
-                  (reverse (cdr (reverse (cdar args))))
-                  (bq-attach-append *bq-append*
-                                    (car (last (car args)))
-                                    result)))
-               ((and (eq (caar args) *bq-quote*)
-                     (consp (cadar args))
-                     (not (bq-frob (cadar args)))
-                     (null (cddar args)))
-                (bq-attach-conses (list (list *bq-quote*
-                                              (caadar args)))
-                                  result))
-               ((eq (caar args) *bq-clobberable*)
-                (bq-attach-append *bq-nconc* (cadar args) result))
-               (t (bq-attach-append *bq-append*
-                                    (car args)
-                                    result)))))
-      ((null args) result)))
-
-(defun null-or-quoted (x)
-  (or (null x) (and (consp x) (eq (car x) *bq-quote*))))
-
-;;; When BQ-ATTACH-APPEND is called, the OP should be #:BQ-APPEND
-;;; or #:BQ-NCONC.  This produces a form (op item result) but
-;;; some simplifications are done on the fly:
-;;;
-;;;  (op '(a b c) '(d e f g)) => '(a b c d e f g)
-;;;  (op item 'nil) => item, provided item is not a splicable frob
-;;;  (op item 'nil) => (op item), if item is a splicable frob
-;;;  (op item (op a b c)) => (op item a b c)
-(defun bq-attach-append (op item result)
-  (cond ((and (null-or-quoted item) (null-or-quoted result))
-         (list *bq-quote* (append (cadr item) (cadr result))))
-        ((or (null result) (equal result *bq-quote-nil*))
-         (if (bq-splicing-frob item) (list op item) item))
-        ((and (consp result) (eq (car result) op))
-         (list* (car result) item (cdr result)))
-        (t (list op item result))))
-
-;;; The effect of BQ-ATTACH-CONSES is to produce a form as if by
-;;; `(LIST* ,@items ,result) but some simplifications are done
-;;; on the fly.
-;;;
-;;;  (LIST* 'a 'b 'c 'd) => '(a b c . d)
-;;;  (LIST* a b c 'nil) => (LIST a b c)
-;;;  (LIST* a b c (LIST* d e f g)) => (LIST* a b c d e f g)
-;;;  (LIST* a b c (LIST d e f g)) => (LIST a b c d e f g)
-(defun bq-attach-conses (items result)
-  (cond ((and (every #'null-or-quoted items)
-              (null-or-quoted result))
-         (list *bq-quote*
-               (append (mapcar #'cadr items) (cadr result))))
-        ((or (null result) (equal result *bq-quote-nil*))
-         (cons *bq-list* items))
-        ((and (consp result)
-              (or (eq (car result) *bq-list*)
-                  (eq (car result) *bq-list**)))
-         (cons (car result) (append items (cdr result))))
-        (t (cons *bq-list** (append items (list result))))))
-
-;;; Removes funny tokens and changes (#:BQ-LIST* a b) into
-;;; (CONS a b) instead of (LIST* a b), purely for readability.
-(defun bq-remove-tokens (x)
-  (cond ((eq x *bq-list*) 'list)
-        ((eq x *bq-append*) 'append)
-        ((eq x *bq-nconc*) 'nconc)
-        ((eq x *bq-list**) 'list*)
-        ((eq x *bq-quote*) 'quote)
-        ((atom x) x)
-        ((eq (car x) *bq-clobberable*)
-         (bq-remove-tokens (cadr x)))
-        ((and (eq (car x) *bq-list**)
-              (consp (cddr x))
-              (null (cdddr x)))
-         (cons 'cons (maptree #'bq-remove-tokens (cdr x))))
-        (t (maptree #'bq-remove-tokens x))))
+    "return args;" ))
 
 (define-transformation backquote (form)
   (bq-completely-process form))
@@ -1267,18 +969,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
@@ -1291,18 +997,19 @@
     (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))))
              (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)
@@ -1310,37 +1017,37 @@
     (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"
       (variable-arity numbers
-	(join numbers "+"))))
+        `(code ,@(interleave numbers "+")))))
 
 (define-raw-builtin - (x &rest others)
   (let ((args (cons x others)))
     (variable-arity args
       (if (null others)
-	  (concat "-" (car args))
-	  (join args "-")))))
+	  `(code "-" ,(car args))
+	  `(code ,@(interleave args "-"))))))
 
 (define-raw-builtin * (&rest numbers)
   (if (null numbers)
       "1"
       (variable-arity numbers
-	(join numbers "*"))))
+	`(code ,@(interleave numbers "*")))))
 
 (define-raw-builtin / (x &rest others)
   (let ((args (cons x others)))
     (variable-arity args
       (if (null others)
-	  (concat "1 /" (car args))
-	  (join args "/")))))
+          `(code "1 /" ,(car args))
+	  `(code ,@(interleave args "/"))))))
 
 (define-builtin mod (x y) (num-op-num x "%" y))
 
@@ -1350,11 +1057,11 @@
     ((null (cdr vars))
      "true")
     ((null (cddr vars))
-     (concat (car vars) op (cadr vars)))
+     `(code ,(car vars) ,op ,(cadr vars)))
     (t
-     (concat (car vars) op (cadr vars)
-	     " && "
-	     (comparison-conjuntion (cdr vars) op)))))
+     `(code ,(car vars) ,op ,(cadr vars)
+            " && "
+            ,(comparison-conjuntion (cdr vars) op)))))
 
 (defmacro define-builtin-comparison (op sym)
   `(define-raw-builtin ,op (x &rest args)
@@ -1367,9 +1074,10 @@
 (define-builtin-comparison >= ">=")
 (define-builtin-comparison <= "<=")
 (define-builtin-comparison = "==")
+(define-builtin-comparison /= "!=")
 
 (define-builtin numberp (x)
-  (js!bool (code "(typeof (" x ") == \"number\")")))
+  (js!bool `(code "(typeof (" ,x ") == \"number\")")))
 
 (define-builtin floor (x)
   (type-check (("x" "number" x))
@@ -1382,314 +1090,372 @@
 
 (define-builtin float-to-string (x)
   (type-check (("x" "number" x))
-    "x.toString()"))
+    "make_lisp_string(x.toString())"))
 
 (define-builtin cons (x y)
-  (code "({car: " x ", cdr: " y "})"))
+  `(code "({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*
+    "var tmp = " x ";"
     "return tmp === " (ls-compile nil)
     "? " (ls-compile nil)
-    ": tmp.car;" *newline*))
+    ": tmp.car;" ))
 
 (define-builtin cdr (x)
   (js!selfcall
-    "var tmp = " x ";" *newline*
+    "var tmp = " x ";"
     "return tmp === " (ls-compile nil) "? "
     (ls-compile nil)
-    ": tmp.cdr;" *newline*))
+    ": 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
-   (js!selfcall
-     "var tmp = " x ";" *newline*
-     "return (typeof tmp == 'object' && 'name' in tmp);" *newline*)))
+  (js!bool `(code "(" ,x " instanceof Symbol)")))
 
 (define-builtin make-symbol (name)
-  (type-check (("name" "string" name))
-    "({name: name})"))
+  `(code "(new Symbol(" ,name "))"))
 
 (define-builtin symbol-name (x)
-  (code "(" x ").name"))
+  `(code "(" ,x ").name"))
 
 (define-builtin set (symbol value)
-  (code "(" symbol ").value = " value))
+  `(code "(" ,symbol ").value = " ,value))
 
 (define-builtin fset (symbol value)
-  (code "(" symbol ").fvalue = " value))
+  `(code "(" ,symbol ").fvalue = " ,value))
 
 (define-builtin boundp (x)
-  (js!bool (code "(" x ".value !== undefined)")))
+  (js!bool `(code "(" ,x ".value !== undefined)")))
+
+(define-builtin fboundp (x)
+  (js!bool `(code "(" ,x ".fvalue !== undefined)")))
 
 (define-builtin symbol-value (x)
   (js!selfcall
-    "var symbol = " x ";" *newline*
-    "var value = symbol.value;" *newline*
-    "if (value === undefined) throw \"Variable `\" + symbol.name + \"' is unbound.\";" *newline*
-    "return value;" *newline*))
+    "var symbol = " x ";"
+    "var value = symbol.value;"
+    "if (value === undefined) throw \"Variable `\" + xstring(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 `\" + symbol.name + \"' is undefined.\";" *newline*
-    "return func;" *newline*))
+    "var symbol = " x ";"
+    "var func = symbol.fvalue;"
+    "if (func === undefined) throw \"Function `\" + xstring(symbol.name) + \"' is undefined.\";"
+    "return func;" ))
 
 (define-builtin symbol-plist (x)
-  (code "((" x ").plist || " (ls-compile nil) ")"))
+  `(code "((" ,x ").plist || " ,(ls-compile nil) ")"))
 
 (define-builtin lambda-code (x)
-  (code "(" x ").toString()"))
+  `(code "make_lisp_string((" ,x ").toString())"))
 
 (define-builtin eq (x y)
-  (js!bool (code "(" x " === " y ")")))
+  (js!bool `(code "(" ,x " === " ,y ")")))
 
 (define-builtin char-code (x)
   (type-check (("x" "string" x))
-    "x.charCodeAt(0)"))
+    "char_to_codepoint(x)"))
 
 (define-builtin code-char (x)
   (type-check (("x" "number" x))
-    "String.fromCharCode(x)"))
+    "char_from_codepoint(x)"))
 
 (define-builtin characterp (x)
   (js!bool
    (js!selfcall
-     "var x = " x ";" *newline*
-     "return (typeof(" x ") == \"string\") && x.length == 1;")))
-
-(define-builtin char-to-string (x)
-  (type-check (("x" "string" x))
-    "(x)"))
+     "var x = " x ";"
+     "return (typeof(" x ") == \"string\") && (x.length == 1 || x.length == 2);")))
 
-(define-builtin stringp (x)
-  (js!bool (code "(typeof(" x ") == \"string\")")))
-
-(define-builtin string-upcase (x)
-  (type-check (("x" "string" x))
-    "x.toUpperCase()"))
+(define-builtin char-upcase (x)
+  `(code "safe_char_upcase(" ,x ")"))
 
-(define-builtin string-length (x)
-  (type-check (("x" "string" x))
-    "x.length"))
+(define-builtin char-downcase (x)
+  `(code "safe_char_downcase(" ,x ")"))
 
-(define-raw-builtin slice (string a &optional b)
-  (js!selfcall
-    "var str = " (ls-compile string) ";" *newline*
-    "var a = " (ls-compile a) ";" *newline*
-    "var b;" *newline*
-    (when b (code "b = " (ls-compile b) ";" *newline*))
-    "return str.slice(a,b);" *newline*))
-
-(define-builtin char (string index)
-  (type-check (("string" "string" string)
-               ("index" "number" index))
-    "string.charAt(index)"))
-
-(define-builtin concat-two (string1 string2)
-  (type-check (("string1" "string" string1)
-               ("string2" "string" string2))
-    "string1.concat(string2)"))
+(define-builtin stringp (x)
+  (js!bool
+   (js!selfcall
+     "var x = " x ";"
+     "return typeof(x) == 'object' && 'length' in x && 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)
-  (type-check (("string" "string" string))
-    (if *multiple-value-p*
-        (js!selfcall
-          "var v = globalEval(string);" *newline*
-          "return values.apply(this, forcemv(v));" *newline*)
-        "globalEval(string)")))
+  (if *multiple-value-p*
+      (js!selfcall
+        "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 new () "{}")
-
-(define-builtin objectp (x)
-  (js!bool (code "(typeof (" x ") === 'object')")))
-
-(define-builtin oget (object key)
-  (js!selfcall
-    "var tmp = " "(" object ")[" key "];" *newline*
-    "return tmp == undefined? " (ls-compile nil) ": tmp ;" *newline*))
-
-(define-builtin oset (object key value)
-  (code "((" object ")[" key "] = " value ")"))
+(define-builtin functionp (x)
+  (js!bool `(code "(typeof " ,x " == 'function')")))
 
-(define-builtin in (key object)
-  (js!bool (code "((" key ") in (" object "))")))
+(define-builtin %write-string (x)
+  `(code "lisp.write(" ,x ")"))
 
-(define-builtin functionp (x)
-  (js!bool (code "(typeof " x " == 'function')")))
+(define-builtin /debug (x)
+  `(code "console.log(xstring(" ,x "))"))
 
-(define-builtin write-string (x)
-  (type-check (("x" "string" x))
-    "lisp.write(x)"))
 
-(define-builtin make-array (n)
-  (js!selfcall
-    "var r = [];" *newline*
-    "for (var i = 0; i < " n "; i++)" *newline*
-    (indent "r.push(" (ls-compile nil) ");" *newline*)
-    "return r;" *newline*))
+;;; Storage vectors. They are used to implement arrays and (in the
+;;; future) structures.
 
-(define-builtin arrayp (x)
+(define-builtin storage-vector-p (x)
   (js!bool
    (js!selfcall
-     "var x = " x ";" *newline*
+     "var x = " x ";"
      "return typeof x === 'object' && 'length' in x;")))
 
-(define-builtin aref (array n)
+(define-builtin make-storage-vector (n)
   (js!selfcall
-    "var x = " "(" array ")[" n "];" *newline*
-    "if (x === undefined) throw 'Out of range';" *newline*
-    "return x;" *newline*))
+    "var r = [];"
+    "r.length = " n ";"
+    "return r;" ))
+
+(define-builtin storage-vector-size (x)
+  `(code ,x ".length"))
 
-(define-builtin aset (array n value)
+(define-builtin resize-storage-vector (vector new-size)
+  `(code "(" ,vector ".length = " ,new-size ")"))
+
+(define-builtin storage-vector-ref (vector n)
   (js!selfcall
-    "var x = " array ";" *newline*
-    "var i = " n ";" *newline*
-    "if (i < 0 || i >= x.length) throw 'Out of range';" *newline*
-    "return x[i] = " value ";" *newline*))
+    "var x = " "(" vector ")[" n "];"
+    "if (x === undefined) throw 'Out of range';"
+    "return x;" ))
+
+(define-builtin storage-vector-set (vector n value)
+  (js!selfcall
+    "var x = " vector ";"
+    "var i = " n ";"
+    "if (i < 0 || i >= x.length) throw 'Out of range';"
+    "return x[i] = " value ";" ))
+
+(define-builtin concatenate-storage-vector (sv1 sv2)
+  (js!selfcall
+    "var sv1 = " sv1 ";"
+    "var r = sv1.concat(" sv2 ");"
+    "r.type = sv1.type;"
+    "r.stringp = 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) ", ") ")")))
-
-;; Receives the JS function as first argument as a literal string. The
-;; second argument is compiled and should evaluate to a vector of
-;; values to apply to the the function. The result returned.
-(define-builtin %js-call (fun args)
-  (code fun ".apply(this, " args ")"))
-
-(defun macro (x)
-  (and (symbolp x)
-       (let ((b (lookup-in-lexenv x *environment* 'function)))
-         (if (and b (eq (binding-type b) 'macro))
-             b
-             nil))))
-
-#+common-lisp
+      `(code "values(" ,@(interleave (mapcar #'ls-compile args) ",") ")")
+      `(code "pv(" ,@(interleave (mapcar #'ls-compile args) ", ") ")")))
+
+
+;;; Javascript FFI
+
+(define-builtin new () "{}")
+
+(define-raw-builtin oget* (object key &rest keys)
+  (js!selfcall
+    "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) ";"
+      `(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)) ")"))
+
+(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')")))
+
+(define-builtin lisp-to-js (x) `(code "lisp_to_js(" ,x ")"))
+(define-builtin js-to-lisp (x) `(code "js_to_lisp(" ,x ")"))
+
+
+(define-builtin in (key object)
+  (js!bool `(code "(xstring(" ,key ") in (" ,object "))")))
+
+(define-builtin map-for-in (function object)
+  (js!selfcall
+   "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) ";" ))
+
+(define-compilation %js-vref (var)
+  `(code "js_to_lisp(" ,var ")"))
+
+(define-compilation %js-vset (var val)
+  `(code "(" ,var " = lisp_to_js(" ,(ls-compile val) "))"))
+
+(define-setf-expander %js-vref (var)
+  (let ((new-value (gensym)))
+    (unless (stringp var)
+      (error "`~S' is not a string." var))
+    (values nil
+            (list var)
+            (list new-value)
+            `(%js-vset ,var ,new-value)
+            `(%js-vref ,var))))
+
+
+#-jscl
 (defvar *macroexpander-cache*
   (make-hash-table :test #'eq))
 
-(defun ls-macroexpand-1 (form)
+(defun !macro-function (symbol)
+  (unless (symbolp symbol)
+    (error "`~S' is not a symbol." symbol))
+  (let ((b (lookup-in-lexenv symbol *environment* 'function)))
+    (if (and b (eq (binding-type b) 'macro))
+        (let ((expander (binding-value b)))
+          (cond
+            #-jscl
+            ((gethash b *macroexpander-cache*)
+             (setq expander (gethash b *macroexpander-cache*)))
+            ((listp expander)
+             (let ((compiled (eval expander)))
+               ;; The list representation are useful while
+               ;; bootstrapping, as we can dump the definition of the
+               ;; macros easily, but they are slow because we have to
+               ;; evaluate them and compile them now and again. So, let
+               ;; us replace the list representation version of the
+               ;; function with the compiled one.
+               ;;
+               #+jscl (setf (binding-value b) compiled)
+               #-jscl (setf (gethash b *macroexpander-cache*) compiled)
+               (setq expander compiled))))
+          expander)
+        nil)))
+
+(defun !macroexpand-1 (form)
   (cond
     ((symbolp form)
      (let ((b (lookup-in-lexenv form *environment* 'variable)))
        (if (and b (eq (binding-type b) 'macro))
            (values (binding-value b) t)
            (values form nil))))
-    ((consp form)
-     (let ((macro-binding (macro (car form))))
-       (if macro-binding
-           (let ((expander (binding-value macro-binding)))
-             (cond
-               #+common-lisp
-               ((gethash macro-binding *macroexpander-cache*)
-                (setq expander (gethash macro-binding *macroexpander-cache*)))
-               ((listp expander)
-                (let ((compiled (eval expander)))
-                  ;; The list representation are useful while
-                  ;; bootstrapping, as we can dump the definition of the
-                  ;; macros easily, but they are slow because we have to
-                  ;; evaluate them and compile them now and again. So, let
-                  ;; us replace the list representation version of the
-                  ;; function with the compiled one.
-                  ;;
-                  #+jscl (setf (binding-value macro-binding) compiled)
-                  #+common-lisp (setf (gethash macro-binding *macroexpander-cache*) compiled)
-                  (setq expander compiled))))
-             (values (apply expander (cdr form)) t))
+    ((and (consp form) (symbolp (car form)))
+     (let ((macrofun (!macro-function (car form))))
+       (if macrofun
+           (values (funcall macrofun (cdr form)) t)
            (values form nil))))
     (t
      (values form nil))))
 
 (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)
-                     (eq (car function) 'lambda)))
+                     (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"))
-            #+common-lisp t)
-       (code (ls-compile `',function) ".fvalue" arglist))
+            #-jscl t)
+       `(code ,(ls-compile `',function) ".fvalue" ,arglist))
+      #+jscl((symbolp function)
+       `(code ,(ls-compile `#',function) ,arglist))
+      ((and (consp function) (eq (car function) 'lambda))
+       `(code ,(ls-compile `#',function) ,arglist))
+      ((and (consp function) (eq (car function) 'oget))
+       `(code ,(ls-compile function) ,arglist))
       (t
-       (code (ls-compile `#',function) arglist)))))
-
-(defun ls-compile-block (sexps &optional return-last-p)
-  (if return-last-p
-      (code (ls-compile-block (butlast sexps))
-            "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)
-  (multiple-value-bind (sexp expandedp) (ls-macroexpand-1 sexp)
+       (error "Bad function descriptor")))))
+
+(defun ls-compile-block (sexps &optional return-last-p decls-allowed-p)
+  (multiple-value-bind (sexps decls)
+      (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*) ";")
+        `(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
@@ -1700,14 +1466,11 @@
               (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))))))
-        ((integerp sexp) (integer-to-string sexp))
-        ((floatp sexp) (float-to-string sexp))
-        ((characterp sexp) (code "\"" (escape-string (string sexp)) "\""))
-        ((stringp sexp) (code "\"" (escape-string sexp) "\""))
-        ((arrayp sexp) (literal sexp))
+        ((or (integerp sexp) (floatp sexp) (characterp sexp) (stringp sexp) (arrayp sexp))
+         (literal sexp))
         ((listp sexp)
          (let ((name (car sexp))
                (args (cdr sexp)))
@@ -1726,6 +1489,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)
 
@@ -1734,23 +1500,24 @@
                (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))))
+       `(progn
+          ,@(mapcar (lambda (s) (convert-toplevel s t))
+                    (cdr sexp))))
       (t
        (when *compile-print-toplevels*
          (let ((form-string (prin1-to-string sexp)))
-           (write-string "Compiling ")
-           (write-string (truncate-string form-string))
-           (write-line "...")))
-
+           (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))))