src: renamed recording methods

This commit is contained in:
mlangkabel
2017-11-19 13:44:10 +01:00
parent 343caebcf6
commit 952ea1651f
11 changed files with 66 additions and 66 deletions
+2 -2
View File
@@ -79,10 +79,10 @@ ParserClient::~ParserClient()
{
}
void ParserClient::onErrorParsed(
void ParserClient::recordError(
const ParseLocation& location, const std::string& message, const std::string& commandline, bool fatal, bool indexed)
{
this->onError(location, message, commandline, fatal, indexed);
doRecordError(location, message, commandline, fatal, indexed);
if (fatal)
{
+8 -8
View File
@@ -49,19 +49,19 @@ public:
virtual void recordQualifierLocation(
const NameHierarchy& qualifierName, const ParseLocation& location) = 0;
virtual void onError(const ParseLocation& location, const std::string& message, const std::string& commandline,
bool fatal, bool indexed) = 0;
virtual void onLocalSymbolParsed(const std::string& name, const ParseLocation& location) = 0;
virtual void onFileParsed(const FileInfo& fileInfo) = 0;
virtual void onCommentParsed(const ParseLocation& location) = 0;
void onErrorParsed(const ParseLocation& location, const std::string& message, const std::string& commandline,
void recordError(const ParseLocation& location, const std::string& message, const std::string& commandline,
bool fatal, bool indexed);
virtual void recordLocalSymbol(const std::string& name, const ParseLocation& location) = 0;
virtual void recordFile(const FileInfo& fileInfo) = 0;
virtual void recordComment(const ParseLocation& location) = 0;
bool hasFatalErrors() const;
protected:
virtual void doRecordError(const ParseLocation& location, const std::string& message, const std::string& commandline,
bool fatal, bool indexed) = 0;
bool m_hasFatalErrors;
};
+12 -12
View File
@@ -73,32 +73,32 @@ void ParserClientImpl::recordQualifierLocation(const NameHierarchy& qualifierNam
addSourceLocation(nodeId, location, locationTypeToInt(LOCATION_QUALIFIER));
}
void ParserClientImpl::onError(
const ParseLocation& location, const std::string& message, const std::string& commandline,bool fatal, bool indexed)
{
if (location.isValid())
{
addError(message, commandline, fatal, indexed, location);
}
}
void ParserClientImpl::onLocalSymbolParsed(const std::string& name, const ParseLocation& location)
void ParserClientImpl::recordLocalSymbol(const std::string& name, const ParseLocation& location)
{
const Id localSymbolId = addLocalSymbol(name);
addSourceLocation(localSymbolId, location, locationTypeToInt(LOCATION_LOCAL_SYMBOL));
}
void ParserClientImpl::onFileParsed(const FileInfo& fileInfo)
void ParserClientImpl::recordFile(const FileInfo& fileInfo)
{
const Id nodeId = addNodeHierarchy(NameHierarchy(fileInfo.path.str(), NAME_DELIMITER_FILE), Node::NODE_FILE);
addFile(nodeId, fileInfo.path, fileInfo.lastWriteTime.toString());
}
void ParserClientImpl::onCommentParsed(const ParseLocation& location)
void ParserClientImpl::recordComment(const ParseLocation& location)
{
addCommentLocation(location);
}
void ParserClientImpl::doRecordError(
const ParseLocation& location, const std::string& message, const std::string& commandline, bool fatal, bool indexed)
{
if (location.isValid())
{
addError(message, commandline, fatal, indexed, location);
}
}
Node::NodeType ParserClientImpl::symbolKindToNodeType(SymbolKind symbolKind) const
{
switch (symbolKind)
+11 -11
View File
@@ -20,33 +20,33 @@ public:
virtual Id recordSymbol(
const NameHierarchy& symbolName, SymbolKind symbolKind,
AccessKind access, DefinitionKind definitionKind);
AccessKind access, DefinitionKind definitionKind) override;
virtual Id recordSymbol(
const NameHierarchy& symbolName, SymbolKind symbolKind,
const ParseLocation& location,
AccessKind access, DefinitionKind definitionKind);
AccessKind access, DefinitionKind definitionKind) override;
virtual Id recordSymbol(
const NameHierarchy& symbolName, SymbolKind symbolKind,
const ParseLocation& location, const ParseLocation& scopeLocation,
AccessKind access, DefinitionKind definitionKind);
AccessKind access, DefinitionKind definitionKind) override;
virtual void recordReference(
ReferenceKind referenceKind, const NameHierarchy& referencedName, const NameHierarchy& contextName,
const ParseLocation& location);
const ParseLocation& location) override;
virtual void recordQualifierLocation(
const NameHierarchy& qualifierName, const ParseLocation& location);
virtual void onError(const ParseLocation& location, const std::string& message, const std::string& commandline,
bool fatal, bool indexed);
const NameHierarchy& qualifierName, const ParseLocation& location) override;
virtual void onLocalSymbolParsed(const std::string& name, const ParseLocation& location);
virtual void onFileParsed(const FileInfo& fileInfo);
virtual void onCommentParsed(const ParseLocation& location);
virtual void recordLocalSymbol(const std::string& name, const ParseLocation& location) override;
virtual void recordFile(const FileInfo& fileInfo) override;
virtual void recordComment(const ParseLocation& location) override;
private:
virtual void doRecordError(const ParseLocation& location, const std::string& message, const std::string& commandline,
bool fatal, bool indexed) override;
Node::NodeType symbolKindToNodeType(SymbolKind symbolType) const;
Edge::EdgeType referenceKindToEdgeType(ReferenceKind referenceKind) const;
void addAccess(Id nodeId, AccessKind access);