!108 forall, exists, count and contains for case-string in (liii scala)

GoldfishScheme.tmu

@@ -10618,6 +10618,10 @@
   <\scm-chunk|goldfish/srfi/srfi-13.scm|true|true>
     (define (string-count str char/pred? . start+end)
 
+    \ \ (when (not (string? str))
+
+    \ \ \ \ (type-error "string-count: first parameter must be string"))
+
     \ \ (let ((str-sub (%string-from-range str start+end))
 
     \ \ \ \ \ \ \ \ (criterion (%make-criterion char/pred?)))

goldfish/liii/scala.scm

@@ -95,6 +95,18 @@
 (define (%length)
   (string-length data))
 
+(define (%forall pred)
+  (string-every pred data))
+
+(define (%exists pred)
+  (string-any pred data))
+
+(define (%contains ch)
+  (string-any (lambda (x) (equal? x ch)) data))
+
+(define (%count pred?)
+  (string-count data pred?))
+
 )
 
 (define-case-class case-list ((data list?))
@@ -155,9 +167,6 @@
           ((length=? 1 xs) (count (car xs) data))
           (else (error 'wrong-number-of-args "case-list%count" xs))))
 
-  (define (%forall pred)
-    (every pred data))
-
   (define (%fold initial f)
     (fold f initial data))
 

goldfish/srfi/srfi-13.scm

@@ -278,6 +278,8 @@
               (loop (+ i 1)))))))
 
 (define (string-count str char/pred? . start+end)
+  (when (not (string? str))
+    (type-error "string-count: first parameter must be string"))
   (let ((str-sub (%string-from-range str start+end))
         (criterion (%make-criterion char/pred?)))
     (count criterion (string->list str-sub))))

liii_scala.tmu

@@ -437,6 +437,70 @@
     \;
   </scm-chunk>
 
