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

lib.data: no loop required, we return or die.

Browse source
This commit is contained in:
Charlotte 2023-07-02 15:23:17 +10:00 committed by Catherine
parent cdf8fcc32f
commit f4b013ac73
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
amaranth/lib/data.py
View file

@ -674,14 +674,13 @@ class View(ValueCastable):
value = self.__target[field.offset:field.offset + field.width] value = self.__target[field.offset:field.offset + field.width]
# Field guarantees that the shape-castable object is well-formed, so there is no need # Field guarantees that the shape-castable object is well-formed, so there is no need
# to handle erroneous cases here. # to handle erroneous cases here.
while isinstance(shape, ShapeCastable): if isinstance(shape, ShapeCastable):
if hasattr(shape, "__call__"): value = shape(value)
value = shape(value) if not isinstance(value, (Value, ValueCastable)):
if not isinstance(value, (Value, ValueCastable)): raise TypeError("{!r}.__call__() must return a value or "
raise TypeError("{!r}.__call__() must return a value or " "a value-castable object, not {!r}"
"a value-castable object, not {!r}" .format(shape, value))
.format(shape, value)) return value
return value
if Shape.cast(shape).signed: if Shape.cast(shape).signed:
return value.as_signed() return value.as_signed()
else: else: