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

build.dsl: allow strings to be used as connector numbers.

Browse source 
Fixes #311.
This commit is contained in:
Jaro Habiger 2020-01-26 18:35:41 +01:00 committed by whitequark
parent 7792a6cd9f
commit ec3a21939e
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nmigen/build/dsl.py
View file

@ -14,8 +14,9 @@ class Pins:
if conn is not None: if conn is not None:
conn_name, conn_number = conn conn_name, conn_number = conn
if not (isinstance(conn_name, str) and isinstance(conn_number, int)): if not (isinstance(conn_name, str) and isinstance(conn_number, (int, str))):
raise TypeError("Connector must be None or a pair of string and integer, not {!r}" raise TypeError("Connector must be None or a pair of string (connector name) and "
"integer/string (connector number), not {!r}"
.format(conn)) .format(conn))
names = ["{}_{}:{}".format(conn_name, conn_number, name) for name in names] names = ["{}_{}:{}".format(conn_name, conn_number, name) for name in names]
@ -236,8 +237,9 @@ class Connector:
if conn is not None: if conn is not None:
conn_name, conn_number = conn conn_name, conn_number = conn
if not (isinstance(conn_name, str) and isinstance(conn_number, int)): if not (isinstance(conn_name, str) and isinstance(conn_number, (int, str))):
raise TypeError("Connector must be None or a pair of string and integer, not {!r}" raise TypeError("Connector must be None or a pair of string (connector name) and "
"integer/string (connector number), not {!r}"
.format(conn)) .format(conn))
for conn_pin, plat_pin in mapping.items(): for conn_pin, plat_pin in mapping.items():

19
nmigen/test/test_build_dsl.py
View file

@ -25,6 +25,8 @@ class PinsTestCase(FHDLTestCase):
def test_conn(self): def test_conn(self):
p = Pins("0 1 2", conn=("pmod", 0)) p = Pins("0 1 2", conn=("pmod", 0))
self.assertEqual(list(p), ["pmod_0:0", "pmod_0:1", "pmod_0:2"]) self.assertEqual(list(p), ["pmod_0:0", "pmod_0:1", "pmod_0:2"])
p = Pins("0 1 2", conn=("pmod", "a"))
self.assertEqual(list(p), ["pmod_a:0", "pmod_a:1", "pmod_a:2"])
def test_map_names(self): def test_map_names(self):
p = Pins("0 1 2", conn=("pmod", 0)) p = Pins("0 1 2", conn=("pmod", 0))
@ -53,6 +55,12 @@ class PinsTestCase(FHDLTestCase):
msg="Direction must be one of \"i\", \"o\", \"oe\", or \"io\", not 'wrong'"): msg="Direction must be one of \"i\", \"o\", \"oe\", or \"io\", not 'wrong'"):
p = Pins("A0 A1", dir="wrong") p = Pins("A0 A1", dir="wrong")
def test_wrong_conn(self):
with self.assertRaises(TypeError,
msg="Connector must be None or a pair of string (connector name) and "
"integer/string (connector number), not ('foo', None)"):
p = Pins("A0 A1", conn=("foo", None))
def test_wrong_map_names(self): def test_wrong_map_names(self):
p = Pins("0 1 2", conn=("pmod", 0)) p = Pins("0 1 2", conn=("pmod", 0))
mapping = { mapping = {
@ -295,6 +303,17 @@ class ConnectorTestCase(FHDLTestCase):
("10", "expansion_0:7"), ("10", "expansion_0:7"),
])) ]))
def test_str_name(self):
c = Connector("ext", "A", "0 1 2")
self.assertEqual(c.name, "ext")
self.assertEqual(c.number, "A")
def test_conn_wrong_name(self):
with self.assertRaises(TypeError,
msg="Connector must be None or a pair of string (connector name) and "
"integer/string (connector number), not ('foo', None)"):
Connector("ext", "A", "0 1 2", conn=("foo", None))
def test_wrong_io(self): def test_wrong_io(self):
with self.assertRaises(TypeError, with self.assertRaises(TypeError,
msg="Connector I/Os must be a dictionary or a string, not []"): msg="Connector I/Os must be a dictionary or a string, not []"):