Move Token to migen.flow.transactions

examples/dataflow/dma.py

@@ -1,6 +1,7 @@
 from random import Random
 
 from migen.flow.network import *
+from migen.flow.transactions import *
 from migen.actorlib import dma_wishbone, dma_asmi
 from migen.actorlib.sim import *
 from migen.bus import wishbone, asmibus

examples/dataflow/misc.py

@@ -1,4 +1,5 @@
 from migen.flow.network import *
+from migen.flow.transactions import *
 from migen.actorlib import misc
 from migen.actorlib.sim import *
 from migen.sim.generic import Simulator

examples/dataflow/structuring.py

@@ -4,6 +4,7 @@ import networkx as nx
 import matplotlib.pyplot as plt
 
 from migen.flow.network import *
+from migen.flow.transactions import *
 from migen.actorlib import structuring
 from migen.actorlib.sim import *
 from migen.sim.generic import Simulator

examples/pytholite/basic.py

@@ -1,4 +1,5 @@
 from migen.flow.network import *
+from migen.flow.transactions import *
 from migen.actorlib.sim import *
 from migen.pytholite.compiler import make_pytholite
 from migen.sim.generic import Simulator

examples/pytholite/uio.py

@@ -1,5 +1,5 @@
 from migen.flow.network import *
-from migen.actorlib.sim import *
+from migen.flow.transactions import *
 from migen.bus import wishbone
 from migen.bus.transactions import *
 from migen.uio.ioo import UnifiedIOSimulation

examples/sim/dataflow.py

@@ -1,5 +1,6 @@
 from migen.fhdl.structure import *
 from migen.flow.actor import *
+from migen.flow.transactions import *
 from migen.flow.network import *
 from migen.actorlib.sim import *
 from migen.sim.generic import Simulator

migen/actorlib/sim.py

@@ -1,12 +1,8 @@
 from migen.fhdl.structure import *
 from migen.flow.actor import *
+from migen.flow.transactions import *
 from migen.sim.generic import PureSimulable
 
-class Token:
-	def __init__(self, endpoint, value=None):
-		self.endpoint = endpoint
-		self.value = value
-
 # Generators yield None or a tuple of Tokens.
 # Tokens for Sink endpoints are pulled and the "value" field filled in.
 # Tokens for Source endpoints are pushed according to their "value" field.

migen/flow/transactions.py

@@ -0,0 +1,5 @@
+class Token:
+	def __init__(self, endpoint, value=None):
+		self.endpoint = endpoint
+		self.value = value
+ 

migen/pytholite/io.py

@@ -3,7 +3,8 @@ from itertools import zip_longest
 
 from migen.fhdl.structure import *
 from migen.uio.ioo import UnifiedIOObject
-from migen.actorlib.sim import *
+from migen.flow.actor import Source, Sink
+from migen.flow.transactions import *
 from migen.bus import wishbone
 from migen.bus.transactions import *
 from migen.pytholite.fsm import *

migen/uio/ioo.py

@@ -1,6 +1,7 @@
 from migen.fhdl.structure import *
 from migen.flow.actor import *
-from migen.actorlib.sim import TokenExchanger, Token
+from migen.flow.transactions import *
+from migen.actorlib.sim import TokenExchanger
 from migen.bus import wishbone, memory
 from migen.bus.transactions import *
 from migen.uio.trampoline import Trampoline