diff options
Diffstat (limited to 'test-suite/tests/regexp.test')
| -rw-r--r-- | test-suite/tests/regexp.test | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/test-suite/tests/regexp.test b/test-suite/tests/regexp.test index 6799423fc..d25a3d42d 100644 --- a/test-suite/tests/regexp.test +++ b/test-suite/tests/regexp.test @@ -155,14 +155,6 @@ (define char-code-limit 256) -;; Since `regexp-quote' uses string ports, and since it is used below -;; with non-ASCII characters, these ports must be Unicode-capable. -(define-syntax with-unicode - (syntax-rules () - ((_ exp) - (with-fluids ((%default-port-encoding "UTF-8")) - exp)))) - (with-test-prefix "regexp-quote" (pass-if-exception "no args" exception:wrong-num-args @@ -191,7 +183,7 @@ (s (string c))) (pass-if (list "char" i (format #f "~s ~s" c s)) (with-ascii-or-latin1-locale i - (let* ((q (with-unicode (regexp-quote s))) + (let* ((q (regexp-quote s)) (m (regexp-exec (make-regexp q flag) s))) (and (= 0 (match:start m)) (= 1 (match:end m)))))))) @@ -204,7 +196,7 @@ ((>= i 256)) (let* ((c (integer->char i)) (s (string #\a c)) - (q (with-unicode (regexp-quote s)))) + (q (regexp-quote s))) (pass-if (list "string \"aX\"" i (format #f "~s ~s ~s" c s q)) (with-ascii-or-latin1-locale i (let* ((m (regexp-exec (make-regexp q flag) s))) @@ -213,9 +205,9 @@ (pass-if "string of all chars" (with-latin1-locale - (let ((m (regexp-exec (make-regexp (with-unicode - (regexp-quote allchars)) - flag) allchars))) + (let ((m (regexp-exec (make-regexp (regexp-quote allchars) + flag) + allchars))) (and (= 0 (match:start m)) (= (string-length allchars) (match:end m))))))))) lst))) |