diff options
| author | Adam Izraelevitz | 2020-05-11 14:38:24 -0700 |
|---|---|---|
| committer | GitHub | 2020-05-11 21:38:24 +0000 |
| commit | 32d814cd260b1585b7eb5f2cacd8457e46821be1 (patch) | |
| tree | c25850dc4474911271b12da4af8f0157b6dc892a /src/main | |
| parent | 706fbd7e36d7810fd07b4648d6d9ab8c9e98c598 (diff) | |
Have AppendInfo use MultiInfo, rather than appending with : (#1580)
* Bugfix - have AppendInfo use MultiInfo, rather than appending with :
* Address reviewer feedback
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/scala/firrtl/Visitor.scala | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/scala/firrtl/Visitor.scala b/src/main/scala/firrtl/Visitor.scala index 084a3006..4033c0fd 100644 --- a/src/main/scala/firrtl/Visitor.scala +++ b/src/main/scala/firrtl/Visitor.scala @@ -60,7 +60,7 @@ class Visitor(infoMode: InfoMode) extends AbstractParseTreeVisitor[FirrtlNode] w private def visitInfo(ctx: Option[InfoContext], parentCtx: ParserRuleContext): Info = { def genInfo(filename: String): String = - stripPath(filename) + "@" + parentCtx.getStart.getLine + "." + + stripPath(filename) + " " + parentCtx.getStart.getLine + ":" + parentCtx.getStart.getCharPositionInLine lazy val useInfo: String = ctx match { case Some(info) => info.getText.drop(2).init // remove surrounding @[ ... ] @@ -70,9 +70,12 @@ class Visitor(infoMode: InfoMode) extends AbstractParseTreeVisitor[FirrtlNode] w case UseInfo => if (useInfo.length == 0) NoInfo else ir.FileInfo(ir.StringLit.unescape(useInfo)) + case AppendInfo(filename) if (useInfo.length == 0) => + ir.FileInfo(ir.StringLit.unescape(genInfo(filename))) case AppendInfo(filename) => - val newInfo = useInfo + ":" + genInfo(filename) - ir.FileInfo(ir.StringLit.unescape(newInfo)) + val useFileInfo = ir.FileInfo(ir.StringLit.unescape(useInfo)) + val newFileInfo = ir.FileInfo(ir.StringLit.unescape(genInfo(filename))) + ir.MultiInfo(useFileInfo, newFileInfo) case GenInfo(filename) => ir.FileInfo(ir.StringLit.unescape(genInfo(filename))) case IgnoreInfo => NoInfo |