X-Git-Url: http://git.hcoop.net/clinton/parenscript.git/blobdiff_plain/49c50da4df7956d8d4e5285ddf987ab0eeebb774..5ffb1ebaaff5e8f899fd4b1bd91b015f2c52d656:/t/ps-tests.lisp

diff --git a/t/ps-tests.lisp b/t/ps-tests.lisp
index 68a502b..69f1564 100644
--- a/t/ps-tests.lisp
+++ b/t/ps-tests.lisp
@@ -7,28 +7,27 @@
 (in-suite ps-tests)
 
 (test-ps-js plus-is-not-commutative
-   (setf x (+ "before" x "after"))
-   "x = 'before' + x + 'after';")
+  (setf x (+ "before" x "after"))
+  "x = 'before' + x + 'after';")
 
 (test-ps-js plus-works-if-first
-   (setf x (+ x "middle" "after"))
-   "x += 'middle' + 'after';")
+  (setf x (+ x "middle" "after"))
+  "x += 'middle' + 'after';")
 
 (test-ps-js setf-side-effects
-            (progn
-              (let ((x 10))
-                (defun side-effect() 
-                  (setf x 4)
-                  (return 3))
-                (setf x (+ 2 (side-effect) x 5))))
-            "
-var x = 10;
+  (progn
+    (let ((x 10))
+      (defun side-effect() 
+        (setf x 4)
+        (return 3))
+      (setf x (+ 2 (side-effect) x 5))))
+  "var x1 = 10;
 function sideEffect() {
-  x = 4;
+  x1 = 4;
   return 3;
 };
-x = 2 + sideEffect() + x + 5;")
-;; Parenscript used to optimize to much:
+x1 = 2 + sideEffect() + x1 + 5;")
+;; Parenscript used to optimize incorrectly:
 ;;   var x = 10;
 ;;   function sideEffect() {
 ;;     x = 4;
@@ -39,69 +38,70 @@ x = 2 + sideEffect() + x + 5;")
 ;;   Which is 20, not 14
 
 
-(test-ps-js dot-notation-bug
-            (.match (+ "" x) "foo")
-            "('' + x).match('foo')")
+(test-ps-js method-call-op-form
+  ((@ (+ "" x) to-string))
+  "('' + x).toString()")
+
+(test-ps-js method-call-op-form-args
+  ((@ (+ "" x) to-string) 1 2 :baz 3)
+  "('' + x).toString(1, 2, 'baz', 3)")
+
+(test-ps-js method-call-number
+  ((@ 10 to-string))
+  "( 10 ).toString()")
+
+(test-ps-js method-call-string
+  ((@ "hi" to-string))
+  "'hi'.toString()")
 
-(test-ps-js method-call-op-form (.to-string (+ "" x)) "('' + x).toString()")
-(test-ps-js method-call-number (.to-string 10) "( 10 ).toString()")
-(test-ps-js method-call-string (.to-string "hi") "'hi'.toString()")
 (test-ps-js method-call-lit-object
-            (.to-string (create :to-string (lambda ()
-					     (return "it works"))))
-            "( { toString : function () { return 'it works'; } } ).toString()")
+  ((@ (create :to-string (lambda () (return "it works"))) to-string))
+  "( { toString : function () { return 'it works'; } } ).toString()")
+
+(test-ps-js method-call-conditional
+  ((if a x y) 1)
+  "(a ? x : y)(1)")
 
 (test-ps-js method-call-variable
-            (.to-string x)
-            "x.toString()")
+  ((@ x to-string))
+  "x.toString()")
 
 (test-ps-js method-call-array
-            (.to-string (list 10 20))
-            "[ 10, 20 ].toString()")
+  ((@ (list 10 20) to-string))
+  "[ 10, 20 ].toString()")
+
 (test-ps-js method-call-fn-call
-            (.to-string (foo))
-            "foo().toString()")
+  ((@ (foo) to-string))
+  "foo().toString()")
+
 (test-ps-js method-call-lambda-fn
-            (.to-string (lambda () (alert 10)))
-            "( function () { alert(10); } ).toString()")
+  ((@ (lambda () (alert 10)) to-string))
+  "( function () { alert(10); } ).toString()")
+
 (test-ps-js method-call-lambda-call
-            (.to-string ((lambda (x) (return x)) 10))
-            "(function (x) { return x; })(10).toString()")
+  ((@ ((lambda (x) (return x)) 10) to-string))
+  "(function (x) { return x; })(10).toString()")
 
 (test no-whitespace-before-dot
-  (let* ((str (compile-script '(.to-string ((lambda (x) (return x)) 10))))
+  (let* ((str (ps1* '((@ ((lambda (x) (return x)) 10) to-string))))
          (dot-pos (position #\. str :test #'char=))
          (char-before (elt str (1- dot-pos)))
          (a-parenthesis #\)))
     (is (char= char-before a-parenthesis))))
 
-;; A problem with long nested operator, when the statement spanned several rows
-;; the rows would not be joined together correctly.
-(test-ps-js bug-dwim-join
-   (alert (ps-html ((:div :id 777
-                          :style (css-inline :border "1pxsssssssssss"
-                                             :font-size "x-small"
-                                             :height (* 2 200)
-                                             :width (* 2 300))))))
-   "alert('<div id=\"777\" style=\"'
- + ('border:1pxsssssssssss;font-size:x-small;height:' + 2 * 200 + ';width:'
- + 2 * 300)
- + '\"></div>')") ;";This line should start with a plus character.
-
-
 (test-ps-js simple-slot-value
   (let ((foo (create :a 1)))
-   (alert (slot-value foo 'a)))
-  "var foo = { a : 1 };
-   alert(foo.a);")
+    (alert (slot-value foo 'a)))
+  "var foo1 = { a : 1 };
+   alert(foo1.a);")
 
 (test-ps-js buggy-slot-value
    (let ((foo (create :a 1))
-        (slot-name "a"))
+         (slot-name "a"))
     (alert (slot-value foo slot-name)))
-  " var foo = { a : 1 };
-    var slotName = 'a';
-    alert(foo[slotName]);
+  " var foo1 = { a : 1 };
+    var slotName2 = 'a';
+    alert(foo1[slotName2]);
    "); Last line was alert(foo.slotName) before bug-fix.
 
 (test-ps-js buggy-slot-value-two
@@ -181,18 +181,10 @@ x = 2 + sideEffect() + x + 5;")
                    ("u0080" . ,(code-char 128)) ;;Character over 127. Actually valid, parenscript escapes them to be sure.
                    ("uABCD" . ,(code-char #xabcd)))));; Really above ascii.
     (loop for (js-escape . lisp-char) in escapes
-	  for generated = (compile-script `(let ((x ,(format nil "hello~ahi" lisp-char)))))
-	  for wanted = (format nil "var x = 'hello\\~ahi';" js-escape)
-	  do (is (string= (normalize-js-code generated) wanted)))))
+          for generated = (ps-doc* `(let ((x ,(format nil "hello~ahi" lisp-char)))))
+          for wanted = (format nil "var x1 = 'hello\\~ahi';" js-escape)
+          do (is (string= (normalize-js-code generated) wanted)))))
   
-(test-ps-js complicated-symbol-name1
-  grid-rows[foo].bar
-  "gridRows[foo].bar")
-
-(test-ps-js complicated-symbol-name2
-  *grid-rows*[foo].bar
-  "GRIDROWS[foo].bar")
-
 (test-ps-js slot-value-setf
   (setf (slot-value x 'y) (+ (+ a 3) 4))
   "x.y = (a + 3) + 4;")
@@ -211,48 +203,69 @@ x = 2 + sideEffect() + x + 5;")
 (test script-star-eval2
   (is (string= "x = 1;" (normalize-js-code (ps* '(setf x 1))))))
 
-(test-ps-js slot-value-null1
-  (slot-value foo nil)
-  "foo")
-
-(test-ps-js slot-value-null2
-  (slot-value foo 'nil)
-  "foo")
-
 (test-ps-js unquoted-nil
   nil
   "null")
 
 (test-ps-js list-with-single-nil
-  (array 'nil)
+  (array nil)
   "[null]")
 
-(test-ps-js quoted-nil
+(test-ps-js quoted-nil-is-array
   'nil
-  "null")
-
-(test defsetf1
-  (ps (defsetf baz (x y) (newval) `(set-baz ,x ,y ,newval)))
-  (is (string= "var _js2 = 1; var _js3 = 2; var _js1 = 3; setBaz(_js2, _js3, _js1);"
-               (normalize-js-code (let ((ps:*ps-gensym-counter* 0))
-                                    (ps (setf (baz 1 2) 3)))))))
-
-(test defsetf-short
-  (ps (defsetf baz set-baz "blah"))
-  (is (string= "setBaz(1, 2, 3, 'foo');" (normalize-js-code (ps (setf (baz 1 2 3) "foo"))))))
-
-(test defun-setf1
-  (is (and (string= (normalize-js-code (ps:ps (defun (setf some-thing) (new-val i1 i2)
-                                           (setf (aref *some-thing* i1 i2) new-val))))
-               "function __setf_someThing(newVal, i1, i2) { SOMETHING[i1][i2] = newVal; };")
-           (string= (let ((ps:*ps-gensym-counter* 0)) (normalize-js-code (ps:ps (setf (some-thing 1 2) "foo"))))
-               "var _js2 = 1; var _js3 = 2; var _js1 = 'foo'; __setf_someThing(_js1, _js2, _js3);"))))
+  "[]")
+
+(test-ps-js defsetf1
+  (progn (defsetf baz (x y) (newval) `(set-baz ,x ,y ,newval))
+         (setf (baz 1 2) 3))
+  "var _js2_4 = 1;
+var _js3_5 = 2;
+var _js1_6 = 3;
+setBaz(_js2_4, _js3_5, _js1_6);")
+
+(test-ps-js defsetf-short
+  (progn (defsetf baz set-baz "docstring")
+         (setf (baz 1 2 3) "foo"))
+  "setBaz(1, 2, 3, 'foo');")
+
+(test-ps-js defun-setf1
+  (progn (defun (setf some-thing) (new-val i1 i2)
+           (setf (aref *some-thing* i1 i2) new-val))
+         (setf (some-thing 1 2) "foo"))
+"function __setf_someThing(newVal, i1, i2) {
+    SOMETHING[i1][i2] = newVal;
+};
+var _js2_4 = 1;
+var _js3_5 = 2;
+var _js1_6 = 'foo';
+__setf_someThing(_js1_6, _js2_4, _js3_5);")
 
 (test-ps-js defun-optional1
   (defun test-opt (&optional x) (return (if x "yes" "no")))
   "function testOpt(x) {
-  x = undefined === x && null || x;
-  return x ? 'yes' : 'no';
+    if (x === undefined) {
+        x = null;
+    };
+    return x ? 'yes' : 'no';
+}")
+
+(test-ps-js defun-optional2
+  (defun foo (x &optional y) (+ x y))
+  "function foo(x, y) {
+    if (y === undefined) {
+        y = null;
+    };
+    x + y;
+}")
+
+(test-ps-js defun-optional3
+  (defun blah (&optional (x 0))
+    (return x))
+  "function blah(x) {
+    if (x === undefined) {
+        x = 0;
+    };
+    return x;
 }")
 
 (test-ps-js return-nothing
@@ -262,11 +275,14 @@ x = 2 + sideEffect() + x + 5;")
 (test-ps-js set-timeout
   (do-set-timeout (10) (alert "foo"))
   "setTimeout(function () { alert('foo'); }, 10)")
-
 (test-ps-js operator-precedence
   (* 3 (+ 4 5) 6)
   "3 * (4 + 5) * 6")
 
+(test-ps-js operators-1
+  (in prop obj)
+  "prop in obj")
+
 (test-ps-js incf1
   (incf foo bar)
   "foo += bar")
@@ -299,12 +315,16 @@ x = 2 + sideEffect() + x + 5;")
   (slot-value foo "bar")
   "foo['bar']")
 
+(test-ps-js slot-value-string1
+  (slot-value "bar" 'length)
+  "'bar'.length")
+
 (test-ps-js slot-value-progn
   (slot-value (progn (some-fun "abc") "123") "length")
   "(someFun('abc'), '123')['length']")
 
 (test-ps-js method-call-block
-  (.to-string (progn (some-fun "abc") "123"))
+  ((@ (progn (some-fun "abc") "123") to-string))
   "(someFun('abc'), '123').toString()")
 
 (test-ps-js create-blank
@@ -315,12 +335,32 @@ x = 2 + sideEffect() + x + 5;")
   {}
   "{ }")
 
+(test-ps-js array-literal1
+  []
+  "[]")
+
+(test-ps-js array-literal2
+  ([])
+  "[]")
+
+(test-ps-js array-literal3
+  ([] 1 2 3)
+  "[1, 2, 3]")
+
+(test-ps-js array-literal4
+  ([] 1 (2 3))
+  "[1, [2, 3]]")
+
+(test-ps-js array-literal5
+  ([] (1 2) ("a" "b"))
+  "[[1, 2], ['a', 'b']]")
+
 (test-ps-js defun-rest1
-  (defun foo (&rest bar) (alert bar[1]))
+  (defun foo (&rest bar) (alert (aref bar 1)))
   "function foo() {
     var bar = [];
-    for (var _js2 = 0; _js2 < arguments.length - 0; _js2 = _js2 + 1) {
-        bar[_js2] = arguments[_js2 + 0];
+    for (var i1 = 0; i1 < arguments.length - 0; i1 += 1) {
+        bar[i1] = arguments[i1 + 0];
     };
     alert(bar[1]);
 }")
@@ -329,19 +369,110 @@ x = 2 + sideEffect() + x + 5;")
   (defun foo (baz &rest bar) (return (+ baz (aref bar 1))))
   "function foo(baz) {
     var bar = [];
-    for (var _js2 = 0; _js2 < arguments.length - 1; _js2 = _js2 + 1) {
-        bar[_js2] = arguments[_js2 + 1];
+    for (var i1 = 0; i1 < arguments.length - 1; i1 += 1) {
+        bar[i1] = arguments[i1 + 1];
     };
     return baz + bar[1];
 }")
 
 (test-ps-js defun-keyword1
   (defun zoo (foo bar &key baz) (return (+ foo bar baz)))
-  "function zoo(foo, bar, _js1) {
-    _js1 = undefined === _js1 && {  } || _js1;
-    return foo + bar + _js1.baz;
+"function zoo(foo, bar) {
+    var baz;
+    var _js2 = arguments.length;
+    for (var n1 = 2; n1 < _js2; n1 += 2) {
+        switch (arguments[n1]) {
+        case 'baz':
+            {
+                baz = arguments[n1 + 1];
+            };
+        };
+    };
+    if (baz === undefined) {
+        baz = null;
+    };
+    return foo + bar + baz;
+}")
+
+(test-ps-js defun-keyword2
+  (defun zoo (&key baz) (return (* baz baz)))
+  "function zoo() {
+    var baz;
+    var _js2 = arguments.length;
+    for (var n1 = 0; n1 < _js2; n1 += 2) {
+        switch (arguments[n1]) {
+        case 'baz':
+            {
+                baz = arguments[n1 + 1];
+            };
+        };
+    };
+    if (baz === undefined) {
+        baz = null;
+    };
+    return baz * baz;
 }")
 
+(test-ps-js defun-keyword3
+  (defun zoo (&key baz (bar 4)) (return (* baz bar)))
+  "function zoo() {
+    var baz;
+    var bar;
+    var _js2 = arguments.length;
+    for (var n1 = 0; n1 < _js2; n1 += 2) {
+        switch (arguments[n1]) {
+        case 'baz':
+            {
+                baz = arguments[n1 + 1];
+            };
+            break;
+        case 'bar':
+            {
+                bar = arguments[n1 + 1];
+            };
+        };
+    };
+    if (baz === undefined) {
+        baz = null;
+    };
+    if (bar === undefined) {
+        bar = 4;
+    };
+    return baz * bar;
+}")
+
+(test-ps-js defun-keyword4
+  (defun hello-world (&key ((:my-name-key my-name) 1))
+    my-name)
+  "function helloWorld() {
+    var myName;
+    var _js2 = arguments.length;
+    for (var n1 = 0; n1 < _js2; n1 += 2) {
+        switch (arguments[n1]) {
+        case 'my-name-key':
+            {
+                myName = arguments[n1 + 1];
+            };
+        };
+    };
+    if (myName === undefined) {
+        myName = 1;
+    };
+    myName;
+}")
+
+(test-ps-js keyword-funcall1
+  (func :baz 1)
+  "func('baz', 1)")
+
+(test-ps-js keyword-funcall2
+  (func :baz 1 :bar foo)
+  "func('baz', 1, 'bar', foo)")
+
+(test-ps-js keyword-funcall3
+  (fun a b :baz c)
+  "fun(a, b, 'baz', c)")
+  
 (test-ps-js cond1
   (cond ((= x 1) 1))
   "if (x == 1) {
@@ -349,7 +480,8 @@ x = 2 + sideEffect() + x + 5;")
 }")
 
 (test-ps-js cond2
-  (cond ((= x 1) 2) ((= y (* x 4)) (foo "blah") (* x y)))
+  (cond ((= x 1) 2)
+        ((= y (* x 4)) (foo "blah") (* x y)))
   "if (x == 1) {
     2;
 } else if (y == x * 4) {
@@ -390,14 +522,391 @@ x = 2 + sideEffect() + x + 5;")
 }")
 
 (test-ps-js funcall-if-expression
-  (document.write
+  ((@ document write)
    (if (= *linkornot* 1)
        (ps-html ((:a :href "#"
-                     :onclick (lisp (ps-inline (transport))))
+                     :onclick (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)
   "-1")
+
+(test macro-environment1
+  (is (string= (normalize-js-code (let* ((macroname (gensym)))
+                                    (ps* `(defmacro ,macroname (x) `(+ ,x 123))
+                                         `(defun test1 ()
+                                           (macrolet ((,macroname (x) `(aref data ,x)))
+                                             (when (,macroname x)
+                                               (setf (,macroname x) 123)))))))
+               (normalize-js-code
+"function test1() {
+    if (data[x]) {
+        data[x] = 123;
+    };
+};
+"))))
+
+(test macro-environment2
+  (is (string= (normalize-js-code (let ((outer-lexical-variable 1))
+                                    (defpsmacro macro-environment2-macro (x)
+                                      `(+ ,outer-lexical-variable ,x))
+                                    (ps* '(macro-environment2-macro 2))))
+               (normalize-js-code "1 + 2;"))))
+
+(test-ps-js ampersand-whole-1
+  (macrolet ((foo (&whole foo bar baz)
+               (declare (ignore bar baz))
+               (format nil "~a" foo)))
+    (foo 1 2))
+  "'(FOO 1 2)';")
+
+(test-ps-js keyword-consistent
+  :x
+  "'x'")
+
+(test-ps-js simple-symbol-macrolet
+  (symbol-macrolet ((x 1)) x)
+  "1;")
+
+(test-ps-js compound-symbol-macrolet
+  (symbol-macrolet ((x 123)
+                    (y (* 2 x)))
+     y)
+  "2 * 123;")
+
+(test-ps-js define-symbol-macro
+  (progn (define-symbol-macro tst-sym-macro 2)
+         tst-sym-macro)
+  "2;")
+
+(test-ps-js expression-progn
+  (defun f () (return (progn (foo) (if x 1 2))))
+  "function f() {
+    return (foo(), x ? 1 : 2);
+}")
+
+(test-ps-js let-decl-in-expression
+  (defun f (x) (return (if x 1 (let* ((foo x)) foo))))
+  "function f(x) {
+    var foo1;
+    return x ? 1 : (foo1 = x, foo1);
+}")
+
+(test-ps-js special-var1
+  (progn (defvar *foo*) (let* ((*foo* 2)) (* *foo* 2)))
+  "var FOO;
+var FOO1;
+try {
+    FOO1 = FOO;
+    FOO = 2;
+    FOO * 2;
+} finally {
+    FOO = FOO1;
+};")
+
+(test-ps-js special-var2
+  (progn (defvar *foo*) (let* ((*baz* 3) (*foo* 2)) (* *foo* 2 *baz*)))
+  "var FOO;
+var BAZ1 = 3;
+var FOO2;
+try {
+    FOO2 = FOO;
+    FOO = 2;
+    FOO * 2 * BAZ1;
+} finally {
+    FOO = FOO2;
+};")
+
+(test-ps-js literal1
+  (setf x undefined)
+  "x = undefined;")
+
+(test-ps-js literal2
+  (aref this x)
+  "this[x]")
+
+(test-ps-js setf-dec1
+  (setf x (- 1 x 2))
+  "x = 1 - x - 2;")
+
+(test-ps-js setf-dec2
+  (setf x (- x 1 2))
+  "x = x - 1 - 2;")
+
+(test-ps-js special-char-equals
+  blah=
+  "blahequals")
+
+(test-ps-js setf-operator-priority
+  (return (or (slot-value cache id)
+              (setf (slot-value cache id) ((@ document get-element-by-id) id))))
+  "return cache[id] || (cache[id] = document.getElementById(id))")
+
+(test-ps-js aref-operator-priority
+  (aref (if (and x (> (length x) 0))
+            (aref x 0)
+            y)
+        z)
+  "(x && x.length > 0 ? x[0] : y)[z]")
+
+(test-ps-js aref-operator-priority1
+  (aref (or (slot-value x 'y)
+            (slot-value a 'b))
+        z)
+  "(x.y || a.b)[z]")
+
+(test-ps-js aref-operator-priority2
+  (aref (if a b c) 0)
+  "(a ? b : c)[0]")
+
+(test-ps-js negative-operator-priority
+  (- (if x y z))
+  "-(x ? y : z)")
+
+(test-ps-js op-p1
+  (new (or a b))
+  "new (a || b)")
+
+(test-ps-js op-p2
+  (delete (if a (or b c) d))
+  "delete (a ? b || c : d)")
+
+(test-ps-js op-p3
+  (not (if (or x (not y)) z))
+  "!(x || !y ? z : null)")
+
+(test-ps-js op-p4
+  (- (- (* 1 2) 3))
+  "-(1 * 2 - 3)")
+
+(test-ps-js op-p5
+  (instanceof (or a b) (if x y z))
+  "((a || b) instanceof (x ? y : z))")
+
+(test-ps-js op-p7
+  (or x (if (= x 0) "zero" "empty"))
+  "x || (x == 0 ? 'zero' : 'empty')")
+
+(test-ps-js named-op-expression
+  (throw (if a b c))
+  "throw a ? b : c")
+
+(test-ps-js named-op-expression1
+  (typeof (or x y))
+  "typeof (x || y)")
+
+(test-ps-js aref-array-expression
+  (aref (or a b c) 0)
+  "(a || b || c)[0]")
+
+(test-ps-js slot-value-operator
+  (slot-value (or a b c) 'd)
+  "(a || b || c).d")
+
+(test-ps-js slot-value-parens
+  (slot-value (slot-value foo 'bar) 'baz)
+  "foo.bar.baz")
+
+(test-ps-js funcall-funcall
+  ((foo))
+  "foo()()")
+
+(test-ps-js expression-funcall
+  ((or (@ window eval) eval) foo nil)
+  "(window.eval || eval)(foo, null)")
+
+(test-ps-js expression-funcall1
+  (((or (@ window eval) eval) foo nil))
+  "(window.eval || eval)(foo, null)()")
+
+(test-ps-js expression-funcall2
+  (((or (@ window eval) eval)) foo nil)
+  "(window.eval || eval)()(foo, null)")
+
+(test-ps-js slot-value-object-literal
+  (slot-value (create :a 1) 'a)
+  "({ a : 1 }).a")
+
+(test-ps-js slot-value-lambda
+  (slot-value (lambda ()) 'prototype)
+  "(function () { }).prototype")
+
+(test-ps-js who-html1
+  (who-ps-html (:span :class "ticker-symbol"
+                      :ticker-symbol symbol
+                      (:a :href "http://foo.com"
+                          symbol)
+                      (:span :class "ticker-symbol-popup")))
+  "'<SPAN CLASS=\"ticker-symbol\" TICKER-SYMBOL=\"' + symbol + '\"><A HREF=\"http://foo.com\">' + symbol + '</A><SPAN CLASS=\"ticker-symbol-popup\"></SPAN></SPAN>'")
+
+(test-ps-js flet1
+  ((lambda () (flet ((foo (x) (return (1+ x)))) (return (foo 1)))))
+  "(function () {
+    var foo = function (x) {
+        return x + 1;
+    };
+    return foo(1);
+})()")
+
+(test-ps-js labels1
+  ((lambda () (labels ((foo (x) 
+                         (return (if (=== 0 x)
+                                     0
+                                     (+ x (foo (1- x)))))))
+                (return (foo 3)))))
+  "(function () {
+    var foo = function foo(x) {
+        return 0 === x ? 0 : x + foo(x - 1);
+    };
+    return foo(3);
+})()")
+
+(test-ps-js for-loop-var-init-exp
+  ((lambda (x)
+     (return (do* ((y (if x 0 1) (1+ y))
+                   (z 0 (1+ z)))
+                  ((= y 3) z))))
+   true)
+  "(function (x) {
+    return (function () {
+        for (var y = x ? 0 : 1, z = 0; y != 3; y += 1, z += 1) {
+        };
+        return z;
+    })();
+})(true)")
+
+(test-ps-js math-pi
+  pi
+  "Math.PI")
+
+(test-ps-js literal-array
+  '(1 2 3)
+  "[1, 2, 3]")
+
+(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)) (declare (ignore x)) (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*)))))))
+
+(test-ps-js ps-js-target-version-keyword-test1
+  (defun foo (x y &key bar baz))
+  "function foo(x, y) {
+    var x1_3 = Array.prototype.indexOf.call(arguments, 'bar', 2);
+    var bar = -1 == x1_3 ? null : arguments[x1_3 + 1];
+    var x2_4 = Array.prototype.indexOf.call(arguments, 'baz', 2);
+    var baz = -1 == x2_4 ? null : arguments[x2_4 + 1];
+}"
+  :js-target-version 1.6)
+
+(test-ps-js nested-if-expressions1
+  (return (if (if x y z) a b))
+  "return (x ? y : z) ? a : b")
+
+(test-ps-js nested-if-expressions2
+  (return (if x y (if z a b)))
+  "return x ? y : (z ? a : b)")
+
+(test-ps-js let1
+  (let (x)
+    (+ x x))
+  "var x1 = null;
+x1 + x1;")
+
+(test-ps-js let2
+  (let ((x 1))
+    (+ x x))
+  "var x1 = 1;
+x1 + x1;")
+
+(test-ps-js let3
+  (let ((x 1)
+        (y 2))
+    (+ x x))
+  "var x1 = 1;
+var y2 = 2;
+x1 + x1;")
+
+(test-ps-js let4
+  (let ((x 1)
+        (y (1+ x)))
+    (+ x y))
+  "var x1 = 1;
+var y2 = x + 1;
+x1 + y2;")
+
+(test-ps-js let5
+  (let ((x 1))
+    (+ x 1)
+    (let ((x (+ x 5)))
+      (+ x 1))
+    (+ x 1))
+  "var x1 = 1;
+x1 + 1;
+var x2 = x1 + 5;
+x2 + 1;
+x1 + 1;")
+
+(test-ps-js let6
+  (let ((x 2))
+    (let ((x 1)
+          (y (1+ x)))
+      (+ x y)))
+  "var x1 = 2;
+var x2 = 1;
+var y3 = x1 + 1;
+x2 + y3;")
+
+(test-ps-js let-exp1
+  (lambda ()
+    (return (let (x) (+ x x))))
+  "function () {
+    var x1;
+    return (x1 = null, x1 + x1);
+}")
+
+(test-ps-js let*1
+  (let* ((x 1)) (+ x x))
+"var x1 = 1;
+x1 + x1;")
+
+(test-ps-js let*2
+  (let* ((x 1)
+         (y (+ x 2)))
+    (+ x y))
+  "var x1 = 1;
+var y2 = x1 + 2;
+x1 + y2;")
+
+(test-ps-js let*3
+  (let ((x 3))
+        (let* ((x 1) 
+               (y (+ x 2))) 
+          (+ x y)))
+  "var x1 = 3;
+var x2 = 1;
+var y3 = x2 + 2;
+x2 + y3;")
+
+(test-ps-js let*4
+  (let ((x 3))
+        (let* ((y (+ x 2))
+               (x 1))
+          (+ x y)))
+  "var x1 = 3;
+var y2 = x1 + 2;
+var x3 = 1;
+x3 + y2;")