diff options
Diffstat (limited to 'src/main/scala/firrtl/passes/Passes.scala')
| -rw-r--r-- | src/main/scala/firrtl/passes/Passes.scala | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main/scala/firrtl/passes/Passes.scala b/src/main/scala/firrtl/passes/Passes.scala index 3658d368..bb65201b 100644 --- a/src/main/scala/firrtl/passes/Passes.scala +++ b/src/main/scala/firrtl/passes/Passes.scala @@ -125,13 +125,13 @@ object ExpandConnects extends Pass { case sx: DefMemory => genders(sx.name) = MALE; sx case sx: DefNode => genders(sx.name) = MALE; sx case sx: IsInvalid => - val invalids = (create_exps(sx.expr) foldLeft Seq[Statement]())( - (invalids, expx) => gender(set_gender(expx)) match { - case BIGENDER => invalids :+ IsInvalid(sx.info, expx) - case FEMALE => invalids :+ IsInvalid(sx.info, expx) - case _ => invalids + val invalids = create_exps(sx.expr).flatMap { case expx => + gender(set_gender(expx)) match { + case BIGENDER => Some(IsInvalid(sx.info, expx)) + case FEMALE => Some(IsInvalid(sx.info, expx)) + case _ => None } - ) + } invalids.size match { case 0 => EmptyStmt case 1 => invalids.head @@ -140,8 +140,8 @@ object ExpandConnects extends Pass { case sx: Connect => val locs = create_exps(sx.loc) val exps = create_exps(sx.expr) - Block((locs zip exps).zipWithIndex map {case ((locx, expx), i) => - get_flip(sx.loc.tpe, i, Default) match { + Block(locs.zip(exps).map { case (locx, expx) => + to_flip(gender(locx)) match { case Default => Connect(sx.info, locx, expx) case Flip => Connect(sx.info, expx, locx) } @@ -154,7 +154,7 @@ object ExpandConnects extends Pass { locs(x).tpe match { case AnalogType(_) => Attach(sx.info, Seq(locs(x), exps(y))) case _ => - get_flip(sx.loc.tpe, x, Default) match { + to_flip(gender(locs(x))) match { case Default => Connect(sx.info, locs(x), exps(y)) case Flip => Connect(sx.info, exps(y), locs(x)) } |