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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nmigen/hdl/rec.py
View file

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

9
nmigen/test/test_hdl_rec.py
View file

@ -79,6 +79,15 @@ class RecordTestCase(FHDLTestCase):
self.assertEqual(repr(r), "(rec <unnamed> stb)") self.assertEqual(repr(r), "(rec <unnamed> stb)")
self.assertEqual(r.stb.name, "stb") self.assertEqual(r.stb.name, "stb")
def test_iter(self):
r = Record([
("data", 4),
("stb", 1),
])
self.assertEqual(repr(r[0]), "(slice (rec r data stb) 0:1)")
self.assertEqual(repr(r[0:3]), "(slice (rec r data stb) 0:3)")
def test_wrong_field(self): def test_wrong_field(self):
r = Record([ r = Record([
("stb", 1), ("stb", 1),