Changeset 12131 in project

Timestamp:

10/09/08 12:46:42 (12 years ago)

Author:

felix winkelmann

Message:

disabled invalid test; regex fixes - at least string-match-positions doesn't seem to return the same results

Location:

chicken/branches/irregular

Files:

• regex.scm (modified) (4 diffs)
• tests/re-tests.txt (modified) (1 diff)

chicken/branches/irregular/regex.scm

@@ -76 +76 @@
       opts))) )
 
+(define (unregexp x)
+  (cond ((regexp? x) (regexp-x x))
+        ((irregex? x) x)
+        (else (irregex x))))
+
 (define (string-match rx str)
-  (let ((rx (irregex rx)))
+  (let ((rx (unregexp rx)))
     (and-let* ((m (irregex-match rx str)))
       (let ((n (irregex-submatches rx)))
@@ -88 +93 @@
 
 (define (string-match-positions rx str)
-  (let ((rx (irregex rx)))
+  (let ((rx (unregexp rx)))
     (and-let* ((m (irregex-match rx str)))
       (let ((n (irregex-submatches m)))
@@ -102 +107 @@
 
 (define (string-search rx str #!optional (start 0) (range (string-length str)))
-  (let ((rx (irregex rx)))
+  (let ((rx (unregexp rx)))
     (and-let* ((m (irregex-search rx str start (fx+ start range))))
       (let loop ((i (irregex-submatches rx)) 
@@ -112 +117 @@
 
 (define (string-search-positions rx str #!optional (start 0) (range (string-length str)))
-  (let ((rx (irregex rx)))
+  (let ((rx (unregexp rx)))
     (and-let* ((m (irregex-search rx str start (fx+ start range))))
       (let loop ((i (irregex-submatches rx))

chicken/branches/irregular/tests/re-tests.txt

@@ -119 +119 @@
 (bc+d$|ef*g.|h?i(j|k))  bcdd    n       -       -
 (bc+d$|ef*g.|h?i(j|k))  reffgz  y       &-\1-\2 effgz-effgz-
-((((((((((a))))))))))   -       c       -       -
 (((((((((a)))))))))     a       y       &       a
 multiple words of text  uh-uh   n       -       -