diff options
| author | Palmer Dabbelt | 2015-10-20 18:55:07 -0700 |
|---|---|---|
| committer | Palmer Dabbelt | 2015-10-20 18:55:07 -0700 |
| commit | f7b496d14087c9838e3ed02413bb924f61a8d774 (patch) | |
| tree | 63b6ae72d80407f79d2b9eb1699c91ab771ee827 /src/main/scala/Chisel/IR.scala | |
| parent | 21bbea7519ed867e24fbd9f999e985cd27141583 (diff) | |
| parent | 581e551526f91cf0b6311637709d8fb99bb24c74 (diff) | |
Merge pull request #26 from ucb-bar/scalastyle-braces
Make if / else braces style conformant to Scalastyle checker
Diffstat (limited to 'src/main/scala/Chisel/IR.scala')
| -rw-r--r-- | src/main/scala/Chisel/IR.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/Chisel/IR.scala b/src/main/scala/Chisel/IR.scala index 2c6b0a4c..78c08c7e 100644 --- a/src/main/scala/Chisel/IR.scala +++ b/src/main/scala/Chisel/IR.scala @@ -55,8 +55,9 @@ abstract class LitArg(val num: BigInt, widthArg: Width) extends Arg { private[Chisel] def width: Width = if (forcedWidth) widthArg else Width(minWidth) protected def minWidth: Int - if (forcedWidth) + if (forcedWidth) { require(widthArg.get >= minWidth) + } } case class ILit(n: BigInt) extends Arg { @@ -85,8 +86,7 @@ case class ModuleIO(mod: Module, name: String) extends Arg { } case class Slot(imm: Node, name: String) extends Arg { override def fullName(ctx: Component) = - if (imm.fullName(ctx).isEmpty) name - else s"${imm.fullName(ctx)}.${name}" + if (imm.fullName(ctx).isEmpty) name else s"${imm.fullName(ctx)}.${name}" } case class Index(imm: Arg, value: Int) extends Arg { def name = s"[$value]" |