Array out-of-range checks

[jscl.git] / ecmalisp.lisp

diff --git a/ecmalisp.lisp b/ecmalisp.lisp
index 286069d..de2fe68 100644 (file)
--- a/ecmalisp.lisp
+++ b/ecmalisp.lisp
@@ -36,6 +36,11 @@
                                                                  args)
                                                  ,@body))))))
 
                                                                  args)
                                                  ,@body))))))
 

+  (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)
 
   (setq nil 'nil)
   (setq t 't)
 

@@ -47,8 +52,8 @@
 
   (defmacro defvar (name value &optional docstring)
     `(progn
 
   (defmacro defvar (name value &optional docstring)
     `(progn

-       (unless (boundp ',name)
-        (setq ,name ,value))
+       (declaim (special ,name))
+       (unless (boundp ',name) (setq ,name ,value))

        ,@(when (stringp docstring) `((oset ',name "vardoc" ,docstring)))
        ',name))
 
        ,@(when (stringp docstring) `((oset ',name "vardoc" ,docstring)))
        ',name))
 

@@ -66,17 +71,14 @@
 
   (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
        (fset ',name
              (named-lambda ,(symbol-name name) ,args

-               ,@(when (stringp (car body)) `(,(car body)))
-               (block ,name
-                 ,@(if (stringp (car body))
-                       (cdr body)
-                       body))))
+               ,@(if (and (stringp (car body)) (not (null (cdr body))))
+                     `(,(car body) (block ,name ,@(cdr body)))
+                     `((block ,name ,@body)))))

        ',name))
 
        ',name))
 

-  (defvar *package* (new))
-

   (defun null (x)
     (eq x nil))
 
   (defun null (x)
     (eq x nil))
 

@@ -86,17 +88,6 @@
   (defmacro while (condition &body body)
     `(block nil (%while ,condition ,@body)))
 
   (defmacro while (condition &body body)
     `(block nil (%while ,condition ,@body)))
 

-  (defun internp (name)
-    (in name *package*))
-
-  (defun intern (name)
-    (if (internp name)
-        (oget *package* name)
-        (oset *package* name (make-symbol name))))
-
-  (defun find-symbol (name)
-    (oget *package* name))
-

   (defvar *gensym-counter* 0)
   (defun gensym (&optional (prefix "G"))
     (setq *gensym-counter* (+ *gensym-counter* 1))
   (defvar *gensym-counter* 0)
   (defun gensym (&optional (prefix "G"))
     (setq *gensym-counter* (+ *gensym-counter* 1))

@@ -107,8 +98,6 @@
 
   ;; Basic functions
   (defun = (x y) (= x y))
 
   ;; Basic functions
   (defun = (x y) (= x y))

-  (defun + (x y) (+ x y))
-  (defun - (x y) (- x y))

   (defun * (x y) (* x y))
   (defun / (x y) (/ x y))
   (defun 1+ (x) (+ x 1))
   (defun * (x y) (* x y))
   (defun / (x y) (/ x y))
   (defun 1+ (x) (+ x 1))

@@ -239,7 +228,6 @@
     `(prog1 (progn ,form1 ,result) ,@body)))
 
 
     `(prog1 (progn ,form1 ,result) ,@body)))
 
 

-

 ;;; This couple of helper functions will be defined in both Common
 ;;; Lisp and in Ecmalisp.
 (defun ensure-list (x)
 ;;; This couple of helper functions will be defined in both Common
 ;;; Lisp and in Ecmalisp.
 (defun ensure-list (x)

@@ -259,6 +247,18 @@
 ;;; constructions.
 #+ecmalisp
 (progn
 ;;; constructions.
 #+ecmalisp
 (progn

+  (defun + (&rest args)
+    (let ((r 0))
+      (dolist (x args r)
+       (incf r x))))
+
+  (defun - (x &rest others)
+    (if (null others)
+       (- x)
+       (let ((r x))
+         (dolist (y others r)
+           (decf r y)))))
+

   (defun append-two (list1 list2)
     (if (null list1)
         list2
   (defun append-two (list1 list2)
     (if (null list1)
         list2

@@ -285,9 +285,13 @@
       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))

@@ -431,6 +435,11 @@
           (setq alist (cdr alist))))
     (car alist))
 
           (setq alist (cdr alist))))
     (car alist))
 

+  (defun string (x)
+    (cond ((stringp x) x)
+          ((symbolp x) (symbol-name x))
+          (t (char-to-string x))))
+

   (defun string= (s1 s2)
     (equal s1 s2))
 
   (defun string= (s1 s2)
     (equal s1 s2))
 

@@ -457,7 +466,118 @@
        (unless (symbolp x)
          (error "Wrong argument type! it should be a symbol"))
        (oget x "vardoc"))))
        (unless (symbolp x)
          (error "Wrong argument type! it should be a symbol"))
        (oget x "vardoc"))))

-  )
+
+  ;; Packages
+
+  (defvar *package-list* nil)
+
+  (defun list-all-packages ()
+    *package-list*)
+
+  (defun make-package (name &optional use)
+    (let ((package (new))
+          (use (mapcar #'find-package-or-fail use)))
+      (oset package "packageName" name)
+      (oset package "symbols" (new))
+      (oset package "exports" (new))
+      (oset package "use" use)
+      (push package *package-list*)
+      package))
+
+  (defun packagep (x)
+    (and (objectp x) (in "symbols" x)))
+
+  (defun find-package (package-designator)
+    (when (packagep package-designator)
+      (return-from find-package package-designator))
+    (let ((name (string package-designator)))
+      (dolist (package *package-list*)
+        (when (string= (package-name package) name)
+          (return package)))))
+
+  (defun find-package-or-fail (package-designator)
+    (or (find-package package-designator)
+        (error "Package unknown.")))
+
+  (defun package-name (package-designator)
+    (let ((package (find-package-or-fail package-designator)))
+      (oget package "packageName")))
+
+  (defun %package-symbols (package-designator)
+    (let ((package (find-package-or-fail package-designator)))
+      (oget package "symbols")))
+
+  (defun package-use-list (package-designator)
+    (let ((package (find-package-or-fail package-designator)))
+      (oget package "use")))
+
+  (defun %package-external-symbols (package-designator)
+    (let ((package (find-package-or-fail package-designator)))
+      (oget package "exports")))
+
+  (defvar *common-lisp-package*
+    (make-package "CL"))
+
+  (defvar *user-package*
+    (make-package "CL-USER" (list *common-lisp-package*)))
+
+  (defvar *keyword-package*
+    (make-package "KEYWORD"))
+
+  (defun keywordp (x)
+    (and (symbolp x) (eq (symbol-package x) *keyword-package*)))
+
+  (defvar *package* *common-lisp-package*)
+
+  (defmacro in-package (package-designator)
+    `(eval-when-compile
+       (setq *package* (find-package-or-fail ,package-designator))))
+
+  ;; 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*)
+      (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*))
+    (car (%find-symbol name 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)
+            (let ((symbols (%package-symbols package)))
+              (oget symbols name)
+              (let ((symbol (make-symbol name)))
+                (oset symbol "package" package)
+                (when (eq package *keyword-package*)
+                  (oset symbol "value" symbol)
+                  (export (list symbol) package))
+                (oset symbols name symbol)))))))
+
+  (defun symbol-package (symbol)
+    (unless (symbolp symbol)
+      (error "it is not a symbol"))
+    (oget symbol "package"))
+
+  (defun export (symbols &optional (package *package*))
+    (let ((exports (%package-external-symbols package)))
+      (dolist (symb symbols t)
+        (oset exports (symbol-name symb) symb)))))
+

 
 ;;; The compiler offers some primitives and special forms which are
 ;;; not found in Common Lisp, for instance, while. So, we grow Common
 
 ;;; The compiler offers some primitives and special forms which are
 ;;; not found in Common Lisp, for instance, while. So, we grow Common

@@ -479,7 +599,10 @@
   (defun setcar (cons new)
     (setf (car cons) new))
   (defun setcdr (cons new)
   (defun setcar (cons new)
     (setf (car cons) new))
   (defun setcdr (cons new)

-    (setf (cdr 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

@@ -514,6 +637,19 @@
 (defun mapconcat (func list)
   (join (mapcar func list)))
 
 (defun mapconcat (func list)
   (join (mapcar func list)))
 

+(defun vector-to-list (vector)
+  (let ((list nil)
+       (size (length vector)))
+    (dotimes (i size (reverse list))
+      (push (aref vector i) list))))
+
+(defun list-to-vector (list)
+  (let ((v (make-array (length list)))
+       (i 0))
+    (dolist (x list v)
+      (aset v i x)
+      (incf i))))
+

 ;;; 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.
 ;;; 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.

@@ -582,7 +718,15 @@
 (progn
   (defun prin1-to-string (form)
     (cond
 (progn
   (defun prin1-to-string (form)
     (cond

-      ((symbolp form) (symbol-name form))
+      ((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))))

       ((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)

@@ -597,7 +741,11 @@
                  (if (null (cdr last))
                      (prin1-to-string (car last))
                      (concat (prin1-to-string (car last)) " . " (prin1-to-string (cdr last)))))
                  (if (null (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) ">"))))

 
   (defun write-line (x)
     (write-string x)
 
   (defun write-line (x)
     (write-string x)

@@ -698,6 +846,7 @@
   (ecase (%read-char stream)
     (#\'
      (list 'function (ls-read stream)))
   (ecase (%read-char stream)
     (#\'
      (list 'function (ls-read stream)))

+    (#\( (list-to-vector (%read-list stream)))

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

@@ -718,12 +867,48 @@
          (t
           (error "Unknown reader form.")))))))
 
          (t
           (error "Unknown reader form.")))))))
 

-(defvar *eof* (make-symbol "EOF"))
+;;; Parse a string of the form NAME, PACKAGE:NAME or
+;;; PACKAGE::NAME and return the name. If the string is of the
+;;; form 1) or 3), but the symbol does not exist, it will be created
+;;; and interned in that package.
+(defun read-symbol (string)
+  (let ((size (length string))
+        package name internalp index)
+    (setq index 0)
+    (while (and (< index size)
+                (not (char= (char string index) #\:)))
+      (incf index))
+    (cond
+      ;; No package prefix
+      ((= index size)
+       (setq name string)
+       (setq package *package*)
+       (setq internalp t))
+      (t
+       ;; Package prefix
+       (if (zerop index)
+           (setq package "KEYWORD")
+           (setq package (string-upcase (subseq string 0 index))))
+       (incf index)
+       (when (char= (char string index) #\:)
+         (setq internalp t)
+         (incf index))
+       (setq name (subseq string index))))
+    ;; Canonalize symbol name and package
+    (setq name (string-upcase name))
+    (setq package (find-package package))
+    ;; TODO: PACKAGE:SYMBOL should signal error if SYMBOL is not an
+    ;; external symbol from PACKAGE.
+    (if (or internalp (eq package (find-package "KEYWORD")))
+        (intern name package)
+        (find-symbol name package))))
+
+(defvar *eof* (gensym))

 (defun ls-read (stream)
   (skip-whitespaces-and-comments stream)
   (let ((ch (%peek-char stream)))
     (cond
 (defun ls-read (stream)
   (skip-whitespaces-and-comments stream)
   (let ((ch (%peek-char stream)))
     (cond

-      ((null ch)
+      ((or (null ch) (char= ch #\)))

        *eof*)
       ((char= ch #\()
        (%read-char stream)
        *eof*)
       ((char= ch #\()
        (%read-char stream)

@@ -748,7 +933,7 @@
        (let ((string (read-until stream #'terminalp)))
          (if (every #'digit-char-p string)
              (parse-integer string)
        (let ((string (read-until stream #'terminalp)))
          (if (every #'digit-char-p string)
              (parse-integer string)

-             (intern (string-upcase string))))))))
+             (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)))

@@ -763,19 +948,23 @@
 
 (defvar *compilation-unit-checks* '())
 
 
 (defvar *compilation-unit-checks* '())
 

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

 
 (defun binding-name (b) (first b))
 (defun binding-type (b) (second b))
 (defun binding-value (b) (third b))
 
 (defun binding-name (b) (first b))
 (defun binding-type (b) (second b))
 (defun binding-value (b) (third b))

+(defun binding-declarations (b) (fourth b))
+

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

-  (setcar (cdr (cdr b)) value))
+  (setcar (cddr b) value))
+
+(defun set-binding-declarations (b value)
+  (setcar (cdddr b) value))
+
+(defun push-binding-declaration (decl b)
+  (set-binding-declarations b (cons decl (binding-declarations b))))

 
 

-(defun binding-declared (b)
-  (and b (fourth b)))
-(defun mark-binding-as-declared (b)
-  (setcar (cdddr b) t))

 
 (defun make-lexenv ()
   (list nil nil nil nil))
 
 (defun make-lexenv ()
   (list nil nil nil nil))

@@ -802,16 +991,8 @@
                 (block (third lexenv))
                 (gotag (fourth lexenv)))))
 
                 (block (third lexenv))
                 (gotag (fourth lexenv)))))
 

-(defvar *global-environment* (make-lexenv))

 (defvar *environment* (make-lexenv))
 
 (defvar *environment* (make-lexenv))
 

-(defun clear-undeclared-global-bindings ()
-  (setq *environment*
-       (mapcar (lambda (namespace)
-                 (remove-if-not #'binding-declared namespace))
-               *environment*)))
-
-

 (defvar *variable-counter* 0)
 (defun gvarname (symbol)
   (concat "v" (integer-to-string (incf *variable-counter*))))
 (defvar *variable-counter* 0)
 (defun gvarname (symbol)
   (concat "v" (integer-to-string (incf *variable-counter*))))

@@ -822,7 +1003,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) t)))
+      (let ((b (make-binding symbol 'lexical-variable (gvarname symbol))))

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

@@ -839,17 +1020,43 @@
 
 (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 t) *environment* 'function))
+  (push-to-lexenv (make-binding name 'macro lambda) *environment* 'function))
+
+(defun global-binding (name type namespace)
+  (or (lookup-in-lexenv name *environment* namespace)
+      (let ((b (make-binding name type nil)))
+        (push-to-lexenv b *environment* namespace)
+        b)))
+
+(defun claimp (symbol namespace claim)
+  (let ((b (lookup-in-lexenv symbol *environment* namespace)))
+    (and b (member claim (binding-declarations b)))))
+
+(defun !proclaim (decl)
+  (case (car decl)
+    (special
+     (dolist (name (cdr decl))
+       (let ((b (global-binding name 'variable 'variable)))
+         (push-binding-declaration 'special b))))
+    (notinline
+     (dolist (name (cdr decl))
+       (let ((b (global-binding name 'function 'function)))
+         (push-binding-declaration 'notinline b))))
+    (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))))))

 
 

-(defvar *compilations* nil)
+#+ecmalisp
+(fset 'proclaim #'!proclaim)

 
 

-(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))) ";")
-      (join-trailing
-       (remove-if #'null-or-empty-p (mapcar #'ls-compile sexps))
-       (concat ";" *newline*))))
+;;; Special forms
+
+(defvar *compilations* nil)

 
 (defmacro define-compilation (name args &body body)
   ;; Creates a new primitive `name' with parameters args and
 
 (defmacro define-compilation (name args &body body)
   ;; Creates a new primitive `name' with parameters args and

@@ -1011,7 +1218,9 @@
      (or (cdr (assoc sexp *literal-symbols*))
         (let ((v (genlit))
               (s #+common-lisp (concat "{name: \"" (escape-string (symbol-name 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)))))
+                 #+ecmalisp (ls-compile
+                              `(intern ,(symbol-name sexp)
+                                       ,(package-name (symbol-package sexp))))))

           (push (cons sexp v) *literal-symbols*)
           (toplevel-compilation (concat "var " v " = " s))
           v)))
           (push (cons sexp v) *literal-symbols*)
           (toplevel-compilation (concat "var " v " = " s))
           v)))

@@ -1022,7 +1231,15 @@
           c
           (let ((v (genlit)))
             (toplevel-compilation (concat "var " v " = " c))
           c
           (let ((v (genlit)))
             (toplevel-compilation (concat "var " v " = " c))

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

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

@@ -1052,43 +1269,46 @@
 (define-compilation progn (&rest body)
   (js!selfcall (ls-compile-block body t)))
 
 (define-compilation progn (&rest body)
   (js!selfcall (ls-compile-block body t)))
 

-(defun dynamic-binding-wrapper (bindings body)
-  (if (null bindings)
-      body
-      (concat
-       "try {" *newline*
-       (indent
-        "var tmp;" *newline*
-        (join
-         (mapcar (lambda (b)
-                   (let ((s (ls-compile `(quote ,(car b)))))
-                     (concat "tmp = " s ".value;" *newline*
-                             s ".value = " (cdr b) ";" *newline*
-                             (cdr b) " = tmp;" *newline*)))
-                 bindings))
-        body)
-       "}" *newline*
-       "finally {"  *newline*
-       (indent
-        (join-trailing
-         (mapcar (lambda (b)
-                   (let ((s (ls-compile `(quote ,(car b)))))
-                     (concat s ".value" " = " (cdr b))))
-                 bindings)
-         (concat ";" *newline*)))
-       "}" *newline*)))
-
+(defun special-variable-p (x)
+  (claimp x 'variable 'special))
+
+;;; Wrap CODE to restore the symbol values of the dynamic
+;;; bindings. BINDINGS is a list of pairs of the form
+;;; (SYMBOL . PLACE),  where PLACE is a Javascript variable
+;;; name to initialize the symbol value and where to stored
+;;; the old value.
+(defun let-binding-wrapper (bindings body)
+  (when (null bindings)
+    (return-from let-binding-wrapper body))
+  (concat
+   "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*)))
+            bindings)
+           body *newline*)
+   "}" *newline*
+   "finally {"  *newline*
+   (indent
+    (mapconcat (lambda (b)
+                 (let ((s (ls-compile `(quote ,(car b)))))
+                   (concat s ".value" " = " (cdr b) ";" *newline*)))
+               bindings))
+   "}" *newline*))

 
 (define-compilation let (bindings &rest body)
   (let ((bindings (mapcar #'ensure-list bindings)))
 
 (define-compilation let (bindings &rest body)
   (let ((bindings (mapcar #'ensure-list bindings)))

-    (let ((variables (mapcar #'first bindings))
-          (values    (mapcar #'second bindings)))
-      (let ((cvalues (mapcar #'ls-compile values))
-            (*environment* (extend-local-env (remove-if #'boundp variables)))
+    (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)
             (dynamic-bindings))
         (concat "(function("
                 (join (mapcar (lambda (x)

-                                (if (boundp x)
+                                (if (special-variable-p x)

                                     (let ((v (gvarname x)))
                                       (push (cons x v) dynamic-bindings)
                                       v)
                                     (let ((v (gvarname x)))
                                       (push (cons x v) dynamic-bindings)
                                       v)

@@ -1097,15 +1317,63 @@
                       ",")
                 "){" *newline*
                 (let ((body (ls-compile-block body t)))
                       ",")
                 "){" *newline*
                 (let ((body (ls-compile-block body t)))

-                  (indent (dynamic-binding-wrapper dynamic-bindings body)))
+                  (indent (let-binding-wrapper dynamic-bindings body)))

                 "})(" (join cvalues ",") ")")))))
 
 
                 "})(" (join cvalues ",") ")")))))
 
 

+;;; Return the code to initialize BINDING, and push it extending the
+;;; current lexical environment if the variable is special.
+(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)))))))
+
+;;; Wrap BODY to restore the symbol values of SYMBOLS after body. It
+;;; DOES NOT generate code to initialize the value of the symbols,
+;;; unlike let-binding-wrapper.
+(defun let*-binding-wrapper (symbols body)
+  (when (null symbols)
+    (return-from let*-binding-wrapper body))
+  (let ((store (mapcar (lambda (s) (cons s (gvarname s)))
+                       (remove-if-not #'special-variable-p symbols))))
+    (concat
+     "try {" *newline*
+     (indent
+      (mapconcat (lambda (b)
+                   (let ((s (ls-compile `(quote ,(car b)))))
+                     (concat "var " (cdr b) " = " s ".value;" *newline*)))
+                 store)
+      body)
+     "}" *newline*
+     "finally {" *newline*
+     (indent
+      (mapconcat (lambda (b)
+                   (let ((s (ls-compile `(quote ,(car b)))))
+                     (concat s ".value" " = " (cdr b) ";" *newline*)))
+                 store))
+     "}" *newline*)))
+
+
+(define-compilation let* (bindings &rest body)
+  (let ((bindings (mapcar #'ensure-list bindings))
+        (*environment* (copy-lexenv *environment*)))
+    (js!selfcall
+      (let ((specials (remove-if-not #'special-variable-p (mapcar #'first bindings)))
+            (body (concat (mapconcat #'let*-initialize-value bindings)
+                          (ls-compile-block body t))))
+        (let*-binding-wrapper specials body)))))
+
+

 (defvar *block-counter* 0)
 
 (define-compilation block (name &rest body)
   (let ((tr (integer-to-string (incf *block-counter*))))
 (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 t)))
+    (let ((b (make-binding name 'block tr)))

       (js!selfcall
         "try {" *newline*
         (let ((*environment* (extend-lexenv (list b) *environment* 'block)))
       (js!selfcall
         "try {" *newline*
         (let ((*environment* (extend-lexenv (list b) *environment* 'block)))

@@ -1145,7 +1413,7 @@
     "        throw cf;" *newline*
     "}" *newline*))
 
     "        throw cf;" *newline*
     "}" *newline*))
 

-(define-compilation throw (id &optional value)
+(define-compilation throw (id value)

   (js!selfcall
     "throw ({"
     "type: 'catch', "
   (js!selfcall
     "throw ({"
     "type: 'catch', "

@@ -1165,7 +1433,7 @@
   (let ((bindings
          (mapcar (lambda (label)
                    (let ((tagidx (integer-to-string (incf *go-tag-counter*))))
   (let ((bindings
          (mapcar (lambda (label)
                    (let ((tagidx (integer-to-string (incf *go-tag-counter*))))

-                     (make-binding label 'gotag (list tbidx tagidx) t)))
+                     (make-binding label 'gotag (list tbidx tagidx))))

                  (remove-if-not #'go-tag-p body))))
     (extend-lexenv bindings *environment* 'gotag)))
 
                  (remove-if-not #'go-tag-p body))))
     (extend-lexenv bindings *environment* 'gotag)))
 

@@ -1275,9 +1543,18 @@
 
 ;;; Primitives
 
 
 ;;; Primitives
 

+(defvar *builtins* nil)
+
+(defmacro define-raw-builtin (name args &body body)
+  ;; Creates a new primitive function `name' with parameters args and
+  ;; @body. The body can access to the local environment through the
+  ;; variable *ENVIRONMENT*.
+  `(push (list ',name (lambda ,args (block ,name ,@body)))
+         *builtins*))
+

 (defmacro define-builtin (name args &body body)
   `(progn
 (defmacro define-builtin (name args &body body)
   `(progn

-     (define-compilation ,name ,args
+     (define-raw-builtin ,name ,args

        (let ,(mapcar (lambda (arg) `(,arg (ls-compile ,arg))) args)
          ,@body))))
 
        (let ,(mapcar (lambda (arg) `(,arg (ls-compile ,arg))) args)
          ,@body))))
 

@@ -1298,12 +1575,54 @@
                decls)
      (concat "return " (progn ,@body) ";" *newline*)))
 
                decls)
      (concat "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
+;;; store the result in some Javascript variables. BODY is evaluated
+;;; with ARGS bound to the list of these variables to generate the
+;;; code which performs the transformation on these variables.
+
+(defun variable-arity-call (args function)
+  (unless (consp args)
+    (error "ARGS must be a non-empty list"))
+  (let ((counter 0)
+        (variables '())
+        (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)))))
+
+
+(defmacro variable-arity (args &body body)
+  (unless (symbolp args)
+    (error "Bad usage of VARIABLE-ARITY, yo must pass a symbol"))
+  `(variable-arity-call ,args
+                        (lambda (,args)
+                          (concat "return " ,@body ";" *newline*))))
+
+

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

-(define-builtin + (x y) (num-op-num x "+" y))
-(define-builtin - (x y) (num-op-num x "-" y))
+(define-raw-builtin + (&rest numbers)
+  (if (null numbers)
+      "0"
+      (variable-arity numbers
+       (join numbers "+"))))
+
+(define-raw-builtin - (x &rest others)
+  (let ((args (cons x others)))
+    (variable-arity args
+      (if (null others)
+         (concat "-" (car args))
+         (join args "-")))))
+
+

 (define-builtin * (x y) (num-op-num x "*" y))
 (define-builtin / (x y) (num-op-num x "/" y))
 
 (define-builtin * (x y) (num-op-num x "*" y))
 (define-builtin / (x y) (num-op-num x "/" y))
 

@@ -1399,7 +1718,7 @@
 (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 (concat "(" x " === " y ")")))
 (define-builtin equal (x y) (js!bool (concat "(" x  " == " y ")")))
 

-(define-builtin string (x)
+(define-builtin char-to-string (x)

   (type-check (("x" "number" x))
     "String.fromCharCode(x)"))
 
   (type-check (("x" "number" x))
     "String.fromCharCode(x)"))
 

@@ -1414,7 +1733,7 @@
   (type-check (("x" "string" x))
     "x.length"))
 
   (type-check (("x" "string" x))
     "x.length"))
 

-(define-compilation slice (string a &optional b)
+(define-raw-builtin slice (string a &optional b)

   (js!selfcall
     "var str = " (ls-compile string) ";" *newline*
     "var a = " (ls-compile a) ";" *newline*
   (js!selfcall
     "var str = " (ls-compile string) ";" *newline*
     "var a = " (ls-compile a) ";" *newline*

@@ -1434,13 +1753,13 @@
                ("string2" "string" string2))
     "string1.concat(string2)"))
 
                ("string2" "string" string2))
     "string1.concat(string2)"))
 

-(define-compilation funcall (func &rest args)
+(define-raw-builtin funcall (func &rest args)

   (concat "(" (ls-compile func) ")("
           (join (mapcar #'ls-compile args)
                 ", ")
           ")"))
 
   (concat "(" (ls-compile func) ")("
           (join (mapcar #'ls-compile args)
                 ", ")
           ")"))
 

-(define-compilation apply (func &rest args)
+(define-raw-builtin apply (func &rest args)

   (if (null args)
       (concat "(" (ls-compile func) ")()")
       (let ((args (butlast args))
   (if (null args)
       (concat "(" (ls-compile func) ")()")
       (let ((args (butlast args))

@@ -1466,6 +1785,9 @@
 
 (define-builtin new () "{}")
 
 
 (define-builtin new () "{}")
 

+(define-builtin objectp (x)
+  (js!bool (concat "(typeof (" x ") === 'object')")))
+

 (define-builtin oget (object key)
   (js!selfcall
     "var tmp = " "(" object ")[" key "];" *newline*
 (define-builtin oget (object key)
   (js!selfcall
     "var tmp = " "(" object ")[" key "];" *newline*

@@ -1484,6 +1806,33 @@
   (type-check (("x" "string" x))
     "lisp.write(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*))
+
+

 (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)))

@@ -1509,27 +1858,59 @@
         form)))
 
 (defun compile-funcall (function args)
         form)))
 
 (defun compile-funcall (function args)

-  (concat (ls-compile `#',function) "("
-          (join (mapcar #'ls-compile 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)
+                    ", ")
+              ")")))
+
+(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))) ";")
+      (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)))
 
 (defun ls-compile (sexp)
   (cond
     ((symbolp sexp)
      (let ((b (lookup-in-lexenv sexp *environment* 'variable)))

-       (if (eq (binding-type b) 'lexical-variable)
-           (binding-value b)
-           (ls-compile `(symbol-value ',sexp)))))
+       (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) "\""))
     ((integerp sexp) (integer-to-string sexp))
     ((stringp sexp) (concat "\"" (escape-string sexp) "\""))

+    ((arrayp sexp) (literal sexp))

     ((listp sexp)
     ((listp sexp)

-     (if (assoc (car sexp) *compilations*)
-         (let ((comp (second (assoc (car sexp) *compilations*))))
-           (apply comp (cdr sexp)))
-         (if (macro (car sexp))
-             (ls-compile (ls-macroexpand-1 sexp))
-             (compile-funcall (car sexp) (cdr 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))))))
+    (t
+     (error "How should I compile this?"))))

 
 (defun ls-compile-toplevel (sexp)
   (let ((*toplevel-compilations* nil))
 
 (defun ls-compile-toplevel (sexp)
   (let ((*toplevel-compilations* nil))

@@ -1556,7 +1937,6 @@
     `(prog1
          (progn
            (setq *compilation-unit-checks* nil)
     `(prog1
          (progn
            (setq *compilation-unit-checks* nil)

-           (clear-undeclared-global-bindings)

            ,@body)
        (dolist (check *compilation-unit-checks*)
          (funcall check))))
            ,@body)
        (dolist (check *compilation-unit-checks*)
          (funcall check))))

@@ -1567,6 +1947,26 @@
                (ls-compile-toplevel x))))
       (js-eval code)))
 
                (ls-compile-toplevel x))))
       (js-eval code)))
 

+  (export '(&rest &optional &body * *gensym-counter* *package* + - / 1+ 1- < <= =
+           = > >= and append apply aref arrayp aset 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-array 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))
+
+  (setq *package* *user-package*)
+

   (js-eval "var lisp")
   (js-vset "lisp" (new))
   (js-vset "lisp.read" #'ls-read-from-string)
   (js-eval "var lisp")
   (js-vset "lisp" (new))
   (js-vset "lisp.read" #'ls-read-from-string)

@@ -1582,9 +1982,7 @@
     (toplevel-compilation
      (ls-compile
       `(progn
     (toplevel-compilation
      (ls-compile
       `(progn

-         ,@(mapcar (lambda (s)
-                     `(oset *package* ,(symbol-name (car s))
-                            (js-vref ,(cdr s))))
+         ,@(mapcar (lambda (s) `(%intern-symbol (js-vref ,(cdr s))))

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