fix #13967: Template simplifier: put Tokens into proper scope #7634
+44
−2
Conversation
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
ludviggunne
changed the title
| @@ -3209,6 +3210,18 @@ class TestSymbolDatabase : public TestFixture { | |||
| ASSERT_EQUALS(2U, fredAType->classDef->linenr()); | |||
| } | |||
|
|
|||
| void namespaces5() { // #13967 | |||
There was a problem hiding this comment.
Not sure if this is still about the TemplateSimplifier, but would a test there make sense?
| @@ -173,6 +173,30 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes() | |||
|
|
|||
| const bool doProgress = (mSettings.reportProgress != -1); | |||
|
|
|||
| std::map<Scope *, std::set<std::string>> forwardDecls; | |||
|
|
|||
| const std::function<Scope *(const Token *, Scope *)> findForwardDeclScope = [&](const Token *tok, Scope *startScope) { | |||
There was a problem hiding this comment.
Can this be a static function?
danmar
reviewed
Jun 28, 2025
| const Variable *x = db->getVariableFromVarId(2U); | ||
| ASSERT_EQUALS("x", x->name()); | ||
| const Scope *scope = x->scope(); | ||
| ASSERT_EQUALS("test", scope->nestedIn->className); |
There was a problem hiding this comment.
this test will not work well if scope->nestedIn is nullptr I want an extra ASSERT to ensure a clear error report is written..
danmar
reviewed
Jun 28, 2025
| " const Test<64> test;\n" | ||
| "}\n"); | ||
| const Variable *x = db->getVariableFromVarId(2U); | ||
| ASSERT_EQUALS("x", x->name()); |
There was a problem hiding this comment.
Hmm I feel this test is a bit weird. Variable ids are just unique numbers. If the variable "x" would get varid 1002 in the future nothing is wrong about that but this test will fail. But on the other hand we have lots of similar tests already in testsymboldatabase so you just followed the common pattern!
So we can keep it..
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.
No description provided.