From 72c3e32f909344a57b182c41c2ede71dc5633f15 Mon Sep 17 00:00:00 2001 From: whitequark Date: Sat, 28 Sep 2019 17:50:24 +0000 Subject: [PATCH] hdl.dsl: add a diagnostic for `m.d.submodules += ...`. --- nmigen/hdl/dsl.py | 15 ++++++++++----- nmigen/test/test_hdl_dsl.py | 7 +++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/nmigen/hdl/dsl.py b/nmigen/hdl/dsl.py index 8a3b561..6934ed3 100644 --- a/nmigen/hdl/dsl.py +++ b/nmigen/hdl/dsl.py @@ -28,7 +28,7 @@ class _ModuleBuilderProxy: object.__setattr__(self, "_depth", depth) -class _ModuleBuilderDomainExplicit(_ModuleBuilderProxy): +class _ModuleBuilderDomain(_ModuleBuilderProxy): def __init__(self, builder, depth, domain): super().__init__(builder, depth) self._domain = domain @@ -38,13 +38,18 @@ class _ModuleBuilderDomainExplicit(_ModuleBuilderProxy): return self -class _ModuleBuilderDomainImplicit(_ModuleBuilderProxy): +class _ModuleBuilderDomains(_ModuleBuilderProxy): def __getattr__(self, name): + if name == "submodules": + warnings.warn("Using '.d.{}' would add statements to clock domain {!r}; " + "did you mean .{} instead?" + .format(name, name, name), + SyntaxWarning, stacklevel=2) if name == "comb": domain = None else: domain = name - return _ModuleBuilderDomainExplicit(self._builder, self._depth, domain) + return _ModuleBuilderDomain(self._builder, self._depth, domain) def __getitem__(self, name): return self.__getattr__(name) @@ -52,7 +57,7 @@ class _ModuleBuilderDomainImplicit(_ModuleBuilderProxy): def __setattr__(self, name, value): if name == "_depth": object.__setattr__(self, name, value) - elif not isinstance(value, _ModuleBuilderDomainExplicit): + elif not isinstance(value, _ModuleBuilderDomain): raise AttributeError("Cannot assign 'd.{}' attribute; did you mean 'd.{} +='?" .format(name, name)) @@ -63,7 +68,7 @@ class _ModuleBuilderDomainImplicit(_ModuleBuilderProxy): class _ModuleBuilderRoot: def __init__(self, builder, depth): self._builder = builder - self.domain = self.d = _ModuleBuilderDomainImplicit(builder, depth) + self.domain = self.d = _ModuleBuilderDomains(builder, depth) def __getattr__(self, name): if name in ("comb", "sync"): diff --git a/nmigen/test/test_hdl_dsl.py b/nmigen/test/test_hdl_dsl.py index c3355cd..08bcc4c 100644 --- a/nmigen/test/test_hdl_dsl.py +++ b/nmigen/test/test_hdl_dsl.py @@ -96,6 +96,13 @@ class DSLTestCase(FHDLTestCase): msg="'Module' object has no attribute 'nonexistentattr'"): m.nonexistentattr + def test_d_suspicious(self): + m = Module() + with self.assertWarns(SyntaxWarning, + msg="Using '.d.submodules' would add statements to clock domain " + "'submodules'; did you mean .submodules instead?"): + m.d.submodules += [] + def test_clock_signal(self): m = Module() m.d.comb += ClockSignal("pix").eq(ClockSignal()) -- 2.30.2