Filter private defines

Author: kornilova203

bindgen/ir/IR.cpp

@@ -166,7 +166,9 @@ void IR::filterDeclarations(const std::string &excludePrefix) {
 
     filterTypeDefs(excludePrefix);
 
-    filterFunctions(excludePrefix);
+    filter(functions, excludePrefix);
+
+    filter(literalDefines, excludePrefix);
 }
 
 void IR::filterTypeDefs(const std::string &excludePrefix) {
@@ -192,17 +194,6 @@ void IR::replaceTypeInTypeDefs(const std::string &oldType,
     }
 }
 
-void IR::filterFunctions(const std::string &excludePrefix) {
-    for (auto it = functions.begin(); it != functions.end();) {
-        Function &function = *it;
-        if (startsWith(function.getName(), excludePrefix)) {
-            it = functions.erase(it);
-        } else {
-            it++;
-        }
-    }
-}
-
 template <typename T>
 bool IR::isTypeUsed(const std::vector<T> &declarations,
                     const std::string &type) {
@@ -253,3 +244,16 @@ void IR::removeDefine(const std::string &name) {
         }
     }
 }
+
+template <typename T>
+void IR::filter(std::vector<T> &declarations,
+                const std::string &excludePrefix) {
+    for (auto it = declarations.begin(); it != declarations.end();) {
+        auto &declaration = *it;
+        if (startsWith(declaration.getName(), excludePrefix)) {
+            it = declarations.erase(it);
+        } else {
+            it++;
+        }
+    }
+}

bindgen/ir/IR.h

@@ -89,11 +89,6 @@ class IR {
     void replaceTypeInTypeDefs(const std::string &oldType,
                                const std::string &newType);
 
-    /**
-     * Remove functions with names that start with excludePrefix.
-     */
-    void filterFunctions(const std::string &excludePrefix);
-
     /**
      * @return true if given type is used only in typedefs.
      */
@@ -110,6 +105,9 @@ class IR {
 
     bool existsFunctionWithName(std::string functionName);
 
+    template <typename T>
+    void filter(std::vector<T> &declarations, const std::string &excludePrefix);
+
     std::string libName;    // name of the library
     std::string linkName;   // name of the library to link with
     std::string objectName; // name of Scala object

tests/samples/LiteralDefine.h

@@ -22,6 +22,8 @@
 extern int a;
 #define MY_A a // unsupported
 
+#define __PRIVATE 1
+
 #define wait_for_it(cond)                                                      \
     do {                                                                       \
         sleep(1000);                                                           \