Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use enumerate(x) instead of zip(range(x), x) 

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
Lars-Peter Clausen 2012-02-02 21:12:37 +01:00
parent 2b3f00cbc1
commit 8380318e84
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
migen/actorlib/control.py
View File

@ -17,9 +17,9 @@ class For(Actor):
if step: params.append("step") if step: params.append("step")
self.d_bv = [BV(bits_for(dimension)) for dimension in maxima] self.d_bv = [BV(bits_for(dimension)) for dimension in maxima]
l_sink = [("d{0}".format(n), [(p, bv) for p in params]) l_sink = [("d{0}".format(n), [(p, bv) for p in params])
for n, bv in zip(range(len(self.d_bv)), self.d_bv)] for n, bv in enumerate(self.d_bv)]
l_source = [("d{0}".format(n), bv) l_source = [("d{0}".format(n), bv)
for n, bv in zip(range(len(self.d_bv)), self.d_bv)] for n, bv in enumerate(self.d_bv)]
Actor.__init__(self, SchedulingModel(SchedulingModel.DYNAMIC), Actor.__init__(self, SchedulingModel(SchedulingModel.DYNAMIC),
("sink", Sink, l_sink), ("sink", Sink, l_sink),
("source", Source, l_source)) ("source", Source, l_source))

4
migen/corelogic/fsm.py
View File

@ -5,7 +5,7 @@ class FSM:
self._state_bv = BV(bits_for(len(states)-1)) self._state_bv = BV(bits_for(len(states)-1))
self._state = Signal(self._state_bv) self._state = Signal(self._state_bv)
self._next_state = Signal(self._state_bv) self._next_state = Signal(self._state_bv)
for state, n in zip(states, range(len(states))): for n, state in enumerate(states):
setattr(self, state, Constant(n, self._state_bv)) setattr(self, state, Constant(n, self._state_bv))
self.actions = [[] for i in range(len(states))] self.actions = [[] for i in range(len(states))]
@ -20,7 +20,7 @@ class FSM:
def get_fragment(self): def get_fragment(self):
cases = [[Constant(s, self._state_bv)] + a cases = [[Constant(s, self._state_bv)] + a
for s, a in zip(range(len(self.actions)), self.actions) if a] for s, a in enumerate(self.actions) if a]
comb = [ comb = [
self._next_state.eq(self._state), self._next_state.eq(self._state),
Case(self._state, *cases) Case(self._state, *cases)

8
migen/flow/plumbing.py
View File

@ -19,8 +19,8 @@ class Combinator(Actor):
def __init__(self, layout, *subrecords): def __init__(self, layout, *subrecords):
source = Record(layout) source = Record(layout)
subrecords = [source.subrecord(*subr) for subr in subrecords] subrecords = [source.subrecord(*subr) for subr in subrecords]
eps = [("sink{0}".format(x[0]), Sink, x[1]) eps = [("sink{0}".format(n), Sink, r)
for x in zip(range(len(subrecords)), subrecords)] for x in enumerate(subrecords)]
ep_source = ("source", Source, source) ep_source = ("source", Source, source)
eps.append(ep_source) eps.append(ep_source)
Actor.__init__(self, Actor.__init__(self,
@ -39,8 +39,8 @@ class Splitter(Actor):
def __init__(self, layout, *subrecords): def __init__(self, layout, *subrecords):
sink = Record(layout) sink = Record(layout)
subrecords = [sink.subrecord(*subr) for subr in subrecords] subrecords = [sink.subrecord(*subr) for subr in subrecords]
eps = [("source{0}".format(x[0]), Source, x[1]) eps = [("source{0}".format(n), Source, r)
for x in zip(range(len(subrecords)), subrecords)] for n, r in enumerate(subrecords)]
ep_sink = ("sink", Sink, sink) ep_sink = ("sink", Sink, sink)
eps.append(ep_sink) eps.append(ep_sink)
Actor.__init__(self, Actor.__init__(self,