hdl._dsl: improve error message on m.domains.cd_foo = ....

Fixes #1331.

Author: wanda-phi

amaranth/hdl/_dsl.py

@@ -191,9 +191,11 @@ def __setattr__(self, name, domain):
             raise TypeError("Only clock domains may be added to `m.domains`, not {!r}"
                             .format(domain))
         if domain.name != name:
-            raise NameError("Clock domain name {!r} must match name in `m.domains.{} += ...` "
-                            "syntax"
-                            .format(domain.name, name))
+            if name == "cd_" + domain.name:
+                raise NameError(f"Domain name should not be prefixed with 'cd_' in `m.domains`, "
+                                f"use `m.domains.{domain.name} = ...` instead")
+            raise NameError(f"Clock domain name {domain.name!r} must match name in "
+                            f"`m.domains.{name} = ...` syntax")
         self._builder._add_domain(domain)
 
 

tests/test_hdl_dsl.py

@@ -930,7 +930,7 @@ def test_domain_add_wrong(self):
     def test_domain_add_wrong_name(self):
         m = Module()
         with self.assertRaisesRegex(NameError,
-                r"^Clock domain name 'bar' must match name in `m\.domains\.foo \+= \.\.\.` syntax$"):
+                r"^Clock domain name 'bar' must match name in `m\.domains\.foo = \.\.\.` syntax$"):
             m.domains.foo = ClockDomain("bar")
 
     def test_domain_add_wrong_duplicate(self):
@@ -968,3 +968,10 @@ def test_lower(self):
         )
         """)
         self.assertEqual(len(f2.subfragments), 0)
+
+    def test_bug_1331(self):
+        m = Module()
+        with self.assertRaisesRegex(NameError,
+                r"^Domain name should not be prefixed with 'cd_' in `m.domains`, "
+                r"use `m.domains.rx = ...` instead$"):
+            m.domains.cd_rx = ClockDomain()