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

hdl._ast: fix _value_repr computation.

Browse source 
Fixes fallout from #1165.
This commit is contained in:
Wanda 2024-03-25 14:41:20 +01:00 • committed by Catherine
parent 11f7b887ad
commit efcd9a4538
5 changed files with 33 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
amaranth/hdl/_ast.py
View file

@ -1972,9 +1972,11 @@ class Signal(Value, DUID, metaclass=_SignalMeta):
if decoder is not None:
# The value representation is specified explicitly. Since we do not expose `hdl._repr`,
# this is the only way to add a custom filter to the signal right now. The setter sets
# `self._value_repr` as well as the compatibility `self.decoder`.
pass
# this is the only way to add a custom filter to the signal right now.
if isinstance(decoder, type) and issubclass(decoder, Enum):
self._value_repr = (_repr.Repr(_repr.FormatEnum(decoder), self),)
else:
self._value_repr = (_repr.Repr(_repr.FormatCustom(decoder), self),)
else:
# If it's an enum, expose it via `self.decoder` for compatibility, whether it's a Python
# enum or an Amaranth enum. This also sets the value representation, even for custom
@ -1995,20 +1997,16 @@ class Signal(Value, DUID, metaclass=_SignalMeta):
self._value_repr = (_repr.Repr(_repr.FormatInt(), self),)
# Compute the value representation that will be used by Amaranth.
if decoder is None:
self._value_repr = (_repr.Repr(_repr.FormatInt(), self),)
self._decoder = None
elif not (isinstance(decoder, type) and issubclass(decoder, Enum)):
self._value_repr = (_repr.Repr(_repr.FormatCustom(decoder), self),)
self._decoder = decoder
else: # Violence. In the name of backwards compatibility!
self._value_repr = (_repr.Repr(_repr.FormatEnum(decoder), self),)
if isinstance(decoder, type) and issubclass(decoder, Enum):
# Violence. In the name of backwards compatibility!
def enum_decoder(value):
try:
return "{0.name:}/{0.value:}".format(decoder(value))
except ValueError:
return str(value)
self._decoder = enum_decoder
else:
self._decoder = decoder
@property
def width(self):

12
amaranth/hdl/_repr.py
View file

@ -14,6 +14,9 @@ class FormatInt(Format):
def format(self, value):
return f"{value:d}"
def __repr__(self):
return f"FormatInt()"
class FormatEnum(Format):
def __init__(self, enum):
@ -25,6 +28,9 @@ class FormatEnum(Format):
except ValueError:
return f"?/{value:d}"
def __repr__(self):
return f"FormatEnum({self.enum.__name__})"
class FormatCustom(Format):
def __init__(self, formatter):
@ -33,6 +39,9 @@ class FormatCustom(Format):
def format(self, value):
return self.formatter(value)
def __repr__(self):
return f"FormatCustom({self.formatter})"
class Repr:
def __init__(self, format, value, *, path=()):
@ -44,3 +53,6 @@ class Repr:
self.format = format
self.value = value
self.path = path
def __repr__(self):
return f"Repr({self.format!r}, {self.value!r}, {self.path!r})"