Changed ps-inline to take a form instead of an implicit progn as a parameter; gave...

The optional arguments bind *js-quote-char* to make it more convenient
to use the two functions with different html generation macros (which
may use single or double quotes to delimit attribute values).

diff --git a/docs/reference.lisp b/docs/reference.lisp
index 9405532..aeb61dc 100644 (file)
--- a/docs/reference.lisp
+++ b/docs/reference.lisp
@@ -926,7 +926,7 @@ a-variable  => aVariable
 (document.write
   (ps-html ((:a :href "#"
                 :onclick (lisp (ps-inline (transport)))) "link")))
-  => document.write('<a href=\"#\" onclick=\"' + 'javascript:transport();' + '\">link</a>')
+  => document.write('<a href=\"#\" onclick=\"' + 'javascript:transport()' + '\">link</a>')
 
 ;;; Forms may be used in attribute lists to conditionally generate
 ;;; the next attribute. In this example the textarea is sometimes disabled.

diff --git a/src/compilation-interface.lisp b/src/compilation-interface.lisp
index eac01eb..ec35faa 100644 (file)
--- a/src/compilation-interface.lisp
+++ b/src/compilation-interface.lisp
@@ -16,12 +16,13 @@ is output to the OUTPUT-STREAM stream."
 Body is evaluated."
   (compile-script `(progn ,@body)))
 
-(defun ps-inline* (form)
-  (concatenate 'string
-               "javascript:"
-               (remove #\Newline
-                       (parenscript-print (compile-parenscript-form form :expecting :statement))
-                       :from-end t)))
+(defun ps-inline* (form &optional (quote-char #\"))
+  (let ((*js-quote-char* quote-char))
+    (concatenate 'string
+                 "javascript:"
+                 (remove #\Newline
+                         (parenscript-print (compile-parenscript-form form :expecting :statement))
+                         :from-end t))))
 
-(defmacro ps-inline (&body body)
-  `(ps-inline* '(progn ,@body)))
+(defmacro ps-inline (form &optional (quote-char #\"))
+  `(ps-inline* ',form ,quote-char))

diff --git a/t/ps-tests.lisp b/t/ps-tests.lisp
index 61bf3eb..d31f801 100644 (file)
--- a/t/ps-tests.lisp
+++ b/t/ps-tests.lisp
@@ -395,7 +395,7 @@ x = 2 + sideEffect() + x + 5;")
                      :onclick (lisp (ps-inline (transport))))
                  img))
        img))
-  "document.write(LINKORNOT == 1 ? '<a href=\"#\" onclick=\"' + 'javascript:transport();' + '\">' + img + '</a>' : img)")
+  "document.write(LINKORNOT == 1 ? '<a href=\"#\" onclick=\"' + 'javascript:transport()' + '\">' + img + '</a>' : img)")
 
 (test-ps-js negate-number-literal ;; ok, this was broken and fixed before, but no one bothered to add the test!
   (- 1)

diff --git a/t/reference-tests.lisp b/t/reference-tests.lisp
index 901de02..4aea054 100644 (file)
--- a/t/reference-tests.lisp
+++ b/t/reference-tests.lisp
@@ -484,7 +484,7 @@ _js2.style.left = _js1;")
   (document.write
   (ps-html ((:a :href "#"
                 :onclick (lisp (ps-inline (transport)))) "link")))
-  "document.write('<a href=\"#\" onclick=\"' + 'javascript:transport();' + '\">link</a>')")
+  "document.write('<a href=\"#\" onclick=\"' + 'javascript:transport()' + '\">link</a>')")
 
 (test-ps-js the-html-generator-4
   (let ((disabled nil)