Fixed 'lisp' form to produce code that captures enclosing lexical scope correctly...

diff --git a/src/printer.lisp b/src/printer.lisp
index 39dcc09..ef77c6f 100644 (file)
--- a/src/printer.lisp
+++ b/src/printer.lisp
@@ -361,6 +361,7 @@ arguments, defines a printer for that form using the given body."
   (psw #\)))
 
 (defprinter js:escape (literal-js)
+  ;; literal-js should be a form that evaluates to a string containing valid JavaScript
   (psw literal-js))
 
 ;;; named statements

diff --git a/src/special-forms.lisp b/src/special-forms.lisp
index 3841f6f..ad49e28 100644 (file)
--- a/src/special-forms.lisp
+++ b/src/special-forms.lisp
@@ -718,9 +718,7 @@ lambda-list::=
 (define-ps-special-form regex (regex)
   `(js:regex ,(string regex)))
 
-(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)))
+(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)))

diff --git a/t/ps-tests.lisp b/t/ps-tests.lisp
index 4e61258..86bc5c2 100644 (file)
--- a/t/ps-tests.lisp
+++ b/t/ps-tests.lisp
@@ -785,3 +785,15 @@ try {
 (test-ps-js literal-array-1
   '(1 foo 3)
   "[1, 'foo', 3]")
+
+(test ps-lisp-expands-in-lexical-environment
+  (is (string= "5;" (let ((x 5)) (ps (lisp x))))))
+
+(test ps*-lisp-expands-in-null-lexical-environment
+  (signals error (let ((x 5)) (ps* '(lisp x)))))
+
+(test ps*-lisp-expands-in-dynamic-environment
+  (is (string= "1 + 2;" (let ((*print-level* 2)) (ps* '(+ 1 (lisp *print-level*)))))))
+
+(test ps-lisp-dynamic-environment
+  (is (string= "1 + 2;" (let ((*print-level* 2)) (ps (+ 1 (lisp *print-level*)))))))