Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix regex patterns #2442

Merged
merged 4 commits into from
Jun 5, 2024
Merged

Fix regex patterns #2442

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50bb7ff
Fix regex patterns
DarkaMaul Apr 23, 2024
dc0fc4b
Merge branch 'dev' into fix/regex-expression
DarkaMaul Apr 26, 2024
8377534
Fix regex
DarkaMaul May 1, 2024
9ce2f6d
Fix formatting issues.
DarkaMaul Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion slither/solc_parsing/expressions/expression_parsing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,9 @@ def parse_expression(expression: Dict, caller_context: CallerContextExpression)
referenced_declaration = expression["attributes"]["referencedDeclaration"]

if t:
found = re.findall(r"[struct|enum|function|modifier] \(([\[\] ()a-zA-Z0-9\.,_]*)\)", t)
found = re.findall(
r"(?:struct|enum|function|modifier) \(([\[\] ()a-zA-Z0-9\.,_]*)\)", t
)
Comment on lines +504 to +506
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The addition of the non-capturing group in the regex pattern is a good practice as it clarifies that the group is only used for matching and not for capturing. This can slightly improve performance and makes the regex cleaner. Consider adding a comment in the code to explain the use of the non-capturing group for future maintainers.

- r"(?:struct|enum|function|modifier) \(([\[\] ()a-zA-Z0-9\.,_]*)\)", t
+ r"(?:struct|enum|function|modifier) \(([\[\] ()a-zA-Z0-9\.,_]*)\)", t  # Use non-capturing group to avoid unnecessary captures
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
found = re.findall(
r"(?:struct|enum|function|modifier) \(([\[\] ()a-zA-Z0-9\.,_]*)\)", t
)
found = re.findall(
r"(?:struct|enum|function|modifier) \(([\[\] ()a-zA-Z0-9\.,_]*)\)", t # Use non-capturing group to avoid unnecessary captures
)

assert len(found) <= 1
if found:
value = value + "(" + found[0] + ")"
Expand Down