From 09958f63470697188e1ed1a01c7ea39b8c56e7ef Mon Sep 17 00:00:00 2001 From: Jim Lawson Date: Tue, 26 Apr 2016 11:06:16 -0700 Subject: Scalastyle fixes and "ignores". - No functional changes. --- src/main/scala/Chisel/Data.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/main/scala/Chisel/Data.scala') diff --git a/src/main/scala/Chisel/Data.scala b/src/main/scala/Chisel/Data.scala index ac3bd9ab..3fa3dc20 100644 --- a/src/main/scala/Chisel/Data.scala +++ b/src/main/scala/Chisel/Data.scala @@ -94,8 +94,11 @@ abstract class Data(dirArg: Direction) extends HasId { var i = 0 val wire = Wire(this.cloneType) val bits = - if (n.width.known && n.width.get >= wire.width.get) n - else Wire(n.cloneTypeWidth(wire.width), init = n) + if (n.width.known && n.width.get >= wire.width.get) { + n + } else { + Wire(n.cloneTypeWidth(wire.width), init = n) + } for (x <- wire.flatten) { x := bits(i + x.getWidth-1, i) i += x.getWidth @@ -124,8 +127,9 @@ object Wire { val x = Reg.makeType(t, null.asInstanceOf[T], init) pushCommand(DefWire(x)) pushCommand(DefInvalid(x.ref)) - if (init != null) + if (init != null) { x := init + } x } } -- cgit v1.2.3