From 64059bfb3c0e3d334e39db5241b754787d6262d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Sat, 24 Jun 2023 22:07:20 +0200 Subject: [PATCH] Remove old utf8 string to list converter. --- src/Makefile | 2 +- src/util-string.scm | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile index 855a36a..8f2fc3f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -274,7 +274,7 @@ UTIL-IO-SOURCES=util-io.scm util-io.o: util-io.import.scm util-io.import.scm: $(UTIL-IO-SOURCES) -UTIL-STRING-SOURCES=util-string.scm testing.import.scm +UTIL-STRING-SOURCES=util-string.scm testing.import.scm util-utf8.scm util-string.o: util-string.import.scm util-string.import.scm: $(UTIL-STRING-SOURCES) diff --git a/src/util-string.scm b/src/util-string.scm index 584b3b5..7f8a465 100644 --- a/src/util-string.scm +++ b/src/util-string.scm @@ -41,7 +41,8 @@ (chicken base) (chicken string) (chicken irregex) - testing) + testing + util-utf8) ;; Extracts first token and the rest as separate string (define (string-first+rest str) @@ -54,13 +55,9 @@ (cons key-str val)) (cons str "")))) - ;; Converts given UTF-8 string into a list of UTF-8 string characters. - (define (string->list/utf8 str) - (irregex-extract (irregex "." 'u) str)) - ;; Encodes given UTF-8 string as quoted-printable (define (string->qp str) - (let loop ((lst (string->list/utf8 str)) + (let loop ((lst (utf8-string->list str)) (res '())) (if (null? lst) (string-intersperse (reverse res) "")