Fixed missing logic in LazyList.

MeltyPlayer · Nov 28, 2023 · d6209b8 · d6209b8
1 parent 401a06b
commit d6209b8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/FinModelUtility/Fin/Fin/src/data/lazy/LazyArray.cs b/FinModelUtility/Fin/Fin/src/data/lazy/LazyArray.cs
@@ -49,10 +49,9 @@ public bool TryGetValue(int key, out T value) {
       return false;
     }
 
-
     public T this[int key] {
       get {
-        if (this.populated_[key]) {
+        if (this.ContainsKey(key)) {
           return this.impl_[key];
         }
 

diff --git a/FinModelUtility/Fin/Fin/src/data/lazy/LazyList.cs b/FinModelUtility/Fin/Fin/src/data/lazy/LazyList.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -26,8 +27,18 @@ public void Clear() {
       this.populated_.Clear();
     }
 
-    public bool ContainsKey(int key) => this.populated_[key];
+    public bool ContainsKey(int key)
+      => this.populated_.Count > key && this.populated_[key];
 
+    public bool TryGetValue(int key, out T value) {
+      if (this.ContainsKey(key)) {
+        value = this.impl_[key];
+        return true;
+      }
+
+      value = default;
+      return false;
+    }
 
     public T this[int key] {
       get {
@@ -59,5 +70,15 @@ public IEnumerable<int> Keys
 
     public IEnumerable<T> Values
       => this.impl_.Where((value, i) => ContainsKey(i));
+
+    IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+
+    public IEnumerator<(int Key, T Value)> GetEnumerator() {
+      for (var i = 0; i < this.populated_.Count; ++i) {
+        if (this.populated_[i]) {
+          yield return (i, this.impl_[i]);
+        }
+      }
+    }
   }
 }