Fix regex for VHDL component instantiations#990
Open
javValverde wants to merge 2 commits intoVUnit:masterfrom
Open
Fix regex for VHDL component instantiations#990javValverde wants to merge 2 commits intoVUnit:masterfrom
javValverde wants to merge 2 commits intoVUnit:masterfrom
Conversation
javValverde
commented
Feb 29, 2024
javValverde
commented
- Add comments to the multiline regex
- Extend unittest for vhdl_parser
- Add comments to the multiline regex - Extend unittest for vhdl_parser
LarsAsplund
reviewed
Mar 1, 2024
vunit/vhdl_parser.py
Outdated
| (?:(?:[a-zA-Z]\w*)\.)? # Optional library name | ||
| ([a-zA-Z]\w*)\s* # Capture component name | ||
| (?:generic|port)\s+map\s* # Generic/port map | ||
| \(.*?\)\s*; # Open and closing brackets |
Collaborator
There was a problem hiding this comment.
Rather than allowing anything between the opening and closing brackets I would suggest extending the previously more restrictive expression with what is needed to pass the new test case:
([\s\w=>,.)(+-'"*/]*)
I cannot recall if the more restrictive expression is there for a reason that is not made explicit in the test cases. For that reason I prefer a more defensive modification.
Author
There was a problem hiding this comment.
Sorry for the delayed reply.
I will modify the regex as you suggested, but I guess there will be other cases in which it won't work
In the mean time I've monkey patched vhdl_parser.py and am matching everything inside the brackets.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.