flow: match record fields by position

diff --git a/migen/flow/actor.py b/migen/flow/actor.py
index 2d7e134c628eb5d2d97f7b2b3c7fcab262a97a6c..6d05917f29822132ec2803d5d180470b4de1e62b 100644 (file)
--- a/migen/flow/actor.py
+++ b/migen/flow/actor.py
@@ -22,12 +22,12 @@ class _Endpoint(Record):
                Record.__init__(self, full_layout)
 
 class Source(_Endpoint):
-       def connect(self, sink):
-               return Record.connect(self, sink)
+       def connect(self, sink, **kwargs):
+               return Record.connect(self, sink, **kwargs)
 
 class Sink(_Endpoint):
-       def connect(self, source):
-               return source.connect(self)
+       def connect(self, source, **kwargs):
+               return source.connect(self, **kwargs)
 
 def get_endpoints(obj, filt=_Endpoint):
        if hasattr(obj, "get_endpoints") and callable(obj.get_endpoints):

diff --git a/migen/flow/network.py b/migen/flow/network.py
index a9970a74ad089397ca84c9493a11e6ced437b3f4..4082720aff8fc3357f1ad071943fe14b989adb62 100644 (file)
--- a/migen/flow/network.py
+++ b/migen/flow/network.py
@@ -210,4 +210,4 @@ class CompositeActor(Module):
                for u, v, d in dfg.edges_iter(data=True):
                        ep_src = getattr(u, d["source"])
                        ep_dst = getattr(v, d["sink"])
-                       self.comb += ep_src.connect(ep_dst)
+                       self.comb += ep_src.connect(ep_dst, match_by_position=True)