Fix #13100 (ValueType::TypeScope set wrong) (danmar#6894)

Author: danmar

lib/symboldatabase.cpp

@@ -7568,7 +7568,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
             else if (tok->previous() && tok->previous()->function() && tok->previous()->function()->isConstructor()) {
                 ValueType valuetype;
                 valuetype.type = ValueType::RECORD;
-                valuetype.typeScope = tok->previous()->function()->token->scope();
+                valuetype.typeScope = tok->previous()->function()->tokenDef->scope();
                 setValueType(tok, valuetype);
             }
 

lib/token.cpp

@@ -36,6 +36,7 @@
 #include <cstdio>
 #include <cstring>
 #include <functional>
+#include <iostream>
 #include <iterator>
 #include <map>
 #include <set>
@@ -1177,6 +1178,11 @@ void Token::createMutualLinks(Token *begin, Token *end)
     end->link(begin);
 }
 
+void Token::printOut() const
+{
+    printOut(std::cout, "");
+}
+
 void Token::printOut(std::ostream& out, const char *title) const
 {
     if (title && title[0])

lib/token.h

@@ -968,16 +968,19 @@ class CPPCHECKLIB Token {
     }
 
     /**
-     * For debugging purposes, prints token and all tokens
-     * followed by it.
+     * For debugging purposes, prints token and all tokens followed by it.
+     */
+    void printOut() const;
+
+    /**
+     * For debugging purposes, prints token and all tokens followed by it.
      * @param title Title for the printout or use default parameter or 0
      * for no title.
      */
     void printOut(std::ostream& out, const char *title = nullptr) const;
 
     /**
-     * For debugging purposes, prints token and all tokens
-     * followed by it.
+     * For debugging purposes, prints token and all tokens followed by it.
      * @param title Title for the printout or use default parameter or 0
      * for no title.
      * @param fileNames Prints out file name instead of file index.

test/testsymboldatabase.cpp

@@ -9207,6 +9207,9 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS("signed int &&", typeOf("std::move(5);", "( 5 )"));
         ASSERT_EQUALS("signed int", typeOf("using F = int(int*); F* f; f(ptr);", "( ptr")); // #9792
 
+        // calling constructor..
+        ASSERT_EQUALS("s", typeOf("struct s { s(int); }; s::s(int){} void foo() { throw s(1); } ", "( 1 )")); // #13100
+
         // struct member..
         ASSERT_EQUALS("signed int", typeOf("struct AB { int a; int b; } ab; x = ab.a;", "."));
         ASSERT_EQUALS("signed int", typeOf("struct AB { int a; int b; } *ab; x = ab[1].a;", "."));