formal→asserts

Closes #171.

diff --git a/nmigen/asserts.py b/nmigen/asserts.py
new file mode 100644 (file)
index 0000000..f374cf0
--- /dev/null
+++ b/nmigen/asserts.py
@@ -0,0 +1,2 @@
+from .hdl.ast import AnyConst, AnySeq, Assert, Assume
+from .hdl.ast import Past, Stable, Rose, Fell, Initial

diff --git a/nmigen/formal.py b/nmigen/formal.py
deleted file mode 100644 (file)
index f374cf0..0000000
--- a/nmigen/formal.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from .hdl.ast import AnyConst, AnySeq, Assert, Assume
-from .hdl.ast import Past, Stable, Rose, Fell, Initial

diff --git a/nmigen/hdl/ast.py b/nmigen/hdl/ast.py
index 757f5268d26256ce6bb3b7a11e82dbf8ddc7655d..c5376d0d02dfd475300cdfc8d6fdaeb2e3a65da2 100644 (file)
--- a/nmigen/hdl/ast.py
+++ b/nmigen/hdl/ast.py
@@ -993,7 +993,7 @@ def Fell(expr, clocks=0, domain=None):
 
 @final
 class Initial(Value):
-    """Start indicator, for formal verification.
+    """Start indicator, for model checking.
 
     An ``Initial`` signal is ``1`` at the first cycle of model checking, and ``0`` at any other.
     """

diff --git a/nmigen/lib/fifo.py b/nmigen/lib/fifo.py
index c59a040c13c4f88c1b969169b2593ac285bfb3c7..2808e549c1550d620826ecf23da2d4e36d4ef3d5 100644 (file)
--- a/nmigen/lib/fifo.py
+++ b/nmigen/lib/fifo.py
@@ -1,7 +1,7 @@
 """First-in first-out queues."""
 
 from .. import *
-from ..formal import *
+from ..asserts import *
 from ..tools import log2_int
 from .coding import GrayEncoder
 

diff --git a/nmigen/test/test_lib_coding.py b/nmigen/test/test_lib_coding.py
index 4cdd83f136fd32ac7626c78b1f5931fdfe82c914..6052c9a6fe14ca273a8fc929606a24bbc34bce20 100644 (file)
--- a/nmigen/test/test_lib_coding.py
+++ b/nmigen/test/test_lib_coding.py
@@ -1,6 +1,6 @@
 from .tools import *
 from ..hdl import *
-from ..formal import *
+from ..asserts 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 9176037f6744d617d1be8ade2c082246efe413b7..9d136c8951b382a0b37c050f432de9a20c8c9cf9 100644 (file)
--- a/nmigen/test/test_lib_fifo.py
+++ b/nmigen/test/test_lib_fifo.py
@@ -1,6 +1,6 @@
 from .tools import *
 from ..hdl import *
-from ..formal import *
+from ..asserts import *
 from ..back.pysim import *
 from ..lib.fifo import *