riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

ValName: 'lazy val' now also counts for providing a name

Browse Source
This commit is contained in:
Wesley W. Terpstra
2017-12-01 10:54:05 -08:00
parent fe8d557751
commit a3e44375c6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
macros/src/main/scala/ValName.scala
View File

@@ -15,7 +15,7 @@ object ValNameImpl
def allOwners(s: c.Symbol): Seq[c.Symbol] = def allOwners(s: c.Symbol): Seq[c.Symbol] =
if (s == `NoSymbol`) Nil else s +: allOwners(s.owner) if (s == `NoSymbol`) Nil else s +: allOwners(s.owner)
val terms = allOwners(c.internal.enclosingOwner).filter(_.isTerm).map(_.asTerm) val terms = allOwners(c.internal.enclosingOwner).filter(_.isTerm).map(_.asTerm)
terms.filter(_.isVal).map(_.name.toString).find(_(0) != '$').map { s => terms.filter(t => t.isVal || t.isLazy).map(_.name.toString).find(_(0) != '$').map { s =>
val trim = s.replaceAll("\\s", "") val trim = s.replaceAll("\\s", "")
c.Expr[ValNameImpl] { q"_root_.freechips.rocketchip.macros.ValNameImpl(${trim})" } c.Expr[ValNameImpl] { q"_root_.freechips.rocketchip.macros.ValNameImpl(${trim})" }
}.getOrElse(c.abort(c.enclosingPosition, "Not a valid application.")) }.getOrElse(c.abort(c.enclosingPosition, "Not a valid application."))