C++: Improve parameter naming #17778
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
jketema
added
depends on internal PR
jketema
commented
Oct 16, 2024
Comment on lines
-76
to
+77
| result = this.getAnEffectiveDeclarationEntry() and result.getName() != "" | ||
| result = this.getAnEffectiveDeclarationEntry() and | ||
| exists(string name | var_decls(unresolveElement(result), _, _, name, _) | name != "") |
There was a problem hiding this comment.
This change is needed to avoid non-monotonic recursion after extending VariableDeclarationEntry.getName(). It does not affect the ouput.
jketema
commented
Oct 16, 2024
Comment on lines
-298
to
+306
| exists(string idx | | ||
| idx = | ||
| ((this.getIndex() + 1).toString() + "th") | ||
| .replaceAll("1th", "1st") | ||
| .replaceAll("2th", "2nd") | ||
| .replaceAll("3th", "3rd") | ||
| .replaceAll("11st", "11th") | ||
| .replaceAll("12nd", "12th") | ||
| .replaceAll("13rd", "13th") and | ||
| exists(string anon | | ||
| anon = "(unnamed parameter " + this.getIndex().toString() + ")" and | ||
| if exists(this.getCanonicalName()) | ||
| then | ||
| result = "declaration of " + this.getCanonicalName() + " as anonymous " + idx + " parameter" | ||
| else result = "declaration of " + idx + " parameter" | ||
| then result = "declaration of " + this.getCanonicalName() + " as " + anon | ||
| else result = "declaration of " + anon |
There was a problem hiding this comment.
This make the string representation of parameter declaration entries consistent with the representation of parameters, which it wasn't.
jketema
commented
Oct 16, 2024
Comment on lines
+244
to
+247
| or | ||
| name = "" and | ||
| not this instanceof ParameterDeclarationEntry and | ||
| result = this.getVariable().(Parameter).getName() |
There was a problem hiding this comment.
This fixes the missing string representation I found while working on requires expressions.
There was a problem hiding this comment.
See the internal PR associated with #17740
geoffw0
approved these changes
Oct 17, 2024
geoffw0
reviewed
Oct 17, 2024
| .replaceAll("3th", "3rd") | ||
| .replaceAll("11st", "11th") | ||
| .replaceAll("12nd", "12th") | ||
| .replaceAll("13rd", "13th") and |
There was a problem hiding this comment.
I will confess to being a bit sad that we lose this wonderful, wonky logic.
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.
See inline comments for explanation.
Pull Request checklist
All query authors
.qhelp. See the documentation in this repository.Internal query authors only
.ql,.qll, or.qhelpfiles. See the documentation (internal access required).