hdl: bring new naming rules to ClockDomain and friends

Author: tpwrules

amaranth/hdl/_ast.py

@@ -2103,8 +2103,7 @@ class ClockSignal(Value):
     """
     def __init__(self, domain="sync", *, src_loc_at=0):
         super().__init__(src_loc_at=src_loc_at)
-        if not isinstance(domain, str):
-            raise TypeError(f"Clock domain name must be a string, not {domain!r}")
+        validate_name(domain, "Clock domain name")
         if domain == "comb":
             raise ValueError(f"Domain '{domain}' does not have a clock")
         self._domain = domain
@@ -2143,8 +2142,7 @@ class ResetSignal(Value):
     """
     def __init__(self, domain="sync", allow_reset_less=False, *, src_loc_at=0):
         super().__init__(src_loc_at=src_loc_at)
-        if not isinstance(domain, str):
-            raise TypeError(f"Clock domain name must be a string, not {domain!r}")
+        validate_name(domain, "Clock domain name")
         if domain == "comb":
             raise ValueError(f"Domain '{domain}' does not have a reset")
         self._domain = domain

amaranth/hdl/_cd.py

@@ -1,5 +1,6 @@
 from .. import tracer
 from ._ast import Signal
+from .._utils import validate_name
 
 
 __all__ = ["ClockDomain", "DomainError"]
@@ -54,6 +55,7 @@ def __init__(self, name=None, *, clk_edge="pos", reset_less=False, async_reset=F
                 name = tracer.get_var_name()
             except tracer.NameNotFound:
                 raise ValueError("Clock domain name must be specified explicitly")
+        validate_name(name, "Clock domain name")
         if name.startswith("cd_"):
             name = name[3:]
         if name == "comb":
@@ -78,6 +80,7 @@ def __init__(self, name=None, *, clk_edge="pos", reset_less=False, async_reset=F
         self.local = local
 
     def rename(self, new_name):
+        validate_name(new_name, "Clock domain name")
         self.name = new_name
         self.clk.name = self._name_for(new_name, "clk")
         if self.rst is not None:

tests/test_hdl_cd.py

@@ -23,6 +23,9 @@ def test_name(self):
             ClockDomain()
         cd_reset = ClockDomain(local=True)
         self.assertEqual(cd_reset.local, True)
+        with self.assertRaisesRegex(TypeError,
+                r"^Clock domain name must be a string, not 1$"):
+            sync.rename(1)
 
     def test_edge(self):
         sync = ClockDomain()
@@ -64,6 +67,9 @@ def test_rename(self):
         self.assertEqual(sync.name, "pix")
         self.assertEqual(sync.clk.name, "pix_clk")
         self.assertEqual(sync.rst.name, "pix_rst")
+        with self.assertRaisesRegex(TypeError,
+                r"^Clock domain name must be a string, not 1$"):
+            sync.rename(1)
 
     def test_rename_reset_less(self):
         sync = ClockDomain(reset_less=True)