From 840732111165384487992a8f2a030652568bda43 Mon Sep 17 00:00:00 2001 From: Daniel Gackle Date: Sat, 11 Apr 2009 15:55:05 -0700 Subject: [PATCH] Restored the old psmacro for LISP evaluation, because the new special form wasn't working. --- src/special-forms.lisp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/special-forms.lisp b/src/special-forms.lisp index 033405a..3841f6f 100644 --- a/src/special-forms.lisp +++ b/src/special-forms.lisp @@ -718,7 +718,9 @@ lambda-list::= (define-ps-special-form regex (regex) `(js:regex ,(string regex))) -(define-ps-special-form lisp (lisp-form) - ;; (ps (foo (lisp bar))) is in effect equivalent to (ps* `(foo ,bar)) - ;; when called from inside of ps*, lisp-form has access only to the dynamic environment (like for eval) - `(js:escape ,(ps1* lisp-form))) +(defpsmacro lisp (&body forms) + "Evaluates the given forms in Common Lisp at ParenScript +macro-expansion time. The value of the last form is treated as a +ParenScript expression and is inserted into the generated Javascript +\(use nil for no-op)." + (eval (cons 'progn forms))) -- 2.20.1