From 6fc742bfaf5ee508a34189400a1a7dbffe3f1cac Mon Sep 17 00:00:00 2001 From: chick Date: Fri, 14 Aug 2020 19:47:53 -0700 Subject: All of src/ formatted with scalafmt --- src/main/scala/firrtl/Namespace.scala | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/main/scala/firrtl/Namespace.scala') diff --git a/src/main/scala/firrtl/Namespace.scala b/src/main/scala/firrtl/Namespace.scala index bb358be6..196539c8 100644 --- a/src/main/scala/firrtl/Namespace.scala +++ b/src/main/scala/firrtl/Namespace.scala @@ -29,8 +29,7 @@ class Namespace private { do { str = s"${value}_$idx" idx += 1 - } - while (!(tryName(str))) + } while (!(tryName(str))) indices(value) = idx str } @@ -55,10 +54,10 @@ object Namespace { def buildNamespaceStmt(s: Statement): Seq[String] = s match { case s: IsDeclaration => Seq(s.name) case s: Conditionally => buildNamespaceStmt(s.conseq) ++ buildNamespaceStmt(s.alt) - case s: Block => s.stmts flatMap buildNamespaceStmt + case s: Block => s.stmts.flatMap(buildNamespaceStmt) case _ => Nil } - namespace.namespace ++= m.ports map (_.name) + namespace.namespace ++= m.ports.map(_.name) m match { case in: Module => namespace.namespace ++= buildNamespaceStmt(in.body) @@ -71,11 +70,11 @@ object Namespace { /** Initializes a [[Namespace]] for [[ir.Module]] names in a [[ir.Circuit]] */ def apply(c: Circuit): Namespace = { val namespace = new Namespace - namespace.namespace ++= c.modules map (_.name) + namespace.namespace ++= c.modules.map(_.name) namespace } - /** Initializes a [[Namespace]] from arbitrary strings **/ + /** Initializes a [[Namespace]] from arbitrary strings * */ def apply(names: Seq[String] = Nil): Namespace = { val namespace = new Namespace namespace.namespace ++= names -- cgit v1.2.3