extracted to GetStaticDatamembers

Author: Vipul-Cariappa

include/clang/Interpreter/CppInterOp.h

@@ -424,11 +424,13 @@ namespace Cpp {
   /// Checks if the provided parameter is a 'Virtual' method.
   CPPINTEROP_API bool IsVirtualMethod(TCppFunction_t method);
 
-  /// Gets all the Fields/Data Members of a Class. For now, it
-  /// only gets non-static data members but in a future update,
-  /// it may support getting static data members as well.
+  /// Gets all the Fields/Data Members of a Class
   CPPINTEROP_API std::vector<TCppScope_t> GetDatamembers(TCppScope_t scope);
 
+  /// Gets all the Static Fields/Data Members of a Class
+  CPPINTEROP_API std::vector<TCppScope_t>
+  GetStaticDatamembers(TCppScope_t scope);
+
   /// This is a Lookup function to be used specifically for data members.
   CPPINTEROP_API TCppScope_t LookupDatamember(const std::string& name,
                                               TCppScope_t parent);

lib/Interpreter/CppInterOp.cpp

@@ -1155,15 +1155,18 @@ namespace Cpp {
         stack_begin.back()++;
       }
 
-      // static field member
-      GetClassDecls<VarDecl>(scope, datamembers);
-
       return datamembers;
     }
 
     return {};
   }
 
+  std::vector<TCppScope_t> GetStaticDatamembers(TCppScope_t scope) {
+    std::vector<TCppScope_t> datamembers;
+    GetClassDecls<VarDecl>(scope, datamembers);
+    return datamembers;
+  }
+
   TCppScope_t LookupDatamember(const std::string& name, TCppScope_t parent) {
     clang::DeclContext *Within = 0;
     if (parent) {

unittests/CppInterOp/VariableReflectionTest.cpp

@@ -31,17 +31,22 @@ TEST(VariableReflectionTest, GetDatamembers) {
   GetAllTopLevelDecls(code, Decls);
   auto datamembers = Cpp::GetDatamembers(Decls[0]);
   auto datamembers1 = Cpp::GetDatamembers(Decls[1]);
+  auto static_datamembers = Cpp::GetStaticDatamembers(Decls[0]);
+  auto static_datamembers1 = Cpp::GetStaticDatamembers(Decls[1]);
 
   // non static field first
   EXPECT_EQ(Cpp::GetQualifiedName(datamembers[0]), "C::a");
   EXPECT_EQ(Cpp::GetQualifiedName(datamembers[1]), "C::c");
   EXPECT_EQ(Cpp::GetQualifiedName(datamembers[2]), "C::e");
-  // static fields
-  EXPECT_EQ(Cpp::GetQualifiedName(datamembers[3]), "C::b");
-  EXPECT_EQ(Cpp::GetQualifiedName(datamembers[4]), "C::d");
-  EXPECT_EQ(Cpp::GetQualifiedName(datamembers[5]), "C::f");
-  EXPECT_EQ(datamembers.size(), 6);
+  EXPECT_EQ(datamembers.size(), 3);
   EXPECT_EQ(datamembers1.size(), 0);
+
+  // static fields
+  EXPECT_EQ(Cpp::GetQualifiedName(static_datamembers[0]), "C::b");
+  EXPECT_EQ(Cpp::GetQualifiedName(static_datamembers[1]), "C::d");
+  EXPECT_EQ(Cpp::GetQualifiedName(static_datamembers[2]), "C::f");
+  EXPECT_EQ(static_datamembers.size(), 3);
+  EXPECT_EQ(static_datamembers1.size(), 0);
 }
 
 #define CODE                                                                   \