;;; language to the compiler to be able to run.
#+ecmalisp
-(js-eval "function id (x) { return 'car' in x ? x.car : x; }")
-
-#+ecmalisp
(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
(declaim (constant nil t) (special t nil))
(setq nil 'nil)
+ (js-vset "nil" nil)
(setq t 't)
+ (defmacro lambda (args &body body)
+ `(function (lambda ,args ,@body)))
+
(defmacro when (condition &body body)
`(if ,condition (progn ,@body) nil))
(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))))
(oset exports (symbol-name symb) symb))))
(defun get-universal-time ()
- (+ (get-unix-time) 2208988800))
-
- ;; The `values-list' primitive cannot be inlined out of functions as
- ;; the VALUES argument is not available there. We declare it
- ;; NOTINLINE to avoid it.
- (declaim (notinline values-list))
- (defun values-list (list)
- (values-list list))
-
- (defun values (&rest args)
- (values-list args)))
+ (+ (get-unix-time) 2208988800)))
;;; The compiler offers some primitives and special forms which are
(aset v i x)
(incf i))))
+#+ecmalisp
+(progn
+ (defun values-list (list)
+ (values-array (list-to-vector list)))
+
+ (defun values (&rest args)
+ (values-list args))
+
+ (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)))
+
+
;;; 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.
;;; 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* '())
+;;; 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 %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)
(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)
(define-compilation if (condition true false)
(concat "(" (ls-compile condition) " !== " (ls-compile nil)
- " ? " (ls-compile true)
- " : " (ls-compile false)
+ " ? " (ls-compile true *multiple-value-p*)
+ " : " (ls-compile false *multiple-value-p*)
")"))
(defvar *lambda-list-keywords* '(&optional &rest))
(error "Bad lambda-list"))
(car rest)))
-
(defun lambda-docstring-wrapper (docstring &rest strs)
(if docstring
(js!selfcall
"return func;" *newline*)
(join strs)))
-(define-compilation lambda (lambda-list &rest body)
+(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 (concat "checkArgs(arguments, " (integer-to-string min) ");" *newline*)))
+ ;; General case:
+ (concat
+ (if (< 1 min)
+ (concat "checkArgsAtLeast(arguments, " (integer-to-string min) ");" *newline*)
+ "")
+ (if (numberp max)
+ (concat "checkArgsAtMost(arguments, " (integer-to-string max) ");" *newline*)
+ "")))))
+
+(defun compile-lambda (lambda-list body)
(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))
(append required-arguments optional-arguments)))
",")
"){" *newline*
- ;; Check number of arguments
(indent
- (if required-arguments
- (concat "if (arguments.length < " (integer-to-string (1+ n-required-arguments))
- ") throw 'too few arguments';" *newline*)
- "")
- (if (not rest-argument)
- (concat "if (arguments.length > "
- (integer-to-string (+ 1 n-required-arguments n-optional-arguments))
- ") throw 'too many arguments';" *newline*)
- "")
+ ;; Check number of arguments
+ (lambda-check-argument-count n-required-arguments
+ n-optional-arguments
+ rest-argument)
;; Optional arguments
(if optional-arguments
(concat "switch(arguments.length-1){" *newline*
*newline*))
"")
;; Body
- (ls-compile-block body t)) *newline*
+ (let ((*multiple-value-p* t)) (ls-compile-block body t)))
"})"))))
(toplevel-compilation (concat "var " v " = " s))
v)))
((consp sexp)
- (let ((c (concat "{car: " (literal (car sexp) t) ", "
- "cdr: " (literal (cdr sexp) t) "}")))
+ (let* ((head (butlast sexp))
+ (tail (last sexp))
+ (c (concat "QIList("
+ (join-trailing (mapcar (lambda (x) (literal x t)) head) ",")
+ (literal (car tail) t)
+ ","
+ (literal (cdr tail) t)
+ ")")))
(if recursive
c
(let ((v (genlit)))
- (toplevel-compilation (concat "var " v " = " c))
- v))))
+ (toplevel-compilation (concat "var " v " = " c))
+ v))))
((arrayp sexp)
(let ((elements (vector-to-list sexp)))
(let ((c (concat "[" (join (mapcar #'literal elements) ", ") "]")))
(define-compilation function (x)
(cond
((and (listp x) (eq (car x) 'lambda))
- (ls-compile x))
+ (compile-lambda (cadr x) (cddr x)))
((symbolp x)
(ls-compile `(symbol-function ',x)))))
+(defvar *compiling-file* nil)
(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)
- (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)
(and (claimp x 'variable 'special) t))
store))
"}" *newline*)))
-
(define-compilation let* (bindings &rest body)
(let ((bindings (mapcar #'ensure-list bindings))
(*environment* (copy-lexenv *environment*)))
(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 (integer-to-string (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)
- (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
+ (if multiple-value-p
+ (concat "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*
- (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*
- " 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
+ "var values = mv;" *newline*
"throw ({"
"type: 'catch', "
"id: " (ls-compile id) ", "
- "value: " (ls-compile value) ", "
+ "values: " (ls-compile value t) ", "
"message: 'Throw uncatched.'"
"})"))
"return ret;" *newline*))
(define-compilation multiple-value-call (func-form &rest forms)
- (let ((func (ls-compile func-form)))
+ (js!selfcall
+ "var func = " (ls-compile func-form) ";" *newline*
+ "var args = [" (if *multiple-value-p* "values" "pv") "];" *newline*
+ "return "
(js!selfcall
- "var args = [values];" *newline*
- "function values(){" *newline*
- (indent "var result = [];" *newline*
- "for (var i=0; i<arguments.length; i++)" *newline*
- (indent "result.push(arguments[i]);"))
- "}" *newline*
+ "var values = mv;" *newline*
+ "var vs;" *newline*
(mapconcat (lambda (form)
- (ls-compile form))
+ (concat "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]);")))
+ "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*))
(define-raw-builtin funcall (func &rest args)
(concat "(" (ls-compile func) ")("
- (join (cons "id" (mapcar #'ls-compile args))
+ (join (cons (if *multiple-value-p* "values" "pv")
+ (mapcar #'ls-compile args))
", ")
")"))
(last (car (last args))))
(js!selfcall
"var f = " (ls-compile func) ";" *newline*
- "var args = [" (join (cons "id" (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*
(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 get-unix-time ()
(concat "(Math.round(new Date() / 1000))"))
-(define-raw-builtin values-list (list)
- (concat "values(" list ")"))
+(define-builtin values-array (array)
+ (if *multiple-value-p*
+ (concat "values.apply(this, " array ")")
+ (concat "pv.apply(this, " array ")")))
+
+(define-raw-builtin values (&rest args)
+ (if *multiple-value-p*
+ (concat "values(" (join (mapcar #'ls-compile args) ", ") ")")
+ (concat "pv(" (join (mapcar #'ls-compile args) ", ") ")")))
(defun macro (x)
(and (symbolp x)
form)))
(defun compile-funcall (function args)
- (if (and (symbolp function)
- (claimp function 'function 'non-overridable))
- (concat (ls-compile `',function) ".fvalue("
- (join (cons "id" (mapcar #'ls-compile args))
- ", ")
- ")")
- (concat (ls-compile `#',function) "("
- (join (cons "id" (mapcar #'ls-compile args))
- ", ")
- ")")))
+ (let ((values-funcs (if *multiple-value-p* "values" "pv")))
+ (if (and (symbolp function)
+ #+ecmalisp (eq (symbol-package function) (find-package "COMMON-LISP"))
+ #+common-lisp t)
+ (concat (ls-compile `',function) ".fvalue("
+ (join (cons values-funcs (mapcar #'ls-compile args))
+ ", ")
+ ")")
+ (concat (ls-compile `#',function) "("
+ (join (cons values-funcs (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))) ";")
+ "return " (ls-compile (car (last sexps)) *multiple-value-p*) ";")
(join-trailing
(remove-if #'null-or-empty-p (mapcar #'ls-compile sexps))
(concat ";" *newline*))))
-(defun ls-compile (sexp)
- (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) "\""))
- ((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))
- (compile-funcall name args))))))
- (t
- (error "How should I compile this?"))))
+(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)))
+ (concat (ls-compile `',sexp) ".value"))
+ (t
+ (ls-compile `(symbol-value ',sexp))))))
+ ((integerp sexp) (integer-to-string sexp))
+ ((stringp sexp) (concat "\"" (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 ((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
- (let ((code (ls-compile sexp)))
+ (let ((code (ls-compile sexp multiple-value-p)))
(concat (join-trailing (get-toplevel-compilations)
(concat ";" *newline*))
(if code
#+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)
- (let ((code
- (with-compilation-unit
- (ls-compile-toplevel x))))
- (js-eval code)))
+ (js-eval (ls-compile-toplevel x t)))
(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 defmacro 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 get-universal-time 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 progn psetq 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))
+ decf declaim defparameter defun defmacro 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 get-universal-time 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 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
+ plusp prin1-to-string print proclaim prog1 prog2 progn psetq 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 values values-list variable warn when write-line
+ write-string zerop))
(setq *package* *user-package*)
(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.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.
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))