Added :regex tag -- an extension allowing to use posix regexp in address and header tests.

@@ -142,6 +142,8 @@
     #:contains)
     #:contains)
    ((member #:matches opt-args)
    ((member #:matches opt-args)
     #:matches)
     #:matches)
+   ((member #:regex opt-args)
+    #:regex)
    (else
    (else
     #:is)))
     #:is)))
 
 
@@ -198,10 +200,25 @@
 	  (set! cl (append (list ch #\\) cl)))
 	  (set! cl (append (list ch #\\) cl)))
 	 (else
 	 (else
 	  (set! cl (append (list ch) cl))))))))
 	  (set! cl (append (list ch) cl))))))))
-		  
-;;;; Standard tests:
 
 
 
 
+(define (get-regex match key comp)
+  (case match
+    ((#:matches)
+     (make-regexp (sieve-regexp-to-posix key)
+		  (if (eq? comp string-ci=?)
+		      regexp/icase
+		      '())))
+    ((#:regex)
+     (make-regexp key
+		  (if (eq? comp string-ci=?)
+		      regexp/icase
+		      '())))
+    (else
+     #f)))
+
+;;;; Standard tests:
+
 (define (test-address header-list key-list . opt-args)
 (define (test-address header-list key-list . opt-args)
   (let ((comp (find-comp opt-args))
   (let ((comp (find-comp opt-args))
 	(match (find-match opt-args))
 	(match (find-match opt-args))
@@ -219,12 +236,7 @@
 	  (let ((header-fields (mu-message-get-header-fields
 	  (let ((header-fields (mu-message-get-header-fields
 				sieve-current-message
 				sieve-current-message
 				header-list))
 				header-list))
-		(rx (if (eq? match #:matches)
-			(make-regexp (sieve-regexp-to-posix key)
-				     (if (eq? comp string-ci=?)
-					 regexp/icase
-					 '()))
-			#f)))
+		(rx (get-regex match key comp)))
 	    (for-each
 	    (for-each
 	     (lambda (h)
 	     (lambda (h)
 	       (let ((hdr (cdr h)))
 	       (let ((hdr (cdr h)))
@@ -247,7 +259,7 @@
 				 ((#:contains)
 				 ((#:contains)
 				  (if (sieve-str-str addr key comp)
 				  (if (sieve-str-str addr key comp)
 				      (exit #t)))
 				      (exit #t)))
-				 ((#:matches)
+				 ((#:matches #:regex)
 				  (if (regexp-exec rx addr)
 				  (if (regexp-exec rx addr)
 				      (exit #t))))
 				      (exit #t))))
 			       (runtime-message SIEVE-NOTICE
 			       (runtime-message SIEVE-NOTICE
@@ -311,12 +323,7 @@
 	  (let ((header-fields (mu-message-get-header-fields
 	  (let ((header-fields (mu-message-get-header-fields
 				sieve-current-message
 				sieve-current-message
 				header-list))
 				header-list))
-		(rx (if (eq? match #:matches)
-			(make-regexp (sieve-regexp-to-posix key)
-				     (if (eq? comp string-ci=?)
-					 regexp/icase
-					 '()))
-			#f)))
+		(rx (get-regex match key comp)))
 	    (for-each
 	    (for-each
 	     (lambda (h)
 	     (lambda (h)
 	       (let ((hdr (cdr h)))
 	       (let ((hdr (cdr h)))
@@ -328,7 +335,7 @@
 		       ((#:contains)
 		       ((#:contains)
 			(if (sieve-str-str hdr key comp)
 			(if (sieve-str-str hdr key comp)
 			    (exit #t)))
 			    (exit #t)))
-		       ((#:matches)
+		       ((#:matches #:regex)
 			(if (regexp-exec rx hdr)
 			(if (regexp-exec rx hdr)
 			    (exit #t)))))))
 			    (exit #t)))))))
 	     header-fields)))
 	     header-fields)))
@@ -341,7 +348,8 @@
 			   (cons "all" #f)))
 			   (cons "all" #f)))
 (define match-type   (list (cons "is" #f)
 (define match-type   (list (cons "is" #f)
 			   (cons "contains" #f)
 			   (cons "contains" #f)
-			   (cons "matches" #f)))
+			   (cons "matches" #f)
+			   (cons "regex" #f)))
 (define size-comp    (list (cons "under" #f)
 (define size-comp    (list (cons "under" #f)
 			   (cons "over" #f)))
 			   (cons "over" #f)))
 (define comparator   (list (cons "comparator" 'string)))
 (define comparator   (list (cons "comparator" 'string)))