tweak with guard (moonbitlang#974)

yj-qin · Sep 11, 2024 · 0ac328a · 0ac328a
1 parent fcc145d
commit 0ac328a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/builtin/arraycore.mbt b/builtin/arraycore.mbt
@@ -72,8 +72,9 @@ pub fn length[T](self : Array[T]) -> Int {
 
 fn set_length[T](self : Array[T], new_len : Int) -> Unit {
   // assert new_len >= 0 && new_len <= self.buf.len
-  if new_len < self.len {
-    for i = new_len; i < self.len; i = i + 1 {
+  let len = self.len
+  if new_len < len {
+    for i in new_len..<len {
       self.buf.set_null(i)
     }
   }

diff --git a/builtin/arrayview.mbt b/builtin/arrayview.mbt
@@ -60,21 +60,14 @@ pub fn op_as_view[T](
   ~start : Int,
   ~end? : Int
 ) -> ArrayView[T] {
+  let len = self.length()
   let end = match end {
-    None => self.length()
-    Some(end) =>
-      if end > self.length() {
-        abort("View end index out of bounds")
-      } else {
-        end
-      }
+    None => len
+    Some(end) => end
   }
-  if start < 0 {
+  guard start >= 0 && start <= end && end <= len else {
     abort("View start index out of bounds")
   }
-  if start > end {
-    abort("View start index greater than end index")
-  }
   ArrayView::{ buf: self.buffer(), start, len: end - start }
 }