Fix published static class members not being wrapped

Author: rdb

src/interrogate/interrogateBuilder.cxx

@@ -1351,11 +1351,6 @@ scan_element(CPPInstance *element, CPPStructType *struct_type,
     return 0;
   }
 
-  if ((element->_storage_class & CPPInstance::SC_static) != 0) {
-    // The element is static, so can't be exported.
-    return 0;
-  }
-
   // Make sure the element knows what its scope is.
   if (element->_ident->_native_scope != scope) {
     element = new CPPInstance(*element);

tests/interrogatedb/CMakeLists.txt

@@ -22,3 +22,4 @@ endfunction()
 
 idb_test(item_assignment.h)
 idb_test(nested_struct.h)
+idb_test(static_class_member.h)

tests/interrogatedb/static_class_member.h

@@ -0,0 +1,7 @@
+//FLAGS: -D__cplusplus -python-native
+
+class Type {
+__published:
+  static const int global_const = 1;
+  static Type *global_ptr;
+};

tests/interrogatedb/static_class_member.txt

@@ -0,0 +1,110 @@
+version: 3.3
+
+index:
+ - wrapper for Type::Type
+ - wrapper for Type::Type
+ - function Type::get_global_const
+ - function Type::get_global_ptr
+ - function Type::set_global_ptr
+ - function Type::Type
+ - function Type::~Type
+ - type Type
+ - type int
+ - type Type *
+ - type Type const *
+ - type Type const
+ - element Type::global_const
+ - element Type::global_ptr
+
+type "Type" {
+  flags: global class fully_defined implicit_destructor
+
+  constructor: Type
+  destructor: ~Type
+  element: global_const
+  element: global_ptr
+}
+
+type "Type *" {
+  flags: wrapped pointer fully_defined
+  wrapped_type: Type
+}
+
+type "Type const" {
+  flags: wrapped const fully_defined
+  wrapped_type: Type
+}
+
+type "Type const *" {
+  flags: wrapped pointer fully_defined
+  wrapped_type: Type const
+}
+
+function "Type::Type" {
+  flags: method constructor
+  prototype:
+    inline Type::Type(void) = default;
+    inline Type::Type(Type const &) = default;
+
+  python wrapper {
+    flags: caller_manages has_return
+    return_type: Type *
+  }
+  python wrapper {
+    flags: caller_manages has_return copy_constructor
+    return_type: Type *
+
+    parameter: Type const *
+  }
+}
+
+function "Type::get_global_const" {
+  flags: method getter
+  expression: "Type::global_const"
+  prototype:
+    static int Type::get_global_const(void);
+  comment:
+    getter for static int const Type::global_const;
+}
+
+function "Type::get_global_ptr" {
+  flags: method getter
+  expression: "Type::global_ptr"
+  prototype:
+    static Type *Type::get_global_ptr(void);
+  comment:
+    getter for static Type *Type::global_ptr;
+}
+
+element "Type::global_const" {
+  type: int
+  flags: has_getter
+  getter: Type::get_global_const
+}
+
+element "Type::global_ptr" {
+  type: Type *
+  flags: has_getter has_setter
+  getter: Type::get_global_ptr
+  setter: Type::set_global_ptr
+}
+
+function "Type::set_global_ptr" {
+  flags: method setter
+  expression: "Type::global_ptr"
+  prototype:
+    static void Type::set_global_ptr(Type *value);
+  comment:
+    setter for static Type *Type::global_ptr;
+}
+
+function "Type::~Type" {
+  flags: method destructor
+  prototype:
+    Type::~Type(void);
+}
+
+type "int" {
+  flags: atomic fully_defined
+  atomic_token: int
+}