Change [public] Data.elementLitArg => [protected] Aggregate.litArgOfBits

5 files changed, 13 insertions, 15 deletions

diff --git a/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala b/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala
index 54932bcc..9bb24e43 100644
--- a/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala
+++ b/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala
@@ -64,6 +64,10 @@ sealed abstract class Aggregate extends Data {
 
   def litToBigIntOption: Option[BigInt] = ???  // TODO implement me
 
+  // Returns the LitArg of a Bits object.
+  // Internal API for Bundle literals, to copy the LitArg of argument literals into the top map.
+  protected def litArgOfBits(elt: Bits): LitArg = elt.litArgOption.get
+
   /** Returns a Seq of the immediate contents of this Aggregate, in order.
     */
   def getElements: Seq[Data]
diff --git a/chiselFrontend/src/main/scala/chisel3/core/Bits.scala b/chiselFrontend/src/main/scala/chisel3/core/Bits.scala
index d39cc088..a8ebab1b 100644
--- a/chiselFrontend/src/main/scala/chisel3/core/Bits.scala
+++ b/chiselFrontend/src/main/scala/chisel3/core/Bits.scala
@@ -81,15 +81,13 @@ sealed abstract class Bits(width: Width)
     case topBindingOpt => topBindingOpt
   }
 
-  protected def litArgOption: Option[LitArg] = topBindingOpt match {
+  private[core] def litArgOption: Option[LitArg] = topBindingOpt match {
     case Some(ElementLitBinding(litArg)) => Some(litArg)
     case _ => None
   }
 
   override def litToBigIntOption: Option[BigInt] = litArgOption.map(_.num)
-  private[chisel3] def litIsForcedWidth: Option[Boolean] = litArgOption.map(_.forcedWidth)
-
-  override def elementLitArg: Option[LitArg] = litArgOption
+  private[core] def litIsForcedWidth: Option[Boolean] = litArgOption.map(_.forcedWidth)
 
   // provide bits-specific literal handling functionality here
   override private[chisel3] def ref: Arg = topBindingOpt match {
diff --git a/chiselFrontend/src/main/scala/chisel3/core/Data.scala b/chiselFrontend/src/main/scala/chisel3/core/Data.scala
index d3d94b21..466f976e 100644
--- a/chiselFrontend/src/main/scala/chisel3/core/Data.scala
+++ b/chiselFrontend/src/main/scala/chisel3/core/Data.scala
@@ -398,10 +398,6 @@ abstract class Data extends HasId with NamedComponent {
   @deprecated("isLit is deprecated, use litToBigIntOption or litTo*Option", "chisel3.2")
   def isLit(): Boolean = litArg.isDefined
 
-  // If this is an element literal, returns the LitArg bound to it.
-  // INTERNAL API, but this isn't protected to allow bundle literal constructors.
-  def elementLitArg: Option[LitArg] = None
-
   /**
    * If this is a literal that is representable as bits, returns the value as a BigInt.
    * If not a literal, or not representable as bits (for example, is or contains Analog), returns None.
diff --git a/src/test/scala/chiselTests/BundleLiteralSpec.scala b/src/test/scala/chiselTests/BundleLiteralSpec.scala
index 8459e0fc..7d28660b 100644
--- a/src/test/scala/chiselTests/BundleLiteralSpec.scala
+++ b/src/test/scala/chiselTests/BundleLiteralSpec.scala
@@ -21,8 +21,8 @@ class BundleLiteralSpec extends ChiselFlatSpec {
     def Lit(aVal: UInt, bVal: Bool): MyBundle = {
       val clone = cloneType
       clone.selfBind(BundleLitBinding(Map(
-        clone.a -> aVal.elementLitArg.get,
-        clone.b -> bVal.elementLitArg.get
+        clone.a -> litArgOfBits(aVal),
+        clone.b -> litArgOfBits(bVal)
       )))
       clone
     }
@@ -30,7 +30,7 @@ class BundleLiteralSpec extends ChiselFlatSpec {
     def Lit(aVal: UInt): MyBundle = {
       val clone = cloneType
       clone.selfBind(BundleLitBinding(Map(
-        clone.a -> aVal.elementLitArg.get
+        clone.a -> litArgOfBits(aVal)
       )))
       clone
     }
diff --git a/src/test/scala/chiselTests/LiteralExtractorSpec.scala b/src/test/scala/chiselTests/LiteralExtractorSpec.scala
index 0ffabfb0..8354297b 100644
--- a/src/test/scala/chiselTests/LiteralExtractorSpec.scala
+++ b/src/test/scala/chiselTests/LiteralExtractorSpec.scala
@@ -63,8 +63,8 @@ class LiteralExtractorSpec extends ChiselFlatSpec {
       def Lit(aVal: SInt, bVal: FixedPoint): InsideBundle = {
         val clone = cloneType
         clone.selfBind(BundleLitBinding(Map(
-          clone.x -> aVal.elementLitArg.get,
-          clone.y -> bVal.elementLitArg.get
+          clone.x -> litArgOfBits(aVal),
+          clone.y -> litArgOfBits(bVal)
         )))
         clone
       }
@@ -107,8 +107,8 @@ class LiteralExtractorSpec extends ChiselFlatSpec {
       def Lit(aVal: UInt, bVal: Bool): MyBundle = {
         val clone = cloneType
         clone.selfBind(BundleLitBinding(Map(
-          clone.a -> aVal.elementLitArg.get,
-          clone.b -> bVal.elementLitArg.get
+          clone.a -> litArgOfBits(aVal),
+          clone.b -> litArgOfBits(bVal)
         )))
         clone
       }