;;; language to the compiler to be able to run.
#+ecmalisp
-(js-eval "function pv (x) { return x; }")
+(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; }")
-
+(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;")
(values-array (list-to-vector list)))
(defun values (&rest args)
- (values-list 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
;;; 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* '())
(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))
(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) *multiple-value-p*) ";" *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))
+ (*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*
+ " return cf.value;" *newline*
+ " else" *newline*
+ " throw cf;" *newline*
+ "}" *newline*)
+ (js!selfcall
+ (indent 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) "'.")))))
+ (when (null b)
+ (error (concat "Unknown block `" (symbol-name name) "'.")))
+ (push-binding-declaration 'used b)
+ (js!selfcall
+ "throw ({"
+ "type: 'block', "
+ "id: " (binding-value b) ", "
+ "value: " (ls-compile value) ", "
+ "message: 'Return from unknown block " (symbol-name name) ".'"
+ "})")))
(define-compilation catch (id &rest body)
(js!selfcall
"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*
"var values = mv;" *newline*
"var vs;" *newline*
(mapconcat (lambda (form)
"else" *newline*
(indent "args.push(vs);" *newline*)))
forms)
- "return (" func ").apply(window, args);" *newline*)))
+ "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 "pv" (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 "pv" (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*
(type-check (("string" "string" string))
(if *multiple-value-p*
(js!selfcall
- "var v = eval.apply(window, [string]));"
+ "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*)
(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)) *multiple-value-p*) ";")
+ "return " (ls-compile (car (last sexps)) *multiple-value-p*) ";")
(join-trailing
(remove-if #'null-or-empty-p (mapcar #'ls-compile sexps))
(concat ";" *newline*))))
(apply comp args)))
(t
(if (macro name)
- (ls-compile (ls-macroexpand-1 sexp))
+ (ls-compile (ls-macroexpand-1 sexp) multiple-value-p)
(compile-funcall name args))))))
(t
(error "How should I compile this?")))))
(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 multiple-value-p)))
= > >= 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-call 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))
+ 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.
projects / jscl.git / blobdiff