hdl.dsl: type check when adding to m.domains.

diff --git a/nmigen/hdl/dsl.py b/nmigen/hdl/dsl.py
index 83637374e22d5ab898dffa94d295f8f5496836ae..aaecd9c503f951dd7473025512c17c465a5c29ca 100644 (file)
--- a/nmigen/hdl/dsl.py
+++ b/nmigen/hdl/dsl.py
@@ -9,6 +9,7 @@ from .._utils import flatten, bits_for, deprecated
 from .. import tracer
 from .ast import *
 from .ir import *
+from .cd import *
 from .xfrm import *
 
 
@@ -107,10 +108,16 @@ class _ModuleBuilderDomainSet:
 
     def __iadd__(self, domains):
         for domain in flatten([domains]):
+            if not isinstance(domain, ClockDomain):
+                raise TypeError("Only clock domains may be added to `m.domains`, not {!r}"
+                                .format(domain))
             self._builder._add_domain(domain)
         return self
 
     def __setattr__(self, name, domain):
+        if not isinstance(domain, ClockDomain):
+            raise TypeError("Only clock domains may be added to `m.domains`, not {!r}"
+                            .format(domain))
         self._builder._add_domain(domain)
 
 

diff --git a/nmigen/test/test_hdl_dsl.py b/nmigen/test/test_hdl_dsl.py
index cc8467c87a6e6c5ee509db38e0d3a4c55854337b..959c6e506367b27db88a36483863bf54c25c8a09 100644 (file)
--- a/nmigen/test/test_hdl_dsl.py
+++ b/nmigen/test/test_hdl_dsl.py
@@ -707,6 +707,15 @@ class DSLTestCase(FHDLTestCase):
         self.assertEqual(len(m._domains), 1)
         self.assertEqual(m._domains[0].name, "foo")
 
+    def test_domain_add_wrong(self):
+        m = Module()
+        with self.assertRaises(TypeError,
+                msg="Only clock domains may be added to `m.domains`, not 1"):
+            m.domains.foo = 1
+        with self.assertRaises(TypeError,
+                msg="Only clock domains may be added to `m.domains`, not 1"):
+            m.domains += 1
+
     def test_lower(self):
         m1 = Module()
         m1.d.comb += self.c1.eq(self.s1)