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

hdl.ast: handle int subclasses as slice start/stop values.

Browse source 
Fixes #601.
This commit is contained in:
whitequark 2021-03-18 23:52:23 +00:00
parent f7c2b9419f
commit c30dcea24d
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nmigen/hdl/ast.py
View file

@ -765,8 +765,8 @@ class Slice(Value):
super().__init__(src_loc_at=src_loc_at)
self.value = Value.cast(value)
self.start = start
self.stop = stop
self.start = int(start)
self.stop = int(stop)
def shape(self):
return Shape(self.stop - self.start)

6
tests/test_hdl_ast.py
View file

@ -630,6 +630,12 @@ class SliceTestCase(FHDLTestCase):
s1 = Slice(c, -4, -1)
self.assertEqual((s1.start, s1.stop), (4, 7))
def test_start_end_bool(self):
c = Const(0, 8)
s = Slice(c, False, True)
self.assertIs(type(s.start), int)
self.assertIs(type(s.stop), int)
def test_start_end_wrong(self):
with self.assertRaisesRegex(TypeError,
r"^Slice start must be an integer, not 'x'$"):