usb-tools/amaranth
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

hdl.ast: handle Repl in ValueKey.

Browse source 
Fixes #735.
This commit is contained in:
Bastian Löher 2023-01-17 00:16:37 +01:00 committed by GitHub
parent e3b2ba4316
commit 427c82fcbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
amaranth/hdl/ast.py
View file

@ -1691,6 +1691,8 @@ class ValueKey:
tuple(ValueKey(e) for e in self.value._iter_as_values()))) tuple(ValueKey(e) for e in self.value._iter_as_values())))
elif isinstance(self.value, Sample): elif isinstance(self.value, Sample):
self._hash = hash((ValueKey(self.value.value), self.value.clocks, self.value.domain)) self._hash = hash((ValueKey(self.value.value), self.value.clocks, self.value.domain))
elif isinstance(self.value, Repl):
self._hash = hash((ValueKey(self.value.value), self.value.count))
elif isinstance(self.value, Initial): elif isinstance(self.value, Initial):
self._hash = 0 self._hash = 0
else: # :nocov: else: # :nocov:
@ -1729,6 +1731,9 @@ class ValueKey:
elif isinstance(self.value, Cat): elif isinstance(self.value, Cat):
return all(ValueKey(a) == ValueKey(b) return all(ValueKey(a) == ValueKey(b)
for a, b in zip(self.value.parts, other.value.parts)) for a, b in zip(self.value.parts, other.value.parts))
elif isinstance(self.value, Repl):
return (ValueKey(self.value.value) == ValueKey(other.value.value) and
self.value.count == other.value.count)
elif isinstance(self.value, ArrayProxy): elif isinstance(self.value, ArrayProxy):
return (ValueKey(self.value.index) == ValueKey(other.value.index) and return (ValueKey(self.value.index) == ValueKey(other.value.index) and
len(self.value.elems) == len(other.value.elems) and len(self.value.elems) == len(other.value.elems) and