Apply formatting

chipsalliance · Dec 17, 2024 · 5f7e78b · 5f7e78b
1 parent 3c93271
commit 5f7e78b
Show file tree

Hide file tree

Showing 195 changed files with 1,869 additions and 2,210 deletions.
diff --git a/core/src/main/scala-2/chisel3/Aggregate.scala b/core/src/main/scala-2/chisel3/Aggregate.scala
@@ -117,9 +117,8 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
 
   /** @group SourceInfoTransformMacro */
   def do_tabulate[T <: Data](
-    n:   Int
-  )(gen: (Int) => T
-  )(
+    n: Int
+  )(gen: (Int) => T)(
     implicit sourceInfo: SourceInfo
   ): Vec[T] = _tabulateImpl(n)(gen)
 
@@ -136,10 +135,9 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
 
   /** @group SourceInfoTransformMacro */
   def do_tabulate[T <: Data](
-    n:   Int,
-    m:   Int
-  )(gen: (Int, Int) => T
-  )(
+    n: Int,
+    m: Int
+  )(gen: (Int, Int) => T)(
     implicit sourceInfo: SourceInfo
   ): Vec[Vec[T]] = _tabulateImpl(n, m)(gen)
 
@@ -157,11 +155,10 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
 
   /** @group SourceInfoTransformMacro */
   def do_tabulate[T <: Data](
-    n:   Int,
-    m:   Int,
-    p:   Int
-  )(gen: (Int, Int, Int) => T
-  )(
+    n: Int,
+    m: Int,
+    p: Int
+  )(gen: (Int, Int, Int) => T)(
     implicit sourceInfo: SourceInfo
   ): Vec[Vec[Vec[T]]] = _tabulateImpl(n, m, p)(gen)
 
@@ -189,10 +186,9 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
 
   /** @group SourceInfoTransformMacro */
   def do_fill[T <: Data](
-    n:   Int,
-    m:   Int
-  )(gen: => T
-  )(
+    n: Int,
+    m: Int
+  )(gen: => T)(
     implicit sourceInfo: SourceInfo
   ): Vec[Vec[T]] = _fillImpl(n, m)(gen)
 
@@ -209,11 +205,10 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
 
   /** @group SourceInfoTransformMacro */
   def do_fill[T <: Data](
-    n:   Int,
-    m:   Int,
-    p:   Int
-  )(gen: => T
-  )(
+    n: Int,
+    m: Int,
+    p: Int
+  )(gen: => T)(
     implicit sourceInfo: SourceInfo
   ): Vec[Vec[Vec[T]]] = _fillImpl(n, m, p)(gen)
 
@@ -231,8 +226,7 @@ object VecInit extends VecInitImpl with SourceInfoDoc {
   def do_iterate[T <: Data](
     start: T,
     len:   Int
-  )(f:     (T) => T
-  )(
+  )(f: (T) => T)(
     implicit sourceInfo: SourceInfo
   ): Vec[T] = _iterateImpl(start, len)(f)
 }

diff --git a/core/src/main/scala-2/chisel3/ChiselEnum.scala b/core/src/main/scala-2/chisel3/ChiselEnum.scala
@@ -26,7 +26,7 @@ abstract class EnumType(factory: ChiselEnum, selfAnnotating: Boolean = true)
 }
 
 abstract class ChiselEnum extends ChiselEnumImpl {
-  protected def Value: Type = macro EnumMacros.ValImpl
+  protected def Value:           Type = macro EnumMacros.ValImpl
   protected def Value(id: UInt): Type = macro EnumMacros.ValCustomImpl
 }
 

