;;; language to the compiler to be able to run.
#+ecmalisp
-(js-eval "function id (x) { return x; }")
+(js-eval "function pv (x) { return x; }")
+#+ecmalisp
+(js-eval "var values = pv;")
#+ecmalisp
(progn
(revappend list '()))
(defmacro psetq (&rest pairs)
- (let (;; For each pair, we store here a list of the form
+ (let ( ;; For each pair, we store here a list of the form
;; (VARIABLE GENSYM VALUE).
(assignments '()))
(while t
(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)))
+
+
;;; 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 *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))
"return func;" *newline*)
(join strs)))
+
(define-compilation lambda (lambda-list &rest body)
(let ((required-arguments (lambda-list-required-arguments lambda-list))
(optional-arguments (lambda-list-optional-arguments lambda-list))
(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 "};"
(concat "(" var " = " (ls-compile val) ")"))
+
;;; Literals
(defun escape-string (string)
(let ((output "")
"})" *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*
+ "values = function(){" *newline*
+ (indent "var result = [];" *newline*
+ "result['multiple-value'] = true;" *newline*
+ "for (var i=0; i<arguments.length; i++)" *newline*
+ (indent "result.push(arguments[i]);" *newline*)
+ "return result;" *newline*)
+ "}" *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.
(define-raw-builtin funcall (func &rest args)
(concat "(" (ls-compile func) ")("
- (join (mapcar #'ls-compile args)
+ (join (cons "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 "pv" (mapcar #'ls-compile args))
", ")
"];" *newline*
"var tail = (" (ls-compile last) ");" *newline*
(define-builtin get-unix-time ()
(concat "(Math.round(new Date() / 1000))"))
+(define-builtin values-array (array)
+ (concat "values.apply(this, " array ")"))
+
+(define-raw-builtin values (&rest args)
+ (concat "values(" (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 (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
(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))
+ (compile-funcall name args))))))
+ (t
+ (error "How should I compile this?")))))
(defun ls-compile-toplevel (sexp)
(let ((*toplevel-compilations* nil))
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
+ 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 variable warn when
- write-line write-string zerop))
+ third throw truncate unless unwind-protect values values-list variable
+ warn when write-line write-string zerop))
(setq *package* *user-package*)
projects / jscl.git / blobdiff