aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/3rdparty/cplusplus/Bind.cpp
diff options
context:
space:
mode:
authorVolodymyr Zibarov <gogan419@gmail.com>2020-05-14 23:07:05 +0300
committerVolodymyr Zibarov <gogan419@gmail.com>2020-05-29 12:39:28 +0000
commit9ee693ee229d28bd618e8dd44bc6b12750d43a29 (patch)
tree7a2a4dd6679fd3647228b5c39d1fc2724ff133a3 /src/libs/3rdparty/cplusplus/Bind.cpp
parentbe97943372bc80d2440daa20cd658599d765b9a9 (diff)
C++: fix built-in code model to work with shared_ptr on MSVC 2017
These changes target Find Usages feature to work with shared_ptr. Improve libs/3rdparty/cplusplus and plugins/cplusplus: parse __declspec() attribute, call to variadic function template without specified template arguments, if constexpr, c++11 attributes [[value]], function templates with default parameters, resolve order for function vs template with default parameter, template operator->() with default arguments, template specialization with numeric values, find best partial specialization, fix partial specialization for non-first specialized argument Fixes: QTCREATORBUG-7866 Fixes: QTCREATORBUG-20781 Fixes: QTCREATORBUG-22857 Fixes: QTCREATORBUG-17825 Change-Id: I31a080f7729edfb2ee9650f1aff48daeba5a673b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Nikolai Kosjar <pinaceae.pinus@gmail.com>
Diffstat (limited to 'src/libs/3rdparty/cplusplus/Bind.cpp')
-rw-r--r--src/libs/3rdparty/cplusplus/Bind.cpp50
1 files changed, 48 insertions, 2 deletions
diff --git a/src/libs/3rdparty/cplusplus/Bind.cpp b/src/libs/3rdparty/cplusplus/Bind.cpp
index 486efffc3d..53a14f6def 100644
--- a/src/libs/3rdparty/cplusplus/Bind.cpp
+++ b/src/libs/3rdparty/cplusplus/Bind.cpp
@@ -918,6 +918,19 @@ void Bind::parameterDeclarationClause(ParameterDeclarationClauseAST *ast, int lp
for (ParameterDeclarationListAST *it = ast->parameter_declaration_list; it; it = it->next) {
this->declaration(it->value);
+
+ // Check for '...' in last parameter declarator for variadic template
+ // (i.e. template<class ... T> void foo(T ... args);)
+ // those last dots are part of parameter declarator, not the parameter declaration clause
+ if (! it->next
+ && it->value->declarator != nullptr
+ && it->value->declarator->core_declarator != nullptr){
+ DeclaratorIdAST* declId = it->value->declarator->core_declarator->asDeclaratorId();
+ if (declId && declId->dot_dot_dot_token != 0){
+ fun->setVariadic(true);
+ fun->setVariadicTemplate(true);
+ }
+ }
}
if (ast->dot_dot_dot_token)
@@ -2767,10 +2780,27 @@ bool Bind::visit(DestructorNameAST *ast)
bool Bind::visit(TemplateIdAST *ast)
{
// collect the template parameters
- std::vector<FullySpecifiedType> templateArguments;
+ std::vector<TemplateArgument> templateArguments;
for (ExpressionListAST *it = ast->template_argument_list; it; it = it->next) {
ExpressionTy value = this->expression(it->value);
- templateArguments.push_back(value);
+ if (value.isValid()) {
+ templateArguments.emplace_back(value);
+ } else {
+ // special case for numeric values
+ if (it->value->asNumericLiteral()) {
+ templateArguments
+ .emplace_back(value,
+ tokenAt(it->value->asNumericLiteral()->literal_token).number);
+ } else if (it->value->asBoolLiteral()) {
+ templateArguments
+ .emplace_back(value, tokenAt(it->value->asBoolLiteral()->literal_token).number);
+ } else {
+ // fall back to non-valid type in templateArguments
+ // for ast->template_argument_list and templateArguments sizes match
+ // TODO support other literals/expressions as default arguments
+ templateArguments.emplace_back(value);
+ }
+ }
}
const Identifier *id = identifier(ast->identifier_token);
@@ -3014,6 +3044,22 @@ bool Bind::visit(GnuAttributeSpecifierAST *ast)
return false;
}
+bool Bind::visit(MsvcDeclspecSpecifierAST *ast)
+{
+ for (GnuAttributeListAST *it = ast->attribute_list; it; it = it->next) {
+ this->attribute(it->value);
+ }
+ return false;
+}
+
+bool Bind::visit(StdAttributeSpecifierAST *ast)
+{
+ for (GnuAttributeListAST *it = ast->attribute_list; it; it = it->next) {
+ this->attribute(it->value);
+ }
+ return false;
+}
+
bool Bind::visit(TypeofSpecifierAST *ast)
{
ExpressionTy expression = this->expression(ast->expression);