+  <paragraph|case-string%forall>
+
+  检查字符串中的所有字符是否都满足给定的谓词。
+
+  <\goldfish-chunk|goldfish/liii/scala.scm|true|true>
+    (define (%forall pred)
+
+    \ \ (string-every pred data))
+
+    \;
+  </goldfish-chunk>
+
+  <paragraph|case-string%exists>
+
+  检查字符串中是否存在至少一个字符满足给定的谓词。
+
+  <\goldfish-chunk|goldfish/liii/scala.scm|true|true>
+    (define (%exists pred)
+
+    \ \ (string-any pred data))
+
+    \;
+  </goldfish-chunk>
+
+  <paragraph|case-string%contains>
+
+  检查字符串中是否包含指定的字符。
+
+  <\goldfish-chunk|goldfish/liii/scala.scm|true|true>
+    (define (%contains ch)
+
+    \ \ (string-any (lambda (x) (equal? x ch)) data))
+
+    \;
+  </goldfish-chunk>
+
+  <paragraph|case-string%count>
+
+  计算字符串中满足给定谓词的字符的数量
+
+  <\goldfish-chunk|goldfish/liii/scala.scm|true|true>
+    (define (%count pred?)
+
+    \ \ (string-count data pred?))
+
+    \;
+  </goldfish-chunk>
+
+  <\goldfish-chunk|tests/goldfish/liii/scala-test.scm|true|true>
+    (let1 str (case-string "Hello, World!")
+
+    \ \ (check (str :forall char-alphabetic?) =\<gtr\> #f)
+
+    \ \ (check (str :exists char-alphabetic?) =\<gtr\> #t)
+
+    \ \ (check (str :contains #\\W) =\<gtr\> #t)
+
+    \ \ (check (str :count char-alphabetic?) =\<gtr\> 10)
+
+    )
+
+    \;
+  </goldfish-chunk>
+
   <\scm-chunk|goldfish/liii/scala.scm|true|true>
     )
 
@@ -584,9 +648,19 @@
   </goldfish-chunk>
 
   <\goldfish-chunk|tests/goldfish/liii/scala-test.scm|true|true>
-    (let1 l (case-list '(1 2 3))
+    (let1 lst (case-list '(1 2 3 4 5))
 
-    \ \ (check-true (l :forall positive?)))
+    \ \ (check (lst :forall (lambda (x) (\<gtr\> x 0))) =\<gtr\> #t)
+
+    \ \ (check (lst :forall (lambda (x) (\<gtr\> x 3))) =\<gtr\> #f)
+
+    )
+
+    \;
+
+    (let1 empty-lst (case-list '())
+
+    \ \ (check (empty-lst :forall (lambda (x) (\<gtr\> x 0))) =\<gtr\> #t))
 
     \;
   </goldfish-chunk>
@@ -693,33 +767,7 @@
     \;
   </scm-chunk>
 
-  <paragraph|case-list%forall>
-
-  <\scm-chunk|goldfish/liii/scala.scm|true|true>
-    \ \ (define (%forall pred)
-
-    \ \ \ \ (every pred data))
-
-    \;
-  </scm-chunk>
-
-  <\scm-chunk|tests/goldfish/liii/scala-test.scm|true|true>
-    (let ((lst (case-list '(1 2 3 4 5))))
-
-    \ \ (check (lst :forall (lambda (x) (\<gtr\> x 0))) =\<gtr\> #t)
-
-    \ \ (check (lst :forall (lambda (x) (\<gtr\> x 3))) =\<gtr\> #f)
-
-    )
-
-    \;
-
-    (let ((empty-lst (case-list '())))
-
-    \ \ \ \ (check (empty-lst :forall (lambda (x) (\<gtr\> x 0))) =\<gtr\> #t))
-
-    \;
-  </scm-chunk>
+  \;
 
   <subparagraph|fold>
 
@@ -929,7 +977,7 @@
 
   <paragraph|case-vector%take-right>
 
-  <\scm-chunk|goldfish/liii/scala.scm|true|true>
+  <\goldfish-chunk|goldfish/liii/scala.scm|true|true>
     \ \ (define (%take-right x . xs)
 
     \ \ \ \ (typed-define (scala-take-right (data vector?) (n integer?))
@@ -961,7 +1009,7 @@
     \ \ \ \ \ \ (if (null? xs) r (apply r xs))))
 
     \;
-  </scm-chunk>
+  </goldfish-chunk>
 
   <\goldfish-chunk|tests/goldfish/liii/scala-test.scm|true|true>
     (let ((vec (case-vector #(1 2 3 4 5))))

tests/goldfish/liii/scala-test.scm

@@ -77,6 +77,13 @@
 
 (check ((case-string "abc") :length) => 3)
 
+(let1 str (case-string "Hello, World!")
+  (check (str :forall char-alphabetic?) => #f)
+  (check (str :exists char-alphabetic?) => #t)
+  (check (str :contains #\W) => #t)
+  (check (str :count char-alphabetic?) => 10)
+)
+
 (let ((lst (case-list '(1 2 3 4 5))))
   (check (lst :take -1 :collect) => '())
   (check (lst :take 0 :collect) => '())
@@ -93,8 +100,13 @@
   (check (lst :take-right 10 :collect) => '(1 2 3 4 5))
 )
 
-(let1 l (case-list '(1 2 3))
-  (check-true (l :forall positive?)))
+(let1 lst (case-list '(1 2 3 4 5))
+  (check (lst :forall (lambda (x) (> x 0))) => #t)
+  (check (lst :forall (lambda (x) (> x 3))) => #f)
+)
+
+(let1 empty-lst (case-list '())
+  (check (empty-lst :forall (lambda (x) (> x 0))) => #t))
 
 (let1 l (case-list '(1 2 3))
   (check-true (l :exists even?)))
@@ -117,14 +129,6 @@
 (check ((case-list (list 1 2 3)) :count) => 3)
 (check ((case-list (list 1 2 3)) :count (cut > <> 1)) => 2)
 
-(let ((lst (case-list '(1 2 3 4 5))))
-  (check (lst :forall (lambda (x) (> x 0))) => #t)
-  (check (lst :forall (lambda (x) (> x 3))) => #f)
-)
-
-(let ((empty-lst (case-list '())))
-    (check (empty-lst :forall (lambda (x) (> x 0))) => #t))
-
 (let ((lst (case-list '(1 2 3 4 5))))
   (check (lst :fold 0 +) => 15)
   (check (lst :fold '() (lambda (x acc) (cons x acc))) => '(5 4 3 2 1))