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

build.dsl: allow both str and int resource attributes.

Browse source
This commit is contained in:
whitequark 2019-08-30 08:35:52 +00:00
parent 98278a044d
commit a4b58cbf3a
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nmigen/build/dsl.py
View file

@ -92,8 +92,9 @@ def DiffPairsN(*args, **kwargs):
class Attrs(OrderedDict): class Attrs(OrderedDict):
def __init__(self, **attrs): def __init__(self, **attrs):
for key, value in attrs.items(): for key, value in attrs.items():
if not (value is None or isinstance(value, str) or hasattr(value, "__call__")): if not (value is None or isinstance(value, (str, int)) or hasattr(value, "__call__")):
raise TypeError("Value of attribute {} must be None, str, or callable, not {!r}" raise TypeError("Value of attribute {} must be None, int, str, or callable, "
"not {!r}"
.format(key, value)) .format(key, value))
super().__init__(**attrs) super().__init__(**attrs)
@ -103,10 +104,8 @@ class Attrs(OrderedDict):
for key, value in self.items(): for key, value in self.items():
if value is None: if value is None:
items.append("!" + key) items.append("!" + key)
elif hasattr(value, "__call__"):
items.append(key + "=" + repr(value))
else: else:
items.append(key + "=" + value) items.append(key + "=" + repr(value))
return "(attrs {})".format(" ".join(items)) return "(attrs {})".format(" ".join(items))

12
nmigen/test/test_build_dsl.py
View file

@ -109,9 +109,9 @@ class DiffPairsTestCase(FHDLTestCase):
class AttrsTestCase(FHDLTestCase): class AttrsTestCase(FHDLTestCase):
def test_basic(self): def test_basic(self):
a = Attrs(IO_STANDARD="LVCMOS33", PULLUP="1") a = Attrs(IO_STANDARD="LVCMOS33", PULLUP=1)
self.assertEqual(a["IO_STANDARD"], "LVCMOS33") self.assertEqual(a["IO_STANDARD"], "LVCMOS33")
self.assertEqual(repr(a), "(attrs IO_STANDARD=LVCMOS33 PULLUP=1)") self.assertEqual(repr(a), "(attrs IO_STANDARD='LVCMOS33' PULLUP=1)")
def test_remove(self): def test_remove(self):
a = Attrs(FOO=None) a = Attrs(FOO=None)
@ -126,8 +126,8 @@ class AttrsTestCase(FHDLTestCase):
def test_wrong_value(self): def test_wrong_value(self):
with self.assertRaises(TypeError, with self.assertRaises(TypeError,
msg="Value of attribute FOO must be None, str, or callable, not 1"): msg="Value of attribute FOO must be None, int, str, or callable, not 1.0"):
a = Attrs(FOO=1) a = Attrs(FOO=1.0)
class ClockTestCase(FHDLTestCase): class ClockTestCase(FHDLTestCase):
@ -142,7 +142,7 @@ class SubsignalTestCase(FHDLTestCase):
def test_basic_pins(self): def test_basic_pins(self):
s = Subsignal("a", Pins("A0"), Attrs(IOSTANDARD="LVCMOS33")) s = Subsignal("a", Pins("A0"), Attrs(IOSTANDARD="LVCMOS33"))
self.assertEqual(repr(s), self.assertEqual(repr(s),
"(subsignal a (pins io A0) (attrs IOSTANDARD=LVCMOS33))") "(subsignal a (pins io A0) (attrs IOSTANDARD='LVCMOS33'))")
def test_basic_diffpairs(self): def test_basic_diffpairs(self):
s = Subsignal("a", DiffPairs("A0", "B0")) s = Subsignal("a", DiffPairs("A0", "B0"))
@ -223,7 +223,7 @@ class ResourceTestCase(FHDLTestCase):
self.assertEqual(repr(r), "(resource serial 0" self.assertEqual(repr(r), "(resource serial 0"
" (subsignal tx (pins o A0))" " (subsignal tx (pins o A0))"
" (subsignal rx (pins i A1))" " (subsignal rx (pins i A1))"
" (attrs IOSTANDARD=LVCMOS33))") " (attrs IOSTANDARD='LVCMOS33'))")
def test_family(self): def test_family(self):
ios = [Subsignal("clk", Pins("A0", dir="o"))] ios = [Subsignal("clk", Pins("A0", dir="o"))]