stdlib: rename has to includes, add Identity bound where previo…

…usly missing
core-lang · Dec 18, 2023 · d32945c · d32945c
1 parent 6357f76
commit d32945c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/dora/stdlib/collections.dora b/dora/stdlib/collections.dora
@@ -278,11 +278,11 @@ impl[T: Equals] Array[T] {
 }
 
 impl[T: Identity] Array[T] {
-  @pub fun has(value: T): Bool {
+  @pub fun includes(val: T): Bool {
     var i = 0i64;
 
     while i < self.size() {
-      if self.get(i).identicalTo(value) {
+      if self.get(i).identicalTo(val) {
         return true;
       }
       i = i + 1i64;
@@ -1347,11 +1347,11 @@ impl[T: Equals] List[T] {
 }
 
 impl[T: Identity] List[T] {
-  @pub fun has(value: T): Bool {
+  @pub fun includes(val: T): Bool {
     var i = 0i64;
 
     while i < self.size() {
-      if self.get(i).identicalTo(value) {
+      if self.get(i).identicalTo(val) {
         return true;
       }
       i = i + 1i64;

diff --git a/dora/stdlib/primitives.dora b/dora/stdlib/primitives.dora
@@ -1,4 +1,4 @@
-use std.traits.{Default, Equals, Hash, Iterator, Zero};
+use std.traits.{Default, Equals, Hash, Identity, Iterator, Zero};
 use std.string.Stringable;
 use std.fatalError;
 
@@ -467,10 +467,6 @@ impl[T] Option[T] {
     ... is Some(value) { value }
     ... is None        { alt   };
 
-  @pub fun has(val: T): Bool = if self
-    ... is Some(actual) { actual === val }
-    ... is None         { false };
-
   @pub fun all(fct: (T): Bool): Bool = if self
     ... is Some(val) { fct(val) }
     ... is None      { true     };
@@ -510,6 +506,12 @@ impl[T] Option[Option[T]] {
     ... is None      { None[T] };
 }
 
+impl[T: Equals] Option[T] {
+  @pub fun includes(val: T): Bool = if self
+    ... is Some(actual) { actual === val }
+    ... is None         { false };
+}
+
 impl[T: Equals] Equals for Option[T] {
   @pub fun equals(rhs: Option[T]): Bool {
     if self.isSome() {
@@ -581,10 +583,6 @@ impl[T, E] Result[T, E] {
     ... is Ok(_)      { fatalError("cannot unwrap Ok."); unreachable[E]() }
     ... is Err(value) { value };
 
-  @pub fun has(val: T): Bool = if self
-    ... is Ok(actual) { actual === val }
-    ... is Err(_)     { false };
-
   @pub fun all(fct: (T): Bool): Bool = if self
     ... is Ok(val) { fct(val) }
     ... is Err(_)  { true     };
@@ -626,6 +624,12 @@ impl[T, E] Result[T, E] {
     ... is Err(_)  { None[T] };
 }
 
+impl[T: Identity, E] Result[T, E] {
+  @pub fun includes(val: T): Bool = if self
+    ... is Ok(actual) { actual.identicalTo(val) }
+    ... is Err(_)     { false };
+}
+
 impl[T: Equals, E] Result[T, E] {
   @pub fun contains(rhs: T): Bool = if self
     ... is Ok(val) { val.equals(rhs) }