;;; literals
(defmacro defpsliteral (name string)
`(progn
- (add-ps-literal ',name)
+ (add-ps-reserved-symbol ',name)
(define-ps-special-form ,name ()
(list 'js:literal ,string))))
(macrolet ((def-for-literal (name printer)
`(progn
- (add-ps-literal ',name)
+ (add-ps-reserved-symbol ',name)
(define-ps-special-form ,name (&optional label)
(list ',printer label)))))
(def-for-literal break js:break)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; arrays
(define-ps-special-form array (&rest values)
- `(js:array ,@(mapcar (lambda (form) (compile-parenscript-form form :expecting :expression))
+ `(js:array ,@(mapcar (lambda (form) (compile-parenscript-form (ps-macroexpand form) :expecting :expression))
values)))
(define-ps-special-form aref (array &rest coords)
,(compile-parenscript-form delta :expecting :expression)))))
(define-ps-special-form decf (x &optional (delta 1))
- (if (eql delta 1)
- `(js:unary-operator js:-- ,(compile-parenscript-form x :expecting :expression) :prefix t)
- `(js:operator js:-= ,(compile-parenscript-form x :expecting :expression)
- ,(compile-parenscript-form delta :expecting :expression))))
+ (let ((x (ps-macroexpand x))
+ (delta (ps-macroexpand delta)))
+ (if (eql delta 1)
+ `(js:unary-operator js:-- ,(compile-parenscript-form x :expecting :expression) :prefix t)
+ `(js:operator js:-= ,(compile-parenscript-form x :expecting :expression)
+ ,(compile-parenscript-form delta :expecting :expression)))))
(define-ps-special-form - (first &rest rest)
- (if rest
- `(js:operator js:- ,@(mapcar (lambda (val) (compile-parenscript-form val :expecting :expression))
- (cons first rest)))
- `(js:unary-operator js:- ,(compile-parenscript-form first :expecting :expression) :prefix t)))
+ (let ((first (ps-macroexpand first))
+ (rest (mapcar #'ps-macroexpand rest)))
+ (if rest
+ `(js:operator js:- ,@(mapcar (lambda (val) (compile-parenscript-form val :expecting :expression))
+ (cons first rest)))
+ `(js:unary-operator js:- ,(compile-parenscript-form first :expecting :expression) :prefix t))))
(define-ps-special-form not (x)
(let ((form (compile-parenscript-form (ps-macroexpand x) :expecting :expression))
(define-ps-special-form if (test then &optional else)
(ecase expecting
- (:statement `(js:if ,(compile-parenscript-form test :expecting :expression)
+ (:statement `(js:if ,(compile-parenscript-form (ps-macroexpand test) :expecting :expression)
,(compile-parenscript-form `(progn ,then))
,@(when else `(:else ,(compile-parenscript-form `(progn ,else))))))
- (:expression `(js:? ,(compile-parenscript-form test :expecting :expression)
- ,(compile-parenscript-form then :expecting :expression)
- ,(compile-parenscript-form else :expecting :expression)))))
+ (:expression `(js:? ,(compile-parenscript-form (ps-macroexpand test) :expecting :expression)
+ ,(compile-parenscript-form (ps-macroexpand then) :expecting :expression)
+ ,(compile-parenscript-form (ps-macroexpand else) :expecting :expression)))))
(define-ps-special-form switch (test-expr &rest clauses)
`(js:switch ,(compile-parenscript-form test-expr :expecting :expression)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; function definition
+
+(defvar *vars-bound-in-enclosing-lexical-scopes* ())
+
(defun compile-function-definition (args body)
- (list (mapcar (lambda (arg) (compile-parenscript-form arg :expecting :symbol)) args)
- (let* ((*enclosing-lexical-block-declarations* ())
- (body (compile-parenscript-form `(progn ,@body)))
- (var-decls (compile-parenscript-form
- `(progn ,@(mapcar (lambda (var) `(var ,var)) *enclosing-lexical-block-declarations*)))))
- `(js:block ,@(cdr var-decls) ,@(cdr body)))))
+ (let ((args (mapcar (lambda (arg) (compile-parenscript-form arg :expecting :symbol)) args)))
+ (list args
+ (let* ((*enclosing-lexical-block-declarations* ())
+ (*vars-bound-in-enclosing-lexical-scopes* (append args
+ *vars-bound-in-enclosing-lexical-scopes*))
+ (body (compile-parenscript-form `(progn ,@body)))
+ (var-decls (compile-parenscript-form
+ `(progn ,@(mapcar (lambda (var) `(var ,var)) *enclosing-lexical-block-declarations*)))))
+ `(js:block ,@(cdr var-decls) ,@(cdr body))))))
(define-ps-special-form %js-lambda (args &rest body)
`(js:lambda ,@(compile-function-definition args body)))
(init-form (if (listp spec) (second spec)))
(supplied-p-var (if (listp spec) (third spec))))
(values var init-form supplied-p-var)))
-
+
(defun parse-aux-spec (spec)
"Returns two values: variable and init-form"
;; [&aux {var | (var [init-form])}*])
(values (if (symbolp spec) spec (first spec))
(when (listp spec) (second spec))))
-(defpsmacro defaultf (place value)
- `(when (=== ,place undefined)
- (setf ,place ,value)))
+(defpsmacro defaultf (name value suppl)
+ `(progn
+ ,@(when suppl `((var ,suppl t)))
+ (when (=== ,name undefined)
+ (setf ,name ,value ,@(when suppl (list suppl nil))))))
(defun parse-extended-function (lambda-list body &optional name)
"Returns two values: the effective arguments and body for a function with
the given lambda-list and body."
- ;; The lambda list is transformed as follows, since a javascript lambda list is just a
+ ;; The lambda list is transformed as follows, since a javascript lambda list is just a
;; list of variable names, and you have access to the arguments variable inside the function:
;; * standard variables are the mapped directly into the js-lambda list
;; * optional variables' variable names are mapped directly into the lambda list,
- ;; and for each optional variable with name v and default value d, a form is produced
- ;; (defaultf v d)
+ ;; and for each optional variable with name v, default value d, and
+ ;; supplied-p parameter s, a form is produced (defaultf v d s)
;; * keyword variables are not included in the js-lambda list, but instead are
;; obtained from the magic js ARGUMENTS pseudo-array. Code assigning values to
- ;; keyword vars is prepended to the body of the function.
+ ;; keyword vars is prepended to the body of the function. Defaults and supplied-p
+ ;; are handled using the same mechanism as with optional vars.
(declare (ignore name))
(multiple-value-bind (requireds optionals rest? rest keys? keys allow? aux? aux
more? more-context more-count key-object)
(mapcar #'parse-optional-spec optionals))))
(opt-forms
(mapcar #'(lambda (opt-spec)
- (multiple-value-bind (var val) (parse-optional-spec opt-spec)
- `(defaultf ,var ,val)))
+ (multiple-value-bind (var val suppl)
+ (parse-optional-spec opt-spec)
+ `(defaultf ,var ,val ,suppl)))
optionals))
(key-forms
(when keys?
(with-ps-gensyms (n)
(let ((decls nil) (assigns nil) (defaults nil))
(mapc (lambda (k)
- (multiple-value-bind (var init-form keyword-str)
+ (multiple-value-bind (var init-form keyword-str suppl)
(parse-key-spec k)
(push `(var ,var) decls)
(push `(,keyword-str (setf ,var (aref arguments (1+ ,n)))) assigns)
- (push (list 'defaultf var init-form) defaults)))
+ (push (list 'defaultf var init-form suppl) defaults)))
(reverse keys))
`(,@decls
(loop :for ,n :from ,(length requireds)
(defpsmacro defun (name lambda-list &body body)
"An extended defun macro that allows cool things like keyword arguments.
lambda-list::=
- (var*
- [&optional {var | (var [init-form [supplied-p-parameter]])}*]
- [&rest var]
- [&key {var | ({var | (keyword-name var)} [init-form [supplied-p-parameter]])}* [&allow-other-keys]]
+ (var*
+ [&optional {var | (var [init-form [supplied-p-parameter]])}*]
+ [&rest var]
+ [&key {var | ({var | (keyword-name var)} [init-form [supplied-p-parameter]])}* [&allow-other-keys]]
[&aux {var | (var [init-form])}*])"
(if (symbolp name)
`(defun-function ,name ,lambda-list ,@body)
(defpsmacro lambda (lambda-list &body body)
"An extended defun macro that allows cool things like keyword arguments.
lambda-list::=
- (var*
- [&optional {var | (var [init-form [supplied-p-parameter]])}*]
- [&rest var]
- [&key {var | ({var | (keyword-name var)} [init-form [supplied-p-parameter]])}* [&allow-other-keys]]
+ (var*
+ [&optional {var | (var [init-form [supplied-p-parameter]])}*]
+ [&rest var]
+ [&key {var | ({var | (keyword-name var)} [init-form [supplied-p-parameter]])}* [&allow-other-keys]]
[&aux {var | (var [init-form])}*])"
(multiple-value-bind (effective-args effective-body)
(parse-extended-function lambda-list body)
(define-ps-special-form flet (fn-defs &rest body)
(let ((fn-renames (make-macro-dictionary)))
- (loop for (fn-name . def) in fn-defs do
+ (loop for (fn-name) in fn-defs do
(setf (gethash fn-name fn-renames) (ps-gensym fn-name)))
(let ((fn-defs (compile-parenscript-form
`(progn ,@(loop for (fn-name . def) in fn-defs collect
(define-ps-special-form labels (fn-defs &rest body)
(with-local-macro-environment (local-fn-renames *ps-local-function-names*)
- (loop for (fn-name . def) in fn-defs do
+ (loop for (fn-name) in fn-defs do
(setf (gethash fn-name local-fn-renames) (ps-gensym fn-name)))
(compile-parenscript-form
`(progn ,@(loop for (fn-name . def) in fn-defs collect
,@body)
:expecting expecting)))
+(define-ps-special-form function (fn-name)
+ (compile-parenscript-form (maybe-rename-local-function fn-name) :expecting expecting))
+
(defvar *defun-setf-name-prefix* "__setf_")
(defpsmacro defun-setf (setf-name lambda-list &body body)
(define-ps-special-form symbol-macrolet (symbol-macros &body body)
(with-local-macro-environment (local-macro-dict *ps-symbol-macro-env*)
- (dolist (macro symbol-macros)
- (destructuring-bind (name expansion)
- macro
- (setf (gethash name local-macro-dict) (lambda (x) (declare (ignore x)) expansion))))
- (compile-parenscript-form `(progn ,@body) :expecting expecting)))
+ (let (local-var-bindings)
+ (dolist (macro symbol-macros)
+ (destructuring-bind (name expansion)
+ macro
+ (setf (gethash name local-macro-dict) (lambda (x) (declare (ignore x)) expansion))
+ (push name local-var-bindings)))
+ (let ((*vars-bound-in-enclosing-lexical-scopes* (append local-var-bindings
+ *vars-bound-in-enclosing-lexical-scopes*)))
+ (compile-parenscript-form `(progn ,@body) :expecting expecting)))))
(define-ps-special-form defmacro (name args &body body) ;; should this be a macro?
(eval `(defpsmacro ,name ,args ,@body))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; objects
-(add-ps-literal '{})
+(add-ps-reserved-symbol '{})
(define-ps-symbol-macro {} (create))
(define-ps-special-form create (&rest arrows)
- `(js:object ,@(loop for (key-expr val-expr) on arrows by #'cddr collecting
- (let ((key (compile-parenscript-form key-expr :expecting :expression)))
- (when (keywordp key)
- (setf key `(js:variable ,key)))
- (assert (or (stringp key)
- (numberp key)
- (and (listp key)
- (or (eq 'js:variable (car key))
- (eq 'quote (car key)))))
- ()
- "Slot key ~s is not one of js-variable, keyword, string or number." key)
- (cons key (compile-parenscript-form val-expr :expecting :expression))))))
-
-(define-ps-special-form %js-slot-value (obj slot)
- (let ((slot (ps-macroexpand slot)))
- `(js:slot-value ,(compile-parenscript-form (ps-macroexpand obj) :expecting :expression)
- ,(if (and (listp slot) (eq 'quote (car slot)))
- (second slot) ;; assume we're quoting a symbol
- (compile-parenscript-form slot)))))
+ `(js:object
+ ,@(loop for (key-expr val-expr) on arrows by #'cddr collecting
+ (let ((compiled-key (compile-parenscript-form (ps-macroexpand key-expr)
+ :expecting :expression)))
+ (assert (or (stringp compiled-key)
+ (numberp compiled-key)
+ (keywordp compiled-key)
+ (and (listp compiled-key)
+ (eq 'js:variable (car compiled-key))))
+ ()
+ "Slot key ~s is not one of js-variable, keyword, string or number."
+ compiled-key)
+ (let ((key (aif (ps-reserved-symbol-p (if (listp compiled-key)
+ (second compiled-key)
+ compiled-key))
+ it
+ compiled-key)))
+ (cons key (compile-parenscript-form (ps-macroexpand val-expr)
+ :expecting :expression)))))))
(define-ps-special-form instanceof (value type)
`(js:instanceof ,(compile-parenscript-form value :expecting :expression)
,(compile-parenscript-form type :expecting :expression)))
+(define-ps-special-form %js-slot-value (obj slot)
+ (let ((slot (ps-macroexpand slot)))
+ `(js:slot-value ,(compile-parenscript-form (ps-macroexpand obj) :expecting :expression)
+ ,(let ((slot (if (and (listp slot) (eq 'quote (car slot)))
+ (second slot) ;; assume we're quoting a symbol
+ (compile-parenscript-form slot))))
+ (if (and (symbolp slot)
+ (ps-reserved-symbol-p slot))
+ (symbol-name-to-js-string slot)
+ slot)))))
+
(defpsmacro slot-value (obj &rest slots)
(if (null (rest slots))
`(%js-slot-value ,obj ,(first slots))
(pushnew name *ps-special-variables*)
`(var ,name ,@(when value-provided? (list value))))
-(defpsmacro let (bindings &body body)
- (flet ((add-renamed-vars (bindings predicate)
- (mapcar (lambda (x) (append x (list (ps-gensym (car x)))))
- (remove-if predicate bindings :key #'car)))
- (var (x) (first x))
- (val (x) (second x))
- (renamed (x) (third x)))
- (let* ((normalized-bindings (mapcar (lambda (x) (if (symbolp x) `(,x nil) x)) bindings))
- (lexical-bindings (add-renamed-vars normalized-bindings #'ps-special-variable-p))
- (dynamic-bindings (add-renamed-vars normalized-bindings (complement #'ps-special-variable-p)))
- (renamed-body `(symbol-macrolet ,(mapcar (lambda (x) (list (var x) (renamed x)))
- lexical-bindings)
- ,@body)))
- `(progn
- ,@(mapcar (lambda (x) `(var ,(renamed x) ,(val x))) lexical-bindings)
- ,(if dynamic-bindings
- `(progn ,@(mapcar (lambda (x) `(var ,(renamed x))) dynamic-bindings)
- (try (progn (setf ,@(loop for x in dynamic-bindings append
- `(,(renamed x) ,(var x)
- ,(var x) ,(val x))))
- ,renamed-body)
- (:finally
- (setf ,@(mapcan (lambda (x) `(,(var x) ,(renamed x))) dynamic-bindings)))))
- renamed-body)))))
+(define-ps-special-form let (bindings &body body)
+ (let* (lexical-bindings-introduced-here
+ (normalized-bindings (mapcar (lambda (x)
+ (if (symbolp x)
+ (list x nil)
+ (list (car x) (ps-macroexpand (cadr x)))))
+ bindings))
+ (free-variables-in-binding-value-expressions (mapcan (lambda (x) (flatten (cadr x)))
+ normalized-bindings)))
+ (flet ((maybe-rename-lexical-var (x)
+ (if (or (member x *vars-bound-in-enclosing-lexical-scopes*)
+ (member x free-variables-in-binding-value-expressions))
+ (ps-gensym x)
+ (progn (push x lexical-bindings-introduced-here) nil)))
+ (rename (x) (first x))
+ (var (x) (second x))
+ (val (x) (third x)))
+ (let* ((lexical-bindings (loop for x in normalized-bindings
+ unless (ps-special-variable-p (car x))
+ collect (cons (maybe-rename-lexical-var (car x)) x)))
+ (dynamic-bindings (loop for x in normalized-bindings
+ when (ps-special-variable-p (car x))
+ collect (cons (ps-gensym (format nil "~A_~A" (car x) 'tmp-stack)) x)))
+ (renamed-body `(symbol-macrolet ,(loop for x in lexical-bindings
+ when (rename x) collect
+ `(,(var x) ,(rename x)))
+ ,@body))
+ (*vars-bound-in-enclosing-lexical-scopes* (append lexical-bindings-introduced-here
+ *vars-bound-in-enclosing-lexical-scopes*)))
+ (compile-parenscript-form
+ `(progn
+ ,@(mapcar (lambda (x) `(var ,(or (rename x) (var x)) ,(val x))) lexical-bindings)
+ ,(if dynamic-bindings
+ `(progn ,@(mapcar (lambda (x) `(var ,(rename x))) dynamic-bindings)
+ (try (progn (setf ,@(loop for x in dynamic-bindings append
+ `(,(rename x) ,(var x)
+ ,(var x) ,(val x))))
+ ,renamed-body)
+ (:finally
+ (setf ,@(mapcan (lambda (x) `(,(var x) ,(rename x))) dynamic-bindings)))))
+ renamed-body))
+ :expecting expecting)))))
(defpsmacro let* (bindings &body body)
(if bindings
HCoop / clinton / parenscript.git / blobdiff