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

data: fixes for parsing and logging

Browse Source 
* readded Storage logs
* turned type name resolver error logs to info logs
* fixed inheritance not parsed in forward declarations
* check file node id before saving source location
* show errors in unparsed files again
This commit is contained in:
Eberhard Graether
2015-09-24 02:39:10 +02:00
parent bb3a8bf351
commit c18bd6a8bc
7 changed files with 108 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/data/parser/cxx/ASTVisitor.cpp
+9 -11
View File
@@ -73,19 +73,17 @@ bool ASTVisitor::VisitCXXRecordDecl(clang::CXXRecordDecl* declaration)
);
}
if (declaration->isClass() || declaration->isStruct())
if ((declaration->isClass() || declaration->isStruct()) &&
declaration->hasBody() && declaration->hasDefinition() && declaration->getNumBases())
{
if (declaration->hasDefinition() && declaration->getNumBases())
for (const clang::CXXBaseSpecifier& it : declaration->bases())
{
for (const clang::CXXBaseSpecifier& it : declaration->bases())
{
m_client->onInheritanceParsed(
getParseLocation(it.getSourceRange()),
utility::getDeclNameHierarchy(declaration),
utility::qualTypeToDataType(it.getType())->getTypeNameHierarchy(),
convertAccessType(it.getAccessSpecifier())
);
}
m_client->onInheritanceParsed(
getParseLocation(it.getSourceRange()),
utility::getDeclNameHierarchy(declaration),
utility::qualTypeToDataType(it.getType())->getTypeNameHierarchy(),
convertAccessType(it.getAccessSpecifier())
);
}
}
}
src/lib/data/parser/cxx/CxxDiagnosticConsumer.cpp
+2 -1
View File
@@ -74,7 +74,8 @@ void CxxDiagnosticConsumer::HandleDiagnostic(clang::DiagnosticsEngine::Level lev
column = presumedLocation.getColumn();
}
if (m_fileManager->hasFilePath(filePath))
// if (m_fileManager->hasFilePath(filePath))
if (m_fileManager)
{
m_client->onError(ParseLocation(filePath, line, column), message);
}
src/lib/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp
+3 -3
View File
@@ -36,7 +36,7 @@ NameHierarchy CxxDeclNameResolver::getDeclNameHierarchy()
}
else
{
LOG_ERROR("unhandled declaration type: " + std::string(m_declaration->getDeclKindName()));
LOG_INFO("unhandled declaration type: " + std::string(m_declaration->getDeclKindName()));
}
contextNameHierarchy = getContextNameHierarchy(m_declaration->getDeclContext());
@@ -117,7 +117,7 @@ std::string CxxDeclNameResolver::getDeclName()
{
//this if fixes the crash, but not the problem TODO
const clang::SourceManager& sourceManager = declaration->getASTContext().getSourceManager();
LOG_ERROR("Template getParam out of Range "+declaration->getLocation().printToString(sourceManager));
LOG_INFO("Template getParam out of Range "+declaration->getLocation().printToString(sourceManager));
}
currentParameterIndex++;
}
@@ -209,7 +209,7 @@ std::string CxxDeclNameResolver::getTemplateParameterString(const clang::NamedDe
templateParameterTypeString = getTemplateParameterTypeString(clang::dyn_cast<clang::TemplateTemplateParmDecl>(parameter));
break;
default:
LOG_ERROR("Unhandled kind of template parameter.");
LOG_INFO("Unhandled kind of template parameter.");
}
std::string parameterName = parameter->getName();
src/lib/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ std::shared_ptr<DataType> CxxTemplateArgumentNameResolver::getTemplateArgumentTy
return std::make_shared<NamedDataType>(typeNameHerarchy);
}
case clang::TemplateArgument::Pack:
LOG_ERROR("Type of template argument not handled: Pack");
LOG_INFO("Type of template argument not handled: Pack");
break;
}
src/lib/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp
+1 -1
View File
@@ -207,7 +207,7 @@ std::shared_ptr<DataType> CxxTypeNameResolver::typeToDataType(const clang::Type*
}
default:
{
LOG_ERROR(std::string("Unhandled kind of type encountered: ") + type->getTypeClassName());
LOG_INFO(std::string("Unhandled kind of type encountered: ") + type->getTypeClassName());
clang::PrintingPolicy pp = clang::PrintingPolicy(clang::LangOptions());
pp.SuppressTagKeyword = true; // value "true": for a class A it prints "A" instead of "class A"
pp.Bool = true; // value "true": prints bool type as "bool" instead of "_Bool"