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

hdl.rec: fix slicing of records.

Browse source
This commit is contained in:
whitequark 2019-04-19 19:55:39 +00:00
parent dda8f34d39
commit 611c25f909
2 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
nmigen/hdl/rec.py
View file

@ -85,16 +85,19 @@ class Record(Value):
def __getattr__(self, name):
return self[name]
def __getitem__(self, name):
try:
return self.fields[name]
except KeyError:
if self.name is None:
reference = "Unnamed record"
else:
reference = "Record '{}'".format(self.name)
raise NameError("{} does not have a field '{}'. Did you mean one of: {}?"
.format(reference, name, ", ".join(self.fields))) from None
def __getitem__(self, item):
if isinstance(item, str):
try:
return self.fields[item]
except KeyError:
if self.name is None:
reference = "Unnamed record"
else:
reference = "Record '{}'".format(self.name)
raise NameError("{} does not have a field '{}'. Did you mean one of: {}?"
.format(reference, item, ", ".join(self.fields))) from None
else:
return super().__getitem__(item)
def shape(self):
return sum(len(f) for f in self.fields.values()), False