Reimplement (.method object . args) syntax

[clinton/parenscript.git] / t / test.lisp

diff --git a/t/test.lisp b/t/test.lisp
index aa865da..ac390f5 100644 (file)
--- a/t/test.lisp
+++ b/t/test.lisp
@@ -1,13 +1,12 @@
-(in-package :js-test)
-
-;; Testcases for parenscript
+(in-package "PS-TEST")
 
 (defun normalize-whitespace (str)
   (substitute #\Space #\Newline (substitute #\Space #\Tab str)))
-
-(defun same-space-between-statements(code)
-  (cl-ppcre:regex-replace-all "\\s*;\\s*" code "; "))
-
+    
+(defun same-space-between-statements (code)
+  (let ((cl-ppcre:*use-bmh-matchers* nil))
+    (cl-ppcre:regex-replace-all "\\s*;\\s*" code "; ")))
+    
 (defun remove-duplicate-spaces (str)
   (labels ((spacep (char) (and char (char= char #\Space)))
            (rds (list)
@@ -15,14 +14,15 @@
                    ((and (spacep (first list)) (spacep (second list))) (rds (cons #\Space (cddr list))))
                    (t (cons (car list) (rds (cdr list)))))))
     (coerce (rds (coerce str 'list)) 'string)))
-
+  
 (defun trim-spaces (str)
   (string-trim '(#\Space) str))
-
+  
 (defun remove-spaces-near-brackets (str)
-  (reduce (lambda (str rex-pair) (cl-ppcre:regex-replace-all (first rex-pair) str (second rex-pair)))
-          (cons str '(("\\[ " "[") (" \\]" "]") ("\\( " "(") (" \\)" ")")))))
-
+  (let ((cl-ppcre:*use-bmh-matchers* nil))
+    (reduce (lambda (str rex-pair) (cl-ppcre:regex-replace-all (first rex-pair) str (second rex-pair)))
+            (cons str '(("\\[ " "[") (" \\]" "]") ("\\( " "(") (" \\)" ")"))))))
+  
 (defun normalize-js-code (str)
   (remove-spaces-near-brackets
    (trim-spaces
@@ -30,33 +30,11 @@
      (same-space-between-statements
       (normalize-whitespace str))))))
 
-(defmacro test-ps-js (testname parenscript javascript)
-  (let (
-       ;; (parenscript
-       ;;   `(progn
-       ;; (defpackage parenscript-test
-       ;; (:lisp-package :parenscript-test))
-       ;; ,parenscript)))
-       )
+(defmacro test-ps-js (testname parenscript javascript &key (js-target-version *js-target-version*))
   `(test ,testname ()
-    (setf js::*var-counter* 0)
-    
-    ;; is-macro expands its argument again when reporting failures, so
-    ;; the reported temporary js-variables get wrong if we don't evalute first.
-    (let* ((parenscript::*enable-package-system* nil)
-          (generated-code (compile-script ',parenscript))
-          (js-code ,javascript))
-      (is (string= (normalize-js-code generated-code)
-                   (normalize-js-code js-code)))))))
-
-(defmacro defpstest (testname (&key (optimize t) (enable-package-system t)) parenscript javascript)
-  `(test ,testname
-    (setf parenscript::*var-counter* 0)
-    (let* ((parenscript::*enable-package-system* ,enable-package-system)
-          (generated-code (compile-script ',parenscript))
-          (js-code ,javascript))
-      (is (string= (normalize-js-code generated-code)
-                   (normalize-js-code js-code))))))
+         (is (string= (normalize-js-code (let ((*js-target-version* ,js-target-version))
+                                           (ps-doc* ',parenscript)))
+                      (normalize-js-code ,javascript)))))
 
 (defun run-tests()
   (format t "Running reference tests:~&")
@@ -65,4 +43,3 @@
   (run! 'ps-tests)
   (format t "Running Package System tests:~&")
   (run! 'package-system-tests))
-