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

build.dsl: check type of resource number.

Browse source 
Fixes #599.
This commit is contained in:
whitequark 2021-12-11 13:37:15 +00:00
parent 7e2b72826f
commit 7c161957bf
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
amaranth/build/dsl.py
View file

@ -197,8 +197,11 @@ class Resource(Subsignal):
return cls(name_or_number + name_suffix, number, *ios) return cls(name_or_number + name_suffix, number, *ios)
def __init__(self, name, number, *args): def __init__(self, name, number, *args):
super().__init__(name, *args) if not isinstance(number, int):
raise TypeError("Resource number must be an integer, not {!r}"
.format(number))
super().__init__(name, *args)
self.number = number self.number = number
def __repr__(self): def __repr__(self):

6
tests/test_build_dsl.py
View file

@ -242,6 +242,12 @@ class ResourceTestCase(FHDLTestCase):
" (subsignal rx (pins i A1))" " (subsignal rx (pins i A1))"
" (attrs IOSTANDARD='LVCMOS33'))") " (attrs IOSTANDARD='LVCMOS33'))")
def test_number_wrong(self):
with self.assertRaisesRegex(TypeError,
r"^Resource number must be an integer, not \(pins o 1\)$"):
# number omitted by accident
Resource("led", Pins("1", dir="o"))
def test_family(self): def test_family(self):
ios = [Subsignal("clk", Pins("A0", dir="o"))] ios = [Subsignal("clk", Pins("A0", dir="o"))]
r1 = Resource.family(0, default_name="spi", ios=ios) r1 = Resource.family(0, default_name="spi", ios=ios)