ValueType: function return type

danmar · danmar · commit 9738cc66ebd3 · 2015-10-11T08:42:31.000+02:00
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -3834,6 +3834,13 @@ void SymbolDatabase::setValueTypeInTokenList(Token *tokens)
                 if (Token::simpleMatch(parsedecl(tok->next(), &valuetype), ")"))
                     ::setValueType(tok, valuetype);
             }
+
+            // function
+            if (tok->previous() && tok->previous()->function() && tok->previous()->function()->retDef) {
+                ValueType valuetype;
+                if (Token::simpleMatch(parsedecl(tok->previous()->function()->retDef, &valuetype), "("))
+                    ::setValueType(tok, valuetype);
+            }
         } else if (tok->variable()) {
             const Variable *var = tok->variable();
             ValueType valuetype;
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -3009,6 +3009,9 @@ class TestSymbolDatabase: public TestFixture {
         ASSERT_EQUALS("const int *", typeOf("const int *a; x = a + 1;", "a +"));
         ASSERT_EQUALS("int * const", typeOf("int * const a; x = a + 1;", "+"));
         ASSERT_EQUALS("const int *", typeOf("const int a[20]; x = a + 1;", "+"));
+
+        // function call..
+        ASSERT_EQUALS("int", typeOf("int a(int); a(5);", "( 5"));
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -3009,6 +3009,9 @@ class TestSymbolDatabase: public TestFixture {`
`3009`	`3009`	`ASSERT_EQUALS("const int ", typeOf("const int a; x = a + 1;", "a +"));`
`3010`	`3010`	`ASSERT_EQUALS("int * const", typeOf("int * const a; x = a + 1;", "+"));`
`3011`	`3011`	`ASSERT_EQUALS("const int *", typeOf("const int a[20]; x = a + 1;", "+"));`
	`3012`	`+`
	`3013`	`+ // function call..`
	`3014`	`+ ASSERT_EQUALS("int", typeOf("int a(int); a(5);", "( 5"));`
`3012`	`3015`	`}`
`3013`	`3016`	`};`
`3014`	`3017`