Switch Scala3 sourceInfo implicits to contextual parameters

Author: adkian-sifive

core/src/main/scala-3/chisel3/Aggregate.scala

@@ -52,8 +52,8 @@ sealed class Vec[T <: Data] private[chisel3] (gen: => T, length: Int)
 
   override def toString: String = super[VecImpl].toString
 
-  def apply(p: UInt)(implicit sourceInfo: SourceInfo): T = do_apply(p)
-  def do_apply(p: UInt)(implicit sourceInfo: SourceInfo): T = _applyImpl(p)
+  def apply(p: UInt)(using sourceInfo: SourceInfo): T = do_apply(p)
+  def do_apply(p: UInt)(using sourceInfo: SourceInfo): T = _applyImpl(p)
 
   /** A reduce operation in a tree like structure instead of sequentially
     * @example An adder tree
@@ -76,7 +76,7 @@ sealed class Vec[T <: Data] private[chisel3] (gen: => T, length: Int)
     redOp:   (T, T) => T,
     layerOp: (T) => T = (x: T) => x
   )(
-    implicit sourceInfo: SourceInfo
+    using sourceInfo: SourceInfo
   ): T = _reduceTreeImpl(redOp, layerOp)
 }
 
@@ -93,7 +93,7 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
     * element
     * @note output elements are connected from the input elements
     */
-  def apply[T <: Data](elts: Seq[T])(implicit sourceInfo: SourceInfo): Vec[T] = _applyImpl(elts)
+  def apply[T <: Data](elts: Seq[T])(using sourceInfo: SourceInfo): Vec[T] = _applyImpl(elts)
 
   /** Creates a new [[Vec]] composed of the input [[Data]] nodes.
     *
@@ -103,7 +103,7 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
     * element
     * @note output elements are connected from the input elements
     */
-  def apply[T <: Data](elt0: T, elts: T*)(implicit sourceInfo: SourceInfo): Vec[T] = _applyImpl(elt0, elts: _*)
+  def apply[T <: Data](elt0: T, elts: T*)(using sourceInfo: SourceInfo): Vec[T] = _applyImpl(elt0, elts: _*)
 
   /** Creates a new [[Vec]] of length `n` composed of the results of the given
     * function applied over a range of integer values starting from 0.
@@ -117,7 +117,7 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
     n:   Int
   )(gen: (Int) => T
   )(
-    implicit sourceInfo: SourceInfo
+    using sourceInfo: SourceInfo
   ): Vec[T] = _tabulateImpl(n)(gen)
 
   /** Creates a new 2D [[Vec]] of length `n by m` composed of the results of the given
@@ -134,7 +134,7 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
     m:   Int
   )(gen: (Int, Int) => T
   )(
-    implicit sourceInfo: SourceInfo
+    using sourceInfo: SourceInfo
   ): Vec[Vec[T]] = _tabulateImpl(n, m)(gen)
 
   /** Creates a new 3D [[Vec]] of length `n by m by p` composed of the results of the given
@@ -152,7 +152,7 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
     p:   Int
   )(gen: (Int, Int, Int) => T
   )(
-    implicit sourceInfo: SourceInfo
+    using sourceInfo: SourceInfo
   ): Vec[Vec[Vec[T]]] = _tabulateImpl(n, m, p)(gen)
 
   /** Creates a new [[Vec]] of length `n` composed of the result of the given
@@ -162,7 +162,7 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
     * @param gen function that takes in an element T and returns an output
     * element of the same type
     */
