X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler.lisp;h=806c9e0810d086846adcebed4d8c093e76602c52;hb=b2de12c4e1a6e77e7f3f22d056adcfeda79d085b;hp=36510f95d37f67fcf08a777695bad792adb3bd2d;hpb=bf4fd5a5239efe4931e03f7174a0907aba6f07ef;p=jscl.git
diff --git a/src/compiler.lisp b/src/compiler.lisp
index 36510f9..806c9e0 100644
--- a/src/compiler.lisp
+++ b/src/compiler.lisp
@@ -1,20 +1,20 @@
-;;; compiler.lisp ---
+;;; compiler.lisp ---
;; copyright (C) 2012, 2013 David Vazquez
;; Copyright (C) 2012 Raimon Grau
-;; This program is free software: you can redistribute it and/or
+;; JSCL is free software: you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
;; published by the Free Software Foundation, either version 3 of the
;; License, or (at your option) any later version.
;;
-;; This program is distributed in the hope that it will be useful, but
+;; JSCL is distributed in the hope that it will be useful, but
;; WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;; General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see .
+;; along with JSCL. If not, see .
;;;; Compiler
@@ -30,7 +30,7 @@
((integerp arg) (integer-to-string arg))
((floatp arg) (float-to-string arg))
((stringp arg) arg)
- (t (error "Unknown argument."))))
+ (t (error "Unknown argument `~S'." arg))))
args))
;;; Wrap X with a Javascript code to convert the result from
@@ -68,7 +68,7 @@
(incf index))
output)))
-#+common-lisp
+#-jscl
(defun indent (&rest string)
(with-output-to-string (*standard-output*)
(with-input-from-string (input (apply #'code string))
@@ -87,62 +87,6 @@
;;; function call.
(defvar *multiple-value-p* nil)
-;; A very simple defstruct built on lists. It supports just slot with
-;; an optional default initform, and it will create a constructor,
-;; predicate and accessors for you.
-(defmacro def!struct (name &rest slots)
- (unless (symbolp name)
- (error "It is not a full defstruct implementation."))
- (let* ((name-string (symbol-name name))
- (slot-descriptions
- (mapcar (lambda (sd)
- (cond
- ((symbolp sd)
- (list sd))
- ((and (listp sd) (car sd) (cddr sd))
- sd)
- (t
- (error "Bad slot accessor."))))
- slots))
- (predicate (intern (concat name-string "-P"))))
- `(progn
- ;; Constructor
- (defun ,(intern (concat "MAKE-" name-string)) (&key ,@slot-descriptions)
- (list ',name ,@(mapcar #'car slot-descriptions)))
- ;; Predicate
- (defun ,predicate (x)
- (and (consp x) (eq (car x) ',name)))
- ;; Copier
- (defun ,(intern (concat "COPY-" name-string)) (x)
- (copy-list x))
- ;; Slot accessors
- ,@(with-collect
- (let ((index 1))
- (dolist (slot slot-descriptions)
- (let* ((name (car slot))
- (accessor-name (intern (concat name-string "-" (string name)))))
- (collect
- `(defun ,accessor-name (x)
- (unless (,predicate x)
- (error ,(concat "The object is not a type " name-string)))
- (nth ,index x)))
- ;; TODO: Implement this with a higher level
- ;; abstraction like defsetf or (defun (setf ..))
- (collect
- `(define-setf-expander ,accessor-name (x)
- (let ((object (gensym))
- (new-value (gensym)))
- (values (list object)
- (list x)
- (list new-value)
- `(progn
- (rplaca (nthcdr ,',index ,object) ,new-value)
- ,new-value)
- `(,',accessor-name ,object)))))
- (incf index)))))
- ',name)))
-
-
;;; Environment
(def!struct binding
@@ -183,6 +127,7 @@
(defvar *variable-counter* 0)
(defun gvarname (symbol)
+ (declare (ignore symbol))
(code "v" (incf *variable-counter*)))
(defun translate-variable (symbol)
@@ -290,7 +235,7 @@
(defun ll-rest-argument (ll)
(let ((rest (ll-section '&rest ll)))
(when (cdr rest)
- (error "Bad lambda-list"))
+ (error "Bad lambda-list `~S'." ll))
(car rest)))
(defun ll-keyword-arguments-canonical (ll)
@@ -316,11 +261,14 @@
(ll-optional-arguments-canonical lambda-list))))
(remove nil (mapcar #'third args))))
-(defun lambda-docstring-wrapper (docstring &rest strs)
- (if docstring
+(defun lambda-name/docstring-wrapper (name docstring &rest strs)
+ (if (or name docstring)
(js!selfcall
"var func = " (join strs) ";" *newline*
- "func.docstring = '" docstring "';" *newline*
+ (when name
+ (code "func.fname = " (js-escape-string name) ";" *newline*))
+ (when docstring
+ (code "func.docstring = " (js-escape-string docstring) ";" *newline*))
"return func;" *newline*)
(apply #'code strs)))
@@ -328,32 +276,25 @@
(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))))
+ (let ((min n-required-arguments)
+ (max (if rest-p 'n/a (+ n-required-arguments n-optional-arguments))))
(block nil
;; Special case: a positive exact number of arguments.
- (when (and (< 1 min) (eql min max))
- (return (code "checkArgs(arguments, " min ");" *newline*)))
+ (when (and (< 0 min) (eql min max))
+ (return (code "checkArgs(nargs, " min ");" *newline*)))
;; General case:
(code
- (when (< 1 min)
- (code "checkArgsAtLeast(arguments, " min ");" *newline*))
+ (when (< 0 min)
+ (code "checkArgsAtLeast(nargs, " min ");" *newline*))
(when (numberp max)
- (code "checkArgsAtMost(arguments, " max ");" *newline*))))))
+ (code "checkArgsAtMost(nargs, " max ");" *newline*))))))
(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 (mapconcat (lambda (arg)
- (code "var " (translate-variable (first arg)) "; " *newline*
- (when (third arg)
- (code "var " (translate-variable (third arg))
- " = " (ls-compile t)
- "; " *newline*))))
- optional-arguments)
- "switch(arguments.length-1){" *newline*
+ (code "switch(nargs){" *newline*
(let ((cases nil)
(idx 0))
(progn
@@ -381,11 +322,9 @@
(when rest-argument
(let ((js!rest (translate-variable rest-argument)))
(code "var " js!rest "= " (ls-compile nil) ";" *newline*
- "for (var i = arguments.length-1; i>="
- (+ 1 n-required-arguments n-optional-arguments)
+ "for (var i = nargs-1; i>=" (+ n-required-arguments n-optional-arguments)
"; i--)" *newline*
- (indent js!rest " = {car: arguments[i], cdr: ") js!rest "};"
- *newline*)))))
+ (indent js!rest " = {car: arguments[i+2], cdr: " js!rest "};" *newline*))))))
(defun compile-lambda-parse-keywords (ll)
(let ((n-required-arguments
@@ -407,12 +346,12 @@
;; Parse keywords
(flet ((parse-keyword (keyarg)
;; ((keyword-name var) init-form)
- (code "for (i=" (+ 1 n-required-arguments n-optional-arguments)
- "; i "foo's"
+;;; "foo" => '"foo"'
+;;; which avoids having to escape quotes where possible
+(defun js-escape-string (string)
+ (let ((index 0)
+ (size (length string))
+ (seen-single-quote nil)
+ (seen-double-quote nil))
+ (flet ((%js-escape-string (string escape-single-quote-p)
+ (let ((output "")
+ (index 0))
+ (while (< index size)
+ (let ((ch (char string index)))
+ (when (char= ch #\\)
+ (setq output (concat output "\\")))
+ (when (and escape-single-quote-p (char= ch #\'))
+ (setq output (concat output "\\")))
+ (when (char= ch #\newline)
+ (setq output (concat output "\\"))
+ (setq ch #\n))
+ (setq output (concat output (string ch))))
+ (incf index))
+ output)))
+ ;; First, scan the string for single/double quotes
+ (while (< index size)
+ (let ((ch (char string index)))
+ (when (char= ch #\')
+ (setq seen-single-quote t))
+ (when (char= ch #\")
+ (setq seen-double-quote t)))
+ (incf index))
+ ;; Then pick the appropriate way to escape the quotes
+ (cond
+ ((not seen-single-quote)
+ (concat "'" (%js-escape-string string nil) "'"))
+ ((not seen-double-quote)
+ (concat "\"" (%js-escape-string string nil) "\""))
+ (t (concat "'" (%js-escape-string string t) "'"))))))
+
+(defun lisp-escape-string (string)
(let ((output "")
(index 0)
(size (length string)))
@@ -524,8 +542,26 @@
(setq ch #\n))
(setq output (concat output (string ch))))
(incf index))
- output))
-
+ (concat "\"" output "\"")))
+
+;;; BOOTSTRAP MAGIC: We record the macro definitions as lists during
+;;; the bootstrap. Once everything is compiled, we want to dump the
+;;; whole global environment to the output file to reproduce it in the
+;;; run-time. However, the environment must contain expander functions
+;;; rather than lists. We do not know how to dump function objects
+;;; itself, so we mark the list definitions with this object and the
+;;; compiler will be called when this object has to be dumped.
+;;; Backquote/unquote does a similar magic, but this use is exclusive.
+;;;
+;;; Indeed, perhaps to compile the object other macros need to be
+;;; evaluated. For this reason we define a valid macro-function for
+;;; this symbol.
+(defvar *magic-unquote-marker* (gensym "MAGIC-UNQUOTE"))
+#-jscl
+(setf (macro-function *magic-unquote-marker*)
+ (lambda (form &optional environment)
+ (declare (ignore environment))
+ (second form)))
(defvar *literal-table* nil)
(defvar *literal-counter* 0)
@@ -534,16 +570,15 @@
(code "l" (incf *literal-counter*)))
(defun dump-symbol (symbol)
- #+common-lisp
+ #-jscl
(let ((package (symbol-package symbol)))
(if (eq package (find-package "KEYWORD"))
- (code "{name: \"" (escape-string (symbol-name symbol))
- "\", 'package': '" (package-name package) "'}")
- (code "{name: \"" (escape-string (symbol-name symbol)) "\"}")))
+ (code "(new Symbol(" (dump-string (symbol-name symbol)) ", " (dump-string (package-name package)) "))")
+ (code "(new Symbol(" (dump-string (symbol-name symbol)) "))")))
#+jscl
(let ((package (symbol-package symbol)))
(if (null package)
- (code "{name: \"" (escape-string (symbol-name symbol)) "\"}")
+ (code "(new Symbol(" (dump-string (symbol-name symbol)) "))")
(ls-compile `(intern ,(symbol-name symbol) ,(package-name package))))))
(defun dump-cons (cons)
@@ -560,24 +595,38 @@
(let ((elements (vector-to-list array)))
(concat "[" (join (mapcar #'literal elements) ", ") "]")))
+(defun dump-string (string)
+ (code "make_lisp_string(" (js-escape-string string) ")"))
+
(defun literal (sexp &optional recursive)
(cond
((integerp sexp) (integer-to-string sexp))
((floatp sexp) (float-to-string sexp))
- ((stringp sexp) (code "\"" (escape-string sexp) "\""))
+ ((characterp sexp) (js-escape-string (string sexp)))
(t
- (or (cdr (assoc sexp *literal-table*))
- (let ((dumped (typecase sexp
+ (or (cdr (assoc sexp *literal-table* :test #'eql))
+ (let ((dumped (typecase sexp
(symbol (dump-symbol sexp))
- (cons (dump-cons sexp))
+ (string (dump-string sexp))
+ (cons
+ ;; BOOTSTRAP MAGIC: See the root file
+ ;; jscl.lisp and the function
+ ;; `dump-global-environment' for futher
+ ;; information.
+ (if (eq (car sexp) *magic-unquote-marker*)
+ (ls-compile (second sexp))
+ (dump-cons sexp)))
(array (dump-array sexp)))))
- (if recursive
+ (if (and recursive (not (symbolp sexp)))
dumped
(let ((jsvar (genlit)))
(push (cons sexp jsvar) *literal-table*)
(toplevel-compilation (code "var " jsvar " = " dumped))
+ (when (keywordp sexp)
+ (toplevel-compilation (code jsvar ".value = " jsvar)))
jsvar)))))))
+
(define-compilation quote (sexp)
(literal sexp))
@@ -592,6 +641,15 @@
(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)))
+ (compile-lambda ll body
+ :name (symbol-name name)
+ :block name)))
((symbolp x)
(let ((b (lookup-in-lexenv x *environment* 'function)))
(if b
@@ -611,8 +669,11 @@
(define-compilation flet (definitions &rest body)
(let* ((fnames (mapcar #'car definitions))
- (fbody (mapcar #'cdr definitions))
- (cfuncs (mapcar #'compile-function-definition fbody))
+ (cfuncs (mapcar (lambda (def)
+ (compile-lambda (cadr def)
+ `((block ,(car def)
+ ,@(cddr def)))))
+ definitions))
(*environment*
(extend-lexenv (mapcar #'make-function-binding fnames)
*environment*
@@ -633,7 +694,8 @@
(js!selfcall
(mapconcat (lambda (func)
(code "var " (translate-function (car func))
- " = " (compile-lambda (cadr func) (cddr func))
+ " = " (compile-lambda (cadr func)
+ `((block ,(car func) ,@(cddr func))))
";" *newline*))
definitions)
(ls-compile-block body t))))
@@ -654,7 +716,14 @@
(define-compilation progn (&rest body)
(if (null (cdr body))
(ls-compile (car body) *multiple-value-p*)
- (js!selfcall (ls-compile-block body t))))
+ (code "("
+ (join
+ (remove-if #'null-or-empty-p
+ (append
+ (mapcar #'ls-compile (butlast body))
+ (list (ls-compile (car (last body)) t))))
+ ",")
+ ")")))
(defun special-variable-p (x)
(and (claimp x 'variable 'special) t))
@@ -703,7 +772,7 @@
variables)
",")
"){" *newline*
- (let ((body (ls-compile-block body t)))
+ (let ((body (ls-compile-block body t t)))
(indent (let-binding-wrapper dynamic-bindings body)))
"})(" (join cvalues ",") ")")))
@@ -751,15 +820,19 @@
(js!selfcall
(let ((specials (remove-if-not #'special-variable-p (mapcar #'first bindings)))
(body (concat (mapconcat #'let*-initialize-value bindings)
- (ls-compile-block body t))))
+ (ls-compile-block body t t))))
(let*-binding-wrapper specials body)))))
-(defvar *block-counter* 0)
-
(define-compilation block (name &rest body)
- (let* ((tr (incf *block-counter*))
- (b (make-binding :name name :type 'block :value tr)))
+ ;; We use Javascript exceptions to implement non local control
+ ;; transfer. Exceptions has dynamic scoping, so we use a uniquely
+ ;; generated object to identify the block. The instance of a empty
+ ;; array is used to distinguish between nested dynamic Javascript
+ ;; exceptions. See https://github.com/davazp/jscl/issues/64 for
+ ;; futher details.
+ (let* ((idvar (gvarname name))
+ (b (make-binding :name name :type 'block :value idvar)))
(when *multiple-value-p*
(push 'multiple-value (binding-declarations b)))
(let* ((*environment* (extend-lexenv (list b) *environment* 'block))
@@ -767,10 +840,11 @@
(if (member 'used (binding-declarations b))
(js!selfcall
"try {" *newline*
+ "var " idvar " = [];" *newline*
(indent cbody)
"}" *newline*
"catch (cf){" *newline*
- " if (cf.type == 'block' && cf.id == " tr ")" *newline*
+ " if (cf.type == 'block' && cf.id == " idvar ")" *newline*
(if *multiple-value-p*
" return values.apply(this, forcemv(cf.values));"
" return cf.values;")
@@ -784,8 +858,12 @@
(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) "'.")))
+ (error "Return from unknown block `~S'." (symbol-name name)))
(push 'used (binding-declarations b))
+ ;; The binding value is the name of a variable, whose value is 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;" *newline*))
"throw ({"
@@ -821,19 +899,16 @@
"message: 'Throw uncatched.'"
"})"))
-
-(defvar *tagbody-counter* 0)
-(defvar *go-tag-counter* 0)
-
(defun go-tag-p (x)
(or (integerp x) (symbolp x)))
(defun declare-tagbody-tags (tbidx body)
- (let ((bindings
- (mapcar (lambda (label)
- (let ((tagidx (integer-to-string (incf *go-tag-counter*))))
- (make-binding :name label :type 'gotag :value (list tbidx tagidx))))
- (remove-if-not #'go-tag-p body))))
+ (let* ((go-tag-counter 0)
+ (bindings
+ (mapcar (lambda (label)
+ (let ((tagidx (integer-to-string (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)))
(define-compilation tagbody (&rest body)
@@ -846,18 +921,21 @@
(unless (go-tag-p (car body))
(push (gensym "START") body))
;; Tagbody compilation
- (let ((tbidx *tagbody-counter*))
+ (let ((branch (gvarname 'branch))
+ (tbidx (gvarname 'tbidx)))
(let ((*environment* (declare-tagbody-tags tbidx body))
initag)
(let ((b (lookup-in-lexenv (first body) *environment* 'gotag)))
(setq initag (second (binding-value b))))
(js!selfcall
- "var tagbody_" tbidx " = " initag ";" *newline*
+ ;; TAGBODY branch to take
+ "var " branch " = " initag ";" *newline*
+ "var " tbidx " = [];" *newline*
"tbloop:" *newline*
"while (true) {" *newline*
(indent "try {" *newline*
(indent (let ((content ""))
- (code "switch(tagbody_" tbidx "){" *newline*
+ (code "switch(" branch "){" *newline*
"case " initag ":" *newline*
(dolist (form (cdr body) content)
(concatf content
@@ -871,7 +949,7 @@
"}" *newline*
"catch (jump) {" *newline*
" if (jump.type == 'tagbody' && jump.id == " tbidx ")" *newline*
- " tagbody_" tbidx " = jump.label;" *newline*
+ " " branch " = jump.label;" *newline*
" else" *newline*
" throw(jump);" *newline*
"}" *newline*)
@@ -884,7 +962,7 @@
((symbolp label) (symbol-name label))
((integerp label) (integer-to-string label)))))
(when (null b)
- (error (concat "Unknown tag `" n "'.")))
+ (error "Unknown tag `~S'" label))
(js!selfcall
"throw ({"
"type: 'tagbody', "
@@ -906,7 +984,7 @@
(define-compilation multiple-value-call (func-form &rest forms)
(js!selfcall
"var func = " (ls-compile func-form) ";" *newline*
- "var args = [" (if *multiple-value-p* "values" "pv") "];" *newline*
+ "var args = [" (if *multiple-value-p* "values" "pv") ", 0];" *newline*
"return "
(js!selfcall
"var values = mv;" *newline*
@@ -918,6 +996,7 @@
"else" *newline*
(indent "args.push(vs);" *newline*)))
forms)
+ "args[1] = args.length-2;" *newline*
"return func.apply(window, args);" *newline*) ";" *newline*))
(define-compilation multiple-value-prog1 (first-form &rest forms)
@@ -926,275 +1005,6 @@
(ls-compile-block forms)
"return args;" *newline*))
-
-;;; Javascript FFI
-
-(define-compilation %js-vref (var) var)
-
-(define-compilation %js-vset (var val)
- (code "(" var " = " (ls-compile val) ")"))
-
-(define-setf-expander %js-vref (var)
- (let ((new-value (gensym)))
- (unless (stringp var)
- (error "a string was expected"))
- (values nil
- (list var)
- (list new-value)
- `(%js-vset ,var ,new-value)
- `(%js-vref ,var))))
-
-
-;;; Backquote implementation.
-;;;
-;;; Author: Guy L. Steele Jr. Date: 27 December 1985
-;;; Tested under Symbolics Common Lisp and Lucid Common Lisp.
-;;; This software is in the public domain.
-
-;;; The following are unique tokens used during processing.
-;;; They need not be symbols; they need not even be atoms.
-(defvar *comma* 'unquote)
-(defvar *comma-atsign* 'unquote-splicing)
-
-(defvar *bq-list* (make-symbol "BQ-LIST"))
-(defvar *bq-append* (make-symbol "BQ-APPEND"))
-(defvar *bq-list** (make-symbol "BQ-LIST*"))
-(defvar *bq-nconc* (make-symbol "BQ-NCONC"))
-(defvar *bq-clobberable* (make-symbol "BQ-CLOBBERABLE"))
-(defvar *bq-quote* (make-symbol "BQ-QUOTE"))
-(defvar *bq-quote-nil* (list *bq-quote* nil))
-
-;;; BACKQUOTE is an ordinary macro (not a read-macro) that processes
-;;; the expression foo, looking for occurrences of #:COMMA,
-;;; #:COMMA-ATSIGN, and #:COMMA-DOT. It constructs code in strict
-;;; accordance with the rules on pages 349-350 of the first edition
-;;; (pages 528-529 of this second edition). It then optionally
-;;; applies a code simplifier.
-
-;;; If the value of *BQ-SIMPLIFY* is non-NIL, then BACKQUOTE
-;;; processing applies the code simplifier. If the value is NIL,
-;;; then the code resulting from BACKQUOTE is exactly that
-;;; specified by the official rules.
-(defparameter *bq-simplify* t)
-
-(defmacro backquote (x)
- (bq-completely-process x))
-
-;;; Backquote processing proceeds in three stages:
-;;;
-;;; (1) BQ-PROCESS applies the rules to remove occurrences of
-;;; #:COMMA, #:COMMA-ATSIGN, and #:COMMA-DOT corresponding to
-;;; this level of BACKQUOTE. (It also causes embedded calls to
-;;; BACKQUOTE to be expanded so that nesting is properly handled.)
-;;; Code is produced that is expressed in terms of functions
-;;; #:BQ-LIST, #:BQ-APPEND, and #:BQ-CLOBBERABLE. This is done
-;;; so that the simplifier will simplify only list construction
-;;; functions actually generated by BACKQUOTE and will not involve
-;;; any user code in the simplification. #:BQ-LIST means LIST,
-;;; #:BQ-APPEND means APPEND, and #:BQ-CLOBBERABLE means IDENTITY
-;;; but indicates places where "%." was used and where NCONC may
-;;; therefore be introduced by the simplifier for efficiency.
-;;;
-;;; (2) BQ-SIMPLIFY, if used, rewrites the code produced by
-;;; BQ-PROCESS to produce equivalent but faster code. The
-;;; additional functions #:BQ-LIST* and #:BQ-NCONC may be
-;;; introduced into the code.
-;;;
-;;; (3) BQ-REMOVE-TOKENS goes through the code and replaces
-;;; #:BQ-LIST with LIST, #:BQ-APPEND with APPEND, and so on.
-;;; #:BQ-CLOBBERABLE is simply eliminated (a call to it being
-;;; replaced by its argument). #:BQ-LIST* is replaced by either
-;;; LIST* or CONS (the latter is used in the two-argument case,
-;;; purely to make the resulting code a tad more readable).
-
-(defun bq-completely-process (x)
- (let ((raw-result (bq-process x)))
- (bq-remove-tokens (if *bq-simplify*
- (bq-simplify raw-result)
- raw-result))))
-
-(defun bq-process (x)
- (cond ((atom x)
- (list *bq-quote* x))
- ((eq (car x) 'backquote)
- (bq-process (bq-completely-process (cadr x))))
- ((eq (car x) *comma*) (cadr x))
- ((eq (car x) *comma-atsign*)
- ;; (error ",@~S after `" (cadr x))
- (error "ill-formed"))
- ;; ((eq (car x) *comma-dot*)
- ;; ;; (error ",.~S after `" (cadr x))
- ;; (error "ill-formed"))
- (t (do ((p x (cdr p))
- (q '() (cons (bracket (car p)) q)))
- ((atom p)
- (cons *bq-append*
- (nreconc q (list (list *bq-quote* p)))))
- (when (eq (car p) *comma*)
- (unless (null (cddr p))
- ;; (error "Malformed ,~S" p)
- (error "Malformed"))
- (return (cons *bq-append*
- (nreconc q (list (cadr p))))))
- (when (eq (car p) *comma-atsign*)
- ;; (error "Dotted ,@~S" p)
- (error "Dotted"))
- ;; (when (eq (car p) *comma-dot*)
- ;; ;; (error "Dotted ,.~S" p)
- ;; (error "Dotted"))
- ))))
-
-;;; This implements the bracket operator of the formal rules.
-(defun bracket (x)
- (cond ((atom x)
- (list *bq-list* (bq-process x)))
- ((eq (car x) *comma*)
- (list *bq-list* (cadr x)))
- ((eq (car x) *comma-atsign*)
- (cadr x))
- ;; ((eq (car x) *comma-dot*)
- ;; (list *bq-clobberable* (cadr x)))
- (t (list *bq-list* (bq-process x)))))
-
-;;; This auxiliary function is like MAPCAR but has two extra
-;;; purposes: (1) it handles dotted lists; (2) it tries to make
-;;; the result share with the argument x as much as possible.
-(defun maptree (fn x)
- (if (atom x)
- (funcall fn x)
- (let ((a (funcall fn (car x)))
- (d (maptree fn (cdr x))))
- (if (and (eql a (car x)) (eql d (cdr x)))
- x
- (cons a d)))))
-
-;;; This predicate is true of a form that when read looked
-;;; like %@foo or %.foo.
-(defun bq-splicing-frob (x)
- (and (consp x)
- (or (eq (car x) *comma-atsign*)
- ;; (eq (car x) *comma-dot*)
- )))
-
-;;; This predicate is true of a form that when read
-;;; looked like %@foo or %.foo or just plain %foo.
-(defun bq-frob (x)
- (and (consp x)
- (or (eq (car x) *comma*)
- (eq (car x) *comma-atsign*)
- ;; (eq (car x) *comma-dot*)
- )))
-
-;;; The simplifier essentially looks for calls to #:BQ-APPEND and
-;;; tries to simplify them. The arguments to #:BQ-APPEND are
-;;; processed from right to left, building up a replacement form.
-;;; At each step a number of special cases are handled that,
-;;; loosely speaking, look like this:
-;;;
-;;; (APPEND (LIST a b c) foo) => (LIST* a b c foo)
-;;; provided a, b, c are not splicing frobs
-;;; (APPEND (LIST* a b c) foo) => (LIST* a b (APPEND c foo))
-;;; provided a, b, c are not splicing frobs
-;;; (APPEND (QUOTE (x)) foo) => (LIST* (QUOTE x) foo)
-;;; (APPEND (CLOBBERABLE x) foo) => (NCONC x foo)
-(defun bq-simplify (x)
- (if (atom x)
- x
- (let ((x (if (eq (car x) *bq-quote*)
- x
- (maptree #'bq-simplify x))))
- (if (not (eq (car x) *bq-append*))
- x
- (bq-simplify-args x)))))
-
-(defun bq-simplify-args (x)
- (do ((args (reverse (cdr x)) (cdr args))
- (result
- nil
- (cond ((atom (car args))
- (bq-attach-append *bq-append* (car args) result))
- ((and (eq (caar args) *bq-list*)
- (notany #'bq-splicing-frob (cdar args)))
- (bq-attach-conses (cdar args) result))
- ((and (eq (caar args) *bq-list**)
- (notany #'bq-splicing-frob (cdar args)))
- (bq-attach-conses
- (reverse (cdr (reverse (cdar args))))
- (bq-attach-append *bq-append*
- (car (last (car args)))
- result)))
- ((and (eq (caar args) *bq-quote*)
- (consp (cadar args))
- (not (bq-frob (cadar args)))
- (null (cddar args)))
- (bq-attach-conses (list (list *bq-quote*
- (caadar args)))
- result))
- ((eq (caar args) *bq-clobberable*)
- (bq-attach-append *bq-nconc* (cadar args) result))
- (t (bq-attach-append *bq-append*
- (car args)
- result)))))
- ((null args) result)))
-
-(defun null-or-quoted (x)
- (or (null x) (and (consp x) (eq (car x) *bq-quote*))))
-
-;;; When BQ-ATTACH-APPEND is called, the OP should be #:BQ-APPEND
-;;; or #:BQ-NCONC. This produces a form (op item result) but
-;;; some simplifications are done on the fly:
-;;;
-;;; (op '(a b c) '(d e f g)) => '(a b c d e f g)
-;;; (op item 'nil) => item, provided item is not a splicable frob
-;;; (op item 'nil) => (op item), if item is a splicable frob
-;;; (op item (op a b c)) => (op item a b c)
-(defun bq-attach-append (op item result)
- (cond ((and (null-or-quoted item) (null-or-quoted result))
- (list *bq-quote* (append (cadr item) (cadr result))))
- ((or (null result) (equal result *bq-quote-nil*))
- (if (bq-splicing-frob item) (list op item) item))
- ((and (consp result) (eq (car result) op))
- (list* (car result) item (cdr result)))
- (t (list op item result))))
-
-;;; The effect of BQ-ATTACH-CONSES is to produce a form as if by
-;;; `(LIST* ,@items ,result) but some simplifications are done
-;;; on the fly.
-;;;
-;;; (LIST* 'a 'b 'c 'd) => '(a b c . d)
-;;; (LIST* a b c 'nil) => (LIST a b c)
-;;; (LIST* a b c (LIST* d e f g)) => (LIST* a b c d e f g)
-;;; (LIST* a b c (LIST d e f g)) => (LIST a b c d e f g)
-(defun bq-attach-conses (items result)
- (cond ((and (every #'null-or-quoted items)
- (null-or-quoted result))
- (list *bq-quote*
- (append (mapcar #'cadr items) (cadr result))))
- ((or (null result) (equal result *bq-quote-nil*))
- (cons *bq-list* items))
- ((and (consp result)
- (or (eq (car result) *bq-list*)
- (eq (car result) *bq-list**)))
- (cons (car result) (append items (cdr result))))
- (t (cons *bq-list** (append items (list result))))))
-
-;;; Removes funny tokens and changes (#:BQ-LIST* a b) into
-;;; (CONS a b) instead of (LIST* a b), purely for readability.
-(defun bq-remove-tokens (x)
- (cond ((eq x *bq-list*) 'list)
- ((eq x *bq-append*) 'append)
- ((eq x *bq-nconc*) 'nconc)
- ((eq x *bq-list**) 'list*)
- ((eq x *bq-quote*) 'quote)
- ((atom x) x)
- ((eq (car x) *bq-clobberable*)
- (bq-remove-tokens (cadr x)))
- ((and (eq (car x) *bq-list**)
- (consp (cddr x))
- (null (cdddr x)))
- (cons 'cons (maptree #'bq-remove-tokens (cdr x))))
- (t (maptree #'bq-remove-tokens x))))
-
(define-transformation backquote (form)
(bq-completely-process form))
@@ -1259,7 +1069,7 @@
(defmacro variable-arity (args &body body)
(unless (symbolp args)
- (error "Bad usage of VARIABLE-ARITY, you must pass a symbol"))
+ (error "`~S' is not a symbol." args))
`(variable-arity-call ,args
(lambda (,args)
(code "return " ,@body ";" *newline*))))
@@ -1319,6 +1129,7 @@
(define-builtin-comparison >= ">=")
(define-builtin-comparison <= "<=")
(define-builtin-comparison = "==")
+(define-builtin-comparison /= "!=")
(define-builtin numberp (x)
(js!bool (code "(typeof (" x ") == \"number\")")))
@@ -1334,7 +1145,7 @@
(define-builtin float-to-string (x)
(type-check (("x" "number" x))
- "x.toString()"))
+ "make_lisp_string(x.toString())"))
(define-builtin cons (x y)
(code "({car: " x ", cdr: " y "})"))
@@ -1368,14 +1179,10 @@
(code "(x.cdr = " new ", x)")))
(define-builtin symbolp (x)
- (js!bool
- (js!selfcall
- "var tmp = " x ";" *newline*
- "return (typeof tmp == 'object' && 'name' in tmp);" *newline*)))
+ (js!bool (code "(" x " instanceof Symbol)")))
(define-builtin make-symbol (name)
- (type-check (("name" "string" name))
- "({name: name})"))
+ (code "(new Symbol(" name "))"))
(define-builtin symbol-name (x)
(code "(" x ").name"))
@@ -1389,68 +1196,65 @@
(define-builtin boundp (x)
(js!bool (code "(" x ".value !== undefined)")))
+(define-builtin fboundp (x)
+ (js!bool (code "(" x ".fvalue !== undefined)")))
+
(define-builtin symbol-value (x)
(js!selfcall
"var symbol = " x ";" *newline*
"var value = symbol.value;" *newline*
- "if (value === undefined) throw \"Variable `\" + symbol.name + \"' is unbound.\";" *newline*
+ "if (value === undefined) throw \"Variable `\" + xstring(symbol.name) + \"' is unbound.\";" *newline*
"return value;" *newline*))
(define-builtin symbol-function (x)
(js!selfcall
"var symbol = " x ";" *newline*
"var func = symbol.fvalue;" *newline*
- "if (func === undefined) throw \"Function `\" + symbol.name + \"' is undefined.\";" *newline*
+ "if (func === undefined) throw \"Function `\" + xstring(symbol.name) + \"' is undefined.\";" *newline*
"return func;" *newline*))
(define-builtin symbol-plist (x)
(code "((" x ").plist || " (ls-compile nil) ")"))
(define-builtin lambda-code (x)
- (code "(" x ").toString()"))
+ (code "make_lisp_string((" x ").toString())"))
-(define-builtin eq (x y) (js!bool (code "(" x " === " y ")")))
-(define-builtin equal (x y) (js!bool (code "(" x " == " y ")")))
+(define-builtin eq (x y)
+ (js!bool (code "(" x " === " y ")")))
-(define-builtin char-to-string (x)
+(define-builtin char-code (x)
+ (type-check (("x" "string" x))
+ "char_to_codepoint(x)"))
+
+(define-builtin code-char (x)
(type-check (("x" "number" x))
- "String.fromCharCode(x)"))
+ "char_from_codepoint(x)"))
-(define-builtin stringp (x)
- (js!bool (code "(typeof(" x ") == \"string\")")))
+(define-builtin characterp (x)
+ (js!bool
+ (js!selfcall
+ "var x = " x ";" *newline*
+ "return (typeof(" x ") == \"string\") && (x.length == 1 || x.length == 2);")))
-(define-builtin string-upcase (x)
- (type-check (("x" "string" x))
- "x.toUpperCase()"))
+(define-builtin char-upcase (x)
+ (code "safe_char_upcase(" x ")"))
-(define-builtin string-length (x)
- (type-check (("x" "string" x))
- "x.length"))
+(define-builtin char-downcase (x)
+ (code "safe_char_downcase(" x ")"))
-(define-raw-builtin slice (string a &optional b)
- (js!selfcall
- "var str = " (ls-compile string) ";" *newline*
- "var a = " (ls-compile a) ";" *newline*
- "var b;" *newline*
- (when b (code "b = " (ls-compile b) ";" *newline*))
- "return str.slice(a,b);" *newline*))
-
-(define-builtin char (string index)
- (type-check (("string" "string" string)
- ("index" "number" index))
- "string.charCodeAt(index)"))
-
-(define-builtin concat-two (string1 string2)
- (type-check (("string1" "string" string1)
- ("string2" "string" string2))
- "string1.concat(string2)"))
+(define-builtin stringp (x)
+ (js!bool
+ (js!selfcall
+ "var x = " x ";" *newline*
+ "return typeof(x) == 'object' && 'length' in x && x.stringp == 1;")))
(define-raw-builtin funcall (func &rest args)
(js!selfcall
"var f = " (ls-compile func) ";" *newline*
"return (typeof f === 'function'? f: f.fvalue)("
- (join (cons (if *multiple-value-p* "values" "pv")
- (mapcar #'ls-compile args))
+ (join (list* (if *multiple-value-p* "values" "pv")
+ (integer-to-string (length args))
+ (mapcar #'ls-compile args))
", ")
")"))
@@ -1461,30 +1265,27 @@
(last (car (last args))))
(js!selfcall
"var f = " (ls-compile func) ";" *newline*
- "var args = [" (join (cons (if *multiple-value-p* "values" "pv")
- (mapcar #'ls-compile args))
+ "var args = [" (join (list* (if *multiple-value-p* "values" "pv")
+ (integer-to-string (length args))
+ (mapcar #'ls-compile args))
", ")
"];" *newline*
"var tail = (" (ls-compile last) ");" *newline*
"while (tail != " (ls-compile nil) "){" *newline*
" args.push(tail.car);" *newline*
+ " args[1] += 1;" *newline*
" tail = tail.cdr;" *newline*
"}" *newline*
"return (typeof f === 'function'? f : f.fvalue).apply(this, args);" *newline*))))
(define-builtin js-eval (string)
- (type-check (("string" "string" string))
- (if *multiple-value-p*
- (js!selfcall
- "var v = globalEval(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*)
- "globalEval(string)")))
+ (if *multiple-value-p*
+ (js!selfcall
+ "var v = globalEval(xstring(" string "));" *newline*
+ "return values.apply(this, forcemv(v));" *newline*)
+ (code "globalEval(xstring(" string "))")))
-(define-builtin error (string)
+(define-builtin %throw (string)
(js!selfcall "throw " string ";" *newline*))
(define-builtin new () "{}")
@@ -1494,48 +1295,74 @@
(define-builtin oget (object key)
(js!selfcall
- "var tmp = " "(" object ")[" key "];" *newline*
+ "var tmp = " "(" object ")[xstring(" key ")];" *newline*
"return tmp == undefined? " (ls-compile nil) ": tmp ;" *newline*))
(define-builtin oset (object key value)
- (code "((" object ")[" key "] = " value ")"))
+ (code "((" object ")[xstring(" key ")] = " value ")"))
(define-builtin in (key object)
- (js!bool (code "((" key ") in (" object "))")))
+ (js!bool (code "(xstring(" key ") in (" object "))")))
+
+(define-builtin map-for-in (function object)
+ (js!selfcall
+ "var f = " function ";" *newline*
+ "var g = (typeof f === 'function' ? f : f.fvalue);" *newline*
+ "var o = " object ";" *newline*
+ "for (var key in o){" *newline*
+ (indent "g(" (if *multiple-value-p* "values" "pv") ", 1, o[key]);" *newline*)
+ "}"
+ " return " (ls-compile nil) ";" *newline*))
(define-builtin functionp (x)
(js!bool (code "(typeof " x " == 'function')")))
(define-builtin write-string (x)
- (type-check (("x" "string" x))
- "lisp.write(x)"))
+ (code "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)
+;;; Storage vectors. They are used to implement arrays and (in the
+;;; future) structures.
+
+(define-builtin storage-vector-p (x)
(js!bool
(js!selfcall
"var x = " x ";" *newline*
"return typeof x === 'object' && 'length' in x;")))
-(define-builtin aref (array n)
+(define-builtin make-storage-vector (n)
+ (js!selfcall
+ "var r = [];" *newline*
+ "r.length = " n ";" *newline*
+ "return r;" *newline*))
+
+(define-builtin storage-vector-size (x)
+ (code x ".length"))
+
+(define-builtin resize-storage-vector (vector new-size)
+ (code "(" vector ".length = " new-size ")"))
+
+(define-builtin storage-vector-ref (vector n)
(js!selfcall
- "var x = " "(" array ")[" n "];" *newline*
+ "var x = " "(" vector ")[" n "];" *newline*
"if (x === undefined) throw 'Out of range';" *newline*
"return x;" *newline*))
-(define-builtin aset (array n value)
+(define-builtin storage-vector-set (vector n value)
(js!selfcall
- "var x = " array ";" *newline*
+ "var x = " vector ";" *newline*
"var i = " n ";" *newline*
"if (i < 0 || i >= x.length) throw 'Out of range';" *newline*
"return x[i] = " value ";" *newline*))
+(define-builtin concatenate-storage-vector (sv1 sv2)
+ (js!selfcall
+ "var sv1 = " sv1 ";" *newline*
+ "var r = sv1.concat(" sv2 ");" *newline*
+ "r.type = sv1.type;" *newline*
+ "r.stringp = sv1.stringp;" *newline*
+ "return r;" *newline*))
+
(define-builtin get-internal-real-time ()
"(new Date()).getTime()")
@@ -1549,82 +1376,102 @@
(code "values(" (join (mapcar #'ls-compile args) ", ") ")")
(code "pv(" (join (mapcar #'ls-compile args) ", ") ")")))
-;; Receives the JS function as first argument as a literal string. The
-;; second argument is compiled and should evaluate to a vector of
-;; values to apply to the the function. The result returned.
-(define-builtin %js-call (fun args)
- (code fun ".apply(this, " args ")"))
-(defun macro (x)
- (and (symbolp x)
- (let ((b (lookup-in-lexenv x *environment* 'function)))
- (if (and b (eq (binding-type b) 'macro))
- b
- nil))))
+;;; Javascript FFI
+
+(define-compilation %js-vref (var)
+ (code "js_to_lisp(" var ")"))
+
+(define-compilation %js-vset (var val)
+ (code "(" var " = lisp_to_js(" (ls-compile val) "))"))
-#+common-lisp
+(define-setf-expander %js-vref (var)
+ (let ((new-value (gensym)))
+ (unless (stringp var)
+ (error "`~S' is not a string." var))
+ (values nil
+ (list var)
+ (list new-value)
+ `(%js-vset ,var ,new-value)
+ `(%js-vref ,var))))
+
+
+#-jscl
(defvar *macroexpander-cache*
(make-hash-table :test #'eq))
-(defun ls-macroexpand-1 (form)
+(defun !macro-function (symbol)
+ (unless (symbolp symbol)
+ (error "`~S' is not a symbol." symbol))
+ (let ((b (lookup-in-lexenv symbol *environment* 'function)))
+ (if (and b (eq (binding-type b) 'macro))
+ (let ((expander (binding-value b)))
+ (cond
+ #-jscl
+ ((gethash b *macroexpander-cache*)
+ (setq expander (gethash b *macroexpander-cache*)))
+ ((listp expander)
+ (let ((compiled (eval expander)))
+ ;; The list representation are useful while
+ ;; bootstrapping, as we can dump the definition of the
+ ;; macros easily, but they are slow because we have to
+ ;; evaluate them and compile them now and again. So, let
+ ;; us replace the list representation version of the
+ ;; function with the compiled one.
+ ;;
+ #+jscl (setf (binding-value b) compiled)
+ #-jscl (setf (gethash b *macroexpander-cache*) compiled)
+ (setq expander compiled))))
+ expander)
+ nil)))
+
+(defun !macroexpand-1 (form)
(cond
((symbolp form)
(let ((b (lookup-in-lexenv form *environment* 'variable)))
(if (and b (eq (binding-type b) 'macro))
(values (binding-value b) t)
(values form nil))))
- ((consp form)
- (let ((macro-binding (macro (car form))))
- (if macro-binding
- (let ((expander (binding-value macro-binding)))
- (cond
- #+common-lisp
- ((gethash macro-binding *macroexpander-cache*)
- (setq expander (gethash macro-binding *macroexpander-cache*)))
- ((listp expander)
- (let ((compiled (eval expander)))
- ;; The list representation are useful while
- ;; bootstrapping, as we can dump the definition of the
- ;; macros easily, but they are slow because we have to
- ;; evaluate them and compile them now and again. So, let
- ;; us replace the list representation version of the
- ;; function with the compiled one.
- ;;
- #+jscl (setf (binding-value macro-binding) compiled)
- #+common-lisp (setf (gethash macro-binding *macroexpander-cache*) compiled)
- (setq expander compiled))))
- (values (apply expander (cdr form)) t))
+ ((and (consp form) (symbolp (car form)))
+ (let ((macrofun (!macro-function (car form))))
+ (if macrofun
+ (values (funcall macrofun (cdr form)) t)
(values form nil))))
(t
(values form nil))))
(defun compile-funcall (function args)
(let* ((values-funcs (if *multiple-value-p* "values" "pv"))
- (arglist (concat "(" (join (cons values-funcs (mapcar #'ls-compile args)) ", ") ")")))
+ (arglist (concat "(" (join (list* values-funcs
+ (integer-to-string (length args))
+ (mapcar #'ls-compile args)) ", ") ")")))
(unless (or (symbolp function)
(and (consp function)
(eq (car function) 'lambda)))
- (error "Bad function"))
+ (error "Bad function designator `~S'" function))
(cond
((translate-function function)
(concat (translate-function function) arglist))
((and (symbolp function)
#+jscl (eq (symbol-package function) (find-package "COMMON-LISP"))
- #+common-lisp t)
+ #-jscl t)
(code (ls-compile `',function) ".fvalue" arglist))
(t
(code (ls-compile `#',function) arglist)))))
-(defun ls-compile-block (sexps &optional return-last-p)
- (if return-last-p
- (code (ls-compile-block (butlast 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-block (sexps &optional return-last-p decls-allowed-p)
+ (multiple-value-bind (sexps decls)
+ (parse-body sexps :declarations decls-allowed-p)
+ (declare (ignore decls))
+ (if return-last-p
+ (code (ls-compile-block (butlast sexps) nil decls-allowed-p)
+ "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 &optional multiple-value-p)
- (multiple-value-bind (sexp expandedp) (ls-macroexpand-1 sexp)
+ (multiple-value-bind (sexp expandedp) (!macroexpand-1 sexp)
(when expandedp
(return-from ls-compile (ls-compile sexp multiple-value-p)))
;; The expression has been macroexpanded. Now compile it!
@@ -1640,10 +1487,8 @@
(code (ls-compile `',sexp) ".value"))
(t
(ls-compile `(symbol-value ',sexp))))))
- ((integerp sexp) (integer-to-string sexp))
- ((floatp sexp) (float-to-string sexp))
- ((stringp sexp) (code "\"" (escape-string sexp) "\""))
- ((arrayp sexp) (literal sexp))
+ ((or (integerp sexp) (floatp sexp) (characterp sexp) (stringp sexp) (arrayp sexp))
+ (literal sexp))
((listp sexp)
(let ((name (car sexp))
(args (cdr sexp)))
@@ -1660,7 +1505,7 @@
(t
(compile-funcall name args)))))
(t
- (error (concat "How should I compile " (prin1-to-string sexp) "?")))))))
+ (error "How should I compile `~S'?" sexp))))))
(defvar *compile-print-toplevels* nil)
@@ -1681,10 +1526,7 @@
(t
(when *compile-print-toplevels*
(let ((form-string (prin1-to-string sexp)))
- (write-string "Compiling ")
- (write-string (truncate-string form-string))
- (write-line "...")))
-
+ (format t "Compiling ~a..." (truncate-string form-string))))
(let ((code (ls-compile sexp multiple-value-p)))
(code (join-trailing (get-toplevel-compilations)
(code ";" *newline*))