diff options
| author | chick | 2016-09-25 18:23:07 -0700 |
|---|---|---|
| committer | jackkoenig | 2016-09-27 13:14:58 -0700 |
| commit | 3f8e1536ff2f4b5090cd2c074ada5d7a413d169f (patch) | |
| tree | c327771170e4438661b4d654e93960b92b31b023 /src/main/scala/firrtl/passes/Passes.scala | |
| parent | 39f06c4cff41030e7802c7b371123e040d9c447b (diff) | |
remove unnecessary parentheses
Diffstat (limited to 'src/main/scala/firrtl/passes/Passes.scala')
| -rw-r--r-- | src/main/scala/firrtl/passes/Passes.scala | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/main/scala/firrtl/passes/Passes.scala b/src/main/scala/firrtl/passes/Passes.scala index dc0eb2a0..06ec8a6d 100644 --- a/src/main/scala/firrtl/passes/Passes.scala +++ b/src/main/scala/firrtl/passes/Passes.scala @@ -59,7 +59,7 @@ class Errors { object ToWorkingIR extends Pass { def name = "Working IR" - def toExp(e: Expression): Expression = e map (toExp) match { + def toExp(e: Expression): Expression = e map toExp match { case e: Reference => WRef(e.name, e.tpe, NodeKind, UNKNOWNGENDER) case e: SubField => WSubField(e.expr, e.name, e.tpe, UNKNOWNGENDER) case e: SubIndex => WSubIndex(e.expr, e.value, e.tpe, UNKNOWNGENDER) @@ -67,20 +67,20 @@ object ToWorkingIR extends Pass { case e => e } - def toStmt(s: Statement): Statement = s map (toExp) match { + def toStmt(s: Statement): Statement = s map toExp match { case s: DefInstance => WDefInstance(s.info, s.name, s.module, UnknownType) - case s => s map (toStmt) + case s => s map toStmt } def run (c:Circuit): Circuit = - c copy (modules = (c.modules map (_ map toStmt))) + c copy (modules = c.modules map (_ map toStmt)) } object PullMuxes extends Pass { def name = "Pull Muxes" def run(c: Circuit): Circuit = { def pull_muxes_e(e: Expression): Expression = { - val ex = e map (pull_muxes_e) match { + val ex = e map pull_muxes_e match { case (e: WSubField) => e.exp match { case (ex: Mux) => Mux(ex.cond, WSubField(ex.tval, e.name, e.tpe, e.gender), @@ -107,9 +107,9 @@ object PullMuxes extends Pass { } case (e) => e } - ex map (pull_muxes_e) + ex map pull_muxes_e } - def pull_muxes(s: Statement): Statement = s map (pull_muxes) map (pull_muxes_e) + def pull_muxes(s: Statement): Statement = s map pull_muxes map pull_muxes_e val modulesx = c.modules.map { case (m:Module) => Module(m.info, m.name, m.ports, pull_muxes(m.body)) case (m:ExtModule) => m @@ -124,7 +124,7 @@ object ExpandConnects extends Pass { def expand_connects(m: Module): Module = { val genders = collection.mutable.LinkedHashMap[String,Gender]() def expand_s(s: Statement): Statement = { - def set_gender(e: Expression): Expression = e map (set_gender) match { + def set_gender(e: Expression): Expression = e map set_gender match { case (e: WRef) => WRef(e.name, e.tpe, e.kind, genders(e.name)) case (e: WSubField) => val f = get_field(e.exp.tpe, e.name) @@ -172,7 +172,7 @@ object ExpandConnects extends Pass { case Flip => Connect(s.info, exps(y), locs(x)) } }) - case (s) => s map (expand_s) + case (s) => s map expand_s } } @@ -221,9 +221,9 @@ object Legalize extends Pass { } } private def legalizePad(expr: DoPrim): Expression = expr.args.head match { - case UIntLiteral(value, IntWidth(width)) if (width < expr.consts.head) => + case UIntLiteral(value, IntWidth(width)) if width < expr.consts.head => UIntLiteral(value, IntWidth(expr.consts.head)) - case SIntLiteral(value, IntWidth(width)) if (width < expr.consts.head) => + case SIntLiteral(value, IntWidth(width)) if width < expr.consts.head => SIntLiteral(value, IntWidth(expr.consts.head)) case _ => expr } @@ -258,7 +258,7 @@ object Legalize extends Pass { } legalizedStmt map legalizeS map legalizeE } - c copy (modules = (c.modules map (_ map legalizeS))) + c copy (modules = c.modules map (_ map legalizeS)) } } @@ -286,7 +286,7 @@ object VerilogWrap extends Pass { } def run(c: Circuit): Circuit = - c copy (modules = (c.modules map (_ map vWrapS))) + c copy (modules = c.modules map (_ map vWrapS)) } object VerilogRename extends Pass { @@ -306,7 +306,7 @@ object VerilogRename extends Pass { p copy (name = verilogRenameN(p.name)) def run(c: Circuit): Circuit = - c copy (modules = (c.modules map (_ map verilogRenameP map verilogRenameS))) + c copy (modules = c.modules map (_ map verilogRenameP map verilogRenameS)) } |
