Basic SETF implementation

[jscl.git] / ecmalisp.lisp

diff --git a/ecmalisp.lisp b/ecmalisp.lisp
index 58cce52..a9b65c5 100644 (file)
--- a/ecmalisp.lisp
+++ b/ecmalisp.lisp
@@ -26,23 +26,36 @@
 (progn
   (eval-when-compile
     (%compile-defmacro 'defmacro
 (progn
   (eval-when-compile
     (%compile-defmacro 'defmacro

-                       '(lambda (name args &rest body)
-                         `(eval-when-compile
-                            (%compile-defmacro ',name
-                                               '(lambda ,(mapcar (lambda (x)
-                                                                   (if (eq x '&body)
-                                                                       '&rest
-                                                                       x))
-                                                                 args)
-                                                 ,@body))))))
+                       '(function
+                         (lambda (name args &rest body)
+                          `(eval-when-compile
+                             (%compile-defmacro ',name
+                                                '(function
+                                                  (lambda ,(mapcar #'(lambda (x)
+                                                                       (if (eq x '&body)
+                                                                           '&rest
+                                                                           x))
+                                                                   args)
+                                                   ,@body))))))))

 
   (defmacro declaim (&rest decls)
     `(eval-when-compile
        ,@(mapcar (lambda (decl) `(!proclaim ',decl)) decls)))
 
 
   (defmacro declaim (&rest decls)
     `(eval-when-compile
        ,@(mapcar (lambda (decl) `(!proclaim ',decl)) decls)))
 

-  (declaim (constant nil t) (special t nil))
-  (setq nil 'nil)
-  (setq t 't)
+  (defmacro defconstant (name value &optional docstring)
+    `(progn
+       (declaim (special ,name))
+       (declaim (constant ,name))
+       (setq ,name ,value)
+       ,@(when (stringp docstring) `((oset ',name "vardoc" ,docstring)))
+       ',name))
+
+  (defconstant t 't)
+  (defconstant nil 'nil)
+  (js-vset "nil" nil)
+
+  (defmacro lambda (args &body body)
+    `(function (lambda ,args ,@body)))

 
   (defmacro when (condition &body body)
     `(if ,condition (progn ,@body) nil))
 
   (defmacro when (condition &body body)
     `(if ,condition (progn ,@body) nil))

@@ -71,7 +84,6 @@
 
   (defmacro defun (name args &rest body)
     `(progn
 
   (defmacro defun (name args &rest body)
     `(progn

-       (declaim (non-overridable ,name))

        (fset ',name
              (named-lambda ,(symbol-name name) ,args
                ,@(if (and (stringp (car body)) (not (null (cdr body))))
        (fset ',name
              (named-lambda ,(symbol-name name) ,args
                ,@(if (and (stringp (car body)) (not (null (cdr body))))

@@ -128,6 +140,7 @@
   (defun second (x) (cadr x))
   (defun third (x) (caddr x))
   (defun fourth (x) (cadddr x))
   (defun second (x) (cadr x))
   (defun third (x) (caddr x))
   (defun fourth (x) (cadddr x))

+  (defun rest (x) (cdr x))

 
   (defun list (&rest args) args)
   (defun atom (x)
 
   (defun list (&rest args) args)
   (defun atom (x)

@@ -277,6 +290,53 @@
   (defun reverse (list)
     (revappend list '()))
 
   (defun reverse (list)
     (revappend list '()))
 

+  (defmacro psetq (&rest pairs)
+    (let ( ;; For each pair, we store here a list of the form
+         ;; (VARIABLE GENSYM VALUE).
+         (assignments '()))
+      (while t
+       (cond
+         ((null pairs) (return))
+         ((null (cdr pairs))
+          (error "Odd paris in PSETQ"))
+         (t
+          (let ((variable (car pairs))
+                (value (cadr pairs)))
+            (push `(,variable ,(gensym) ,value)  assignments)
+            (setq pairs (cddr pairs))))))
+      (setq assignments (reverse assignments))
+      ;;
+      `(let ,(mapcar #'cdr assignments)
+        (setq ,@(!reduce #'append (mapcar #'butlast assignments) '())))))
+
+  (defmacro do (varlist endlist &body body)
+    `(block nil
+       (let ,(mapcar (lambda (x) (list (first x) (second x))) varlist)
+        (while t
+          (when ,(car endlist)
+            (return (progn ,(cdr endlist))))
+          (tagbody ,@body)
+          (psetq
+           ,@(apply #'append
+                    (mapcar (lambda (v)
+                              (and (consp (cddr v))
+                                   (list (first v) (third v))))
+                            varlist)))))))
+
+  (defmacro do* (varlist endlist &body body)
+    `(block nil
+       (let* ,(mapcar (lambda (x) (list (first x) (second x))) varlist)
+        (while t
+          (when ,(car endlist)
+            (return (progn ,(cdr endlist))))
+          (tagbody ,@body)
+          (setq
+           ,@(apply #'append
+                    (mapcar (lambda (v)
+                              (and (consp (cddr v))
+                                   (list (first v) (third v))))
+                            varlist)))))))
+

   (defun list-length (list)
     (let ((l 0))
       (while (not (null list))
   (defun list-length (list)
     (let ((l 0))
       (while (not (null list))

@@ -285,21 +345,56 @@
       l))
 
   (defun length (seq)
       l))
 
   (defun length (seq)

-    (if (stringp seq)
-        (string-length seq)
-        (list-length seq)))
+    (cond
+      ((stringp seq)
+       (string-length seq))
+      ((arrayp seq)
+       (oget seq "length"))
+      ((listp seq)
+       (list-length seq))))

 
   (defun concat-two (s1 s2)
     (concat-two s1 s2))
 
 
   (defun concat-two (s1 s2)
     (concat-two s1 s2))
 

-  (defun mapcar (func list)
-    (if (null list)
-        '()
-        (cons (funcall func (car list))
-              (mapcar func (cdr list)))))
+  (defmacro with-collect (&body body)
+    (let ((head (gensym))
+          (tail (gensym)))
+      `(let* ((,head (cons 'sentinel nil))
+              (,tail ,head))
+         (flet ((collect (x)
+                  (rplacd ,tail (cons x nil))
+                  (setq ,tail (cdr ,tail))
+                  x))
+           ,@body)
+         (cdr ,head))))
+
+  (defun map1 (func list)
+    (with-collect
+      (while list
+        (collect (funcall func (car list)))
+        (setq list (cdr list)))))
+
+  (defmacro loop (&body body)
+    `(while t ,@body))
+
+  (defun mapcar (func list &rest lists)
+    (let ((lists (cons list lists)))
+      (with-collect
+        (block loop
+          (loop
+             (let ((elems (map1 #'car lists)))
+               (do ((tail lists (cdr tail)))
+                   ((null tail))
+                 (when (null (car tail)) (return-from loop))
+                 (rplaca tail (cdar tail)))
+               (collect (apply func elems))))))))

 
   (defun identity (x) x)
 
 
   (defun identity (x) x)
 

+  (defun constantly (x)
+    (lambda (&rest args)
+      x))
+

   (defun copy-list (x)
     (mapcar #'identity x))
 
   (defun copy-list (x)
     (mapcar #'identity x))
 

@@ -372,6 +467,10 @@
         (- x #\0)
         nil))
 
         (- x #\0)
         nil))
 

+  (defun digit-char (weight)
+    (and (<= 0 weight 9)
+        (char "0123456789" weight)))
+

   (defun subseq (seq a &optional b)
     (cond
       ((stringp seq)
   (defun subseq (seq a &optional b)
     (cond
       ((stringp seq)

@@ -381,15 +480,6 @@
       (t
        (error "Unsupported argument."))))
 
       (t
        (error "Unsupported argument."))))
 

-  (defun parse-integer (string)
-    (let ((value 0)
-          (index 0)
-          (size (length string)))
-      (while (< index size)
-        (setq value (+ (* value 10) (digit-char-p (char string index))))
-        (incf index))
-      value))
-

   (defun some (function seq)
     (cond
       ((stringp seq)
   (defun some (function seq)
     (cond
       ((stringp seq)

@@ -463,7 +553,82 @@
          (error "Wrong argument type! it should be a symbol"))
        (oget x "vardoc"))))
 
          (error "Wrong argument type! it should be a symbol"))
        (oget x "vardoc"))))
 

-  ;; Packages
+  (defmacro multiple-value-bind (variables value-from &body body)
+    `(multiple-value-call (lambda (&optional ,@variables &rest ,(gensym))
+                            ,@body)
+       ,value-from))
+
+  (defmacro multiple-value-list (value-from)
+    `(multiple-value-call #'list ,value-from))
+
+
+  ;;; Generalized references (SETF)
+
+  (defvar *setf-expanders* nil)
+
+  (defun get-setf-expansion (place)
+    (if (symbolp place)
+        (let ((value (gensym)))
+          (values nil
+                  nil
+                  `(,value)
+                  `(setq ,place ,value)
+                  place))
+        (let* ((access-fn (car place))
+             (expander (cdr (assoc access-fn *setf-expanders*))))
+          (when (null expander)
+            (error "Unknown generalized reference."))
+          (apply expander (cdr place)))))
+
+  (defmacro define-setf-expander (access-fn lambda-list &body body)
+    (unless (symbolp access-fn)
+      (error "ACCESS-FN must be a symbol."))
+    `(progn (push (cons ',access-fn (lambda ,lambda-list ,@body))
+                  *setf-expanders*)
+            ',access-fn))
+
+  (defmacro setf (&rest pairs)
+    (cond
+      ((null pairs)
+       nil)
+      ((null (cdr pairs))
+       (error "Odd number of arguments to setf."))
+      ((null (cddr pairs))
+       (let ((place (first pairs))
+             (value (second pairs)))
+         (multiple-value-bind (vars vals store-vars writer-form reader-form)
+             (get-setf-expansion place)
+           ;; TODO: Optimize the expansion code here.
+           `(let* ,(mapcar #'list vars vals)
+              (multiple-value-bind ,store-vars
+                  ,value
+                ,writer-form)))))
+      (t
+       `(progn
+          ,@(do ((pairs pairs (cddr pairs))
+                 (result '() (cons `(setf ,(car pairs) ,(cadr pairs)) result)))
+                ((null pairs)
+                 (reverse result)))))))
+
+  (define-setf-expander car (x)
+    (let ((cons (gensym))
+          (new-value (gensym)))
+      (values (list cons)
+              (list x)
+              (list new-value)
+              `(progn (rplaca ,cons ,new-value) ,new-value)
+              `(car ,cons))))
+
+  (define-setf-expander cdr (x)
+    (let ((cons (gensym))
+          (new-value (gensym)))
+      (values (list cons)
+              (list x)
+              (list new-value)
+              `(progn (rplacd ,cons ,new-value) ,new-value)
+              `(car ,cons))))
+
+  ;;; Packages

 
   (defvar *package-list* nil)
 
 
   (defvar *package-list* nil)
 

@@ -532,29 +697,37 @@
   ;; This function is used internally to initialize the CL package
   ;; with the symbols built during bootstrap.
   (defun %intern-symbol (symbol)
   ;; This function is used internally to initialize the CL package
   ;; with the symbols built during bootstrap.
   (defun %intern-symbol (symbol)

-    (let ((symbols (%package-symbols *common-lisp-package*)))
-      (oset symbol "package" *common-lisp-package*)
+    (let* ((package
+            (if (in "package" symbol)
+                (find-package-or-fail (oget symbol "package"))
+                *common-lisp-package*))
+           (symbols (%package-symbols package)))
+      (oset symbol "package" package)
+      (when (eq package *keyword-package*)
+        (oset symbol "value" symbol))

       (oset symbols (symbol-name symbol) symbol)))
 
       (oset symbols (symbol-name symbol) symbol)))
 

-  (defun %find-symbol (name package)
-    (let ((package (find-package-or-fail package)))
-      (let ((symbols (%package-symbols package)))
-        (if (in name symbols)
-            (cons (oget symbols name) t)
-            (dolist (used (package-use-list package) (cons nil nil))
-              (let ((exports (%package-external-symbols used)))
-                (when (in name exports)
-                  (return-from %find-symbol
-                    (cons (oget exports name) t)))))))))
-

   (defun find-symbol (name &optional (package *package*))
   (defun find-symbol (name &optional (package *package*))

-    (car (%find-symbol name package)))
+    (let* ((package (find-package-or-fail package))
+           (externals (%package-external-symbols package))
+           (symbols (%package-symbols package)))
+      (cond
+        ((in name externals)
+         (values (oget externals name) :external))
+        ((in name symbols)
+         (values (oget symbols name) :internal))
+        (t
+         (dolist (used (package-use-list package) (values nil nil))
+           (let ((exports (%package-external-symbols used)))
+             (when (in name exports)
+               (return (values (oget exports name) :inherit)))))))))

 
   (defun intern (name &optional (package *package*))
     (let ((package (find-package-or-fail package)))
 
   (defun intern (name &optional (package *package*))
     (let ((package (find-package-or-fail package)))

-      (let ((result (%find-symbol name package)))
-        (if (cdr result)
-            (car result)
+      (multiple-value-bind (symbol foundp)
+          (find-symbol name package)
+        (if foundp
+            (values symbol foundp)

             (let ((symbols (%package-symbols package)))
               (oget symbols name)
               (let ((symbol (make-symbol name)))
             (let ((symbols (%package-symbols package)))
               (oget symbols name)
               (let ((symbol (make-symbol name)))

@@ -562,7 +735,8 @@
                 (when (eq package *keyword-package*)
                   (oset symbol "value" symbol)
                   (export (list symbol) package))
                 (when (eq package *keyword-package*)
                   (oset symbol "value" symbol)
                   (export (list symbol) package))

-                (oset symbols name symbol)))))))
+                (oset symbols name symbol)
+                (values symbol nil)))))))

 
   (defun symbol-package (symbol)
     (unless (symbolp symbol)
 
   (defun symbol-package (symbol)
     (unless (symbolp symbol)

@@ -572,7 +746,10 @@
   (defun export (symbols &optional (package *package*))
     (let ((exports (%package-external-symbols package)))
       (dolist (symb symbols t)
   (defun export (symbols &optional (package *package*))
     (let ((exports (%package-external-symbols package)))
       (dolist (symb symbols t)

-        (oset exports (symbol-name symb) symb)))))
+        (oset exports (symbol-name symb) symb))))
+
+  (defun get-universal-time ()
+    (+ (get-unix-time) 2208988800)))

 
 
 ;;; The compiler offers some primitives and special forms which are
 
 
 ;;; The compiler offers some primitives and special forms which are

@@ -592,10 +769,8 @@
   (defun concat-two (s1 s2)
     (concatenate 'string s1 s2))
 
   (defun concat-two (s1 s2)
     (concatenate 'string s1 s2))
 

-  (defun setcar (cons new)
-    (setf (car cons) new))
-  (defun setcdr (cons new)
-    (setf (cdr cons) new)))
+  (defun aset (array idx value)
+    (setf (aref array idx) value)))

 
 ;;; At this point, no matter if Common Lisp or ecmalisp is compiling
 ;;; from here, this code will compile on both. We define some helper
 
 ;;; At this point, no matter if Common Lisp or ecmalisp is compiling
 ;;; from here, this code will compile on both. We define some helper

@@ -630,38 +805,26 @@
 (defun mapconcat (func list)
   (join (mapcar func list)))
 
 (defun mapconcat (func list)
   (join (mapcar func list)))
 

-;;; Like CONCAT, 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.
+(defun vector-to-list (vector)
+  (let ((list nil)
+       (size (length vector)))
+    (dotimes (i size (reverse list))
+      (push (aref vector i) list))))

 
 

-#+ecmalisp
-(defun indent (&rest string)
-  (let ((input (join 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)))
+(defun list-to-vector (list)
+  (let ((v (make-array (length list)))
+       (i 0))
+    (dolist (x list v)
+      (aset v i x)
+      (incf i))))

 
 

-#+common-lisp
-(defun indent (&rest string)
-  (with-output-to-string (*standard-output*)
-    (with-input-from-string (input (join string))
-      (loop
-         for line = (read-line input nil)
-         while line
-         do (write-string "    ")
-         do (write-line line)))))
+#+ecmalisp
+(progn
+  (defun values-list (list)
+    (values-array (list-to-vector list)))

 
 

+  (defun values (&rest args)
+    (values-list args)))

 
 (defun integer-to-string (x)
   (cond
 
 (defun integer-to-string (x)
   (cond

@@ -674,22 +837,8 @@
        (while (not (zerop x))
          (push (mod x 10) digits)
          (setq x (truncate x 10)))
        (while (not (zerop x))
          (push (mod x 10) digits)
          (setq x (truncate x 10)))

-       (join (mapcar (lambda (d) (string (char "0123456789" d)))
-                     digits))))))
-
-
-;;; Wrap X with a Javascript code to convert the result from
-;;; Javascript generalized booleans to T or NIL.
-(defun js!bool (x)
-  (concat "(" 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
-;;; statements valid expressions and provide a private scope as well.
-;;; It could be defined as function, but we could do some
-;;; preprocessing in the future.
-(defmacro js!selfcall (&body body)
-  `(concat "(function(){" *newline* (indent ,@body) "})()"))
+       (mapconcat (lambda (x) (string (digit-char x)))
+                 digits)))))

 
 
 ;;; Printer
 
 
 ;;; Printer

@@ -699,14 +848,17 @@
   (defun prin1-to-string (form)
     (cond
       ((symbolp form)
   (defun prin1-to-string (form)
     (cond
       ((symbolp form)

-       (if (cdr (%find-symbol (symbol-name form) *package*))
-           (symbol-name form)
-           (let ((package (symbol-package form))
-                 (name (symbol-name form)))
-             (concat (if (eq package (find-package "KEYWORD"))
-                         ""
-                         (package-name package))
-                     ":" name))))
+       (multiple-value-bind (symbol foundp)
+           (find-symbol (symbol-name form) *package*)
+         (if (and foundp (eq symbol form))
+             (symbol-name form)
+             (let ((package (symbol-package form))
+                   (name (symbol-name form)))
+               (concat (cond
+                         ((null package) "#")
+                         ((eq package (find-package "KEYWORD")) "")
+                         (t (package-name package)))
+                       ":" name)))))

       ((integerp form) (integer-to-string form))
       ((stringp form) (concat "\"" (escape-string form) "\""))
       ((functionp form)
       ((integerp form) (integer-to-string form))
       ((stringp form) (concat "\"" (escape-string form) "\""))
       ((functionp form)

@@ -722,6 +874,8 @@
                      (prin1-to-string (car last))
                      (concat (prin1-to-string (car last)) " . " (prin1-to-string (cdr last)))))
                ")"))
                      (prin1-to-string (car last))
                      (concat (prin1-to-string (car last)) " . " (prin1-to-string (cdr last)))))
                ")"))

+      ((arrayp form)
+       (concat "#" (prin1-to-string (vector-to-list form))))

       ((packagep form)
        (concat "#<PACKAGE " (package-name form) ">"))))
 
       ((packagep form)
        (concat "#<PACKAGE " (package-name form) ">"))))
 

@@ -754,7 +908,7 @@
 (defun %read-char (stream)
   (and (< (cdr stream) (length (car stream)))
        (prog1 (char (car stream) (cdr stream))
 (defun %read-char (stream)
   (and (< (cdr stream) (length (car stream)))
        (prog1 (char (car stream) (cdr stream))

-         (setcdr stream (1+ (cdr stream))))))
+         (rplacd stream (1+ (cdr stream))))))

 
 (defun whitespacep (ch)
   (or (char= ch #\space) (char= ch #\newline) (char= ch #\tab)))
 
 (defun whitespacep (ch)
   (or (char= ch #\space) (char= ch #\newline) (char= ch #\tab)))

@@ -824,6 +978,8 @@
   (ecase (%read-char stream)
     (#\'
      (list 'function (ls-read stream)))
   (ecase (%read-char stream)
     (#\'
      (list 'function (ls-read stream)))

+    (#\( (list-to-vector (%read-list stream)))
+    (#\: (make-symbol (string-upcase (read-until stream #'terminalp))))

     (#\\
      (let ((cname
             (concat (string (%read-char stream))
     (#\\
      (let ((cname
             (concat (string (%read-char stream))

@@ -880,6 +1036,40 @@
         (intern name package)
         (find-symbol name package))))
 
         (intern name package)
         (find-symbol name package))))
 

+
+(defun !parse-integer (string junk-allow)
+  (block nil
+    (let ((value 0)
+         (index 0)
+         (size (length string))
+         (sign 1))
+      (when (zerop size) (return (values nil 0)))
+      ;; Optional sign
+      (case (char string 0)
+       (#\+ (incf index))
+       (#\- (setq sign -1)
+            (incf index)))
+      ;; First digit
+      (unless (and (< index size)
+                  (setq value (digit-char-p (char string index))))
+       (return (values nil index)))
+      (incf index)
+      ;; Other digits
+      (while (< index size)
+       (let ((digit (digit-char-p (char string index))))
+         (unless digit (return))
+         (setq value (+ (* value 10) digit))
+         (incf index)))
+      (if (or junk-allow
+             (= index size)
+             (char= (char string index) #\space))
+         (values (* sign value) index)
+         (values nil index)))))
+
+#+ecmalisp
+(defun parse-integer (string)
+  (!parse-integer string nil))
+

 (defvar *eof* (gensym))
 (defun ls-read (stream)
   (skip-whitespaces-and-comments stream)
 (defvar *eof* (gensym))
 (defun ls-read (stream)
   (skip-whitespaces-and-comments stream)

@@ -908,9 +1098,8 @@
        (read-sharp stream))
       (t
        (let ((string (read-until stream #'terminalp)))
        (read-sharp stream))
       (t
        (let ((string (read-until stream #'terminalp)))

-         (if (every #'digit-char-p string)
-             (parse-integer string)
-             (read-symbol string)))))))
+        (or (values (!parse-integer string nil))
+            (read-symbol string)))))))

 
 (defun ls-read-from-string (string)
   (ls-read (make-string-stream string)))
 
 (defun ls-read-from-string (string)
   (ls-read (make-string-stream string)))

@@ -923,7 +1112,68 @@
 ;;; too. The respective real functions are defined in the target (see
 ;;; the beginning of this file) as well as some primitive functions.
 
 ;;; too. The respective real functions are defined in the target (see
 ;;; the beginning of this file) as well as some primitive functions.
 

-(defvar *compilation-unit-checks* '())
+(defun code (&rest args)
+  (mapconcat (lambda (arg)
+               (cond
+                 ((null arg) "")
+                 ((integerp arg) (integer-to-string arg))
+                 ((stringp arg) arg)
+                 (t (error "Unknown argument."))))
+             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) ")"))
+
+;;; Concatenate the arguments and wrap them with a self-calling
+;;; Javascript anonymous function. It is used to make some Javascript
+;;; statements valid expressions and provide a private scope as well.
+;;; 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) "})()"))
+
+;;; 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.
+
+#+ecmalisp
+(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
+;;; `*multiple-value-p*' is NIL, is granted that only the primary
+;;; value will be used, so we can optimize to avoid the VALUES
+;;; function call.
+(defvar *multiple-value-p* nil)

 
 (defun make-binding (name type value &optional declarations)
   (list name type value declarations))
 
 (defun make-binding (name type value &optional declarations)
   (list name type value declarations))

@@ -934,10 +1184,10 @@
 (defun binding-declarations (b) (fourth b))
 
 (defun set-binding-value (b value)
 (defun binding-declarations (b) (fourth b))
 
 (defun set-binding-value (b value)

-  (setcar (cddr b) value))
+  (rplaca (cddr b) value))

 
 (defun set-binding-declarations (b value)
 
 (defun set-binding-declarations (b value)

-  (setcar (cdddr b) value))
+  (rplaca (cdddr b) value))

 
 (defun push-binding-declaration (decl b)
   (set-binding-declarations b (cons decl (binding-declarations b))))
 
 (defun push-binding-declaration (decl b)
   (set-binding-declarations b (cons decl (binding-declarations b))))

@@ -951,10 +1201,10 @@
 
 (defun push-to-lexenv (binding lexenv namespace)
   (ecase namespace
 
 (defun push-to-lexenv (binding lexenv namespace)
   (ecase namespace

-    (variable   (setcar        lexenv  (cons binding (car lexenv))))
-    (function   (setcar   (cdr lexenv) (cons binding (cadr lexenv))))
-    (block      (setcar  (cddr lexenv) (cons binding (caddr lexenv))))
-    (gotag      (setcar (cdddr lexenv) (cons binding (cadddr lexenv))))))
+    (variable   (rplaca        lexenv  (cons binding (car lexenv))))
+    (function   (rplaca   (cdr lexenv) (cons binding (cadr lexenv))))
+    (block      (rplaca  (cddr lexenv) (cons binding (caddr lexenv))))
+    (gotag      (rplaca (cdddr lexenv) (cons binding (cadddr lexenv))))))

 
 (defun extend-lexenv (bindings lexenv namespace)
   (let ((env (copy-lexenv lexenv)))
 
 (defun extend-lexenv (bindings lexenv namespace)
   (let ((env (copy-lexenv lexenv)))

@@ -972,7 +1222,7 @@
 
 (defvar *variable-counter* 0)
 (defun gvarname (symbol)
 
 (defvar *variable-counter* 0)
 (defun gvarname (symbol)

-  (concat "v" (integer-to-string (incf *variable-counter*))))
+  (code "v" (incf *variable-counter*)))

 
 (defun translate-variable (symbol)
   (binding-value (lookup-in-lexenv symbol *environment* 'variable)))
 
 (defun translate-variable (symbol)
   (binding-value (lookup-in-lexenv symbol *environment* 'variable)))

@@ -980,7 +1230,7 @@
 (defun extend-local-env (args)
   (let ((new (copy-lexenv *environment*)))
     (dolist (symbol args new)
 (defun extend-local-env (args)
   (let ((new (copy-lexenv *environment*)))
     (dolist (symbol args new)

-      (let ((b (make-binding symbol 'lexical-variable (gvarname symbol))))
+      (let ((b (make-binding symbol 'variable (gvarname symbol))))

         (push-to-lexenv b new 'variable)))))
 
 ;;; Toplevel compilations
         (push-to-lexenv b new 'variable)))))
 
 ;;; Toplevel compilations

@@ -997,7 +1247,8 @@
 
 (defun %compile-defmacro (name lambda)
   (toplevel-compilation (ls-compile `',name))
 
 (defun %compile-defmacro (name lambda)
   (toplevel-compilation (ls-compile `',name))

-  (push-to-lexenv (make-binding name 'macro lambda) *environment* 'function))
+  (push-to-lexenv (make-binding name 'macro lambda) *environment* 'function)
+  name)

 
 (defun global-binding (name type namespace)
   (or (lookup-in-lexenv name *environment* namespace)
 
 (defun global-binding (name type namespace)
   (or (lookup-in-lexenv name *environment* namespace)

@@ -1022,11 +1273,7 @@
     (constant
      (dolist (name (cdr decl))
        (let ((b (global-binding name 'variable 'variable)))
     (constant
      (dolist (name (cdr decl))
        (let ((b (global-binding name 'variable 'variable)))

-         (push-binding-declaration 'constant b))))
-    (non-overridable
-     (dolist (name (cdr decl))
-       (let ((b (global-binding name 'function 'function)))
-         (push-binding-declaration 'non-overridable b))))))
+         (push-binding-declaration 'constant b))))))

 
 #+ecmalisp
 (fset 'proclaim #'!proclaim)
 
 #+ecmalisp
 (fset 'proclaim #'!proclaim)

@@ -1043,33 +1290,56 @@
          *compilations*))
 
 (define-compilation if (condition true false)
          *compilations*))
 
 (define-compilation if (condition true false)

-  (concat "(" (ls-compile condition) " !== " (ls-compile nil)
-          " ? " (ls-compile true)
-          " : " (ls-compile false)
-          ")"))
+  (code "(" (ls-compile condition) " !== " (ls-compile nil)
+        " ? " (ls-compile true *multiple-value-p*)
+        " : " (ls-compile false *multiple-value-p*)
+        ")"))

 
 

-(defvar *lambda-list-keywords* '(&optional &rest))
+(defvar *lambda-list-keywords* '(&optional &rest &key))

 
 (defun list-until-keyword (list)
   (if (or (null list) (member (car list) *lambda-list-keywords*))
       nil
       (cons (car list) (list-until-keyword (cdr list)))))
 
 
 (defun list-until-keyword (list)
   (if (or (null list) (member (car list) *lambda-list-keywords*))
       nil
       (cons (car list) (list-until-keyword (cdr list)))))
 

+(defun lambda-list-section (keyword lambda-list)
+  (list-until-keyword (cdr (member keyword lambda-list))))
+

 (defun lambda-list-required-arguments (lambda-list)
   (list-until-keyword lambda-list))
 
 (defun lambda-list-optional-arguments-with-default (lambda-list)
 (defun lambda-list-required-arguments (lambda-list)
   (list-until-keyword lambda-list))
 
 (defun lambda-list-optional-arguments-with-default (lambda-list)

-  (mapcar #'ensure-list (list-until-keyword (cdr (member '&optional lambda-list)))))
+  (mapcar #'ensure-list (lambda-list-section '&optional lambda-list)))

 
 (defun lambda-list-optional-arguments (lambda-list)
   (mapcar #'car (lambda-list-optional-arguments-with-default lambda-list)))
 
 (defun lambda-list-rest-argument (lambda-list)
 
 (defun lambda-list-optional-arguments (lambda-list)
   (mapcar #'car (lambda-list-optional-arguments-with-default lambda-list)))
 
 (defun lambda-list-rest-argument (lambda-list)

-  (let ((rest (list-until-keyword (cdr (member '&rest lambda-list)))))
+  (let ((rest (lambda-list-section '&rest lambda-list)))

     (when (cdr rest)
       (error "Bad lambda-list"))
     (car rest)))
 
     (when (cdr rest)
       (error "Bad lambda-list"))
     (car rest)))
 

+(defun lambda-list-keyword-arguments-canonical (lambda-list)
+  (flet ((canonalize (keyarg)
+          ;; Build a canonical keyword argument descriptor, filling
+          ;; the optional fields. The result is a list of the form
+          ;; ((keyword-name var) init-form).
+          (let* ((arg (ensure-list keyarg))
+                 (init-form (cadr arg))
+                 var
+                 keyword-name)
+            (if (listp (car arg))
+                (setq var (cadr (car arg))
+                      keyword-name (car (car arg)))
+                (setq var (car arg)
+                      keyword-name (intern (symbol-name (car arg)) "KEYWORD")))
+            `((,keyword-name ,var) ,init-form))))
+    (mapcar #'canonalize (lambda-list-section '&key lambda-list))))
+
+(defun lambda-list-keyword-arguments (lambda-list)
+  (mapcar (lambda (keyarg) (second (first keyarg)))
+         (lambda-list-keyword-arguments-canonical lambda-list)))

 
 (defun lambda-docstring-wrapper (docstring &rest strs)
   (if docstring
 
 (defun lambda-docstring-wrapper (docstring &rest strs)
   (if docstring

@@ -1077,12 +1347,117 @@
         "var func = " (join strs) ";" *newline*
         "func.docstring = '" docstring "';" *newline*
         "return func;" *newline*)
         "var func = " (join strs) ";" *newline*
         "func.docstring = '" docstring "';" *newline*
         "return func;" *newline*)

-      (join strs)))
-
-(define-compilation lambda (lambda-list &rest body)
+      (apply #'code strs)))
+
+(defun lambda-check-argument-count
+    (n-required-arguments n-optional-arguments rest-p)
+  ;; Note: Remember that we assume that the number of arguments of a
+  ;; call is at least 1 (the values argument).
+  (let ((min (1+ n-required-arguments))
+        (max (if rest-p 'n/a (+ 1 n-required-arguments n-optional-arguments))))
+    (block nil
+      ;; Special case: a positive exact number of arguments.
+      (when (and (< 1 min) (eql min max))
+        (return (code "checkArgs(arguments, " min ");" *newline*)))
+      ;; General case:
+      (code
+       (when (< 1 min)
+         (code "checkArgsAtLeast(arguments, " min ");" *newline*))
+       (when (numberp max)
+         (code "checkArgsAtMost(arguments, " max ");" *newline*))))))
+
+(defun compile-lambda-optional (lambda-list)
+  (let* ((optional-arguments (lambda-list-optional-arguments lambda-list))
+        (n-required-arguments (length (lambda-list-required-arguments lambda-list)))
+        (n-optional-arguments (length optional-arguments)))
+    (when optional-arguments
+      (code "switch(arguments.length-1){" *newline*
+            (let ((optional-and-defaults
+                   (lambda-list-optional-arguments-with-default lambda-list))
+                  (cases nil)
+                  (idx 0))
+              (progn
+                (while (< idx n-optional-arguments)
+                  (let ((arg (nth idx optional-and-defaults)))
+                    (push (code "case " (+ idx n-required-arguments) ":" *newline*
+                                (translate-variable (car arg))
+                                "="
+                                (ls-compile (cadr arg))
+                                ";" *newline*)
+                          cases)
+                    (incf idx)))
+                (push (code "default: break;" *newline*) cases)
+                (join (reverse cases))))
+            "}" *newline*))))
+
+(defun compile-lambda-rest (lambda-list)
+  (let ((n-required-arguments (length (lambda-list-required-arguments lambda-list)))
+       (n-optional-arguments (length (lambda-list-optional-arguments lambda-list)))
+       (rest-argument (lambda-list-rest-argument lambda-list)))
+    (when rest-argument
+      (let ((js!rest (translate-variable rest-argument)))
+        (code "var " js!rest "= " (ls-compile nil) ";" *newline*
+              "for (var i = arguments.length-1; i>="
+              (+ 1 n-required-arguments n-optional-arguments)
+              "; i--)" *newline*
+              (indent js!rest " = {car: arguments[i], cdr: ") js!rest "};"
+              *newline*)))))
+
+(defun compile-lambda-parse-keywords (lambda-list)
+  (let ((n-required-arguments
+        (length (lambda-list-required-arguments lambda-list)))
+       (n-optional-arguments
+        (length (lambda-list-optional-arguments lambda-list)))
+       (keyword-arguments
+        (lambda-list-keyword-arguments-canonical lambda-list)))
+    (code
+     "var i;" *newline*
+     ;; Declare variables
+     (mapconcat (lambda (arg)
+                 (let ((var (second (car arg))))
+                   (code "var " (translate-variable var) "; " *newline*)))
+               keyword-arguments)
+     ;; Parse keywords
+     (flet ((parse-keyword (keyarg)
+             ;; ((keyword-name var) init-form)
+             (code "for (i=" (+ 1 n-required-arguments n-optional-arguments)
+                    "; i<arguments.length; i+=2){" *newline*
+                    (indent
+                     "if (arguments[i] === " (ls-compile (caar keyarg)) "){" *newline*
+                     (indent (translate-variable (cadr (car keyarg)))
+                             " = arguments[i+1];"
+                             *newline*
+                             "break;" *newline*)
+                     "}" *newline*)
+                    "}" *newline*
+                    ;; Default value
+                    "if (i == arguments.length){" *newline*
+                    (indent
+                     (translate-variable (cadr (car keyarg)))
+                     " = "
+                     (ls-compile (cadr keyarg))
+                     ";" *newline*)
+                    "}" *newline*)))
+       (mapconcat #'parse-keyword keyword-arguments))
+     ;; Check for unknown keywords
+     (when keyword-arguments
+       (code "for (i=" (+ 1 n-required-arguments n-optional-arguments)
+             "; i<arguments.length; i+=2){" *newline*
+             (indent "if ("
+                     (join (mapcar (lambda (x)
+                                     (concat "arguments[i] !== " (ls-compile (caar x))))
+                                   keyword-arguments)
+                           " && ")
+                     ")" *newline*
+                     (indent
+                      "throw 'Unknown keyword argument ' + arguments[i].name;" *newline*))
+             "}" *newline*)))))
+
+(defun compile-lambda (lambda-list body)

   (let ((required-arguments (lambda-list-required-arguments lambda-list))
         (optional-arguments (lambda-list-optional-arguments lambda-list))
   (let ((required-arguments (lambda-list-required-arguments lambda-list))
         (optional-arguments (lambda-list-optional-arguments lambda-list))

-        (rest-argument (lambda-list-rest-argument lambda-list))
+       (keyword-arguments  (lambda-list-keyword-arguments  lambda-list))
+        (rest-argument      (lambda-list-rest-argument      lambda-list))

         documentation)
     ;; Get the documentation string for the lambda function
     (when (and (stringp (car body))
         documentation)
     ;; Get the documentation string for the lambda function
     (when (and (stringp (car body))

@@ -1094,74 +1469,58 @@
           (*environment* (extend-local-env
                           (append (ensure-list rest-argument)
                                   required-arguments
           (*environment* (extend-local-env
                           (append (ensure-list rest-argument)
                                   required-arguments

-                                  optional-arguments))))
+                                  optional-arguments
+                                 keyword-arguments))))

       (lambda-docstring-wrapper
        documentation
        "(function ("
       (lambda-docstring-wrapper
        documentation
        "(function ("

-       (join (mapcar #'translate-variable
-                     (append required-arguments optional-arguments))
+       (join (cons "values"
+                   (mapcar #'translate-variable
+                           (append required-arguments optional-arguments)))

              ",")
        "){" *newline*
              ",")
        "){" *newline*

-       ;; Check number of arguments

        (indent
        (indent

-        (if required-arguments
-            (concat "if (arguments.length < " (integer-to-string n-required-arguments)
-                    ") throw 'too few arguments';" *newline*)
-            "")
-        (if (not rest-argument)
-            (concat "if (arguments.length > "
-                    (integer-to-string (+ n-required-arguments n-optional-arguments))
-                    ") throw 'too many arguments';" *newline*)
-            "")
-        ;; Optional arguments
-        (if optional-arguments
-            (concat "switch(arguments.length){" *newline*
-                    (let ((optional-and-defaults
-                           (lambda-list-optional-arguments-with-default lambda-list))
-                          (cases nil)
-                          (idx 0))
-                      (progn
-                        (while (< idx n-optional-arguments)
-                          (let ((arg (nth idx optional-and-defaults)))
-                            (push (concat "case "
-                                          (integer-to-string (+ idx n-required-arguments)) ":" *newline*
-                                          (translate-variable (car arg))
-                                          "="
-                                          (ls-compile (cadr arg))
-                                          ";" *newline*)
-                                  cases)
-                            (incf idx)))
-                        (push (concat "default: break;" *newline*) cases)
-                        (join (reverse cases))))
-                    "}" *newline*)
-            "")
-        ;; &rest/&body argument
-        (if rest-argument
-            (let ((js!rest (translate-variable rest-argument)))
-              (concat "var " js!rest "= " (ls-compile nil) ";" *newline*
-                      "for (var i = arguments.length-1; i>="
-                      (integer-to-string (+ n-required-arguments n-optional-arguments))
-                      "; i--)" *newline*
-                      (indent js!rest " = "
-                              "{car: arguments[i], cdr: ") js!rest "};"
-                      *newline*))
-            "")
-        ;; Body
-        (ls-compile-block body t)) *newline*
+        ;; Check number of arguments
+        (lambda-check-argument-count n-required-arguments
+                                     n-optional-arguments
+                                     (or rest-argument keyword-arguments))
+       (compile-lambda-optional lambda-list)
+       (compile-lambda-rest lambda-list)
+       (compile-lambda-parse-keywords lambda-list)
+        (let ((*multiple-value-p* t))
+         (ls-compile-block body t)))

        "})"))))
 
        "})"))))
 

-(define-compilation setq (var val)
+
+
+(defun setq-pair (var val)

   (let ((b (lookup-in-lexenv var *environment* 'variable)))
   (let ((b (lookup-in-lexenv var *environment* 'variable)))

-    (if (eq (binding-type b) 'lexical-variable)
-        (concat (binding-value b) " = " (ls-compile val))
+    (if (and (eq (binding-type b) 'variable)
+             (not (member 'special (binding-declarations b)))
+             (not (member 'constant (binding-declarations b))))
+        (code (binding-value b) " = " (ls-compile val))

         (ls-compile `(set ',var ,val)))))
 
         (ls-compile `(set ',var ,val)))))
 

+(define-compilation setq (&rest pairs)
+  (let ((result ""))
+    (while t
+      (cond
+       ((null pairs) (return))
+       ((null (cdr pairs))
+        (error "Odd paris in SETQ"))
+       (t
+        (concatf result
+          (concat (setq-pair (car pairs) (cadr pairs))
+                  (if (null (cddr pairs)) "" ", ")))
+        (setq pairs (cddr pairs)))))
+    (code "(" result ")")))
+

 ;;; FFI Variable accessors
 (define-compilation js-vref (var)
   var)
 
 (define-compilation js-vset (var val)
 ;;; FFI Variable accessors
 (define-compilation js-vref (var)
   var)
 
 (define-compilation js-vset (var val)

-  (concat "(" var " = " (ls-compile val) ")"))
+  (code "(" var " = " (ls-compile val) ")"))

 
 
 ;;; Literals
 
 
 ;;; Literals

@@ -1185,30 +1544,51 @@
 (defvar *literal-counter* 0)
 
 (defun genlit ()
 (defvar *literal-counter* 0)
 
 (defun genlit ()

-  (concat "l" (integer-to-string (incf *literal-counter*))))
+  (code "l" (incf *literal-counter*)))

 
 (defun literal (sexp &optional recursive)
   (cond
     ((integerp sexp) (integer-to-string sexp))
 
 (defun literal (sexp &optional recursive)
   (cond
     ((integerp sexp) (integer-to-string sexp))

-    ((stringp sexp) (concat "\"" (escape-string sexp) "\""))
+    ((stringp sexp) (code "\"" (escape-string sexp) "\""))

     ((symbolp sexp)
      (or (cdr (assoc sexp *literal-symbols*))
         (let ((v (genlit))
     ((symbolp sexp)
      (or (cdr (assoc sexp *literal-symbols*))
         (let ((v (genlit))

-              (s #+common-lisp (concat "{name: \"" (escape-string (symbol-name sexp)) "\"}")
-                 #+ecmalisp (ls-compile
-                              `(intern ,(symbol-name sexp)
-                                       ,(package-name (symbol-package sexp))))))
+              (s #+common-lisp
+                 (let ((package (symbol-package sexp)))
+                   (if (eq package (find-package "KEYWORD"))
+                       (code "{name: \"" (escape-string (symbol-name sexp))
+                             "\", 'package': '" (package-name package) "'}")
+                       (code "{name: \"" (escape-string (symbol-name sexp)) "\"}")))
+                 #+ecmalisp
+                 (let ((package (symbol-package sexp)))
+                   (if (null package)
+                       (code "{name: \"" (escape-string (symbol-name sexp)) "\"}")
+                       (ls-compile `(intern ,(symbol-name sexp) ,(package-name package)))))))

           (push (cons sexp v) *literal-symbols*)
           (push (cons sexp v) *literal-symbols*)

-          (toplevel-compilation (concat "var " v " = " s))
+          (toplevel-compilation (code "var " v " = " s))

           v)))
     ((consp sexp)
           v)))
     ((consp sexp)

-     (let ((c (concat "{car: " (literal (car sexp) t) ", "
-                     "cdr: " (literal (cdr sexp) t) "}")))
+     (let* ((head (butlast sexp))
+            (tail (last sexp))
+            (c (code "QIList("
+                     (join-trailing (mapcar (lambda (x) (literal x t)) head) ",")
+                     (literal (car tail) t)
+                     ","
+                     (literal (cdr tail) t)
+                     ")")))

        (if recursive
           c
           (let ((v (genlit)))
        (if recursive
           c
           (let ((v (genlit)))

-            (toplevel-compilation (concat "var " v " = " c))
-            v))))))
+             (toplevel-compilation (code "var " v " = " c))
+             v))))
+    ((arrayp sexp)
+     (let ((elements (vector-to-list sexp)))
+       (let ((c (concat "[" (join (mapcar #'literal elements) ", ") "]")))
+        (if recursive
+            c
+            (let ((v (genlit)))
+              (toplevel-compilation (code "var " v " = " c))
+              v)))))))

 
 (define-compilation quote (sexp)
   (literal sexp))
 
 (define-compilation quote (sexp)
   (literal sexp))

@@ -1223,23 +1603,74 @@
 (define-compilation function (x)
   (cond
     ((and (listp x) (eq (car x) 'lambda))
 (define-compilation function (x)
   (cond
     ((and (listp x) (eq (car x) 'lambda))

-     (ls-compile x))
+     (compile-lambda (cadr x) (cddr x)))

     ((symbolp x)
     ((symbolp x)

-     (ls-compile `(symbol-function ',x)))))
+     (let ((b (lookup-in-lexenv x *environment* 'function)))
+       (if b
+          (binding-value b)
+          (ls-compile `(symbol-function ',x)))))))
+
+
+(defun make-function-binding (fname)
+  (make-binding fname 'function (gvarname fname)))
+
+(defun compile-function-definition (list)
+  (compile-lambda (car list) (cdr list)))
+
+(defun translate-function (name)
+  (let ((b (lookup-in-lexenv name *environment* 'function)))
+    (binding-value b)))
+
+(define-compilation flet (definitions &rest body)
+  (let* ((fnames (mapcar #'car definitions))
+         (fbody  (mapcar #'cdr definitions))
+         (cfuncs (mapcar #'compile-function-definition fbody))
+         (*environment*
+          (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 ",") ")")))
+
+(define-compilation labels (definitions &rest body)
+  (let* ((fnames (mapcar #'car definitions))
+        (*environment*
+          (extend-lexenv (mapcar #'make-function-binding fnames)
+                         *environment*
+                         'function)))
+    (js!selfcall
+      (mapconcat (lambda (func)
+                  (code "var " (translate-function (car func))
+                         " = " (compile-lambda (cadr func) (cddr func))
+                         ";" *newline*))
+                definitions)
+      (ls-compile-block body t))))
+
+

 
 

+(defvar *compiling-file* nil)

 (define-compilation eval-when-compile (&rest body)
 (define-compilation eval-when-compile (&rest body)

-  (eval (cons 'progn body))
-  nil)
+  (if *compiling-file*
+      (progn
+        (eval (cons 'progn body))
+        nil)
+      (ls-compile `(progn ,@body))))

 
 (defmacro define-transformation (name args form)
   `(define-compilation ,name ,args
      (ls-compile ,form)))
 
 (define-compilation progn (&rest body)
 
 (defmacro define-transformation (name args form)
   `(define-compilation ,name ,args
      (ls-compile ,form)))
 
 (define-compilation progn (&rest body)

-  (js!selfcall (ls-compile-block body t)))
+  (if (null (cdr body))
+      (ls-compile (car body) *multiple-value-p*)
+      (js!selfcall (ls-compile-block body t))))

 
 (defun special-variable-p (x)
 
 (defun special-variable-p (x)

-  (claimp x 'variable 'special))
+  (and (claimp x 'variable 'special) t))

 
 ;;; Wrap CODE to restore the symbol values of the dynamic
 ;;; bindings. BINDINGS is a list of pairs of the form
 
 ;;; Wrap CODE to restore the symbol values of the dynamic
 ;;; bindings. BINDINGS is a list of pairs of the form

@@ -1249,15 +1680,15 @@
 (defun let-binding-wrapper (bindings body)
   (when (null bindings)
     (return-from let-binding-wrapper body))
 (defun let-binding-wrapper (bindings body)
   (when (null bindings)
     (return-from let-binding-wrapper body))

-  (concat
+  (code

    "try {" *newline*
    (indent "var tmp;" *newline*
            (mapconcat
             (lambda (b)
               (let ((s (ls-compile `(quote ,(car b)))))
    "try {" *newline*
    (indent "var tmp;" *newline*
            (mapconcat
             (lambda (b)
               (let ((s (ls-compile `(quote ,(car b)))))

-                (concat "tmp = " s ".value;" *newline*
-                        s ".value = " (cdr b) ";" *newline*
-                        (cdr b) " = tmp;" *newline*)))
+                (code "tmp = " s ".value;" *newline*
+                      s ".value = " (cdr b) ";" *newline*
+                      (cdr b) " = tmp;" *newline*)))

             bindings)
            body *newline*)
    "}" *newline*
             bindings)
            body *newline*)
    "}" *newline*

@@ -1265,42 +1696,42 @@
    (indent
     (mapconcat (lambda (b)
                  (let ((s (ls-compile `(quote ,(car b)))))
    (indent
     (mapconcat (lambda (b)
                  (let ((s (ls-compile `(quote ,(car b)))))

-                   (concat s ".value" " = " (cdr b) ";" *newline*)))
+                   (code s ".value" " = " (cdr b) ";" *newline*)))

                bindings))
    "}" *newline*))
 
 (define-compilation let (bindings &rest body)
                bindings))
    "}" *newline*))
 
 (define-compilation let (bindings &rest body)

-  (let ((bindings (mapcar #'ensure-list bindings)))
-    (let ((variables (mapcar #'first bindings)))
-      (let ((cvalues (mapcar #'ls-compile (mapcar #'second bindings)))
-            (*environment* (extend-local-env (remove-if #'special-variable-p variables)))
-            (dynamic-bindings))
-        (concat "(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 ",") ")")))))
+  (let* ((bindings (mapcar #'ensure-list bindings))
+         (variables (mapcar #'first bindings))
+         (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 ",") ")")))

 
 
 ;;; Return the code to initialize BINDING, and push it extending the
 
 
 ;;; Return the code to initialize BINDING, and push it extending the

-;;; current lexical environment if the variable is special.
+;;; current lexical environment if the variable is not special.

 (defun let*-initialize-value (binding)
   (let ((var (first binding))
         (value (second binding)))
     (if (special-variable-p var)
 (defun let*-initialize-value (binding)
   (let ((var (first binding))
         (value (second binding)))
     (if (special-variable-p var)

-        (concat (ls-compile `(setq ,var ,value)) ";" *newline*)
-        (let ((v (gvarname var)))
-          (let ((b (make-binding var 'variable v)))
-            (prog1 (concat "var " v " = " (ls-compile value) ";" *newline*)
-              (push-to-lexenv b *environment* 'variable)))))))
+        (code (ls-compile `(setq ,var ,value)) ";" *newline*)
+        (let* ((v (gvarname var))
+               (b (make-binding var 'variable v)))
+          (prog1 (code "var " v " = " (ls-compile value) ";" *newline*)
+            (push-to-lexenv b *environment* 'variable))))))

 
 ;;; Wrap BODY to restore the symbol values of SYMBOLS after body. It
 ;;; DOES NOT generate code to initialize the value of the symbols,
 
 ;;; Wrap BODY to restore the symbol values of SYMBOLS after body. It
 ;;; DOES NOT generate code to initialize the value of the symbols,

@@ -1310,12 +1741,12 @@
     (return-from let*-binding-wrapper body))
   (let ((store (mapcar (lambda (s) (cons s (gvarname s)))
                        (remove-if-not #'special-variable-p symbols))))
     (return-from let*-binding-wrapper body))
   (let ((store (mapcar (lambda (s) (cons s (gvarname s)))
                        (remove-if-not #'special-variable-p symbols))))

-    (concat
+    (code

      "try {" *newline*
      (indent
       (mapconcat (lambda (b)
                    (let ((s (ls-compile `(quote ,(car b)))))
      "try {" *newline*
      (indent
       (mapconcat (lambda (b)
                    (let ((s (ls-compile `(quote ,(car b)))))

-                     (concat "var " (cdr b) " = " s ".value;" *newline*)))
+                     (code "var " (cdr b) " = " s ".value;" *newline*)))

                  store)
       body)
      "}" *newline*
                  store)
       body)
      "}" *newline*

@@ -1323,11 +1754,10 @@
      (indent
       (mapconcat (lambda (b)
                    (let ((s (ls-compile `(quote ,(car b)))))
      (indent
       (mapconcat (lambda (b)
                    (let ((s (ls-compile `(quote ,(car b)))))

-                     (concat s ".value" " = " (cdr b) ";" *newline*)))
+                     (code s ".value" " = " (cdr b) ";" *newline*)))

                  store))
      "}" *newline*)))
 
                  store))
      "}" *newline*)))
 

-

 (define-compilation let* (bindings &rest body)
   (let ((bindings (mapcar #'ensure-list bindings))
         (*environment* (copy-lexenv *environment*)))
 (define-compilation let* (bindings &rest body)
   (let ((bindings (mapcar #'ensure-list bindings))
         (*environment* (copy-lexenv *environment*)))

@@ -1341,53 +1771,66 @@
 (defvar *block-counter* 0)
 
 (define-compilation block (name &rest body)
 (defvar *block-counter* 0)
 
 (define-compilation block (name &rest body)

-  (let ((tr (integer-to-string (incf *block-counter*))))
-    (let ((b (make-binding name 'block tr)))
-      (js!selfcall
-        "try {" *newline*
-        (let ((*environment* (extend-lexenv (list b) *environment* 'block)))
-          (indent "return " (ls-compile `(progn ,@body)) ";" *newline*))
-        "}" *newline*
-        "catch (cf){" *newline*
-        "    if (cf.type == 'block' && cf.id == " tr ")" *newline*
-        "        return cf.value;" *newline*
-        "    else" *newline*
-        "        throw cf;" *newline*
-        "}" *newline*))))
+  (let* ((tr (incf *block-counter*))
+         (b (make-binding name 'block tr)))
+    (when *multiple-value-p*
+      (push-binding-declaration 'multiple-value b))
+    (let* ((*environment* (extend-lexenv (list b) *environment* 'block))
+           (cbody (ls-compile-block body t)))
+      (if (member 'used (binding-declarations b))
+          (js!selfcall
+            "try {" *newline*
+            (indent cbody)
+            "}" *newline*
+            "catch (cf){" *newline*
+            "    if (cf.type == 'block' && cf.id == " tr ")" *newline*
+            (if *multiple-value-p*
+                "        return values.apply(this, forcemv(cf.values));"
+                "        return cf.values;")
+            *newline*
+            "    else" *newline*
+            "        throw cf;" *newline*
+            "}" *newline*)
+          (js!selfcall cbody)))))

 
 (define-compilation return-from (name &optional value)
 
 (define-compilation return-from (name &optional value)

-  (let ((b (lookup-in-lexenv name *environment* 'block)))
-    (if b
-        (js!selfcall
-          "throw ({"
-          "type: 'block', "
-          "id: " (binding-value b) ", "
-          "value: " (ls-compile value) ", "
-          "message: 'Return from unknown block " (symbol-name name) ".'"
-          "})")
-        (error (concat "Unknown block `" (symbol-name name) "'.")))))
-
+  (let* ((b (lookup-in-lexenv name *environment* 'block))
+         (multiple-value-p (member 'multiple-value (binding-declarations b))))
+    (when (null b)
+      (error (concat "Unknown block `" (symbol-name name) "'.")))
+    (push-binding-declaration 'used b)
+    (js!selfcall
+      (when multiple-value-p (code "var values = mv;" *newline*))
+      "throw ({"
+      "type: 'block', "
+      "id: " (binding-value b) ", "
+      "values: " (ls-compile value multiple-value-p) ", "
+      "message: 'Return from unknown block " (symbol-name name) ".'"
+      "})")))

 
 (define-compilation catch (id &rest body)
   (js!selfcall
     "var id = " (ls-compile id) ";" *newline*
     "try {" *newline*
 
 (define-compilation catch (id &rest body)
   (js!selfcall
     "var id = " (ls-compile id) ";" *newline*
     "try {" *newline*

-    (indent "return " (ls-compile `(progn ,@body))
-            ";" *newline*)
+    (indent (ls-compile-block body t)) *newline*

     "}" *newline*
     "catch (cf){" *newline*
     "    if (cf.type == 'catch' && cf.id == id)" *newline*
     "}" *newline*
     "catch (cf){" *newline*
     "    if (cf.type == 'catch' && cf.id == id)" *newline*

-    "        return cf.value;" *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*))
 
 (define-compilation throw (id value)
   (js!selfcall
     "    else" *newline*
     "        throw cf;" *newline*
     "}" *newline*))
 
 (define-compilation throw (id value)
   (js!selfcall

+    "var values = mv;" *newline*

     "throw ({"
     "type: 'catch', "
     "id: " (ls-compile id) ", "
     "throw ({"
     "type: 'catch', "
     "id: " (ls-compile id) ", "

-    "value: " (ls-compile value) ", "
+    "values: " (ls-compile value t) ", "

     "message: 'Throw uncatched.'"
     "})"))
 
     "message: 'Throw uncatched.'"
     "})"))
 

@@ -1416,7 +1859,7 @@
   (unless (go-tag-p (car body))
     (push (gensym "START") body))
   ;; Tagbody compilation
   (unless (go-tag-p (car body))
     (push (gensym "START") body))
   ;; Tagbody compilation

-  (let ((tbidx (integer-to-string *tagbody-counter*)))
+  (let ((tbidx *tagbody-counter*))

     (let ((*environment* (declare-tagbody-tags tbidx body))
           initag)
       (let ((b (lookup-in-lexenv (first body) *environment* 'gotag)))
     (let ((*environment* (declare-tagbody-tags tbidx body))
           initag)
       (let ((b (lookup-in-lexenv (first body) *environment* 'gotag)))

@@ -1427,17 +1870,17 @@
         "while (true) {" *newline*
         (indent "try {" *newline*
                 (indent (let ((content ""))
         "while (true) {" *newline*
         (indent "try {" *newline*
                 (indent (let ((content ""))

-                          (concat "switch(tagbody_" tbidx "){" *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)))
-                                            (concat "case " (second (binding-value b)) ":" *newline*)))))
-                                  "default:" *newline*
-                                  "    break tbloop;" *newline*
-                                  "}" *newline*)))
+                          (code "switch(tagbody_" tbidx "){" *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*
                 "}" *newline*
                 "catch (jump) {" *newline*
                 "    if (jump.type == 'tagbody' && jump.id == " tbidx ")" *newline*

@@ -1453,16 +1896,15 @@
         (n (cond
              ((symbolp label) (symbol-name label))
              ((integerp label) (integer-to-string label)))))
         (n (cond
              ((symbolp label) (symbol-name label))
              ((integerp label) (integer-to-string label)))))

-    (if b
-        (js!selfcall
-          "throw ({"
-          "type: 'tagbody', "
-          "id: " (first (binding-value b)) ", "
-          "label: " (second (binding-value b)) ", "
-          "message: 'Attempt to GO to non-existing tag " n "'"
-          "})" *newline*)
-        (error (concat "Unknown tag `" n "'.")))))
-
+    (when (null b)
+      (error (concat "Unknown tag `" n "'.")))
+    (js!selfcall
+      "throw ({"
+      "type: 'tagbody', "
+      "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
 
 (define-compilation unwind-protect (form &rest clean-up)
   (js!selfcall

@@ -1474,6 +1916,30 @@
     "}" *newline*
     "return ret;" *newline*))
 
     "}" *newline*
     "return ret;" *newline*))
 

+(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") "];" *newline*
+    "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)
+      "return func.apply(window, args);" *newline*) ";" *newline*))
+
+(define-compilation multiple-value-prog1 (first-form &rest forms)
+  (js!selfcall
+    "var args = " (ls-compile first-form *multiple-value-p*) ";" *newline*
+    (ls-compile-block forms)
+    "return args;" *newline*))
+
+

 
 ;;; A little backquote implementation without optimizations of any
 ;;; kind for ecmalisp.
 
 ;;; A little backquote implementation without optimizations of any
 ;;; kind for ecmalisp.

@@ -1531,18 +1997,18 @@
 (defmacro type-check (decls &body body)
   `(js!selfcall
      ,@(mapcar (lambda (decl)
 (defmacro type-check (decls &body body)
   `(js!selfcall
      ,@(mapcar (lambda (decl)

-                   `(concat "var " ,(first decl) " = " ,(third decl) ";" *newline*))
-                 decls)
+                 `(code "var " ,(first decl) " = " ,(third decl) ";" *newline*))
+               decls)

      ,@(mapcar (lambda (decl)
      ,@(mapcar (lambda (decl)

-                 `(concat "if (typeof " ,(first decl) " != '" ,(second decl) "')" *newline*
-                          (indent "throw 'The value ' + "
-                                  ,(first decl)
-                                  " + ' is not a type "
-                                  ,(second decl)
-                                  ".';"
-                                  *newline*)))
+                 `(code "if (typeof " ,(first decl) " != '" ,(second decl) "')" *newline*
+                        (indent "throw 'The value ' + "
+                                ,(first decl)
+                                " + ' is not a type "
+                                ,(second decl)
+                                ".';"
+                                *newline*)))

                decls)
                decls)

-     (concat "return " (progn ,@body) ";" *newline*)))
+     (code "return " (progn ,@body) ";" *newline*)))

 
 ;;; VARIABLE-ARITY compiles variable arity operations. ARGS stands for
 ;;; a variable which holds a list of forms. It will compile them and
 
 ;;; VARIABLE-ARITY compiles variable arity operations. ARGS stands for
 ;;; a variable which holds a list of forms. It will compile them and

@@ -1554,16 +2020,18 @@
   (unless (consp args)
     (error "ARGS must be a non-empty list"))
   (let ((counter 0)
   (unless (consp args)
     (error "ARGS must be a non-empty list"))
   (let ((counter 0)

-        (variables '())
+        (fargs '())

         (prelude ""))
     (dolist (x args)
         (prelude ""))
     (dolist (x args)

-      (let ((v (concat "x" (integer-to-string (incf counter)))))
-        (push v variables)
-        (concatf prelude
-                 (concat "var " v " = " (ls-compile x) ";" *newline*
-                         "if (typeof " v " !== 'number') throw 'Not a number!';"
-                         *newline*))))
-    (js!selfcall prelude (funcall function (reverse variables)))))
+      (if (numberp x)
+          (push (integer-to-string x) fargs)
+          (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)))))

 
 
 (defmacro variable-arity (args &body body)
 
 
 (defmacro variable-arity (args &body body)

@@ -1571,11 +2039,11 @@
     (error "Bad usage of VARIABLE-ARITY, you must pass a symbol"))
   `(variable-arity-call ,args
                         (lambda (,args)
     (error "Bad usage of VARIABLE-ARITY, you must pass a symbol"))
   `(variable-arity-call ,args
                         (lambda (,args)

-                          (concat "return " ,@body ";" *newline*))))
+                          (code "return " ,@body ";" *newline*))))

 
 (defun num-op-num (x op y)
   (type-check (("x" "number" x) ("y" "number" y))
 
 (defun num-op-num (x op y)
   (type-check (("x" "number" x) ("y" "number" y))

-    (concat "x" op "y")))
+    (code "x" op "y")))

 
 (define-raw-builtin + (&rest numbers)
   (if (null numbers)
 
 (define-raw-builtin + (&rest numbers)
   (if (null numbers)

@@ -1630,14 +2098,14 @@
 (define-builtin-comparison = "==")
 
 (define-builtin numberp (x)
 (define-builtin-comparison = "==")
 
 (define-builtin numberp (x)

-  (js!bool (concat "(typeof (" x ") == \"number\")")))
+  (js!bool (code "(typeof (" x ") == \"number\")")))

 
 (define-builtin floor (x)
   (type-check (("x" "number" x))
     "Math.floor(x)"))
 
 (define-builtin cons (x y)
 
 (define-builtin floor (x)
   (type-check (("x" "number" x))
     "Math.floor(x)"))
 
 (define-builtin cons (x y)

-  (concat "({car: " x ", cdr: " y "})"))
+  (code "({car: " x ", cdr: " y "})"))

 
 (define-builtin consp (x)
   (js!bool
 
 (define-builtin consp (x)
   (js!bool

@@ -1659,13 +2127,13 @@
     (ls-compile nil)
     ": tmp.cdr;" *newline*))
 
     (ls-compile nil)
     ": tmp.cdr;" *newline*))
 

-(define-builtin setcar (x new)
+(define-builtin rplaca (x new)

   (type-check (("x" "object" x))
   (type-check (("x" "object" x))

-    (concat "(x.car = " new ")")))
+    (code "(x.car = " new ", x)")))

 
 

-(define-builtin setcdr (x new)
+(define-builtin rplacd (x new)

   (type-check (("x" "object" x))
   (type-check (("x" "object" x))

-    (concat "(x.cdr = " new ")")))
+    (code "(x.cdr = " new ", x)")))

 
 (define-builtin symbolp (x)
   (js!bool
 
 (define-builtin symbolp (x)
   (js!bool

@@ -1678,16 +2146,16 @@
     "({name: name})"))
 
 (define-builtin symbol-name (x)
     "({name: name})"))
 
 (define-builtin symbol-name (x)

-  (concat "(" x ").name"))
+  (code "(" x ").name"))

 
 (define-builtin set (symbol value)
 
 (define-builtin set (symbol value)

-  (concat "(" symbol ").value = " value))
+  (code "(" symbol ").value = " value))

 
 (define-builtin fset (symbol value)
 
 (define-builtin fset (symbol value)

-  (concat "(" symbol ").function = " value))
+  (code "(" symbol ").fvalue = " value))

 
 (define-builtin boundp (x)
 
 (define-builtin boundp (x)

-  (js!bool (concat "(" x ".value !== undefined)")))
+  (js!bool (code "(" x ".value !== undefined)")))

 
 (define-builtin symbol-value (x)
   (js!selfcall
 
 (define-builtin symbol-value (x)
   (js!selfcall

@@ -1699,25 +2167,25 @@
 (define-builtin symbol-function (x)
   (js!selfcall
     "var symbol = " x ";" *newline*
 (define-builtin symbol-function (x)
   (js!selfcall
     "var symbol = " x ";" *newline*

-    "var func = symbol.function;" *newline*
+    "var func = symbol.fvalue;" *newline*

     "if (func === undefined) throw \"Function `\" + symbol.name + \"' is undefined.\";" *newline*
     "return func;" *newline*))
 
 (define-builtin symbol-plist (x)
     "if (func === undefined) throw \"Function `\" + symbol.name + \"' is undefined.\";" *newline*
     "return func;" *newline*))
 
 (define-builtin symbol-plist (x)

-  (concat "((" x ").plist || " (ls-compile nil) ")"))
+  (code "((" x ").plist || " (ls-compile nil) ")"))

 
 (define-builtin lambda-code (x)
 
 (define-builtin lambda-code (x)

-  (concat "(" x ").toString()"))
+  (code "(" x ").toString()"))

 
 

-(define-builtin eq    (x y) (js!bool (concat "(" x " === " y ")")))
-(define-builtin equal (x y) (js!bool (concat "(" x  " == " y ")")))
+(define-builtin eq    (x y) (js!bool (code "(" x " === " y ")")))
+(define-builtin equal (x y) (js!bool (code "(" x  " == " y ")")))

 
 (define-builtin char-to-string (x)
   (type-check (("x" "number" x))
     "String.fromCharCode(x)"))
 
 (define-builtin stringp (x)
 
 (define-builtin char-to-string (x)
   (type-check (("x" "number" x))
     "String.fromCharCode(x)"))
 
 (define-builtin stringp (x)

-  (js!bool (concat "(typeof(" x ") == \"string\")")))
+  (js!bool (code "(typeof(" x ") == \"string\")")))

 
 (define-builtin string-upcase (x)
   (type-check (("x" "string" x))
 
 (define-builtin string-upcase (x)
   (type-check (("x" "string" x))

@@ -1732,9 +2200,7 @@
     "var str = " (ls-compile string) ";" *newline*
     "var a = " (ls-compile a) ";" *newline*
     "var b;" *newline*
     "var str = " (ls-compile string) ";" *newline*
     "var a = " (ls-compile a) ";" *newline*
     "var b;" *newline*

-    (if b
-        (concat "b = " (ls-compile b) ";" *newline*)
-        "")
+    (when b (code "b = " (ls-compile b) ";" *newline*))

     "return str.slice(a,b);" *newline*))
 
 (define-builtin char (string index)
     "return str.slice(a,b);" *newline*))
 
 (define-builtin char (string index)

@@ -1748,19 +2214,21 @@
     "string1.concat(string2)"))
 
 (define-raw-builtin funcall (func &rest args)
     "string1.concat(string2)"))
 
 (define-raw-builtin funcall (func &rest args)

-  (concat "(" (ls-compile func) ")("
-          (join (mapcar #'ls-compile args)
-                ", ")
-          ")"))
+  (code "(" (ls-compile func) ")("
+        (join (cons (if *multiple-value-p* "values" "pv")
+                    (mapcar #'ls-compile args))
+              ", ")
+        ")"))

 
 (define-raw-builtin apply (func &rest args)
   (if (null args)
 
 (define-raw-builtin apply (func &rest args)
   (if (null args)

-      (concat "(" (ls-compile func) ")()")
+      (code "(" (ls-compile func) ")()")

       (let ((args (butlast args))
             (last (car (last args))))
         (js!selfcall
           "var f = " (ls-compile func) ";" *newline*
       (let ((args (butlast args))
             (last (car (last args))))
         (js!selfcall
           "var f = " (ls-compile func) ";" *newline*

-          "var args = [" (join (mapcar #'ls-compile args)
+          "var args = [" (join (cons (if *multiple-value-p* "values" "pv")
+                                     (mapcar #'ls-compile args))

                                ", ")
           "];" *newline*
           "var tail = (" (ls-compile last) ");" *newline*
                                ", ")
           "];" *newline*
           "var tail = (" (ls-compile last) ");" *newline*

@@ -1772,7 +2240,15 @@
 
 (define-builtin js-eval (string)
   (type-check (("string" "string" string))
 
 (define-builtin js-eval (string)
   (type-check (("string" "string" string))

-    "eval.apply(window, [string])"))
+    (if *multiple-value-p*
+        (js!selfcall
+          "var v = eval.apply(window, [string]);" *newline*
+          "if (typeof v !== 'object' || !('multiple-value' in v)){" *newline*
+          (indent "v = [v];" *newline*
+                  "v['multiple-value'] = true;" *newline*)
+          "}" *newline*
+          "return values.apply(this, v);" *newline*)
+        "eval.apply(window, [string])")))

 
 (define-builtin error (string)
   (js!selfcall "throw " string ";" *newline*))
 
 (define-builtin error (string)
   (js!selfcall "throw " string ";" *newline*))

@@ -1780,7 +2256,7 @@
 (define-builtin new () "{}")
 
 (define-builtin objectp (x)
 (define-builtin new () "{}")
 
 (define-builtin objectp (x)

-  (js!bool (concat "(typeof (" x ") === 'object')")))
+  (js!bool (code "(typeof (" x ") === 'object')")))

 
 (define-builtin oget (object key)
   (js!selfcall
 
 (define-builtin oget (object key)
   (js!selfcall

@@ -1788,18 +2264,57 @@
     "return tmp == undefined? " (ls-compile nil) ": tmp ;" *newline*))
 
 (define-builtin oset (object key value)
     "return tmp == undefined? " (ls-compile nil) ": tmp ;" *newline*))
 
 (define-builtin oset (object key value)

-  (concat "((" object ")[" key "] = " value ")"))
+  (code "((" object ")[" key "] = " value ")"))

 
 (define-builtin in (key object)
 
 (define-builtin in (key object)

-  (js!bool (concat "((" key ") in (" object "))")))
+  (js!bool (code "((" key ") in (" object "))")))

 
 (define-builtin functionp (x)
 
 (define-builtin functionp (x)

-  (js!bool (concat "(typeof " x " == 'function')")))
+  (js!bool (code "(typeof " x " == 'function')")))

 
 (define-builtin write-string (x)
   (type-check (("x" "string" x))
     "lisp.write(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*))
+
+(define-builtin arrayp (x)
+  (js!bool
+   (js!selfcall
+     "var x = " x ";" *newline*
+     "return typeof x === 'object' && 'length' in x;")))
+
+(define-builtin aref (array n)
+  (js!selfcall
+    "var x = " "(" array ")[" n "];" *newline*
+    "if (x === undefined) throw 'Out of range';" *newline*
+    "return x;" *newline*))
+
+(define-builtin aset (array n value)
+  (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*))
+
+(define-builtin get-unix-time ()
+  (code "(Math.round(new Date() / 1000))"))
+
+(define-builtin values-array (array)
+  (if *multiple-value-p*
+      (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) ", ") ")")))
+

 (defun macro (x)
   (and (symbolp x)
        (let ((b (lookup-in-lexenv x *environment* 'function)))
 (defun macro (x)
   (and (symbolp x)
        (let ((b (lookup-in-lexenv x *environment* 'function)))

@@ -1825,70 +2340,76 @@
         form)))
 
 (defun compile-funcall (function args)
         form)))
 
 (defun compile-funcall (function args)

-  (if (and (symbolp function)
-           (claimp function 'function 'non-overridable))
-      (concat (ls-compile `',function) ".function("
-              (join (mapcar #'ls-compile args)
-                    ", ")
-              ")")
-      (concat (ls-compile `#',function) "("
-              (join (mapcar #'ls-compile args)
-                    ", ")
-              ")")))
+  (let* ((values-funcs (if *multiple-value-p* "values" "pv"))
+         (arglist (concat "(" (join (cons values-funcs (mapcar #'ls-compile args)) ", ") ")")))
+    (cond
+      ((translate-function function)
+       (concat (translate-function function) arglist))
+      ((and (symbolp function)
+            #+ecmalisp (eq (symbol-package function) (find-package "COMMON-LISP"))
+            #+common-lisp t)
+       (code (ls-compile `',function) ".fvalue" arglist))
+      (t
+       (code (ls-compile `#',function) arglist)))))

 
 (defun ls-compile-block (sexps &optional return-last-p)
   (if return-last-p
 
 (defun ls-compile-block (sexps &optional return-last-p)
   (if return-last-p

-      (concat (ls-compile-block (butlast sexps))
-              "return " (ls-compile (car (last sexps))) ";")
+      (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*))))
 
       (join-trailing
        (remove-if #'null-or-empty-p (mapcar #'ls-compile sexps))
        (concat ";" *newline*))))
 

-(defun ls-compile (sexp)
-  (cond
-    ((symbolp sexp)
-     (let ((b (lookup-in-lexenv sexp *environment* 'variable)))
-       (cond
-         ((and b (not (member 'special (binding-declarations b))))
-          (binding-value b))
-         ((or (keywordp sexp)
-              (member 'constant (binding-declarations b)))
-          (concat (ls-compile `',sexp) ".value"))
-         (t
-          (ls-compile `(symbol-value ',sexp))))))
-    ((integerp sexp) (integer-to-string sexp))
-    ((stringp sexp) (concat "\"" (escape-string sexp) "\""))
-    ((listp sexp)
-     (let ((name (car sexp))
-           (args (cdr sexp)))
-       (cond
-         ;; Special forms
-         ((assoc name *compilations*)
-          (let ((comp (second (assoc name *compilations*))))
-            (apply comp args)))
-         ;; Built-in functions
-         ((and (assoc name *builtins*)
-               (not (claimp name 'function 'notinline)))
-          (let ((comp (second (assoc name *builtins*))))
-            (apply comp args)))
-         (t
-          (if (macro name)
-              (ls-compile (ls-macroexpand-1 sexp))
-              (compile-funcall name args))))))))
+(defun ls-compile (sexp &optional multiple-value-p)
+  (let ((*multiple-value-p* multiple-value-p))
+    (cond
+      ((symbolp sexp)
+       (let ((b (lookup-in-lexenv sexp *environment* 'variable)))
+         (cond
+           ((and b (not (member 'special (binding-declarations b))))
+            (binding-value b))
+           ((or (keywordp sexp)
+                (member 'constant (binding-declarations b)))
+            (code (ls-compile `',sexp) ".value"))
+           (t
+            (ls-compile `(symbol-value ',sexp))))))
+      ((integerp sexp) (integer-to-string sexp))
+      ((stringp sexp) (code "\"" (escape-string sexp) "\""))
+      ((arrayp sexp) (literal sexp))
+      ((listp sexp)
+       (let ((name (car sexp))
+             (args (cdr sexp)))
+         (cond
+           ;; Special forms
+           ((assoc name *compilations*)
+            (let ((comp (second (assoc name *compilations*))))
+              (apply comp args)))
+           ;; Built-in functions
+           ((and (assoc name *builtins*)
+                 (not (claimp name 'function 'notinline)))
+            (let ((comp (second (assoc name *builtins*))))
+              (apply comp args)))
+           (t
+            (if (macro name)
+                (ls-compile (ls-macroexpand-1 sexp) multiple-value-p)
+                (compile-funcall name args))))))
+      (t
+       (error "How should I compile this?")))))

 
 

-(defun ls-compile-toplevel (sexp)
+(defun ls-compile-toplevel (sexp &optional multiple-value-p)

   (let ((*toplevel-compilations* nil))
     (cond
       ((and (consp sexp) (eq (car sexp) 'progn))
   (let ((*toplevel-compilations* nil))
     (cond
       ((and (consp sexp) (eq (car sexp) 'progn))

-       (let ((subs (mapcar #'ls-compile-toplevel (cdr sexp))))
+       (let ((subs (mapcar (lambda (s)
+                             (ls-compile-toplevel s t))
+                           (cdr sexp))))

          (join (remove-if #'null-or-empty-p subs))))
       (t
          (join (remove-if #'null-or-empty-p subs))))
       (t

-       (let ((code (ls-compile sexp)))
-         (concat (join-trailing (get-toplevel-compilations)
-                                (concat ";" *newline*))
-                 (if code
-                     (concat code ";" *newline*)
-                     "")))))))
+       (let ((code (ls-compile sexp multiple-value-p)))
+         (code (join-trailing (get-toplevel-compilations)
+                              (code ";" *newline*))
+               (when code
+                 (code code ";" *newline*))))))))

 
 
 ;;; Once we have the compiler, we define the runtime environment and
 
 
 ;;; Once we have the compiler, we define the runtime environment and

@@ -1897,37 +2418,34 @@
 
 #+ecmalisp
 (progn
 
 #+ecmalisp
 (progn

-  (defmacro with-compilation-unit (&body body)
-    `(prog1
-         (progn
-           (setq *compilation-unit-checks* nil)
-           ,@body)
-       (dolist (check *compilation-unit-checks*)
-         (funcall check))))
-

   (defun eval (x)
   (defun eval (x)

-    (let ((code
-           (with-compilation-unit
-               (ls-compile-toplevel x))))
-      (js-eval code)))
-
-  (export '(&rest &optional &body * *gensym-counter* *package* + - / 1+ 1- < <= =
-           = > >= and append apply assoc atom block boundp boundp butlast caar
-           cadddr caddr cadr car car case catch cdar cdddr cddr cdr cdr char
-           char-code char= code-char cond cons consp copy-list decf declaim
-           defparameter defun defvar digit-char-p disassemble documentation
-           dolist dotimes ecase eq eql equal error eval every export fdefinition
-           find-package find-symbol first fourth fset funcall function functionp
-           gensym go identity if in-package incf integerp integerp intern
-           keywordp lambda last length let let* list-all-packages list listp
-           make-package make-symbol mapcar member minusp mod nil not nth nthcdr
-           null numberp or package-name package-use-list packagep plusp
-           prin1-to-string print proclaim prog1 prog2 pron push quote remove
-           remove-if remove-if-not return return-from revappend reverse second
-           set setq some string-upcase string string= stringp subseq
-           symbol-function symbol-name symbol-package symbol-plist symbol-value
-           symbolp t tagbody third throw truncate unless unwind-protect variable
-           warn when write-line write-string zerop))
+    (js-eval (ls-compile-toplevel x t)))
+
+  (export '(&rest &key &optional &body * *gensym-counter* *package* +
+           - / 1+ 1- < <= = = > >= and append apply aref arrayp assoc
+           atom block boundp boundp butlast caar cadddr caddr cadr
+           car car case catch cdar cdddr cddr cdr cdr char char-code
+           char= code-char cond cons consp constantly copy-list decf
+           declaim defconstant defparameter defun defmacro defvar
+           digit-char digit-char-p disassemble do do* documentation
+           dolist dotimes ecase eq eql equal error eval every export
+           fdefinition find-package find-symbol first flet fourth
+           fset funcall function functionp gensym get-universal-time
+           go identity if in-package incf integerp integerp intern
+           keywordp labels lambda last length let let*
+           list-all-packages list listp make-array make-package
+           make-symbol mapcar member minusp mod multiple-value-bind
+           multiple-value-call multiple-value-list
+           multiple-value-prog1 nil not nth nthcdr null numberp or
+           package-name package-use-list packagep parse-integer plusp
+           prin1-to-string print proclaim prog1 prog2 progn psetq
+           push quote remove remove-if remove-if-not return
+           return-from revappend reverse rplaca rplacd second set setf
+           setq some string-upcase string string= stringp subseq
+           symbol-function symbol-name symbol-package symbol-plist
+           symbol-value symbolp t tagbody third throw truncate unless
+           unwind-protect values values-list variable warn when
+           write-line write-string zerop))

 
   (setq *package* *user-package*)
 
 
   (setq *package* *user-package*)
 

@@ -1936,20 +2454,23 @@
   (js-vset "lisp.read" #'ls-read-from-string)
   (js-vset "lisp.print" #'prin1-to-string)
   (js-vset "lisp.eval" #'eval)
   (js-vset "lisp.read" #'ls-read-from-string)
   (js-vset "lisp.print" #'prin1-to-string)
   (js-vset "lisp.eval" #'eval)

-  (js-vset "lisp.compile" #'ls-compile-toplevel)
+  (js-vset "lisp.compile" (lambda (s) (ls-compile-toplevel s t)))

   (js-vset "lisp.evalString" (lambda (str) (eval (ls-read-from-string str))))
   (js-vset "lisp.evalString" (lambda (str) (eval (ls-read-from-string str))))

-  (js-vset "lisp.compileString" (lambda (str) (ls-compile-toplevel (ls-read-from-string str))))
+  (js-vset "lisp.compileString" (lambda (str) (ls-compile-toplevel (ls-read-from-string str) t)))

 
   ;; Set the initial global environment to be equal to the host global
   ;; environment at this point of the compilation.
   (eval-when-compile
     (toplevel-compilation
 
   ;; Set the initial global environment to be equal to the host global
   ;; environment at this point of the compilation.
   (eval-when-compile
     (toplevel-compilation

+     (ls-compile `(setq *environment* ',*environment*))))
+
+  (eval-when-compile
+    (toplevel-compilation

      (ls-compile
       `(progn
          ,@(mapcar (lambda (s) `(%intern-symbol (js-vref ,(cdr s))))
                    *literal-symbols*)
          (setq *literal-symbols* ',*literal-symbols*)
      (ls-compile
       `(progn
          ,@(mapcar (lambda (s) `(%intern-symbol (js-vref ,(cdr s))))
                    *literal-symbols*)
          (setq *literal-symbols* ',*literal-symbols*)

-         (setq *environment* ',*environment*)

          (setq *variable-counter* ,*variable-counter*)
          (setq *gensym-counter* ,*gensym-counter*)
          (setq *block-counter* ,*block-counter*)))))
          (setq *variable-counter* ,*variable-counter*)
          (setq *gensym-counter* ,*gensym-counter*)
          (setq *block-counter* ,*block-counter*)))))

@@ -1972,19 +2493,17 @@
         seq)))
 
   (defun ls-compile-file (filename output)
         seq)))
 
   (defun ls-compile-file (filename output)

-    (setq *compilation-unit-checks* nil)
-    (with-open-file (out output :direction :output :if-exists :supersede)
-      (let* ((source (read-whole-file filename))
-             (in (make-string-stream source)))
-        (loop
-           for x = (ls-read in)
-           until (eq x *eof*)
-           for compilation = (ls-compile-toplevel x)
-           when (plusp (length compilation))
-           do (write-string compilation out))
-        (dolist (check *compilation-unit-checks*)
-          (funcall check))
-        (setq *compilation-unit-checks* nil))))
+    (let ((*compiling-file* t))
+      (with-open-file (out output :direction :output :if-exists :supersede)
+        (write-string (read-whole-file "prelude.js") out)
+        (let* ((source (read-whole-file filename))
+               (in (make-string-stream source)))
+          (loop
+             for x = (ls-read in)
+             until (eq x *eof*)
+             for compilation = (ls-compile-toplevel x)
+             when (plusp (length compilation))
+             do (write-string compilation out))))))

 
   (defun bootstrap ()
     (setq *environment* (make-lexenv))
 
   (defun bootstrap ()
     (setq *environment* (make-lexenv))