Remove undefined defines

Author: kornilova203

bindgen/defines/DefineFinder.cpp

@@ -65,3 +65,13 @@ DefineFinder::getFinalIdentifier(const clang::Token &token) const {
     // TODO: token is another definition. Find the original value
     return nullptr;
 }
+
+void DefineFinder::MacroUndefined(const clang::Token &MacroNameTok,
+                                  const clang::MacroDefinition &MD) {
+    clang::SourceManager &sm = compiler.getSourceManager();
+    if (sm.isWrittenInMainFile(MacroNameTok.getLocation()) &&
+        !MD.getMacroInfo()->isFunctionLike()) {
+        std::string macroName = MacroNameTok.getIdentifierInfo()->getName();
+        ir.removeDefine(macroName);
+    }
+}

bindgen/defines/DefineFinder.h

@@ -12,6 +12,9 @@ class DefineFinder : public clang::PPCallbacks {
     void MacroDefined(const clang::Token &MacroNameTok,
                       const clang::MacroDirective *MD) override;
 
+    void MacroUndefined(const clang::Token &MacroNameTok,
+                        const clang::MacroDefinition &MD) override;
+
   private:
     IR &ir;
     const clang::CompilerInstance &compiler;

bindgen/ir/Define.cpp

@@ -1,3 +1,5 @@
 #include "Define.h"
 
 Define::Define(std::string name) : name(std::move(name)) {}
+
+std::string Define::getName() { return name; }

bindgen/ir/Define.h

@@ -7,8 +7,10 @@ class Define {
   public:
     explicit Define(std::string name);
 
+    std::string getName();
+
   protected:
-    const std::string name;
+    std::string name;
 };
 
 #endif // SCALA_NATIVE_BINDGEN_DEFINE_H

bindgen/ir/IR.cpp

@@ -247,3 +247,13 @@ bool IR::existsFunctionWithName(std::string functionName) {
     }
     return false;
 }
+
+void IR::removeDefine(const std::string &name) {
+    for (auto it = literalDefines.begin(), end = literalDefines.end();
+         it != end; ++it) {
+        if ((*it).getName() == name) {
+            literalDefines.erase(it);
+            return;
+        }
+    }
+}

bindgen/ir/IR.h

@@ -46,6 +46,8 @@ class IR {
 
     void generate(const std::string &excludePrefix);
 
+    void removeDefine(const std::string &name);
+
   private:
     /**
      * Generates type defs for enums, structs and unions

bindgen/ir/LiteralDefine.h

@@ -4,7 +4,7 @@
 #include "Define.h"
 #include <llvm/Support/raw_ostream.h>
 
-class LiteralDefine : Define {
+class LiteralDefine : public Define {
   public:
     LiteralDefine(std::string name, std::string literal);
 

tests/samples/Define.h

@@ -10,11 +10,15 @@ extern int a;
 #define MY_A a // unsupported
 
 #ifdef NOT_DEFINED
-#define SHOULD_NOT_BE_DEFINED 0
+#define SHOULD_NOT_BE_DEFINED "Because NOT_DEFINED is not defined"
 #endif
 
+#define DEFINED_ONLY_IN_HEADER "Defined only inside the header file"
+
 #if INT == 0
-#define SHOULD_NOT_BE_DEFINED 1
+#define SHOULD_NOT_BE_DEFINED "Because INT is 42"
 #else
-#define SHOULD_BE_DEFINED 2
+#define SHOULD_BE_DEFINED "Because INT is not equal to 0"
 #endif
+
+#undef DEFINED_ONLY_IN_HEADER

tests/samples/Define.scala

@@ -7,5 +7,5 @@ object DefineDefines {
   val STRING: native.CString = c"Hello, World!"
   val INT = 42
   val FLOAT = 5.6
-  val SHOULD_BE_DEFINED = 2
+  val SHOULD_BE_DEFINED: native.CString = c"Because INT is not equal to 0"
 }