SymbolDatabase: Set valuetype for this

danmar · danmar · commit 8fb8e06003db · 2022-11-12T22:23:42.000+01:00
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -7033,6 +7033,18 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                 parsedecl(fscope->function->retDef, &vt, mDefaultSignedness, mSettings, mIsCpp);
                 setValueType(tok, vt);
             }
+        } else if (tok->isKeyword() && tok->str() == "this" && tok->scope()->isExecutable()) {
+            const Scope* fscope = tok->scope();
+            while (fscope && !fscope->function)
+                fscope = fscope->nestedIn;
+            const Scope* defScope = fscope && fscope->function->tokenDef ? fscope->function->tokenDef->scope() : nullptr;
+            if (defScope && defScope->isClassOrStruct()) {
+                ValueType vt(ValueType::Sign::UNKNOWN_SIGN, ValueType::Type::RECORD, 1);
+                vt.typeScope = defScope;
+                if (fscope->function->isConst())
+                    vt.constness = 1;
+                setValueType(tok, vt);
+            }
         }
     }
 
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -473,6 +473,7 @@ class TestSymbolDatabase : public TestFixture {
 
         TEST_CASE(valueType1);
         TEST_CASE(valueType2);
+        TEST_CASE(valueTypeThis);
 
         TEST_CASE(variadic1); // #7453
         TEST_CASE(variadic2); // #7649
@@ -7923,6 +7924,11 @@ class TestSymbolDatabase : public TestFixture {
         }
     }
 
+    void valueTypeThis() {
+        ASSERT_EQUALS("C *", typeOf("class C { C() { *this = 0; } };", "this"));
+        ASSERT_EQUALS("const C *", typeOf("class C { void foo() const; }; void C::foo() const { *this = 0; }", "this"));
+    }
+
     void variadic1() { // #7453
         {
             GET_SYMBOL_DB("CBase* create(const char *c1, ...);\n"

Original file line number	Diff line number	Diff line change
`@@ -7033,6 +7033,18 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to`
`7033`	`7033`	`parsedecl(fscope->function->retDef, &vt, mDefaultSignedness, mSettings, mIsCpp);`
`7034`	`7034`	`setValueType(tok, vt);`
`7035`	`7035`	`}`
	`7036`	`+ } else if (tok->isKeyword() && tok->str() == "this" && tok->scope()->isExecutable()) {`
	`7037`	`+ const Scope* fscope = tok->scope();`
	`7038`	`+ while (fscope && !fscope->function)`
	`7039`	`+ fscope = fscope->nestedIn;`
	`7040`	`+ const Scope* defScope = fscope && fscope->function->tokenDef ? fscope->function->tokenDef->scope() : nullptr;`
	`7041`	`+ if (defScope && defScope->isClassOrStruct()) {`
	`7042`	`+ ValueType vt(ValueType::Sign::UNKNOWN_SIGN, ValueType::Type::RECORD, 1);`
	`7043`	`+ vt.typeScope = defScope;`
	`7044`	`+ if (fscope->function->isConst())`
	`7045`	`+ vt.constness = 1;`
	`7046`	`+ setValueType(tok, vt);`
	`7047`	`+ }`
`7036`	`7048`	`}`
`7037`	`7049`	`}`
`7038`	`7050`
Original file line number	Diff line number	Diff line change
`@@ -473,6 +473,7 @@ class TestSymbolDatabase : public TestFixture {`
`473`	`473`
`474`	`474`	`TEST_CASE(valueType1);`
`475`	`475`	`TEST_CASE(valueType2);`
	`476`	`+ TEST_CASE(valueTypeThis);`
`476`	`477`
`477`	`478`	`TEST_CASE(variadic1); // #7453`
`478`	`479`	`TEST_CASE(variadic2); // #7649`
`@@ -7923,6 +7924,11 @@ class TestSymbolDatabase : public TestFixture {`
`7923`	`7924`	`}`
`7924`	`7925`	`}`
`7925`	`7926`
	`7927`	`+ void valueTypeThis() {`
	`7928`	`+ ASSERT_EQUALS("C ", typeOf("class C { C() { this = 0; } };", "this"));`
	`7929`	`+ ASSERT_EQUALS("const C ", typeOf("class C { void foo() const; }; void C::foo() const { this = 0; }", "this"));`
	`7930`	`+ }`
	`7931`	`+`
`7926`	`7932`	`void variadic1() { // #7453`
`7927`	`7933`	`{`
`7928`	`7934`	`GET_SYMBOL_DB("CBase* create(const char *c1, ...);\n"`