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

hdl.rec: fix Record.like() being called through a subclass.

Browse source 
The subclass does not necessarily take layout as the first argument.
This commit is contained in:
whitequark 2019-11-09 16:44:01 +00:00
parent dc2a09b8b9
commit f8f7d83127
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nmigen/hdl/rec.py
View file

@ -83,8 +83,8 @@ class Layout:
# Unlike most Values, Record *can* be subclassed. # Unlike most Values, Record *can* be subclassed.
class Record(Value): class Record(Value):
@classmethod @staticmethod
def like(cls, other, *, name=None, name_suffix=None, src_loc_at=0): def like(other, *, name=None, name_suffix=None, src_loc_at=0):
if name is not None: if name is not None:
new_name = str(name) new_name = str(name)
elif name_suffix is not None: elif name_suffix is not None:
@ -107,7 +107,7 @@ class Record(Value):
fields[field_name] = Signal.like(field, name=concat(new_name, field_name), fields[field_name] = Signal.like(field, name=concat(new_name, field_name),
src_loc_at=1 + src_loc_at) src_loc_at=1 + src_loc_at)
return cls(other.layout, name=new_name, fields=fields, src_loc_at=1) return Record(other.layout, name=new_name, fields=fields, src_loc_at=1)
def __init__(self, layout, *, name=None, fields=None, src_loc_at=0): def __init__(self, layout, *, name=None, fields=None, src_loc_at=0):
if name is None: if name is None: