Add lookup with index

ekiwi · Oct 29, 2024 · 3238a39 · 3238a39
1 parent c5d1f15
commit 3238a39
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/wellen/src/hierarchy.rs b/wellen/src/hierarchy.rs
@@ -737,15 +737,26 @@ impl Hierarchy {
     }
 
     pub fn lookup_var<N: AsRef<str>>(&self, path: &[N], name: &N) -> Option<VarRef> {
+        self.lookup_var_with_index(path, name, &None)
+    }
+
+    pub fn lookup_var_with_index<N: AsRef<str>>(
+        &self,
+        path: &[N],
+        name: &N,
+        index: &Option<VarIndex>,
+    ) -> Option<VarRef> {
         match path {
-            [] => self
-                .vars()
-                .find(|v| self.get(*v).name(self) == name.as_ref()),
+            [] => self.vars().find(|v| {
+                let v = self.get(*v);
+                v.name(self) == name.as_ref() && (index.is_none() || (v.index == *index))
+            }),
             scopes => {
                 let scope = self.get(self.lookup_scope(scopes)?);
-                scope
-                    .vars(self)
-                    .find(|v| self.get(*v).name(self) == name.as_ref())
+                scope.vars(self).find(|v| {
+                    let v = self.get(*v);
+                    v.name(self) == name.as_ref() && (index.is_none() || (v.index == *index))
+                })
             }
         }
     }