;;; language to the compiler to be able to run.
#+ecmalisp
+(js-eval "function pv (x) { return x ; }")
+
+#+ecmalisp
+(js-eval "function mv(){ var r = []; r['multiple-value'] = true; for (var i=0; i<arguments.length; i++) r.push(arguments[i]); return r; }")
+
+;;; NOTE: Define VALUES to be MV for toplevel forms. It is because
+;;; `eval' compiles the forms and execute the Javascript code at
+;;; toplevel with `js-eval', so it is necessary to return multiple
+;;; values from the eval function.
+#+ecmalisp
+(js-eval "var values = mv;")
+
+#+ecmalisp
(progn
(eval-when-compile
(%compile-defmacro 'defmacro
;; 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))
;;; 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 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) '())))))
+
(defun list-length (list)
(let ((l 0))
(while (not (null list))
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 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
(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
(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))))
+
+#+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 (,@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.
(symbol-name form)
(let ((package (symbol-package form))
(name (symbol-name form)))
- (concat (if (eq package (find-package "KEYWORD"))
- ""
- (package-name package))
+ (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) "\""))
(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) ">"))))
(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))
;;; too. The respective real functions are defined in the target (see
;;; the beginning of this file) as well as some primitive functions.
+;;; If the special variable `*multiple-value-p*' is NON-NIL, then the
+;;; compilation of the current form is allowed to return multiple
+;;; values, using the VALUES variable.
+(defvar *multiple-value-p* nil)
+
(defvar *compilation-unit-checks* '())
(defun make-binding (name type value &optional declarations)
(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
(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*
;; Check number of arguments
(indent
(if required-arguments
- (concat "if (arguments.length < " (integer-to-string n-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 (+ n-required-arguments n-optional-arguments))
+ (integer-to-string (+ 1 n-required-arguments n-optional-arguments))
") throw 'too many arguments';" *newline*)
"")
;; Optional arguments
(if optional-arguments
- (concat "switch(arguments.length){" *newline*
+ (concat "switch(arguments.length-1){" *newline*
(let ((optional-and-defaults
(lambda-list-optional-arguments-with-default lambda-list))
(cases nil)
(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))
+ (integer-to-string (+ 1 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*
+ (let ((*multiple-value-p* t)) (ls-compile-block body t)))
+ *newline*
"})"))))
-(define-compilation setq (var val)
+
+(defun setq-pair (var val)
(let ((b (lookup-in-lexenv var *environment* 'variable)))
(if (eq (binding-type b) 'lexical-variable)
(concat (binding-value b) " = " (ls-compile 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)))))
+ (concat "(" result ")")))
+
;;; FFI Variable accessors
(define-compilation js-vref (var)
var)
(concat "(" var " = " (ls-compile val) ")"))
+
;;; Literals
(defun escape-string (string)
(let ((output "")
(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))))))
+ #+ecmalisp
+ (let ((package (symbol-package sexp)))
+ (if (null package)
+ (concat "{name: \"" (escape-string (symbol-name sexp)) "\"}")
+ (ls-compile `(intern ,(symbol-name sexp) ,(package-name package)))))))
(push (cons sexp v) *literal-symbols*)
(toplevel-compilation (concat "var " v " = " s))
v)))
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 progn (&rest body)
(js!selfcall (ls-compile-block body t)))
-
-(defun restoring-dynamic-binding (bindings body)
+(defun special-variable-p (x)
+ (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
+;;; (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 body)
+ (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
- (join-trailing (mapcar (lambda (b)
- (let ((s (ls-compile `(quote ,(car b)))))
- (concat s ".value" " = " (cdr b))))
- bindings)
- (concat ";" *newline*)))
+ (mapconcat (lambda (b)
+ (let ((s (ls-compile `(quote ,(car b)))))
+ (concat s ".value" " = " (cdr b) ";" *newline*)))
+ bindings))
"}" *newline*))
-(defun dynamic-binding-wrapper (bindings body)
- (if (null bindings)
- body
- (restoring-dynamic-binding
- bindings
- (concat "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*))))
-
(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 (lambda (v)(claimp v 'variable 'special))
- variables)))
- (dynamic-bindings))
- (concat "(function("
- (join (mapcar (lambda (x)
- (if (claimp x 'variable 'special)
- (let ((v (gvarname x)))
- (push (cons x v) dynamic-bindings)
- v)
- (translate-variable x)))
- variables)
- ",")
- "){" *newline*
- (let ((body (ls-compile-block body t)))
- (indent (dynamic-binding-wrapper dynamic-bindings body)))
- "})(" (join cvalues ",") ")")))))
-
-
-(defun let*-initialize (x)
- (let ((var (first x))
- (value (second x)))
- (if (claimp var 'variable 'special)
- (ls-compile `(setq ,var ,value))
- (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)))))))
+ (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))
+ (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 ",") ")")))
+
+
+;;; 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))
+ (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 ((body
- (concat (mapconcat #'let*-initialize bindings)
- (ls-compile-block body t))))
- (if (some (lambda (b) (claimp (car b) 'variable 'special)) bindings)
- (restoring-dynamic-binding bindings body)
- body)))))
-
+ (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)
(js!selfcall
"try {" *newline*
(let ((*environment* (extend-lexenv (list b) *environment* 'block)))
- (indent "return " (ls-compile `(progn ,@body)) ";" *newline*))
+ (indent "return " (ls-compile `(progn ,@body) *multiple-value-p*) ";" *newline*))
"}" *newline*
"catch (cf){" *newline*
" if (cf.type == 'block' && cf.id == " tr ")" *newline*
"})")
(error (concat "Unknown block `" (symbol-name name) "'.")))))
-
(define-compilation catch (id &rest body)
(js!selfcall
"var id = " (ls-compile id) ";" *newline*
"})" *newline*)
(error (concat "Unknown tag `" n "'.")))))
-
(define-compilation unwind-protect (form &rest clean-up)
(js!selfcall
"var ret = " (ls-compile nil) ";" *newline*
"}" *newline*
"return ret;" *newline*))
+(define-compilation multiple-value-call (func-form &rest forms)
+ (let ((func (ls-compile func-form)))
+ (js!selfcall
+ "var args = [values];" *newline*
+ "var values = mv;" *newline*
+ "var vs;" *newline*
+ (mapconcat (lambda (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);" *newline*)))
+
+
;;; A little backquote implementation without optimizations of any
;;; kind for ecmalisp.
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, you 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")))
-(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))
+(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-raw-builtin * (&rest numbers)
+ (if (null numbers)
+ "1"
+ (variable-arity numbers
+ (join numbers "*"))))
+
+(define-raw-builtin / (x &rest others)
+ (let ((args (cons x others)))
+ (variable-arity args
+ (if (null others)
+ (concat "1 /" (car args))
+ (join args "/")))))
(define-builtin mod (x y) (num-op-num x "%" y))
-(define-builtin < (x y) (js!bool (num-op-num x "<" y)))
-(define-builtin > (x y) (js!bool (num-op-num x ">" y)))
-(define-builtin = (x y) (js!bool (num-op-num x "==" y)))
-(define-builtin <= (x y) (js!bool (num-op-num x "<=" y)))
-(define-builtin >= (x y) (js!bool (num-op-num x ">=" y)))
+
+(defun comparison-conjuntion (vars op)
+ (cond
+ ((null (cdr vars))
+ "true")
+ ((null (cddr vars))
+ (concat (car vars) op (cadr vars)))
+ (t
+ (concat (car vars) op (cadr vars)
+ " && "
+ (comparison-conjuntion (cdr vars) op)))))
+
+(defmacro define-builtin-comparison (op sym)
+ `(define-raw-builtin ,op (x &rest args)
+ (let ((args (cons x args)))
+ (variable-arity args
+ (js!bool (comparison-conjuntion args ,sym))))))
+
+(define-builtin-comparison > ">")
+(define-builtin-comparison < "<")
+(define-builtin-comparison >= ">=")
+(define-builtin-comparison <= "<=")
+(define-builtin-comparison = "==")
(define-builtin numberp (x)
(js!bool (concat "(typeof (" x ") == \"number\")")))
(concat "(" symbol ").value = " value))
(define-builtin fset (symbol value)
- (concat "(" symbol ").function = " value))
+ (concat "(" symbol ").fvalue = " value))
(define-builtin boundp (x)
(js!bool (concat "(" x ".value !== undefined)")))
(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 lambda-code (x)
(concat "(" x ").toString()"))
-
(define-builtin eq (x y) (js!bool (concat "(" x " === " y ")")))
(define-builtin equal (x y) (js!bool (concat "(" x " == " y ")")))
(define-raw-builtin funcall (func &rest args)
(concat "(" (ls-compile func) ")("
- (join (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 (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*))
(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 ()
+ (concat "(Math.round(new Date() / 1000))"))
+
+(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)
(let ((b (lookup-in-lexenv x *environment* 'function)))
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")))
+ (if (and (symbolp function)
+ (claimp function 'function 'non-overridable))
+ (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) "\""))
- ((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)))
+ (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-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)))
-
- (export '(* *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
- in-package incf integerp integerp intern keywordp
- lambda-code 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
+ (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 multiple-value-bind
+ multiple-value-call multiple-value-list 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))
+ 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.