Clean up imports.

This commit:
  * moves lists of universally useful imports from `nmigen` to
    `nmigen.hdl` and `nmigen.lib`, reimporting them in `nmigen`;
  * replaces lots of imports from individual parts of `nmigen.hdl`
    with a star import from `nmigen.hdl`;
  * replaces imports in tests with what we expect downstream code
    to use;
  * adds some missing imports in `nmigen.formal`.

diff --git a/nmigen/__init__.py b/nmigen/__init__.py
index 17ddfea244168d5e624098dca7f5c6abb89f58f8..d2aa2bae9cb5d190c1fd7bcf24f44c039256318e 100644 (file)
--- a/nmigen/__init__.py
+++ b/nmigen/__init__.py
@@ -2,13 +2,5 @@ from ._version import get_versions
 __version__ = get_versions()['version']
 del get_versions
 
-from .hdl.ast import Value, Const, C, Mux, Cat, Repl, Array, Signal, ClockSignal, ResetSignal
-from .hdl.dsl import Module
-from .hdl.cd import ClockDomain
-from .hdl.ir import Elaboratable, Fragment, Instance
-from .hdl.mem import Memory
-from .hdl.rec import Record
-from .hdl.xfrm import ResetInserter, CEInserter
-
-from .lib.cdc import MultiReg
-# from .lib.io import
+from .hdl import *
+from .lib import *

diff --git a/nmigen/formal.py b/nmigen/formal.py
index 3d97b3370d48a1db35fbaf750bc0976c3426d7bb..2836cca077c1203d57664e0597d58c972f43a009 100644 (file)
--- a/nmigen/formal.py
+++ b/nmigen/formal.py
@@ -1 +1,2 @@
 from .hdl.ast import AnyConst, AnySeq, Assert, Assume
+from .hdl.ast import Past, Stable, Rose, Fell

diff --git a/nmigen/hdl/__init__.py b/nmigen/hdl/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..388d1ce1ffd17f53a83e670c44fbe57c024b0172 100644 (file)
--- a/nmigen/hdl/__init__.py
+++ b/nmigen/hdl/__init__.py
@@ -0,0 +1,7 @@
+from .ast import Value, Const, C, Mux, Cat, Repl, Array, Signal, ClockSignal, ResetSignal
+from .dsl import Module
+from .cd import ClockDomain
+from .ir import Elaboratable, Fragment, Instance
+from .mem import Memory
+from .rec import Record
+from .xfrm import DomainRenamer, ResetInserter, CEInserter

diff --git a/nmigen/lib/__init__.py b/nmigen/lib/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cc3587b40ef5b4e2ef906ec3ff045f09c77d2177 100644 (file)
--- a/nmigen/lib/__init__.py
+++ b/nmigen/lib/__init__.py
@@ -0,0 +1 @@
+from .cdc import MultiReg

diff --git a/nmigen/test/test_lib_cdc.py b/nmigen/test/test_lib_cdc.py
index 4a6c1cfb4b7e147cc0bcfa298cb496625c02d620..9aea5d4279f11f9eeee58195869475c8bf312dc6 100644 (file)
--- a/nmigen/test/test_lib_cdc.py
+++ b/nmigen/test/test_lib_cdc.py
@@ -1,7 +1,5 @@
 from .tools import *
-from ..hdl.ast import *
-from ..hdl.cd import *
-from ..hdl.dsl import *
+from ..hdl import *
 from ..back.pysim import *
 from ..lib.cdc import *
 

diff --git a/nmigen/test/test_lib_coding.py b/nmigen/test/test_lib_coding.py
index 8c6b624cc030babdc77b102b5b0cae4355d9dd05..4cdd83f136fd32ac7626c78b1f5931fdfe82c914 100644 (file)
--- a/nmigen/test/test_lib_coding.py
+++ b/nmigen/test/test_lib_coding.py
@@ -1,7 +1,6 @@
 from .tools import *
-from ..hdl.ast import *
-from ..hdl.dsl import *
-from ..hdl.ir import *
+from ..hdl import *
+from ..formal import *
 from ..back.pysim import *
 from ..lib.coding import *
 

diff --git a/nmigen/test/test_lib_fifo.py b/nmigen/test/test_lib_fifo.py
index 34971865a1fd7a223151602e8b959b7dd93fdcdb..735e00e355e4ea9e79eda45fd2371108b82aae1a 100644 (file)
--- a/nmigen/test/test_lib_fifo.py
+++ b/nmigen/test/test_lib_fifo.py
@@ -1,10 +1,6 @@
 from .tools import *
-from ..hdl.ast import *
-from ..hdl.dsl import *
-from ..hdl.mem import *
-from ..hdl.ir import *
-from ..hdl.xfrm import *
-from ..hdl.cd import *
+from ..hdl import *
+from ..formal import *
 from ..back.pysim import *
 from ..lib.fifo import *
 

diff --git a/nmigen/test/test_lib_io.py b/nmigen/test/test_lib_io.py
index 38f66cbcf2dd0c89937bce4fa65d26ecfaa9c566..7ae44a3ec6e79917eaf8132d4619c2e9544c737d 100644 (file)
--- a/nmigen/test/test_lib_io.py
+++ b/nmigen/test/test_lib_io.py
@@ -1,6 +1,7 @@
 from .tools import *
-from ..hdl.ast import *
+from ..hdl import *
 from ..hdl.rec import *
+from ..back.pysim import *
 from ..lib.io import *
 
 

diff --git a/nmigen/vendor/fpga/lattice_ice40.py b/nmigen/vendor/fpga/lattice_ice40.py
index 43f5cb3835bced3888ccbf445106d28ce3db16fb..8dc2d2b68314d2e7bef0b8bfa6772015536b195a 100644 (file)
--- a/nmigen/vendor/fpga/lattice_ice40.py
+++ b/nmigen/vendor/fpga/lattice_ice40.py
@@ -3,9 +3,7 @@ import os
 import subprocess
 import tempfile
 
-from ...hdl.ast import *
-from ...hdl.dsl import *
-from ...hdl.ir import *
+from ...hdl import *
 from ...build import *