hdl.ast: don't crash on Mux(<bool>, ...).

Fixes #240.

diff --git a/nmigen/hdl/ast.py b/nmigen/hdl/ast.py
index 6a68a670084ffdae24817fd0471783f5b427ff5c..61753005694526df7df5528aa5c3ffbedc912734 100644 (file)
--- a/nmigen/hdl/ast.py
+++ b/nmigen/hdl/ast.py
@@ -526,8 +526,9 @@ def Mux(sel, val1, val0):
     Value, out
         Output ``Value``. If ``sel`` is asserted, the Mux returns ``val1``, else ``val0``.
     """
+    sel = Value.wrap(sel)
     if len(sel) != 1:
-        sel = Value.wrap(sel).bool()
+        sel = sel.bool()
     return Operator("m", [sel, val1, val0])
 
 

diff --git a/nmigen/test/test_hdl_ast.py b/nmigen/test/test_hdl_ast.py
index 0c4914bee68d6cc4d3f77354a9fd50c3ae7618be..f90d444465db337c417909b3c0e2e883bcdfa3d0 100644 (file)
--- a/nmigen/test/test_hdl_ast.py
+++ b/nmigen/test/test_hdl_ast.py
@@ -292,6 +292,10 @@ class OperatorTestCase(FHDLTestCase):
         v = Mux(s, Const(0, (4, False)), Const(0, (6, False)))
         self.assertEqual(repr(v), "(m (b (const 3'd4)) (const 4'd0) (const 6'd0))")
 
+    def test_mux_bool(self):
+        v = Mux(True, Const(0), Const(0))
+        self.assertEqual(repr(v), "(m (const 1'd1) (const 1'd0) (const 1'd0))")
+
     def test_bool(self):
         v = Const(0).bool()
         self.assertEqual(repr(v), "(b (const 1'd0))")