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

hdl.ast: fix ValueKey.__eq__.

Browse source
This commit is contained in:
Marcelina Kościelnicka 2023-06-07 17:17:44 +02:00 committed by Catherine
parent 20db537162
commit 3d3846e996
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
amaranth/hdl/ast.py
View file

@ -1745,7 +1745,7 @@ class ValueKey:
return False return False
if isinstance(self.value, Const): if isinstance(self.value, Const):
return self.value.value == other.value.value return self.value.value == other.value.value and self.value.width == other.value.width
elif isinstance(self.value, (Signal, AnyValue)): elif isinstance(self.value, (Signal, AnyValue)):
return self.value is other.value return self.value is other.value
elif isinstance(self.value, (ClockSignal, ResetSignal)): elif isinstance(self.value, (ClockSignal, ResetSignal)):
@ -1765,8 +1765,9 @@ class ValueKey:
self.value.width == other.value.width and self.value.width == other.value.width and
self.value.stride == other.value.stride) self.value.stride == other.value.stride)
elif isinstance(self.value, Cat): elif isinstance(self.value, Cat):
return all(ValueKey(a) == ValueKey(b) return (len(self.value.parts) == len(other.value.parts) and
for a, b in zip(self.value.parts, other.value.parts)) all(ValueKey(a) == ValueKey(b)
for a, b in zip(self.value.parts, other.value.parts)))
elif isinstance(self.value, Repl): elif isinstance(self.value, Repl):
return (ValueKey(self.value.value) == ValueKey(other.value.value) and return (ValueKey(self.value.value) == ValueKey(other.value.value) and
self.value.count == other.value.count) self.value.count == other.value.count)