diff --git a/core/src/main/scala-2/chisel3/Mem.scala b/core/src/main/scala-2/chisel3/Mem.scala
@@ -185,15 +185,15 @@ object SyncReadMem extends ObjectSyncReadMemImpl {
     * @param size number of elements in the memory
     * @param t data type of memory element
     */
-  def apply[T <: Data](size: BigInt, t: T): SyncReadMem[T] = macro MemTransform.apply[T]
+  def apply[T <: Data](size: BigInt, t: T):                      SyncReadMem[T] = macro MemTransform.apply[T]
   def apply[T <: Data](size: BigInt, t: T, ruw: ReadUnderWrite): SyncReadMem[T] = macro MemTransform.apply_ruw[T]
 
   /** Creates a sequential/synchronous-read, sequential/synchronous-write [[SyncReadMem]].
     *
     * @param size number of elements in the memory
     * @param t data type of memory element
     */
-  def apply[T <: Data](size: Int, t: T): SyncReadMem[T] = macro MemTransform.apply[T]
+  def apply[T <: Data](size: Int, t: T):                      SyncReadMem[T] = macro MemTransform.apply[T]
   def apply[T <: Data](size: Int, t: T, ruw: ReadUnderWrite): SyncReadMem[T] = macro MemTransform.apply_ruw[T]
 
   /** @group SourceInfoTransformMacro */
@@ -239,8 +239,8 @@ sealed class SyncReadMem[T <: Data] private[chisel3] (
   t:                  T,
   n:                  BigInt,
   val readUnderWrite: SyncReadMem.ReadUnderWrite,
-  sourceInfo:         SourceInfo)
-    extends MemBase[T](t, n, sourceInfo)
+  sourceInfo:         SourceInfo
+) extends MemBase[T](t, n, sourceInfo)
     with SyncReadMemImpl[T] {
 
   override def read(x: UInt): T = macro SourceInfoTransform.xArg

diff --git a/core/src/main/scala-2/chisel3/Num.scala b/core/src/main/scala-2/chisel3/Num.scala
@@ -29,7 +29,7 @@ import chisel3.experimental.SourceInfo
 trait Num[T <: Data] extends NumImpl[T] {
   // def << (b: T): T
   // def >> (b: T): T
-  //def unary_-: T
+  // def unary_-: T
 
   // REVIEW TODO: double check ops conventions against FIRRTL
 

diff --git a/core/src/main/scala-2/chisel3/PrintfMacros.scala b/core/src/main/scala-2/chisel3/PrintfMacros.scala
@@ -11,11 +11,8 @@ import scala.reflect.macros.blackbox
 
 object PrintfMacrosCompat {
   def _applyMacroWithInterpolatorCheck(
-    c:          blackbox.Context
-  )(fmt:        c.Tree,
-    data:       c.Tree*
-  )(sourceInfo: c.Tree
-  ): c.Tree = {
+    c: blackbox.Context
+  )(fmt: c.Tree, data: c.Tree*)(sourceInfo: c.Tree): c.Tree = {
     import c.universe._
     _checkFormatString(c)(fmt)
     val apply_impl_do = symbolOf[this.type].asClass.module.info.member(TermName("printfWithReset"))

diff --git a/core/src/main/scala-2/chisel3/VerificationStatementMacros.scala b/core/src/main/scala-2/chisel3/VerificationStatementMacros.scala
@@ -46,12 +46,8 @@ object VerifStmtMacrosCompat {
 
     /** @group VerifPrintMacros */
     def _applyMacroWithInterpolatorCheck(
-      c:          blackbox.Context
-    )(cond:       c.Tree,
-      message:    c.Tree,
-      data:       c.Tree*
-    )(sourceInfo: c.Tree
-    ): c.Tree = {
+      c: blackbox.Context
+    )(cond: c.Tree, message: c.Tree, data: c.Tree*)(sourceInfo: c.Tree): c.Tree = {
       import c.universe._
       _checkFormatString(c)(message)
       val apply_impl_do = symbolOf[this.type].asClass.module.info.member(TermName("_applyWithSourceLinePrintable"))
@@ -60,35 +56,26 @@ object VerifStmtMacrosCompat {
 
     /** @group VerifPrintMacros */
     def _applyMacroWithStringMessage(
-      c:          blackbox.Context
-    )(cond:       c.Tree,
-      message:    c.Tree,
-      data:       c.Tree
-    )(sourceInfo: c.Tree
-    ): c.Tree = {
+      c: blackbox.Context
+    )(cond: c.Tree, message: c.Tree, data: c.Tree)(sourceInfo: c.Tree): c.Tree = {
       import c.universe._
       val apply_impl_do = symbolOf[this.type].asClass.module.info.member(TermName("_applyWithSourceLinePrintable"))
       q"$apply_impl_do($cond, ${getLine(c)},_root_.scala.Some(_root_.chisel3.Printable.pack($message,..$data)))($sourceInfo)"
     }
 
     /** @group VerifPrintMacros */
     def _applyMacroWithPrintableMessage(
-      c:          blackbox.Context
-    )(cond:       c.Tree,
-      message:    c.Tree
-    )(sourceInfo: c.Tree
-    ): c.Tree = {
+      c: blackbox.Context
+    )(cond: c.Tree, message: c.Tree)(sourceInfo: c.Tree): c.Tree = {
       import c.universe._
       val apply_impl_do = symbolOf[this.type].asClass.module.info.member(TermName("_applyWithSourceLinePrintable"))
       q"$apply_impl_do($cond, ${getLine(c)}, _root_.scala.Some($message))($sourceInfo)"
     }
 
     /** @group VerifPrintMacros */
     def _applyMacroWithNoMessage(
-      c:          blackbox.Context
-    )(cond:       c.Tree
-    )(sourceInfo: c.Tree
-    ): c.Tree = {
+      c: blackbox.Context
+    )(cond: c.Tree)(sourceInfo: c.Tree): c.Tree = {
       import c.universe._
       val apply_impl_do = symbolOf[this.type].asClass.module.info.member(TermName("_applyWithSourceLinePrintable"))
       q"$apply_impl_do($cond, ${getLine(c)}, _root_.scala.None)($sourceInfo)"
@@ -127,12 +114,8 @@ object VerifStmtMacrosCompat {
 
     /** @group VerifPrintMacros */
     def _applyMacroWithInterpolatorCheck(
-      c:          blackbox.Context
-    )(cond:       c.Tree,
-      message:    c.Tree,
-      data:       c.Tree*
-    )(sourceInfo: c.Tree
-    ): c.Tree = {
+      c: blackbox.Context
+    )(cond: c.Tree, message: c.Tree, data: c.Tree*)(sourceInfo: c.Tree): c.Tree = {
       import c.universe._
       _checkFormatString(c)(message)
       val apply_impl_do = symbolOf[this.type].asClass.module.info.member(TermName("_applyWithSourceLinePrintable"))
@@ -141,35 +124,26 @@ object VerifStmtMacrosCompat {
 
     /** @group VerifPrintMacros */
     def _applyMacroWithStringMessage(
-      c:          blackbox.Context
-    )(cond:       c.Tree,
-      message:    c.Tree,
-      data:       c.Tree
-    )(sourceInfo: c.Tree
-    ): c.Tree = {
+      c: blackbox.Context
+    )(cond: c.Tree, message: c.Tree, data: c.Tree)(sourceInfo: c.Tree): c.Tree = {
       import c.universe._
       val apply_impl_do = symbolOf[this.type].asClass.module.info.member(TermName("_applyWithSourceLinePrintable"))
       q"$apply_impl_do($cond, ${getLine(c)}, _root_.scala.Some(_root_.chisel3.Printable.pack($message, ..$data)))($sourceInfo)"
     }
 
     /** @group VerifPrintMacros */
     def _applyMacroWithPrintableMessage(
-      c:          blackbox.Context
-    )(cond:       c.Tree,
-      message:    c.Tree
-    )(sourceInfo: c.Tree
-    ): c.Tree = {
+      c: blackbox.Context
+    )(cond: c.Tree, message: c.Tree)(sourceInfo: c.Tree): c.Tree = {
       import c.universe._
       val apply_impl_do = symbolOf[this.type].asClass.module.info.member(TermName("_applyWithSourceLinePrintable"))
       q"$apply_impl_do($cond, ${getLine(c)}, _root_.scala.Some($message))($sourceInfo)"
     }
 
     /** @group VerifPrintMacros */
     def _applyMacroWithNoMessage(
-      c:          blackbox.Context
-    )(cond:       c.Tree
-    )(sourceInfo: c.Tree
-    ): c.Tree = {
+      c: blackbox.Context
+    )(cond: c.Tree)(sourceInfo: c.Tree): c.Tree = {
       import c.universe._
       val apply_impl_do = symbolOf[this.type].asClass.module.info.member(TermName("_applyWithSourceLinePrintable"))
       q"$apply_impl_do($cond, ${getLine(c)}, _root_.scala.None)($sourceInfo)"
@@ -199,22 +173,17 @@ object VerifStmtMacrosCompat {
 
     /** @group VerifPrintMacros */
     def _applyMacroWithNoMessage(
-      c:          blackbox.Context
-    )(cond:       c.Tree
-    )(sourceInfo: c.Tree
-    ): c.Tree = {
+      c: blackbox.Context
+    )(cond: c.Tree)(sourceInfo: c.Tree): c.Tree = {
       import c.universe._
       val apply_impl_do = symbolOf[this.type].asClass.module.info.member(TermName("_applyWithSourceLine"))
       q"$apply_impl_do($cond, ${getLine(c)}, _root_.scala.None)($sourceInfo)"
     }
 
     /** @group VerifPrintMacros */
     def _applyMacroWithMessage(
-      c:          blackbox.Context
-    )(cond:       c.Tree,
-      message:    c.Tree
-    )(sourceInfo: c.Tree
-    ): c.Tree = {
+      c: blackbox.Context
+    )(cond: c.Tree, message: c.Tree)(sourceInfo: c.Tree): c.Tree = {
       import c.universe._
       val apply_impl_do = symbolOf[this.type].asClass.module.info.member(TermName("_applyWithSourceLine"))
       q"$apply_impl_do($cond, ${getLine(c)}, _root_.scala.Some($message))($sourceInfo)"

diff --git a/core/src/main/scala-2/chisel3/experimental/SourceInfo.scala b/core/src/main/scala-2/chisel3/experimental/SourceInfo.scala
@@ -34,7 +34,7 @@ sealed trait SourceInfo {
 
 sealed trait NoSourceInfo extends SourceInfo {
   def makeMessage(f: String => String = x => x): String = ""
-  def filenameOption: Option[String] = None
+  def filenameOption:                            Option[String] = None
 }
 
 /** For when source info can't be generated because of a technical limitation, like for Reg because

diff --git a/core/src/main/scala-2/chisel3/experimental/dataview/InvertibleDataView.scala b/core/src/main/scala-2/chisel3/experimental/dataview/InvertibleDataView.scala
@@ -6,8 +6,8 @@ import chisel3._
 import scala.reflect.runtime.universe.WeakTypeTag
 
 private[chisel3] trait InvertibleDataView {
-  def swapArgs[A, B, C, D](f: (A, B) => Iterable[(C, D)]): (B, A) => Iterable[(D, C)] = {
-    case (b, a) => f(a, b).map(_.swap)
+  def swapArgs[A, B, C, D](f: (A, B) => Iterable[(C, D)]): (B, A) => Iterable[(D, C)] = { case (b, a) =>
+    f(a, b).map(_.swap)
   }
 
   /** Provides `invert` for invertible [[DataView]]s