(defmacro js!selfcall (&body body)
``(call (function nil (code ,,@body))))
+(defmacro js!selfcall* (&body body)
+ ``(call (function nil ,,@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.
(defun gvarname (symbol)
(declare (ignore symbol))
- (code "v" (incf *variable-counter*)))
+ (incf *variable-counter*)
+ (concat "v" (integer-to-string *variable-counter*)))
(defun translate-variable (symbol)
(awhen (lookup-in-lexenv symbol *environment* 'variable)
*compilations*))
(define-compilation if (condition true &optional false)
- `(code "(" ,(ls-compile condition) " !== " ,(ls-compile nil)
- " ? " ,(ls-compile true *multiple-value-p*)
- " : " ,(ls-compile false *multiple-value-p*)
- ")"))
+ `(if (!== ,(ls-compile condition) ,(ls-compile nil))
+ ,(ls-compile true *multiple-value-p*)
+ ,(ls-compile false *multiple-value-p*)))
(defvar *ll-keywords* '(&optional &rest &key))
(flet ((canonicalize (keyarg)
;; Build a canonical keyword argument descriptor, filling
;; the optional fields. The result is a list of the form
- ;; ((keyword-name var) init-form).
+ ;; ((keyword-name var) init-form svar).
(let ((arg (ensure-list keyarg)))
(cons (if (listp (car arg))
(car arg)
(ll-optional-arguments-canonical lambda-list))))
(remove nil (mapcar #'third args))))
-(defun lambda-name/docstring-wrapper (name docstring &rest code)
+(defun lambda-name/docstring-wrapper (name docstring code)
(if (or name docstring)
- (js!selfcall
- "var func = " `(code ,@code) ";"
- (when name
- `(code "func.fname = " ,(js-escape-string name) ";"))
- (when docstring
- `(code "func.docstring = " ,(js-escape-string docstring) ";"))
- "return func;")
- `(code ,@code)))
+ (js!selfcall*
+ `(var (func ,code))
+ (when name `(= (get func "fname") ,name))
+ (when docstring `(= (get func "docstring") ,docstring))
+ `(return func))
+ code))
(defun lambda-check-argument-count
(n-required-arguments n-optional-arguments rest-p)
(block nil
;; Special case: a positive exact number of arguments.
(when (and (< 0 min) (eql min max))
- (return `(code "checkArgs(nargs, " ,min ");")))
+ (return `(call |checkArgs| |nargs| ,min)))
;; General case:
- `(code
- ,(when (< 0 min)
- `(code "checkArgsAtLeast(nargs, " ,min ");"))
- ,(when (numberp max)
- `(code "checkArgsAtMost(nargs, " ,max ");"))))))
+ `(progn
+ ,(when (< 0 min) `(call |checkArgsAtLeast| |nargs| ,min))
+ ,(when (numberp max) `(call |checkArgsAtMost| |nargs| ,max))))))
(defun compile-lambda-optional (ll)
(let* ((optional-arguments (ll-optional-arguments-canonical ll))
(n-required-arguments (length (ll-required-arguments ll)))
(n-optional-arguments (length optional-arguments)))
(when optional-arguments
- `(code "switch(nargs){"
- ,(let ((cases nil)
- (idx 0))
- (progn
- (while (< idx n-optional-arguments)
- (let ((arg (nth idx optional-arguments)))
- (push `(code "case " ,(+ idx n-required-arguments) ":"
- (code ,(translate-variable (car arg))
- "="
- ,(ls-compile (cadr arg)) ";")
- ,(when (third arg)
- `(code ,(translate-variable (third arg))
- "="
- ,(ls-compile nil)
- ";")))
- cases)
- (incf idx)))
- (push `(code "default: break;") cases)
- `(code ,@(reverse cases))))
- "}"))))
+ `(switch |nargs|
+ ,@(with-collect
+ (dotimes (idx n-optional-arguments)
+ (let ((arg (nth idx optional-arguments)))
+ (collect `(case ,(+ idx n-required-arguments)))
+ (collect `(= ,(make-symbol (translate-variable (car arg)))
+ ,(ls-compile (cadr arg))))
+ (collect (when (third arg)
+ `(= ,(make-symbol (translate-variable (third arg)))
+ ,(ls-compile nil))))))
+ (collect 'default)
+ (collect '(break)))))))
(defun compile-lambda-rest (ll)
(let ((n-required-arguments (length (ll-required-arguments ll)))
(n-optional-arguments (length (ll-optional-arguments ll)))
(rest-argument (ll-rest-argument ll)))
(when rest-argument
- (let ((js!rest (translate-variable rest-argument)))
- `(code "var " ,js!rest "= " ,(ls-compile nil) ";"
- "for (var i = nargs-1; i>=" ,(+ n-required-arguments n-optional-arguments)
- "; i--)"
- (code ,js!rest " = {car: arguments[i+2], cdr: " ,js!rest "};"))))))
+ (let ((js!rest (make-symbol (translate-variable rest-argument))))
+ `(progn
+ (var (,js!rest ,(ls-compile nil)))
+ (var i)
+ (for ((= i (- |nargs| 1))
+ (>= i ,(+ n-required-arguments n-optional-arguments))
+ (post-- i))
+ (= ,js!rest (object "car" (property |arguments| (+ i 2))
+ "cdr" ,js!rest))))))))
(defun compile-lambda-parse-keywords (ll)
(let ((n-required-arguments
(length (ll-optional-arguments ll)))
(keyword-arguments
(ll-keyword-arguments-canonical ll)))
- `(code
- ;; Declare variables
- ,@(mapcar (lambda (arg)
- (let ((var (second (car arg))))
- `(code "var " ,(translate-variable var) "; "
- ,(when (third arg)
- `(code "var " ,(translate-variable (third arg))
- " = " ,(ls-compile nil)
- ";" )))))
- keyword-arguments)
- ;; Parse keywords
- ,(flet ((parse-keyword (keyarg)
- ;; ((keyword-name var) init-form)
- `(code "for (i=" ,(+ n-required-arguments n-optional-arguments)
- "; i<nargs; i+=2){"
- "if (arguments[i+2] === " ,(ls-compile (caar keyarg)) "){"
- ,(translate-variable (cadr (car keyarg)))
- " = arguments[i+3];"
- ,(let ((svar (third keyarg)))
- (when svar
- `(code ,(translate-variable svar) " = " ,(ls-compile t) ";" )))
- "break;"
- "}"
- "}"
- ;; Default value
- "if (i == nargs){"
- ,(translate-variable (cadr (car keyarg)))
- " = "
- ,(ls-compile (cadr keyarg))
- ";"
- "}")))
- (when keyword-arguments
- `(code "var i;"
- ,@(mapcar #'parse-keyword keyword-arguments))))
- ;; Check for unknown keywords
- ,(when keyword-arguments
- `(code "var start = " ,(+ n-required-arguments n-optional-arguments) ";"
- "if ((nargs - start) % 2 == 1){"
- "throw 'Odd number of keyword arguments';"
- "}"
- "for (i = start; i<nargs; i+=2){"
- "if ("
- ,@(interleave (mapcar (lambda (x)
- `(code "arguments[i+2] !== " ,(ls-compile (caar x))))
- keyword-arguments)
- " && ")
- ")"
- "throw 'Unknown keyword argument ' + xstring(arguments[i+2].name);"
- "}" )))))
+ `(progn
+ ;; Declare variables
+ ,@(with-collect
+ (dolist (keyword-argument keyword-arguments)
+ (destructuring-bind ((keyword-name var) &optional initform svar)
+ keyword-argument
+ (declare (ignore keyword-name initform))
+ (collect `(var ,(make-symbol (translate-variable var))))
+ (when svar
+ (collect
+ `(var (,(make-symbol (translate-variable svar))
+ ,(ls-compile nil))))))))
+
+ ;; Parse keywords
+ ,(flet ((parse-keyword (keyarg)
+ (destructuring-bind ((keyword-name var) &optional initform svar) keyarg
+ ;; ((keyword-name var) init-form svar)
+ `(progn
+ (for ((= i ,(+ n-required-arguments n-optional-arguments))
+ (< i |nargs|)
+ (+= i 2))
+ ;; ....
+ (if (=== (property |arguments| (+ i 2))
+ ,(ls-compile keyword-name))
+ (progn
+ (= ,(make-symbol (translate-variable var))
+ (property |arguments| (+ i 3)))
+ ,(when svar `(= ,(make-symbol (translate-variable svar))
+ ,(ls-compile t)))
+ (break))))
+ (if (== i |nargs|)
+ (= ,(make-symbol (translate-variable var))
+ ,(ls-compile initform)))))))
+ (when keyword-arguments
+ `(progn
+ (var i)
+ ,@(mapcar #'parse-keyword keyword-arguments))))
+
+ ;; Check for unknown keywords
+ ,(when keyword-arguments
+ `(progn
+ (var (start ,(+ n-required-arguments n-optional-arguments)))
+ (if (== (% (- |nargs| start) 2) 1)
+ (throw "Odd number of keyword arguments."))
+ (for ((= i start) (< i |nargs|) (+= i 2))
+ (if (and ,@(mapcar (lambda (keyword-argument)
+ (destructuring-bind ((keyword-name var) &optional initform svar)
+ keyword-argument
+ (declare (ignore var initform svar))
+ `(!== (property |arguments| (+ i 2)) ,(ls-compile keyword-name))))
+ keyword-arguments))
+ (throw (+ "Unknown keyword argument "
+ (call |xstring|
+ (property
+ (property |arguments| (+ i 2))
+ "name")))))))))))
(defun parse-lambda-list (ll)
(values (ll-required-arguments ll)
keyword-arguments
(ll-svars ll)))))
(lambda-name/docstring-wrapper name documentation
- `(code
- "(function ("
- ,(join (list* "values"
- "nargs"
- (mapcar #'translate-variable
- (append required-arguments optional-arguments)))
- ",")
- "){"
- ;; Check number of arguments
- ,(lambda-check-argument-count n-required-arguments
- n-optional-arguments
- (or rest-argument keyword-arguments))
- ,(compile-lambda-optional ll)
- ,(compile-lambda-rest ll)
- ,(compile-lambda-parse-keywords ll)
- ,(let ((*multiple-value-p* t))
- (if block
- (ls-compile-block `((block ,block ,@body)) t)
- (ls-compile-block body t)))
- "})"))))))
+ `(function (|values| |nargs| ,@(mapcar (lambda (x)
+ (make-symbol (translate-variable x)))
+ (append required-arguments optional-arguments)))
+ ;; Check number of arguments
+ ,(lambda-check-argument-count n-required-arguments
+ n-optional-arguments
+ (or rest-argument keyword-arguments))
+ ,(compile-lambda-optional ll)
+ ,(compile-lambda-rest ll)
+ ,(compile-lambda-parse-keywords ll)
+
+ ,(let ((*multiple-value-p* t))
+ (if block
+ (ls-compile-block `((block ,block ,@body)) t)
+ (ls-compile-block body t)))))))))
(defun setq-pair (var val)
(eq (binding-type b) 'variable)
(not (member 'special (binding-declarations b)))
(not (member 'constant (binding-declarations b))))
- `(code ,(binding-value b) " = " ,(ls-compile val)))
+ ;; TODO: Unnecesary make-symbol when codegen migration is
+ ;; finished.
+ `(= ,(make-symbol (binding-value b)) ,(ls-compile val)))
((and b (eq (binding-type b) 'macro))
(ls-compile `(setf ,var ,val)))
(t
((null (cdr pairs))
(error "Odd pairs in SETQ"))
(t
- (push `(code ,(setq-pair (car pairs) (cadr pairs))
- ,(if (null (cddr pairs)) "" ", "))
- result)
+ (push `,(setq-pair (car pairs) (cadr pairs)) result)
(setq pairs (cddr pairs)))))
- `(code "(" ,@(reverse result) ")")))
+ `(progn ,@(reverse result))))
;;; Compilation of literals an object dumping
(defvar *literal-counter* 0)
(defun genlit ()
- (code "l" (incf *literal-counter*)))
+ (incf *literal-counter*)
+ (concat "l" (integer-to-string *literal-counter*)))
(defun dump-symbol (symbol)
#-jscl
(let ((package (symbol-package symbol)))
(if (eq package (find-package "KEYWORD"))
- `(code "(new Symbol(" ,(dump-string (symbol-name symbol)) ", " ,(dump-string (package-name package)) "))")
- `(code "(new Symbol(" ,(dump-string (symbol-name symbol)) "))")))
+ `(new (call |Symbol| ,(dump-string (symbol-name symbol)) ,(dump-string (package-name package))))
+ `(new (call |Symbol| ,(dump-string (symbol-name symbol))))))
#+jscl
(let ((package (symbol-package symbol)))
(if (null package)
- `(code "(new Symbol(" ,(dump-string (symbol-name symbol)) "))")
+ `(new (call |Symbol| ,(dump-string (symbol-name symbol))))
(ls-compile `(intern ,(symbol-name symbol) ,(package-name package))))))
(defun dump-cons (cons)
(let ((head (butlast cons))
(tail (last cons)))
- `(code "QIList("
- ,@(interleave (mapcar (lambda (x) (literal x t)) head) "," t)
- ,(literal (car tail) t)
- ","
- ,(literal (cdr tail) t)
- ")")))
+ `(call |QIList|
+ ,@(mapcar (lambda (x) `(code ,(literal x t))) head)
+ (code ,(literal (car tail) t))
+ (code ,(literal (cdr tail) t)))))
(defun dump-array (array)
(let ((elements (vector-to-list array)))
- `(code "[" ,(join (mapcar #'literal elements) ", ") "]")))
+ (list-to-vector (mapcar (lambda (x) `(code ,(literal x)))
+ elements))))
(defun dump-string (string)
- `(code "make_lisp_string(" ,(js-escape-string string) ")"))
+ `(call |make_lisp_string| ,string))
(defun literal (sexp &optional recursive)
(cond
(literal sexp))
(define-compilation %while (pred &rest body)
- (js!selfcall
- "while(" (ls-compile pred) " !== " (ls-compile nil) "){" *newline*
- `(code ,(ls-compile-block body))
- "}" *newline*
- "return " (ls-compile nil) ";" *newline*))
+ (js!selfcall*
+ `(while (!== ,(ls-compile pred) ,(ls-compile nil))
+ 0 ; TODO: Force
+ ; braces. Unnecesary when code
+ ; is gone
+ ,(ls-compile-block body))
+ `(return ,(ls-compile nil))))
(define-compilation function (x)
(cond
((and (listp x) (eq (car x) 'lambda))
(compile-lambda (cadr x) (cddr x)))
((and (listp x) (eq (car x) 'named-lambda))
- ;; TODO: destructuring-bind now! Do error checking manually is
- ;; very annoying.
- (let ((name (cadr x))
- (ll (caddr x))
- (body (cdddr x)))
+ (destructuring-bind (name ll &rest body) (cdr x)
(compile-lambda ll body
:name (symbol-name name)
:block name)))
(extend-lexenv (mapcar #'make-function-binding fnames)
*environment*
'function)))
- `(code "(function("
- ,@(interleave (mapcar #'translate-function fnames) ",")
- "){"
- ,(ls-compile-block body t)
- "})(" ,@(interleave cfuncs ",") ")")))
+ `(call (function ,(mapcar #'make-symbol (mapcar #'translate-function fnames))
+ ,(ls-compile-block body t))
+ ,@cfuncs)))
(define-compilation labels (definitions &rest body)
(let* ((fnames (mapcar #'car definitions))
(extend-lexenv (mapcar #'make-function-binding fnames)
*environment*
'function)))
- (js!selfcall
- `(code ,@(mapcar (lambda (func)
- `(code "var " ,(translate-function (car func))
- " = " ,(compile-lambda (cadr func)
- `((block ,(car func) ,@(cddr func))))
- ";" ))
- definitions))
+ (js!selfcall*
+ `(progn
+ ,@(mapcar (lambda (func)
+ `(var (,(make-symbol (translate-function (car func)))
+ ,(compile-lambda (cadr func)
+ `((block ,(car func) ,@(cddr func)))))))
+ definitions))
(ls-compile-block body t))))
(define-compilation progn (&rest body)
(if (null (cdr body))
(ls-compile (car body) *multiple-value-p*)
- `(code "("
- ,@(interleave
- (append (mapcar #'ls-compile (butlast body))
- (list (ls-compile (car (last body)) t)))
- ",")
- ")")))
+ `(progn
+ ,@(append (mapcar #'ls-compile (butlast body))
+ (list (ls-compile (car (last body)) t))))))
(define-compilation macrolet (definitions &rest body)
(let ((*environment* (copy-lexenv *environment*)))
(defun let-binding-wrapper (bindings body)
(when (null bindings)
(return-from let-binding-wrapper body))
- `(code
- "try {"
- (code "var tmp;"
- ,@(mapcar
- (lambda (b)
- (let ((s (ls-compile `(quote ,(car b)))))
- `(code "tmp = " ,s ".value;"
- ,s ".value = " ,(cdr b) ";"
- ,(cdr b) " = tmp;" )))
- bindings)
- ,body
- )
- "}"
- "finally {"
- (code
- ,@(mapcar (lambda (b)
- (let ((s (ls-compile `(quote ,(car b)))))
- `(code ,s ".value" " = " ,(cdr b) ";" )))
- bindings))
- "}" ))
+ `(progn
+ (try (var tmp)
+ ,@(with-collect
+ (dolist (b bindings)
+ (let ((s (ls-compile `',(car b))))
+ (collect `(= tmp (get ,s "value")))
+ (collect `(= (get ,s "value") ,(cdr b)))
+ (collect `(= ,(cdr b) tmp)))))
+ ,body)
+ (finally
+ ,@(with-collect
+ (dolist (b bindings)
+ (let ((s (ls-compile `(quote ,(car b)))))
+ (collect `(= (get ,s "value") ,(cdr b)))))))))
(define-compilation let (bindings &rest body)
(let* ((bindings (mapcar #'ensure-list bindings))
(cvalues (mapcar #'ls-compile (mapcar #'second bindings)))
(*environment* (extend-local-env (remove-if #'special-variable-p variables)))
(dynamic-bindings))
- `(code "(function("
- ,@(interleave
- (mapcar (lambda (x)
- (if (special-variable-p x)
- (let ((v (gvarname x)))
- (push (cons x v) dynamic-bindings)
- v)
- (translate-variable x)))
- variables)
- ",")
- "){"
- ,(let ((body (ls-compile-block body t t)))
- `(code ,(let-binding-wrapper dynamic-bindings body)))
- "})(" ,@(interleave cvalues ",") ")")))
+ `(call (function ,(mapcar (lambda (x)
+ (if (special-variable-p x)
+ (let ((v (gvarname x)))
+ (push (cons x (make-symbol v)) dynamic-bindings)
+ (make-symbol v))
+ (make-symbol (translate-variable x))))
+ variables)
+ ,(let ((body (ls-compile-block body t t)))
+ `,(let-binding-wrapper dynamic-bindings body)))
+ ,@cvalues)))
;;; Return the code to initialize BINDING, and push it extending the
;; unique identifier of the block as exception. We can't use the
;; variable name itself, because it could not to be unique, so we
;; capture it in a closure.
- (js!selfcall
- (when multiple-value-p `(code "var values = mv;" ))
- "throw ({"
- "type: 'block', "
- "id: " (binding-value b) ", "
- "values: " (ls-compile value multiple-value-p) ", "
- "message: 'Return from unknown block " (symbol-name name) ".'"
- "})")))
+ (js!selfcall*
+ (when multiple-value-p
+ `(var (|values| |mv|)))
+ `(throw
+ (object
+ "type" "block"
+ "id" ,(make-symbol (binding-value b))
+ "values" ,(ls-compile value multiple-value-p)
+ "message" ,(concat "Return from unknown block '" (symbol-name name) "'."))))))
(define-compilation catch (id &rest body)
- (js!selfcall
- "var id = " (ls-compile id) ";"
- "try {"
- `(code ,(ls-compile-block body t))
- "}"
- "catch (cf){"
- " if (cf.type == 'catch' && cf.id == id)"
- (if *multiple-value-p*
- " return values.apply(this, forcemv(cf.values));"
- " return pv.apply(this, forcemv(cf.values));")
-
- " else"
- " throw cf;"
- "}" ))
+ (js!selfcall*
+ `(var (|id| ,(ls-compile id)))
+ `(try
+ ,(ls-compile-block body t))
+ `(catch (|cf|)
+ (if (and (== (get |cf| "type") "catch")
+ (== (get |cf| "id") |id|))
+ ,(if *multiple-value-p*
+ `(return (call (get |values| "apply")
+ this
+ (call |forcemv| (get |cf| "values"))))
+ `(return (call (get |pv| "apply")
+ this
+ (call |forcemv| (get |cf| "values")))))
+ (throw |cf|)))))
(define-compilation throw (id value)
- (js!selfcall
- "var values = mv;"
- "throw ({"
- "type: 'catch', "
- "id: " (ls-compile id) ", "
- "values: " (ls-compile value t) ", "
- "message: 'Throw uncatched.'"
- "})"))
+ (js!selfcall*
+ `(var (|values| |mv|))
+ `(throw (object
+ |type| "catch"
+ |id| ,(ls-compile id)
+ |values| ,(ls-compile value t)
+ |message| "Throw uncatched."))))
(defun go-tag-p (x)
(or (integerp x) (symbolp x)))
(let* ((go-tag-counter 0)
(bindings
(mapcar (lambda (label)
- (let ((tagidx (integer-to-string (incf go-tag-counter))))
+ (let ((tagidx (incf go-tag-counter)))
(make-binding :name label :type 'gotag :value (list tbidx tagidx))))
(remove-if-not #'go-tag-p body))))
(extend-lexenv bindings *environment* 'gotag)))
initag)
(let ((b (lookup-in-lexenv (first body) *environment* 'gotag)))
(setq initag (second (binding-value b))))
- (js!selfcall
+ (js!selfcall*
;; TAGBODY branch to take
- "var " branch " = " initag ";"
- "var " tbidx " = [];"
- "tbloop:"
- "while (true) {"
- `(code "try {"
- ,(let ((content nil))
- `(code "switch(" ,branch "){"
- "case " ,initag ":"
- ,@(dolist (form (cdr body) (reverse content))
- (push (if (not (go-tag-p form))
- `(code ,(ls-compile form) ";" )
+ `(var (,(make-symbol branch) ,initag))
+ `(var (,(make-symbol tbidx) #()))
+ `(label tbloop
+ (while true
+ (try
+ (switch ,(make-symbol branch)
+ ,@(with-collect
+ (collect `(case ,initag))
+ (dolist (form (cdr body))
+ (if (go-tag-p form)
(let ((b (lookup-in-lexenv form *environment* 'gotag)))
- `(code "case " ,(second (binding-value b)) ":" )))
- content))
- "default:"
- " break tbloop;"
- "}" ))
- "}"
- "catch (jump) {"
- " if (jump.type == 'tagbody' && jump.id == " ,tbidx ")"
- " " ,branch " = jump.label;"
- " else"
- " throw(jump);"
- "}" )
- "}"
- "return " (ls-compile nil) ";" ))))
+ (collect `(case ,(second (binding-value b)))))
+ (progn
+ (collect (ls-compile form))
+ ;; TEMPORAL!
+ (collect '(code ";"))))))
+ default
+ (break tbloop)))
+ (catch (jump)
+ (if (and (== (get jump "type") "tagbody")
+ (== (get jump "id") ,(make-symbol tbidx)))
+ (= ,(make-symbol branch) (get jump "label"))
+ (throw jump)))))
+ `(return ,(ls-compile nil))))))
(define-compilation go (label)
(let ((b (lookup-in-lexenv label *environment* 'gotag))
((integerp label) (integer-to-string label)))))
(when (null b)
(error "Unknown tag `~S'" label))
- (js!selfcall
- "throw ({"
- "type: 'tagbody', "
- "id: " (first (binding-value b)) ", "
- "label: " (second (binding-value b)) ", "
- "message: 'Attempt to GO to non-existing tag " n "'"
- "})" )))
+ (js!selfcall*
+ `(throw
+ (object
+ "type" "tagbody"
+ "id" ,(make-symbol (first (binding-value b)))
+ "label" ,(second (binding-value b))
+ "message" ,(concat "Attempt to GO to non-existing tag " n))))))
(define-compilation unwind-protect (form &rest clean-up)
- (js!selfcall
- "var ret = " (ls-compile nil) ";"
- "try {"
- `(code "ret = " ,(ls-compile form) ";" )
- "} finally {"
- `(code ,(ls-compile-block clean-up))
- "}"
- "return ret;" ))
+ (js!selfcall*
+ `(var (|ret| ,(ls-compile nil)))
+ `(try
+ (= |ret| ,(ls-compile form)))
+ `(finally
+ ,(ls-compile-block clean-up))
+ `(return |ret|)))
(define-compilation multiple-value-call (func-form &rest forms)
- (js!selfcall
- "var func = " (ls-compile func-form) ";"
- "var args = [" (if *multiple-value-p* "values" "pv") ", 0];"
- "return "
- (js!selfcall
- "var values = mv;"
- "var vs;"
- `(code
- ,@(mapcar (lambda (form)
- `(code "vs = " ,(ls-compile form t) ";"
- "if (typeof vs === 'object' && 'multiple-value' in vs)"
- (code " args = args.concat(vs);" )
- " else "
- (code "args.push(vs);" )))
- forms))
- "args[1] = args.length-2;"
- "return func.apply(window, args);" ) ";" ))
+ (js!selfcall*
+ `(var (func ,(ls-compile func-form)))
+ `(var (args ,(vector (if *multiple-value-p* '|values| '|pv|) 0)))
+ `(return
+ ,(js!selfcall*
+ `(var (|values| |mv|))
+ `(var vs)
+ `(progn
+ ,@(with-collect
+ (dolist (form forms)
+ (collect `(= vs ,(ls-compile form t)))
+ (collect `(if (and (=== (typeof vs) "object")
+ (in "multiple-value" vs))
+ (= args (call (get args "concat") vs))
+ (call (get args "push") vs))))))
+ `(= (property args 1) (- (property args "length") 2))
+ `(return (call (get func "apply") |window| args))))))
(define-compilation multiple-value-prog1 (first-form &rest forms)
(js!selfcall
(prelude '()))
(dolist (x args)
(cond
- ((floatp x) (push (float-to-string x) fargs))
- ((numberp x) (push (integer-to-string x) fargs))
- (t (let ((v (code "x" (incf counter))))
+ ((or (floatp x) (numberp x)) (push x fargs))
+ (t (let ((v (make-symbol (code "x" (incf counter)))))
(push v fargs)
(push `(code "var " ,v " = " ,(ls-compile x) ";"
"if (typeof " ,v " !== 'number') throw 'Not a number!';")
(define-raw-builtin + (&rest numbers)
(if (null numbers)
- "0"
+ 0
(variable-arity numbers
- `(code ,@(interleave numbers "+")))))
+ `(+ ,@numbers))))
(define-raw-builtin - (x &rest others)
(let ((args (cons x others)))
- (variable-arity args
- (if (null others)
- `(code "-" ,(car args))
- `(code ,@(interleave args "-"))))))
+ (variable-arity args `(- ,@args))))
(define-raw-builtin * (&rest numbers)
(if (null numbers)
- "1"
- (variable-arity numbers
- `(code ,@(interleave numbers "*")))))
+ 1
+ (variable-arity numbers `(* ,@numbers))))
(define-raw-builtin / (x &rest others)
(let ((args (cons x others)))
(variable-arity args
(if (null others)
- `(code "1 /" ,(car args))
- `(code ,@(interleave args "/"))))))
+ `(/ 1 ,(car args))
+ (reduce (lambda (x y) `(/ ,x ,y))
+ args)))))
(define-builtin mod (x y) (num-op-num x "%" y))
(defun comparison-conjuntion (vars op)
(cond
((null (cdr vars))
- "true")
+ 'true)
((null (cddr vars))
- `(code ,(car vars) ,op ,(cadr vars)))
+ `(,op ,(car vars) ,(cadr vars)))
(t
- `(code ,(car vars) ,op ,(cadr vars)
- " && "
- ,(comparison-conjuntion (cdr vars) op)))))
+ `(and (,op ,(car vars) ,(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))))))
+ (js!bool (comparison-conjuntion args ',sym))))))
-(define-builtin-comparison > ">")
-(define-builtin-comparison < "<")
-(define-builtin-comparison >= ">=")
-(define-builtin-comparison <= "<=")
-(define-builtin-comparison = "==")
-(define-builtin-comparison /= "!=")
+(define-builtin-comparison > >)
+(define-builtin-comparison < <)
+(define-builtin-comparison >= >=)
+(define-builtin-comparison <= <=)
+(define-builtin-comparison = ==)
+(define-builtin-comparison /= !=)
(define-builtin numberp (x)
- (js!bool `(code "(typeof (" ,x ") == \"number\")")))
+ (js!bool `(== (typeof ,x) "number")))
(define-builtin floor (x)
(type-check (("x" "number" x))
"make_lisp_string(x.toString())"))
(define-builtin cons (x y)
- `(code "({car: " ,x ", cdr: " ,y "})"))
+ `(object "car" ,x "cdr" ,y))
(define-builtin consp (x)
(js!bool
- (js!selfcall
- "var tmp = " x ";"
- "return (typeof tmp == 'object' && 'car' in tmp);" )))
+ (js!selfcall*
+ `(var (tmp ,x))
+ `(return (and (== (typeof tmp) "object")
+ (in "car" tmp))))))
(define-builtin car (x)
- (js!selfcall
- "var tmp = " x ";"
- "return tmp === " (ls-compile nil)
- "? " (ls-compile nil)
- ": tmp.car;" ))
+ (js!selfcall*
+ `(var (tmp ,x))
+ `(return (if (=== tmp ,(ls-compile nil))
+ ,(ls-compile nil)
+ (get tmp "car")))))
(define-builtin cdr (x)
- (js!selfcall
- "var tmp = " x ";"
- "return tmp === " (ls-compile nil) "? "
- (ls-compile nil)
- ": tmp.cdr;" ))
+ (js!selfcall*
+ `(var (tmp ,x))
+ `(return (if (=== tmp ,(ls-compile nil))
+ ,(ls-compile nil)
+ (get tmp "cdr")))))
(define-builtin rplaca (x new)
(type-check (("x" "object" x))
`(code "(x.cdr = " ,new ", x)")))
(define-builtin symbolp (x)
- (js!bool `(code "(" ,x " instanceof Symbol)")))
+ (js!bool `(instanceof ,x |Symbol|)))
(define-builtin make-symbol (name)
- `(code "(new Symbol(" ,name "))"))
+ `(new (call |Symbol| ,name)))
(define-builtin symbol-name (x)
- `(code "(" ,x ").name"))
+ `(get ,x "name"))
(define-builtin set (symbol value)
- `(code "(" ,symbol ").value = " ,value))
+ `(= (get ,symbol "value") ,value))
(define-builtin fset (symbol value)
- `(code "(" ,symbol ").fvalue = " ,value))
+ `(= (get ,symbol "fvalue") ,value))
(define-builtin boundp (x)
- (js!bool `(code "(" ,x ".value !== undefined)")))
+ (js!bool `(!== (get ,x "value") undefined)))
(define-builtin fboundp (x)
- (js!bool `(code "(" ,x ".fvalue !== undefined)")))
+ (js!bool `(!== (get ,x "fvalue") undefined)))
(define-builtin symbol-value (x)
- (js!selfcall
- "var symbol = " x ";"
- "var value = symbol.value;"
- "if (value === undefined) throw \"Variable `\" + xstring(symbol.name) + \"' is unbound.\";"
- "return value;" ))
+ (js!selfcall*
+ `(var (symbol ,x)
+ (value (get symbol "value")))
+ `(if (=== value undefined)
+ (throw (+ "Variable `" (call |xstring| (get symbol "name")) "' is unbound.")))
+ `(return value)))
(define-builtin symbol-function (x)
- (js!selfcall
- "var symbol = " x ";"
- "var func = symbol.fvalue;"
- "if (func === undefined) throw \"Function `\" + xstring(symbol.name) + \"' is undefined.\";"
- "return func;" ))
+ (js!selfcall*
+ `(var (symbol ,x)
+ (func (get symbol "fvalue")))
+ `(if (=== func undefined)
+ (throw (+ "Function `" (call |xstring| (get symbol "name")) "' is undefined.")))
+ `(return func)))
(define-builtin symbol-plist (x)
- `(code "((" ,x ").plist || " ,(ls-compile nil) ")"))
+ `(or (get ,x "plist") ,(ls-compile nil)))
(define-builtin lambda-code (x)
- `(code "make_lisp_string((" ,x ").toString())"))
+ `(call |make_lisp_string| (call (get ,x "toString"))))
(define-builtin eq (x y)
- (js!bool `(code "(" ,x " === " ,y ")")))
+ (js!bool `(=== ,x ,y)))
(define-builtin char-code (x)
(type-check (("x" "string" x))
(define-builtin characterp (x)
(js!bool
- (js!selfcall
- "var x = " x ";"
- "return (typeof(" x ") == \"string\") && (x.length == 1 || x.length == 2);")))
+ (js!selfcall*
+ `(var (x ,x))
+ `(return (and (== (typeof x) "string")
+ (or (== (get x "length") 1)
+ (== (get x "length") 2)))))))
(define-builtin char-upcase (x)
- `(code "safe_char_upcase(" ,x ")"))
+ `(call |safe_char_upcase| ,x))
(define-builtin char-downcase (x)
- `(code "safe_char_downcase(" ,x ")"))
+ `(call |safe_char_downcase| ,x))
(define-builtin stringp (x)
(js!bool
- (js!selfcall
- "var x = " x ";"
- "return typeof(x) == 'object' && 'length' in x && x.stringp == 1;")))
+ (js!selfcall*
+ `(var (x ,x))
+ `(return (and (and (===(typeof x) "object")
+ (in "length" x))
+ (== (get x "stringp") 1))))))
(define-raw-builtin funcall (func &rest args)
- (js!selfcall
- "var f = " (ls-compile func) ";"
- "return (typeof f === 'function'? f: f.fvalue)("
- `(code
- ,@(interleave (list* (if *multiple-value-p* "values" "pv")
- (integer-to-string (length args))
- (mapcar #'ls-compile args))
- ", "))
- ")"))
+ (js!selfcall*
+ `(var (f ,(ls-compile func)))
+ `(return (call (if (=== (typeof f) "function")
+ f
+ (get f "fvalue"))
+ ,@(list* (if *multiple-value-p* '|values| '|pv|)
+ (length args)
+ (mapcar #'ls-compile args))))))
(define-raw-builtin apply (func &rest args)
(if (null args)
- `(code "(" ,(ls-compile func) ")()")
+ (ls-compile func)
(let ((args (butlast args))
(last (car (last args))))
- (js!selfcall
- "var f = " (ls-compile func) ";"
- "var args = [" `(code
- ,@(interleave (list* (if *multiple-value-p* "values" "pv")
- (integer-to-string (length args))
- (mapcar #'ls-compile args))
- ", "))
- "];"
- "var tail = (" (ls-compile last) ");"
- "while (tail != " (ls-compile nil) "){"
- " args.push(tail.car);"
- " args[1] += 1;"
- " tail = tail.cdr;"
- "}"
- "return (typeof f === 'function'? f : f.fvalue).apply(this, args);" ))))
+ (js!selfcall*
+ `(var (f ,(ls-compile func)))
+ `(var (args ,(list-to-vector
+ (list* (if *multiple-value-p* '|values| '|pv|)
+ (length args)
+ (mapcar #'ls-compile args)))))
+ `(var (tail ,(ls-compile last)))
+ `(while (!= tail ,(ls-compile nil))
+ (call (get args "push") (get tail "car"))
+ (post++ (property args 1))
+ (= tail (get tail "cdr")))
+ `(return (call (get (if (=== (typeof f) "function")
+ f
+ (get f "fvalue"))
+ "apply")
+ this
+ args))))))
(define-builtin js-eval (string)
(if *multiple-value-p*
- (js!selfcall
- "var v = globalEval(xstring(" string "));"
- "return values.apply(this, forcemv(v));" )
- `(code "globalEval(xstring(" ,string "))")))
+ (js!selfcall*
+ `(var (v (call |globalEval| (call |xstring| ,string))))
+ `(return (call (get |values| "apply") this (call |forcemv| v))))
+ `(call |globalEval| (call |xstring| ,string))))
(define-builtin %throw (string)
- (js!selfcall "throw " string ";" ))
+ (js!selfcall* `(throw ,string)))
(define-builtin functionp (x)
- (js!bool `(code "(typeof " ,x " == 'function')")))
+ (js!bool `(=== (typeof ,x) "function")))
(define-builtin %write-string (x)
- `(code "lisp.write(" ,x ")"))
+ `(call (get |lisp| "write") ,x))
(define-builtin /debug (x)
- `(code "console.log(xstring(" ,x "))"))
+ `(call (get |console| "log") (call |xstring| ,x)))
;;; Storage vectors. They are used to implement arrays and (in the
(define-builtin storage-vector-p (x)
(js!bool
- (js!selfcall
- "var x = " x ";"
- "return typeof x === 'object' && 'length' in x;")))
+ (js!selfcall*
+ `(var (x ,x))
+ `(return (and (=== (typeof x) "object") (in "length" x))))))
(define-builtin make-storage-vector (n)
- (js!selfcall
- "var r = [];"
- "r.length = " n ";"
- "return r;" ))
+ (js!selfcall*
+ `(var (r #()))
+ `(= (get r "length") ,n)
+ `(return r)))
(define-builtin storage-vector-size (x)
- `(code ,x ".length"))
+ `(get ,x "length"))
(define-builtin resize-storage-vector (vector new-size)
- `(code "(" ,vector ".length = " ,new-size ")"))
+ `(= (get ,vector "length") ,new-size))
(define-builtin storage-vector-ref (vector n)
- (js!selfcall
- "var x = " "(" vector ")[" n "];"
- "if (x === undefined) throw 'Out of range';"
- "return x;" ))
+ (js!selfcall*
+ `(var (x (property ,vector ,n)))
+ `(if (=== x undefined) (throw "Out of range."))
+ `(return x)))
(define-builtin storage-vector-set (vector n value)
- (js!selfcall
- "var x = " vector ";"
- "var i = " n ";"
- "if (i < 0 || i >= x.length) throw 'Out of range';"
- "return x[i] = " value ";" ))
+ (js!selfcall*
+ `(var (x ,vector))
+ `(var (i ,n))
+ `(if (or (< i 0) (>= i (get x "length")))
+ (throw "Out of range."))
+ `(return (= (property x i) ,value))))
(define-builtin concatenate-storage-vector (sv1 sv2)
- (js!selfcall
- "var sv1 = " sv1 ";"
- "var r = sv1.concat(" sv2 ");"
- "r.type = sv1.type;"
- "r.stringp = sv1.stringp;"
- "return r;" ))
+ (js!selfcall*
+ `(var (sv1 ,sv1))
+ `(var (r (call (get sv1 "concat") ,sv2)))
+ `(= (get r "type") (get sv1 "type"))
+ `(= (get r "stringp") (get sv1 "stringp"))
+ `(return r)))
(define-builtin get-internal-real-time ()
- "(new Date()).getTime()")
+ `(call (get (new (call |Date|)) "getTime")))
(define-builtin values-array (array)
(if *multiple-value-p*
- `(code "values.apply(this, " ,array ")")
- `(code "pv.apply(this, " ,array ")")))
+ `(call (get |values| "apply") this ,array)
+ `(call (get |pv| "apply") this ,array)))
(define-raw-builtin values (&rest args)
(if *multiple-value-p*
- `(code "values(" ,@(interleave (mapcar #'ls-compile args) ",") ")")
- `(code "pv(" ,@(interleave (mapcar #'ls-compile args) ", ") ")")))
-
+ `(call |values| ,@(mapcar #'ls-compile args))
+ `(call |pv| ,@(mapcar #'ls-compile args))))
;;; Javascript FFI
-(define-builtin new () "{}")
+(define-builtin new ()
+ '(object))
(define-raw-builtin oget* (object key &rest keys)
- (js!selfcall
- "var tmp = (" (ls-compile object) ")[xstring(" (ls-compile key) ")];"
- `(code
- ,@(mapcar (lambda (key)
- `(code "if (tmp === undefined) return " ,(ls-compile nil) ";"
- "tmp = tmp[xstring(" ,(ls-compile key) ")];" ))
- keys))
- "return tmp === undefined? " (ls-compile nil) " : tmp;" ))
+ (js!selfcall*
+ `(progn
+ (var (tmp (property ,(ls-compile object) (call |xstring| ,(ls-compile key)))))
+ ,@(mapcar (lambda (key)
+ `(progn
+ (if (=== tmp undefined) (return ,(ls-compile nil)))
+ (= tmp (property tmp (call |xstring| ,(ls-compile key))))))
+ keys))
+ `(return (if (=== tmp undefined) ,(ls-compile nil) tmp))))
(define-raw-builtin oset* (value object key &rest keys)
(let ((keys (cons key keys)))
- (js!selfcall
- "var obj = " (ls-compile object) ";"
- `(code ,@(mapcar (lambda (key)
- `(code "obj = obj[xstring(" ,(ls-compile key) ")];"
- "if (obj === undefined) throw 'Impossible to set Javascript property.';" ))
- (butlast keys)))
- "var tmp = obj[xstring(" (ls-compile (car (last keys))) ")] = " (ls-compile value) ";"
- "return tmp === undefined? " (ls-compile nil) " : tmp;" )))
+ (js!selfcall*
+ `(progn
+ (var (obj ,(ls-compile object)))
+ ,@(mapcar (lambda (key)
+ `(progn
+ (= obj (property obj (call |xstring| ,(ls-compile key))))
+ (if (=== object undefined)
+ (throw "Impossible to set object property."))))
+ (butlast keys))
+ (var (tmp
+ (= (property obj (call |xstring| ,(ls-compile (car (last keys)))))
+ ,(ls-compile value))))
+ (return (if (=== tmp undefined)
+ ,(ls-compile nil)
+ tmp))))))
(define-raw-builtin oget (object key &rest keys)
- `(code "js_to_lisp(" ,(ls-compile `(oget* ,object ,key ,@keys)) ")"))
+ `(call |js_to_lisp| ,(ls-compile `(oget* ,object ,key ,@keys))))
(define-raw-builtin oset (value object key &rest keys)
(ls-compile `(oset* (lisp-to-js ,value) ,object ,key ,@keys)))
(define-builtin objectp (x)
- (js!bool `(code "(typeof (" ,x ") === 'object')")))
+ (js!bool `(=== (typeof ,x) "object")))
-(define-builtin lisp-to-js (x) `(code "lisp_to_js(" ,x ")"))
-(define-builtin js-to-lisp (x) `(code "js_to_lisp(" ,x ")"))
+(define-builtin lisp-to-js (x) `(call |lisp_to_js| ,x))
+(define-builtin js-to-lisp (x) `(call |js_to_lisp| ,x))
(define-builtin in (key object)
- (js!bool `(code "(xstring(" ,key ") in (" ,object "))")))
+ (js!bool `(in (call |xstring| ,key) ,object)))
(define-builtin map-for-in (function object)
- (js!selfcall
- "var f = " function ";"
- "var g = (typeof f === 'function' ? f : f.fvalue);"
- "var o = " object ";"
- "for (var key in o){"
- `(code "g(" ,(if *multiple-value-p* "values" "pv") ", 1, o[key]);" )
- "}"
- " return " (ls-compile nil) ";" ))
+ (js!selfcall*
+ `(var (f ,function)
+ (g (if (=== (typeof f) "function") f (get f "fvalue")))
+ (o ,object))
+ `(for-in (key o)
+ (call g ,(if *multiple-value-p* '|values| '|pv|) 1 (get o "key")))
+ `(return ,(ls-compile nil))))
(define-compilation %js-vref (var)
- `(code "js_to_lisp(" ,var ")"))
+ `(call |js_to_lisp| ,(make-symbol var)))
(define-compilation %js-vset (var val)
- `(code "(" ,var " = lisp_to_js(" ,(ls-compile val) "))"))
+ `(= ,(make-symbol var) (call |lisp_to_js| ,(ls-compile val))))
(define-setf-expander %js-vref (var)
(let ((new-value (gensym)))
(defun convert-toplevel (sexp &optional multiple-value-p)
(let ((*toplevel-compilations* nil))
(cond
- ((and (consp sexp) (eq (car sexp) 'progn))
+ ;; Non-empty toplevel progn
+ ((and (consp sexp)
+ (eq (car sexp) 'progn)
+ (cdr sexp))
`(progn
,@(mapcar (lambda (s) (convert-toplevel s t))
(cdr sexp))))