regex patch

Suggested by: Lou Vanek <vanek@acd.net>

diff --git a/docs/manual.pdf b/docs/manual.pdf
index 6c53cfb..739344e 100644 (file)
Binary files a/docs/manual.pdf and b/docs/manual.pdf differ

diff --git a/docs/reference.lisp b/docs/reference.lisp
index c7ae72f..70a718f 100644 (file)
--- a/docs/reference.lisp
+++ b/docs/reference.lisp
@@ -233,9 +233,14 @@ an-object.foo => anObject.foo
 ;
 ; regex ::= a Lisp string
 
-;;; Regular expressions can be created by using the `REGEX' form. The
-;;; regex form actually does nothing at all to its argument, and
-;;; prints it as is.
+;;; Regular expressions can be created by using the `REGEX' form. If
+;;; the argument does not start with a slash, it is surrounded by
+;;; slashes to make it a proper JavaScript regex. If the argument
+;;; starts with a slash it is left as it is. This makes it possible
+;;; to use modifiers such as slash-i (case-insensitive) or
+;;; slash-g (match-globally (all)).
+
+(regex "foobar") => /foobar/
 
 (regex "/foobar/i") => /foobar/i
 

diff --git a/src/js.lisp b/src/js.lisp
index 329e8b2..e543092 100644 (file)
--- a/src/js.lisp
+++ b/src/js.lisp
@@ -1313,9 +1313,14 @@ vice-versa.")
 (define-js-compiler-macro regex (regex)
   (make-instance 'regex :value (string regex)))
 
+(defun first-slash-p (string)
+  (and (> (length string) 0)
+       (eq (char string 0) '#\/)))
+
 (defmethod js-to-strings ((regex regex) start-pos)
-  (declare (ignore start-pos))
-  (list (format nil "/~A/" (value regex))))
+   (declare (ignore start-pos))
+   (let ((slash (if (first-slash-p (value regex)) nil "/")))
+     (list (format nil (concatenate 'string slash "~A" slash) (value regex)))))
 
 ;;; conditional compilation
 

diff --git a/t/ref2test.lisp b/t/ref2test.lisp
index a1cee4e..84c3dde 100644 (file)
--- a/t/ref2test.lisp
+++ b/t/ref2test.lisp
@@ -67,8 +67,8 @@
                  ((search "=>" (subseq built (+ 1 sep-pos)))
                   (format t "Error , two separators found~%"))
                  ((and (string= heading "regular-expression-literals")
-                       (= 2 heading-count)) ;requires cl-interpol reader
-                  (format t "Skipping regex-test two~&"))
+                       (= 3 heading-count)) ;requires cl-interpol reader
+                  (format t "Skipping regex-test with cl-interpol&"))
                  ((and lisp-part javascript-part)
                   (format out-stream "(test-ps-js ~a-~a~%  ~a~%  \"~a\")~%~%"
                           heading heading-count

diff --git a/t/reference-tests.lisp b/t/reference-tests.lisp
index 4d3e821..b010ad4 100644 (file)
--- a/t/reference-tests.lisp
+++ b/t/reference-tests.lisp
@@ -112,6 +112,10 @@
   "this.a + this.b + this.c;")
 
 (test-ps-js regular-expression-literals-1
+  (regex "foobar")
+  "/foobar/")
+
+(test-ps-js regular-expression-literals-2
   (regex "/foobar/i")
   "/foobar/i")