data: Macro handling

Macros have now edges from Files where they are usesd

src/lib/data/parser/ParserClient.h

@@ -6,8 +6,12 @@
 
 #include "utility/types.h"
 #include "data/name/NameHierarchy.h"
+
 #include "utility/file/FileInfo.h"
 
+#include "ParseLocation.h"
+
+
 struct ParseFunction;
 struct ParseLocation;
 struct ParseTypeUsage;
@@ -132,6 +136,11 @@ public:
 	virtual Id onFileParsed(const FileInfo& fileInfo) = 0;
 	virtual Id onFileIncludeParsed(
 		const ParseLocation& location, const FileInfo& fileInfo, const FileInfo& includedFileInfo) = 0;
+
+
+	virtual Id onMacroDefineParsed(const ParseLocation& location, const NameHierarchy& macroNameHierarchy) = 0;
+	virtual Id onMacroExpandParsed(
+		const ParseLocation& location, const NameHierarchy& macroNameHierarchy) = 0;
 };
 
 #endif // PARSER_CLIENT_H

src/lib/data/parser/cxx/ASTVisitor.h

@@ -18,11 +18,11 @@ public:
 	virtual ~ASTVisitor();
 
 	// Left for debugging purposes. Uncomment to see a colored ast-dump of the parsed file.
-	// virtual bool VisitTranslationUnitDecl(clang::TranslationUnitDecl* decl)
-	// {
-	// 	decl->dump();
-	// 	return true;
-	// }
+//	virtual bool VisitTranslationUnitDecl(clang::TranslationUnitDecl* decl)
+//	{
+//		decl->dump();
+//		return true;
+//	}
 
 	// RecursiveASTVisitor implementation
 	virtual bool VisitStmt(const clang::Stmt* statement); // avoid visiting

src/lib/data/parser/cxx/PreprocessorCallbacks.cpp

@@ -1,5 +1,10 @@
 #include "data/parser/cxx/PreprocessorCallbacks.h"
 
+
+#include "clang/Driver/Util.h"
+#include "clang/Basic/IdentifierTable.h"
+#include "clang/Lex/MacroArgs.h"
+
 #include "utility/file/FileManager.h"
 #include "utility/file/FileRegister.h"
 
@@ -62,6 +67,56 @@ void PreprocessorCallbacks::InclusionDirective(
 	}
 }
 
+void PreprocessorCallbacks::MacroDefined( const clang::Token &MacroNameTok, const clang::MacroDirective *MD)
+{
+	// ignore builtin macros
+	if(m_sourceManager.getSpellingLoc(MacroNameTok.getLocation()).printToString(m_sourceManager)[0] == '<')
+	{
+		return;
+	}
+	m_sourceManager.getSpellingLoc(MacroNameTok.getLocation()).dump(m_sourceManager);
+
+	NameHierarchy nameHierarchy;
+	nameHierarchy.push(std::make_shared<NameElement>(MacroNameTok.getIdentifierInfo()->getName().str()));
+	m_client->onMacroDefineParsed( getParseLocation(MacroNameTok), nameHierarchy);
+}
+
+void PreprocessorCallbacks::MacroExpands(
+	const clang::Token &MacroNameTok, const clang::MacroDefinition &MD,
+	clang::SourceRange Range, const clang::MacroArgs *Args
+){
+	NameHierarchy nameHierarchy;
+	nameHierarchy.push(std::make_shared<NameElement>(MacroNameTok.getIdentifierInfo()->getName().str()));
+
+	m_client->onMacroExpandParsed( getParseLocation(MacroNameTok), nameHierarchy);
+}
+
+ParseLocation PreprocessorCallbacks::getParseLocation(const clang::Token &MacroNameTok) const
+{
+	clang::SourceLocation location = MacroNameTok.getLocation();
+	return ParseLocation(
+			m_sourceManager.getFilename(location),
+			m_sourceManager.getSpellingLineNumber(location),
+			m_sourceManager.getSpellingColumnNumber(location),
+			m_sourceManager.getSpellingLineNumber(MacroNameTok.getEndLoc()),
+			m_sourceManager.getSpellingColumnNumber(MacroNameTok.getEndLoc()) - 1
+	);
+}
+
+ParseLocation PreprocessorCallbacks::getParseLocation(clang::MacroInfo *macroInfo) const
+{
+	clang::SourceLocation location = macroInfo->getDefinitionLoc();
+	clang::SourceLocation endLocation = macroInfo->getDefinitionEndLoc();
+
+	return ParseLocation(
+			m_sourceManager.getFilename(location),
+			m_sourceManager.getSpellingLineNumber(location),
+			m_sourceManager.getSpellingColumnNumber(location),
+			m_sourceManager.getSpellingLineNumber(endLocation),
+			m_sourceManager.getSpellingColumnNumber(endLocation) - 1
+	);
+}
+
 ParseLocation PreprocessorCallbacks::getParseLocation(const clang::SourceRange& sourceRange) const
 {
 	if (sourceRange.isInvalid())

src/lib/data/parser/cxx/PreprocessorCallbacks.h

@@ -2,7 +2,9 @@
 #define PREPROCESSOR_CALLBACKS_H
 
 #include "clang/Basic/SourceManager.h"
+#include "clang/Lex/MacroInfo.h"
 #include "clang/Lex/PPCallbacks.h"
+#include "clang/Lex/Token.h"
 
 class FileRegister;
 class ParserClient;
@@ -22,8 +24,17 @@ public:
 		clang::CharSourceRange fileNameRange, const clang::FileEntry* fileEntry, llvm::StringRef searchPath,
 		llvm::StringRef relativePath, const clang::Module* imported);
 
+	virtual void MacroDefined(const clang::Token &MacroNameTok, const clang::MacroDirective *MD	);
+
+	virtual void MacroExpands(
+		const clang::Token &MacroNameTok, const clang::MacroDefinition &MD,
+		clang::SourceRange Range, const clang::MacroArgs *Args
+	);
+
 private:
 	ParseLocation getParseLocation(const clang::SourceRange& sourceRange) const;
+	ParseLocation getParseLocation(const clang::Token& MacroNameToc) const;
+	ParseLocation getParseLocation(clang::MacroInfo *MacroNameToc) const;
 
 	const clang::SourceManager& m_sourceManager;
 	ParserClient* m_client;