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

lib.wiring: preserve insertion order in SignatureMembers.__iter__.

Browse source
This commit is contained in:
Jean-François Nguyen 2023-12-11 17:38:12 +01:00 • committed by Catherine
parent 8e6ae9e6e0
commit d154bddf17
2 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
amaranth/lib/wiring.py
View file

@ -163,7 +163,7 @@ class SignatureMembers(Mapping):
def __eq__(self, other):
return (isinstance(other, (SignatureMembers, FlippedSignatureMembers)) and
list(self.flatten()) == list(other.flatten()))
list(sorted(self.flatten())) == list(sorted(other.flatten())))
def __contains__(self, name):
return name in self._dict
@ -189,7 +189,7 @@ class SignatureMembers(Mapping):
raise SignatureError("Members cannot be removed from a signature")
def __iter__(self):
return iter(sorted(self._dict))
return iter(self._dict)
def __len__(self):
return len(self._dict)
@ -647,7 +647,7 @@ def connect(m, *args, **kwargs):
signatures[handle] = obj.signature
# Collate signatures and build connections.
flattens = {handle: signature.members.flatten()
flattens = {handle: iter(sorted(signature.members.flatten()))
for handle, signature in signatures.items()}
connections = []
# Each iteration of the outer loop is intended to connect several (usually a pair) members