From: whitequark <cz@m-labs.hk>
Date: Mon, 19 Aug 2019 20:23:24 +0000 (+0000)
Subject: formal→asserts
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1816086bb285b873322de9c34116ad45d2c4bc39;p=nmigen.git

formal→asserts

Closes #171.
---

diff --git a/nmigen/asserts.py b/nmigen/asserts.py
new file mode 100644
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
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 757f526..c5376d0 100644
--- 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 c59a040..2808e54 100644
--- 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 4cdd83f..6052c9a 100644
--- 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 9176037..9d136c8 100644
--- 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 *