diff options
| author | Andrew Waterman | 2015-08-04 00:27:43 -0700 |
|---|---|---|
| committer | Andrew Waterman | 2015-08-04 04:52:27 -0700 |
| commit | 13bf0218e7e9fe3fb336a9fe5cd18d7e262e4a03 (patch) | |
| tree | d2ab832cb96dc79f05f8a1a681cb80a298dac939 /src/main/scala/Chisel/Core.scala | |
| parent | 28d2d5a7f9c01273eac866a42b230664c3169a3b (diff) | |
Add better cloneTypeWidth and deprecate old one
Diffstat (limited to 'src/main/scala/Chisel/Core.scala')
| -rw-r--r-- | src/main/scala/Chisel/Core.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/scala/Chisel/Core.scala b/src/main/scala/Chisel/Core.scala index a3483c82..ee78b583 100644 --- a/src/main/scala/Chisel/Core.scala +++ b/src/main/scala/Chisel/Core.scala @@ -278,7 +278,9 @@ abstract class Data(dirArg: Direction) extends Id { private[Chisel] def lref: Alias = Alias(this) private[Chisel] def ref: Arg = if (isLit) litArg() else lref private[Chisel] def debugName = mod.debugName + "." + getRefForId(this).debugName - private[Chisel] def cloneTypeWidth(width: Int): this.type + private[Chisel] def cloneTypeWidth(width: Int): this.type // deprecated + private[Chisel] def cloneTypeWidth(width: Option[Int]): this.type = + cloneTypeWidth(width.getOrElse(-1)) def := (that: Data): Unit = this badConnect that def <> (that: Data): Unit = this badConnect that @@ -931,7 +933,7 @@ class Bundle extends Aggregate(NO_DIR) { BundleType(this.toPorts, isFlip) override def flatten: IndexedSeq[Bits] = - allElts.map(_._2.flatten).reduce(_ ++ _) + allElts.flatMap(_._2.flatten) lazy val elements: ListMap[String, Data] = ListMap(allElts:_*) |