Merge pull request #840 from candy-lang/more-text-functions

More text functions

packages/Core/list.candy

@@ -109,6 +109,46 @@ concatenate listA listB :=
     }
   }
 
+firstIndexWhere list predicate :=
+  needs (is list)
+  needs (function.is1 predicate)
+  recursive [list, Index: 0] { recurse [list, index] ->
+    ifElse (index | equals (list | length)) { NotFound } {
+      predicateResult = predicate (list | get index)
+      needs (bool.is predicateResult)
+      ifElse predicateResult { FoundAt index } { recurse [list, Index: int.add index 1] }
+    }
+  }
+firstWhere list predicate :=
+  needs (is list)
+  needs (function.is1 predicate)
+  list | firstIndexWhere predicate %
+    FoundAt index -> Found (list | get index)
+    NotFound -> NotFound
+firstIndexOf list item :=
+  needs (is list)
+  firstIndexWhere list { a -> a | equals item }
+lastIndexWhere list predicate :=
+  needs (is list)
+  needs (function.is1 predicate)
+  recursive [list, Index: list | lastIndex | result.unwrapOr (int.negate 1)] {
+    recurse [list, index] ->
+    ifElse (index | equals (int.negate 1)) { NotFound } {
+      predicateResult = predicate (list | get index)
+      needs (bool.is predicateResult)
+      ifElse predicateResult { FoundAt index } { recurse [list, Index: int.subtract index 1] }
+    }
+  }
+lastWhere list predicate :=
+  needs (is list)
+  needs (function.is1 predicate)
+  list | lastIndexWhere predicate %
+    FoundAt index -> Found (list | get index)
+    NotFound -> NotFound
+lastIndexOf list item :=
+  needs (is list)
+  lastIndexWhere list { a -> a | equals item }
+
 #test =
 #  [checkEquals] = use "..check"
 #

packages/Core/text.candy

@@ -2,6 +2,7 @@ builtins = use "Builtins"
 bool = use "..bool"
 [ifElse, recursive] = use "..controlFlow"
 [equals] = use "..equality"
+function = use "..function"
 int = use "..int"
 # iterable = use "..iterable"
 list = use "..list"
@@ -10,6 +11,9 @@ type = use "..type"
 
 is value := type.is value Text
 
+newline := "
+
+"
 rick := "
   We're no strangers to love
   You know the rules and so do I
@@ -122,16 +126,31 @@ trim text :=
   needs (is text)
   text | trimStart | trimEnd
 
-firstIndexOf text char :=
+firstIndexWhere text predicate :=
   needs (is text)
-  needs (is char)
-  needs (length char | equals 1)
-  recursive 0 { recurse i ->
-    ifElse
-      text | length | int.isGreaterThan i
-      { ifElse (text | characterAt i | equals char) { i } { i | int.add 1 | recurse } }
-      { int.negate 1 }
-  }
+  needs (function.is1 predicate)
+  text | characters | list.firstIndexWhere predicate
+firstIndexOf text character :=
+  needs (is text)
+  needs (is character)
+  needs (character | length | equals 1)
+  text | characters | list.firstIndexOf character
+lastIndexWhere text predicate :=
+  needs (is text)
+  needs (function.is1 predicate)
+  text | characters | list.lastIndexWhere predicate
+lastIndexOf text character :=
+  needs (is text)
+  needs (is character)
+  needs (character | length | equals 1)
+  text | characters | list.lastIndexOf character
+
+isAsciiDigit character :=
+  needs (is character)
+  needs (character | length | equals 1)
+  character %
+    "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" -> True
+    _ -> False
 
 repeat text times :=
   needs (is text)
@@ -143,23 +162,23 @@ repeat text times :=
     }
   }
 
-padStart text len char :=
+padStart text len character :=
   needs (is text)
   needs (int.is len)
-  needs (is char)
-  needs (char | length | equals 1)
+  needs (is character)
+  needs (character | length | equals 1)
   textLength = text | length
   ifElse (textLength | int.isGreaterThanOrEqualTo len) { text } {
-    (char | repeat (len | int.subtract textLength)) | concatenate text 
+    (character | repeat (len | int.subtract textLength)) | concatenate text
   }
-padEnd text len char :=
+padEnd text len character :=
   needs (is text)
   needs (int.is len)
-  needs (is char)
-  needs (char | length | equals 1)
+  needs (is character)
+  needs (character | length | equals 1)
   textLength = text | length
   ifElse (textLength | int.isGreaterThanOrEqualTo len) { text } {
-    text | concatenate (char | repeat (len | int.subtract textLength))
+    text | concatenate (character | repeat (len | int.subtract textLength))
   }
 
 #test =