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

logic: c language support

Browse Source 
* re-added gui for c project setup
* ASTVisitor now visits RecordDecls instead of CXXRecordDecls
* prevented endless recursion when parsing struct that is defined in functions signature.
This commit is contained in:
malte_langkabel
2015-12-18 16:27:49 +01:00
parent 5c0493267c
commit bed0f8f157
4 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_parser/data/parser/cxx/ASTVisitor.cpp
+23 -16
View File
@@ -50,7 +50,7 @@ bool ASTVisitor::VisitTypedefDecl(clang::TypedefDecl* declaration)
return true;
}
bool ASTVisitor::VisitCXXRecordDecl(clang::CXXRecordDecl* declaration)
bool ASTVisitor::VisitRecordDecl(clang::RecordDecl* declaration)
{
if (isLocatedInUnparsedProjectFile(declaration))
{
@@ -74,18 +74,21 @@ bool ASTVisitor::VisitCXXRecordDecl(clang::CXXRecordDecl* declaration)
}
if ((declaration->isClass() || declaration->isStruct()) &&
declaration->hasDefinition() && declaration->getDefinition() == declaration && declaration->getNumBases())
declaration->isThisDeclarationADefinition())
{
for (const clang::CXXBaseSpecifier& it : declaration->bases())
if (clang::CXXRecordDecl* cxxDecl = clang::dyn_cast_or_null<clang::CXXRecordDecl>(declaration))
{
m_client->onInheritanceParsed(
getParseLocation(it.getSourceRange()),
utility::getDeclNameHierarchy(declaration),
utility::qualTypeToDataType(it.getType())->getTypeNameHierarchy(),
convertAccessType(it.getAccessSpecifier())
);
for (const clang::CXXBaseSpecifier& it : cxxDecl->bases())
{
m_client->onInheritanceParsed(
getParseLocation(it.getSourceRange()),
utility::getDeclNameHierarchy(declaration),
utility::qualTypeToDataType(it.getType())->getTypeNameHierarchy(),
convertAccessType(it.getAccessSpecifier())
);
// TODO: check for template class and add arguments!
// TODO: check for template class and add arguments!
}
}
}
}
@@ -1004,17 +1007,21 @@ ParseLocation ASTVisitor::getParseLocationOfFunctionBody(const clang::FunctionDe
return ParseLocation();
}
ParseLocation ASTVisitor::getParseLocationOfRecordBody(clang::CXXRecordDecl* decl) const
ParseLocation ASTVisitor::getParseLocationOfRecordBody(clang::RecordDecl* decl) const
{
if (decl->hasDefinition() && decl->isThisDeclarationADefinition())
if (decl->isThisDeclarationADefinition())
{
clang::SourceRange range;
clang::ClassTemplateDecl* templateDecl = decl->getDescribedClassTemplate();
if (templateDecl)
if (clang::CXXRecordDecl* cxxDecl = clang::dyn_cast_or_null<clang::CXXRecordDecl>(decl))
{
range = templateDecl->getSourceRange();
clang::ClassTemplateDecl* templateDecl = cxxDecl->getDescribedClassTemplate();
if (templateDecl)
{
range = templateDecl->getSourceRange();
}
}
else
if (range.isInvalid())
{
range = decl->getDefinition()->getSourceRange();
}