mmanek patch 1 #6352
Closed
mmanek patch 1 #6352
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
|
Thanks for contribution. Please update the title of the PR to reflect what it does. And please add a unit test. |
firewave
reviewed
Apr 26, 2024
|
Not sure where it is used, but |
|
There is |
| @@ -152,7 +151,7 @@ static bool isClassStructUnionEnumStart(const Token * tok) | |||
| const Token * tok2 = tok->previous(); | |||
| while (tok2 && !Token::Match(tok2, "class|struct|union|enum|{|}|;")) | |||
| tok2 = tok2->previous(); | |||
| return Token::Match(tok2, "class|struct|union|enum"); | |||
| return Token::Match(tok2, "class|struct|union|enum") || Token::Match(tok2, "enum %type% %name%"); | |||
There was a problem hiding this comment.
This is unnecessary. We just check whether we have arrived at one of the four keywords here.
| @@ -80,7 +79,7 @@ static bool isEnumStart(const Token* tok) | |||
| { | |||
| if (!tok || tok->str() != "{") | |||
| return false; | |||
| return (tok->strAt(-1) == "enum") || (tok->strAt(-2) == "enum") || Token::Match(tok->tokAt(-3), "enum class %name%"); | |||
| return (tok->strAt(-1) == "enum") || (tok->strAt(-2) == "enum") || Token::Match(tok->tokAt(-3), "enum class %name%") || Token::Match(tok->tokAt(-3), "enum %type% %name%"); | |||
There was a problem hiding this comment.
I suggest moving the code from isEnumScope() here and replacing the call to isEnumScope() with isEnumStart().
|
Feel free to reopen once comments have been addressed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I added a condition in the “IsEnumStart” function that checks the token three positions previous to the current one which will help verify that the pattern of the program is correct. Additionally, I added a condition that comes before the return statement of “isClassStructUnionEnumStart” that checks if the enum -> type -> name pattern is detected.