This repository has been archived by the owner on Aug 20, 2024. It is now read-only.
Fix MultiInfo parser + serialization bug #2265
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FileInfo compression sorts the outputted entries alphabetically, but this test did not reflect that fact
|
Looking good. Could you please add the test from #2253 to show that your PR solves the issue? |
azidar
approved these changes
Jun 17, 2021
| @@ -321,4 +321,17 @@ class InfoSpec extends FirrtlFlatSpec with FirrtlMatchers { | |||
| for (line <- check) | |||
| result should containLine(line) | |||
| } | |||
|
|
|||
| "Source Locators" should "not loose information when going through serialization + parsing" in { | |||
There was a problem hiding this comment.
Suggested change
| "Source Locators" should "not loose information when going through serialization + parsing" in { | |
| "Source Locators" should "not lose information when going through serialization + parsing" in { |
src/main/scala/firrtl/Visitor.scala
Outdated
|
|
||
| // Grab each File.format line:col token from the input string | ||
| splitCompressedInfo.findAllIn(escaped).matchData.foreach { info => | ||
| { |
There was a problem hiding this comment.
Unnecessary curly braces here
src/main/scala/firrtl/Visitor.scala
Outdated
| // If there were no subgroups, the regex matched against a non-conforming source locator | ||
| // pattern, so do not process it | ||
| case None => out = out :+ ir.FileInfo.fromEscaped(info.toString) | ||
| case Some(file) => { |
There was a problem hiding this comment.
Suggested change
| case Some(file) => { | |
| case Some(file) => |
Again, unnecessary curly braces.
src/main/scala/firrtl/Visitor.scala
Outdated
| val lineDescriptors = info.group(2) | ||
| // Grab each line:col values from the separated (compressed) FileInfo. | ||
| splitLineDescriptors.findAllIn(lineDescriptors).matchData.foreach { lineDescriptor => | ||
| { |
14 tasks
ekiwi
added
the
Please Merge
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR addresses the issue highlighted in #2253: in particular, the firrtl parser can now reconstruct a
MultiInfostructure that was previously serialized and compressed by the algorithm in #2212. This only results in a single levelMultiInfodue to the flattening step of serialization, so it can not recreate aMultiInfoofMultiInfos or any such recursive source locator object.Contributor Checklist
Type of Improvement
bug fix
API Impact
No change
Backend Code Generation Impact
Should have no impact.
Desired Merge Strategy
Squash and merge
Release Notes
Firrtl parser can now handle parsing a serialized, compressed source locator and return a
MultiInfoobject consisting ofFileInfos.Reviewer Checklist (only modified by reviewer)
Please Merge?