compat.fhdl: reexport Array.

diff --git a/doc/COMPAT_SUMMARY.md b/doc/COMPAT_SUMMARY.md
index c09eb631e6b9ab0c79ee5968fd24d05e7a926864..c2180860be9998f522a136821c8216b2b9b75dc6 100644 (file)
--- a/doc/COMPAT_SUMMARY.md
+++ b/doc/COMPAT_SUMMARY.md
@@ -77,8 +77,8 @@ Compatibility summary
       - (-) `_check_statement` **obs** → `Statement.wrap`
       - (+) `If` **obs** → `.hdl.dsl.Module.If`
       - (+) `Case` **obs** → `.hdl.dsl.Module.Switch`
-      - (−) `_ArrayProxy` ?
-      - (−) `Array` ?
+      - (+) `_ArrayProxy` → `.hdl.ast.ArrayProxy`, `choices=`→`elems=`, `key=`→`index=`
+      - (+) `Array` id
       - (+) `ClockDomain` → `.hdl.cd.ClockDomain`
       - (−) `_ClockDomainList` ?
       - (−) `SPECIAL_INPUT`/`SPECIAL_OUTPUT`/`SPECIAL_INOUT` ?

diff --git a/nmigen/compat/fhdl/structure.py b/nmigen/compat/fhdl/structure.py
index 95c68c2260465c85c02b98548be1752b97a96fc2..1743df2d70a3f4d4478c0255d5e11268c2dd8d81 100644 (file)
--- a/nmigen/compat/fhdl/structure.py
+++ b/nmigen/compat/fhdl/structure.py
@@ -2,7 +2,8 @@ from collections import OrderedDict
 
 from ...tools import deprecated
 from ...hdl import ast
-from ...hdl.ast import DUID, Value, Signal, Mux, Cat, Repl, Const, C, ClockSignal, ResetSignal
+from ...hdl.ast import (DUID, Value, Signal, Mux, Cat, Repl, Const, C, ClockSignal, ResetSignal,
+                        Array, ArrayProxy as _ArrayProxy)
 from ...hdl.cd import ClockDomain
 
 
@@ -84,8 +85,4 @@ class Case(ast.Switch):
         return self
 
 
-def Array(*args):
-    raise NotImplementedError
-
-
 (SPECIAL_INPUT, SPECIAL_OUTPUT, SPECIAL_INOUT) = range(3)

diff --git a/nmigen/hdl/ast.py b/nmigen/hdl/ast.py
index 8ccd5522462945669dd4970495c1e485fcd4b53d..a2d3adf705c6c42208a631efb1ac97132c0512bf 100644 (file)
--- a/nmigen/hdl/ast.py
+++ b/nmigen/hdl/ast.py
@@ -713,7 +713,7 @@ class Array(MutableSequence):
             master.dat_r.eq(buses[sel].dat_r),
         ]
     """
-    def __init__(self, iterable):
+    def __init__(self, iterable=()):
         self._inner    = list(iterable)
         self._proxy_at = None
         self._mutable  = True