1.1 --- a/myhdl/_Waiter.py Mon Jun 22 22:52:48 2009 +0200
1.2 +++ b/myhdl/_Waiter.py Sat Jul 25 11:07:24 2009 +0200
1.3 @@ -35,6 +35,7 @@
1.4 from myhdl._simulator import _siglist, _futureEvents
1.5 from myhdl._enum import enum
1.6
1.7 +
1.8 schedule = _futureEvents.append
1.9
1.10
1.11 @@ -101,6 +102,8 @@
1.12 schedule((t + clause._time, clone))
1.13 elif isinstance(clause, GeneratorType):
1.14 waiters.append(_Waiter(clause, clone))
1.15 + elif isinstance(clause, _Instantiator):
1.16 + waiters.append(_Waiter(clause.gen, clone))
1.17 elif isinstance(clause, join):
1.18 waiters.append(_Waiter(clause._generator(), clone))
1.19 elif clause is None:
1.20 @@ -366,4 +369,6 @@
1.21
1.22
1.23
1.24 -
1.25 +# avoid problems with recursive imports
1.26 +from myhdl._instance import _Instantiator
1.27 +