-  def fill[T <: Data](n: Int)(gen: => T)(implicit sourceInfo: SourceInfo): Vec[T] = _fillImpl(n)(gen)
+  def fill[T <: Data](n: Int)(gen: => T)(using sourceInfo: SourceInfo): Vec[T] = _fillImpl(n)(gen)
 
   /** Creates a new 2D [[Vec]] of length `n by m` composed of the result of the given
     * function applied to an element of data type T.
@@ -177,7 +177,7 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
     m:   Int
   )(gen: => T
   )(
-    implicit sourceInfo: SourceInfo
+    using sourceInfo: SourceInfo
   ): Vec[Vec[T]] = _fillImpl(n, m)(gen)
 
   /** Creates a new 3D [[Vec]] of length `n by m by p` composed of the result of the given
@@ -195,7 +195,7 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
     p:   Int
   )(gen: => T
   )(
-    implicit sourceInfo: SourceInfo
+    using sourceInfo: SourceInfo
   ): Vec[Vec[Vec[T]]] = _fillImpl(n, m, p)(gen)
 
   /** Creates a new [[Vec]] of length `n` composed of the result of the given
@@ -211,7 +211,7 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
     len:   Int
   )(f:     (T) => T
   )(
-    implicit sourceInfo: SourceInfo
+    using sourceInfo: SourceInfo
   ): Vec[T] = _iterateImpl(start, len)(f)
 }
 
@@ -222,32 +222,32 @@ trait VecLike[T <: Data] extends VecLikeImpl[T] with SourceInfoDoc {
 
   /** Creates a dynamically indexed read or write accessor into the array.
     */
-  def apply(p: UInt)(implicit sourceInfo: SourceInfo): T
+  def apply(p: UInt)(using sourceInfo: SourceInfo): T
 
   /** Outputs true if p outputs true for every element.
     */
-  def forall(p: T => Bool)(implicit sourceInfo: SourceInfo): Bool = _forallImpl(p)
+  def forall(p: T => Bool)(using sourceInfo: SourceInfo): Bool = _forallImpl(p)
 
   /** Outputs true if p outputs true for at least one element.
     */
-  def exists(p: T => Bool)(implicit sourceInfo: SourceInfo): Bool = _existsImpl(p)
+  def exists(p: T => Bool)(using sourceInfo: SourceInfo): Bool = _existsImpl(p)
 
   /** Outputs true if the vector contains at least one element equal to x (using
     * the === operator).
     */
-  def contains(x: T)(implicit sourceInfo: SourceInfo, ev: T <:< UInt): Bool = _containsImpl(x)
+  def contains(x: T)(using sourceInfo: SourceInfo, ev: T <:< UInt): Bool = _containsImpl(x)
 
   /** Outputs the number of elements for which p is true.
     */
-  def count(p: T => Bool)(implicit sourceInfo: SourceInfo): UInt = _countImpl(p)
+  def count(p: T => Bool)(using sourceInfo: SourceInfo): UInt = _countImpl(p)
 
   /** Outputs the index of the first element for which p outputs true.
     */
-  def indexWhere(p: T => Bool)(implicit sourceInfo: SourceInfo): UInt = _indexWhereImpl(p)
+  def indexWhere(p: T => Bool)(using sourceInfo: SourceInfo): UInt = _indexWhereImpl(p)
 
   /** Outputs the index of the last element for which p outputs true.
     */
-  def lastIndexWhere(p: T => Bool)(implicit sourceInfo: SourceInfo): UInt = _lastIndexWhereImpl(p)
+  def lastIndexWhere(p: T => Bool)(using sourceInfo: SourceInfo): UInt = _lastIndexWhereImpl(p)
 
   /** Outputs the index of the element for which p outputs true, assuming that
     * the there is exactly one such element.
@@ -259,7 +259,7 @@ trait VecLike[T <: Data] extends VecLikeImpl[T] with SourceInfoDoc {
     * true is NOT checked (useful in cases where the condition doesn't always
     * hold, but the results are not used in those cases)
     */
-  def onlyIndexWhere(p: T => Bool)(implicit sourceInfo: SourceInfo): UInt = _onlyIndexWhereImpl(p)
+  def onlyIndexWhere(p: T => Bool)(using sourceInfo: SourceInfo): UInt = _onlyIndexWhereImpl(p)
 }
 
 /** Base class for Aggregates based on key values pairs of String and Data