From ec914ed1d4d3a601eb78638bb70fe9a8996ca4e1 Mon Sep 17 00:00:00 2001 From: Donald Sebastian Leung Date: Thu, 8 Oct 2020 13:44:39 +0800 Subject: [PATCH] Add variable keyword argument support to nmigen.hdl.rec.Record --- nmigen/hdl/rec.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/nmigen/hdl/rec.py b/nmigen/hdl/rec.py index 54b270af..6bb3b14b 100644 --- a/nmigen/hdl/rec.py +++ b/nmigen/hdl/rec.py @@ -78,7 +78,11 @@ def __eq__(self, other): # Unlike most Values, Record *can* be subclassed. class Record(Value): @staticmethod - def like(other, *, name=None, name_suffix=None, src_loc_at=0): + def like(other, *, name=None, name_suffix=None, src_loc_at=0, **kwargs): + kw = dict() + kw.update(other.kwargs) + kw.update(kwargs) + if name is not None: new_name = str(name) elif name_suffix is not None: @@ -96,14 +100,16 @@ def concat(a, b): field = other[field_name] if isinstance(field, Record): fields[field_name] = Record.like(field, name=concat(new_name, field_name), - src_loc_at=1 + src_loc_at) + src_loc_at=1 + src_loc_at, **kw) else: 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, **kw) + + return Record(other.layout, name=new_name, fields=fields, src_loc_at=1, **kw) - 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, **kwargs): + self.kwargs = kwargs - def __init__(self, layout, *, name=None, fields=None, src_loc_at=0): if name is None: name = tracer.get_var_name(depth=2 + src_loc_at, default=None) @@ -128,10 +134,10 @@ def concat(a, b): else: if isinstance(field_shape, Layout): self.fields[field_name] = Record(field_shape, name=concat(name, field_name), - src_loc_at=1 + src_loc_at) + src_loc_at=1 + src_loc_at, **kwargs) else: self.fields[field_name] = Signal(field_shape, name=concat(name, field_name), - src_loc_at=1 + src_loc_at) + src_loc_at=1 + src_loc_at, **kwargs) def __getattr__(self, name): return self[name]