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

lib.wiring: flip sub-interfaces accessed via FlippedInterface.

Browse source
This commit is contained in:
William D. Jones 2023-11-15 18:03:13 -05:00 committed by Catherine
parent 1802f7fddd
commit abd74ead55
2 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
amaranth/lib/wiring.py
View file

@ -570,6 +570,9 @@ class FlippedInterface:
value = getattr(self.__unflipped, name)
if inspect.ismethod(value):
return types.MethodType(value.__func__, self)
elif name in self.__unflipped.signature.members and \
self.__unflipped.signature.members[name].is_signature:
return flipped(value)
else:
return value

32
tests/test_lib_wiring.py
View file

@ -598,6 +598,38 @@ class FlippedInterfaceTestCase(unittest.TestCase):
flipped_interface = CustomSignature({}).flip().create()
self.assertTrue(hasattr(flipped_interface, "custom_method"))
def test_propagate_flipped(self):
class InterfaceWithFlippedSub(Component):
signature = Signature({
"a": In(Signature({
"b": Out(Signature({
"c": Out(1)
})),
"d": In(Signature({
"e": Out(1)
})),
"f": Out(1)
}))
})
def __init__(self):
super().__init__()
self.g = Signature({"h": In(1)})
ifsub = InterfaceWithFlippedSub()
self.assertIsInstance(ifsub.a.b.signature, FlippedSignature)
self.assertIsInstance(ifsub.a.d.signature, Signature)
self.assertIsInstance(ifsub.signature.members["a"].signature.
members["b"].signature, FlippedSignature)
self.assertIsInstance(ifsub.signature.members["a"].signature.
members["d"].signature, Signature)
self.assertIsInstance(ifsub.a.f, Signal)
self.assertEqual(ifsub.signature.members["a"].signature.
members["f"].flow, In)
self.assertIsInstance(flipped(ifsub).g, Signature)
self.assertEqual(ifsub.g.members["h"].flow, In)
self.assertEqual(flipped(ifsub).g.members["h"].flow, In)
class ConnectTestCase(unittest.TestCase):
def test_arg_handles_and_signature_attr(self):