ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: improved template argument parsing

Browse Source 
* improved the way of gettig a TemplateSpecializationTypeLoc from any TypeLoc to parse template arguments.
* fixed wrong forward mouse button code in app settings.
This commit is contained in:
malte_langkabel
2015-12-16 16:36:36 +01:00
parent 82a16341d8
commit d5cf4b7109
5 changed files with 51 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_parser/data/parser/cxx/ASTVisitor.cpp
+29 -65
View File
@@ -179,11 +179,7 @@ bool ASTVisitor::VisitParmVarDecl(clang::ParmVarDecl* declaration)
{
// todo: handle parameters here!
// maybe handle template args in visitvardecl to account for local variables and stuff...
clang::TypeLoc loc = declaration->getTypeSourceInfo()->getTypeLoc();
if (loc.getTypeLocClass() == clang::TypeLoc::TypeLocClass::TemplateSpecialization)
{
processTemplateArguments(loc.getAs<clang::TemplateSpecializationTypeLoc>());
}
processTemplateArguments(declaration->getTypeSourceInfo()->getTypeLoc());
return true;
}
@@ -552,38 +548,22 @@ void ASTVisitor::VisitCXXConstructExprInDeclBody(clang::DeclaratorDecl* decl, cl
void ASTVisitor::VisitExplicitCastExprInDeclBody(clang::FunctionDecl* decl, clang::ExplicitCastExpr* expr)
{
clang::TypeLoc loc = expr->getTypeInfoAsWritten()->getTypeLoc();
if (loc.getTypeLocClass() == clang::TypeLoc::TypeLocClass::TemplateSpecialization)
{
processTemplateArguments(loc.getAs<clang::TemplateSpecializationTypeLoc>());
}
processTemplateArguments(expr->getTypeInfoAsWritten()->getTypeLoc());
}
void ASTVisitor::VisitExplicitCastExprInDeclBody(clang::DeclaratorDecl* decl, clang::ExplicitCastExpr* expr)
{
clang::TypeLoc loc = expr->getTypeInfoAsWritten()->getTypeLoc();
if (loc.getTypeLocClass() == clang::TypeLoc::TypeLocClass::TemplateSpecialization)
{
processTemplateArguments(loc.getAs<clang::TemplateSpecializationTypeLoc>());
}
processTemplateArguments(expr->getTypeInfoAsWritten()->getTypeLoc());
}
void ASTVisitor::VisitCXXTemporaryObjectExprInDeclBody(clang::FunctionDecl* decl, clang::CXXTemporaryObjectExpr* expr)
{
clang::TypeLoc loc = expr->getTypeSourceInfo()->getTypeLoc();
if (loc.getTypeLocClass() == clang::TypeLoc::TypeLocClass::TemplateSpecialization)
{
processTemplateArguments(loc.getAs<clang::TemplateSpecializationTypeLoc>());
}
processTemplateArguments(expr->getTypeSourceInfo()->getTypeLoc());
}
void ASTVisitor::VisitCXXTemporaryObjectExprInDeclBody(clang::DeclaratorDecl* decl, clang::CXXTemporaryObjectExpr* expr)
{
clang::TypeLoc loc = expr->getTypeSourceInfo()->getTypeLoc();
if (loc.getTypeLocClass() == clang::TypeLoc::TypeLocClass::TemplateSpecialization)
{
processTemplateArguments(loc.getAs<clang::TemplateSpecializationTypeLoc>());
}
processTemplateArguments(expr->getTypeSourceInfo()->getTypeLoc());
}
void ASTVisitor::VisitCXXNewExprInDeclBody(clang::FunctionDecl* decl, clang::CXXNewExpr* expr)
@@ -593,11 +573,7 @@ void ASTVisitor::VisitCXXNewExprInDeclBody(clang::FunctionDecl* decl, clang::CXX
getParseFunction(decl)
);
clang::TypeLoc loc = expr->getAllocatedTypeSourceInfo()->getTypeLoc();
if (loc.getTypeLocClass() == clang::TypeLoc::TypeLocClass::TemplateSpecialization)
{
processTemplateArguments(loc.getAs<clang::TemplateSpecializationTypeLoc>());
}
processTemplateArguments(expr->getAllocatedTypeSourceInfo()->getTypeLoc());
}
void ASTVisitor::VisitCXXNewExprInDeclBody(clang::DeclaratorDecl* decl, clang::CXXNewExpr* expr)
@@ -607,11 +583,7 @@ void ASTVisitor::VisitCXXNewExprInDeclBody(clang::DeclaratorDecl* decl, clang::C
getParseVariable(decl)
);
clang::TypeLoc loc = expr->getAllocatedTypeSourceInfo()->getTypeLoc();
if (loc.getTypeLocClass() == clang::TypeLoc::TypeLocClass::TemplateSpecialization)
{
processTemplateArguments(loc.getAs<clang::TemplateSpecializationTypeLoc>());
}
processTemplateArguments(expr->getAllocatedTypeSourceInfo()->getTypeLoc());
}
void ASTVisitor::VisitMemberExprInDeclBody(clang::FunctionDecl* decl, clang::MemberExpr* expr)
@@ -705,11 +677,7 @@ void ASTVisitor::VisitVarDeclInDeclBody(clang::FunctionDecl* decl, clang::VarDec
getParseFunction(decl)
);
clang::TypeLoc loc = varDecl->getTypeSourceInfo()->getTypeLoc();
if (loc.getTypeLocClass() == clang::TypeLoc::TypeLocClass::TemplateSpecialization)
{
processTemplateArguments(loc.getAs<clang::TemplateSpecializationTypeLoc>());
}
processTemplateArguments(varDecl->getTypeSourceInfo()->getTypeLoc());
}
void ASTVisitor::processFunctionDecl(clang::FunctionDecl* declaration)
@@ -724,11 +692,7 @@ void ASTVisitor::processFunctionDecl(clang::FunctionDecl* declaration)
clang::TypeLoc functionLoc = declaration->getTypeSourceInfo()->getTypeLoc();
if (functionLoc.getTypeLocClass() == clang::TypeLoc::TypeLocClass::FunctionProto)
{
clang::TypeLoc returnLoc = functionLoc.getAs<clang::FunctionProtoTypeLoc>().getReturnLoc();
if (returnLoc.getTypeLocClass() == clang::TypeLoc::TypeLocClass::TemplateSpecialization)
{
processTemplateArguments(returnLoc.getAs<clang::TemplateSpecializationTypeLoc>());
}
processTemplateArguments(functionLoc.getAs<clang::FunctionProtoTypeLoc>().getReturnLoc());
}
@@ -794,11 +758,7 @@ void ASTVisitor::processTemplateArgumentsOfExplicitSpecialization(clang::ClassTe
{
if (clang::TypeSourceInfo* typeSourceInfo = specializationDecl->getTypeAsWritten())
{
clang::TypeLoc loc = typeSourceInfo->getTypeLoc();
if (loc.getTypeLocClass() == clang::TypeLoc::TypeLocClass::TemplateSpecialization)
{
processTemplateArguments(loc.getAs<clang::TemplateSpecializationTypeLoc>());
}
processTemplateArguments(typeSourceInfo->getTypeLoc());
}
else
{
@@ -866,26 +826,30 @@ void ASTVisitor::processTemplateArguments(clang::DeclRefExpr* expr)
}
}
void ASTVisitor::processTemplateArguments(clang::TemplateSpecializationTypeLoc loc)
void ASTVisitor::processTemplateArguments(clang::TypeLoc typeLoc)
{
NameHierarchy specializationNameHierarchy = utility::qualTypeToDataType(loc.getType())->getTypeNameHierarchy();
if (!isLocatedInProjectFile(getParseLocation(loc.getSourceRange())))
clang::TemplateSpecializationTypeLoc specializationLoc = utility::getNextTypeLoc<clang::TemplateSpecializationTypeLoc>(typeLoc);
if (!specializationLoc.isNull())
{
return;
}
NameHierarchy specializationNameHierarchy = utility::qualTypeToDataType(specializationLoc.getType())->getTypeNameHierarchy();
for (unsigned int i = 0; i < loc.getNumArgs(); i++)
{
const clang::TemplateArgument& argument = loc.getArgLoc(i).getArgument();
NameHierarchy argumentNameHierarchy = utility::templateArgumentToDataType(argument)->getTypeNameHierarchy();
if (argumentNameHierarchy.size()) // FIXME: Some TemplateArgument kinds are not handled yet.
if (!isLocatedInProjectFile(getParseLocation(specializationLoc.getSourceRange())))
{
m_client->onTemplateArgumentTypeOfTemplateRecordParsed(
getParseLocationForTokensInRange(loc.getArgLoc(i).getSourceRange()),
argumentNameHierarchy,
specializationNameHierarchy
return;
}
for (unsigned int i = 0; i < specializationLoc.getNumArgs(); i++)
{
const clang::TemplateArgument& argument = specializationLoc.getArgLoc(i).getArgument();
NameHierarchy argumentNameHierarchy = utility::templateArgumentToDataType(argument)->getTypeNameHierarchy();
if (argumentNameHierarchy.size()) // FIXME: Some TemplateArgument kinds are not handled yet.
{
m_client->onTemplateArgumentTypeOfTemplateRecordParsed(
getParseLocationForTokensInRange(specializationLoc.getArgLoc(i).getSourceRange()),
argumentNameHierarchy,
specializationNameHierarchy
);
}
}
}
}
src/lib_parser/data/parser/cxx/ASTVisitor.h
+1 -1
View File
@@ -72,7 +72,7 @@ private:
void processTemplateArgumentsOfExplicitSpecialization(clang::FunctionDecl* declaration);
void processTemplateArgumentsOfExplicitSpecialization(clang::ClassTemplateSpecializationDecl* specializationDecl);
void processTemplateArguments(clang::DeclRefExpr* expr);
void processTemplateArguments(clang::TemplateSpecializationTypeLoc loc);
void processTemplateArguments(clang::TypeLoc loc);
bool isLocatedInUnparsedProjectFile(const clang::Decl* declaration) const;
bool isLocatedInProjectFile(const ParseLocation& location) const;
src/lib_parser/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp
+1 -1
View File
@@ -65,9 +65,9 @@ std::shared_ptr<DataType> CxxTypeNameResolver::typeToDataType(const clang::Type*
break;
}
case clang::Type::ConstantArray:
case clang::Type::VariableArray:
case clang::Type::DependentSizedArray:
case clang::Type::IncompleteArray:
case clang::Type::VariableArray:
{
std::shared_ptr<DataType> innerType = qualTypeToDataType(clang::dyn_cast<clang::ArrayType>(type)->getElementType());
dataType = std::make_shared<ArrayModifiedDataType>(innerType);
src/lib_parser/data/parser/cxx/utilityCxx.h
+19
View File
@@ -6,6 +6,7 @@
#include <vector>
#include "clang/AST/Type.h"
#include "clang/AST/TypeLoc.h"
#include "clang/AST/Decl.h"
#include "clang/AST/DeclTemplate.h"
@@ -14,6 +15,9 @@ class NameHierarchy;
namespace utility
{
template <typename TypeLocType>
TypeLocType getNextTypeLoc(clang::TypeLoc loc);
std::shared_ptr<DataType> qualTypeToDataType(clang::QualType qualType);
NameHierarchy getDeclNameHierarchy(const clang::Decl* declaration);
@@ -21,4 +25,19 @@ namespace utility
NameHierarchy getTemplateSpecializationParentNameHierarchy(clang::ClassTemplateSpecializationDecl* declaration);
}
template <typename TypeLocType>
TypeLocType utility::getNextTypeLoc(clang::TypeLoc loc)
{
while (!loc.isNull())
{
TypeLocType ret = loc.getAs<TypeLocType>();
if (!ret.isNull())
{
return ret;
}
loc = loc.getNextTypeLoc();
}
return TypeLocType(); // isNull() of this object returns true.
}
#endif // UTILITY_CLANG_H