Replaced get_exposed_classes() with the dict EXPOSED_CLASSES

- Type and Key are now subclasses of object
- EntityEnumerator.enum_entity is now a pure virtual

Author: Ayuto

addons/source-python/packages/source-python/memory/__init__.py

@@ -28,7 +28,7 @@
     'alloc',
     'find_binary',
     'get_error',
-    'get_exposed_classes',
+    'EXPOSED_CLASSES',
     'get_object_pointer',
     'get_size',
     'make_object'

addons/source-python/packages/source-python/memory/helpers.py

@@ -29,7 +29,7 @@
 # =============================================================================
 # >> Type
 # =============================================================================
-class Type:
+class Type(object):
     '''
     This class is used to specify the type of an attribute or array created by
     a TypeManager instance.
@@ -64,7 +64,7 @@ def is_native(type_name):
 # =============================================================================
 # >> Key
 # =============================================================================
-class Key:
+class Key(object):
     '''
     This class holds some constants and provides converters for parse_data().
     '''

addons/source-python/packages/source-python/memory/manager.py

@@ -14,7 +14,6 @@
 # >> ALL DECLARATION
 # =============================================================================
 __all__ = [
-    'EXPOSED_CLASSES',
     'CustomType',
     'TypeManager',
     'manager',
@@ -24,12 +23,6 @@
 ]
 
 
-# =============================================================================
-# >> GLOBAL VARIABLES
-# =============================================================================
-EXPOSED_CLASSES = get_exposed_classes()
-
-
 # =============================================================================
 # >> CustomType
 # =============================================================================

src/core/modules/engines/engines_wrap_python.cpp

@@ -1217,7 +1217,7 @@ void export_engine_trace()
 	// Enumerator baseclass
 	class_<IEntityEnumeratorWrap, boost::noncopyable>("EntityEnumerator")
 		.def("enum_entity",
-			&IEntityEnumeratorWrap::EnumEntity,
+			pure_virtual(&IEntityEnumeratorWrap::EnumEntity),
 			"Gets called with each handle."
 		)
 

src/core/modules/memory/memory_tools.cpp

@@ -44,7 +44,7 @@ extern std::map<CHook *, std::map<DynamicHooks::HookType_t, std::list<PyObject *
 
 CHookManager* g_pHookMngr = new CHookManager;
 
-std::map<const char*, object> g_ExposedClasses;
+dict g_oExposedClasses;
 
 //-----------------------------------------------------------------------------
 // CPointer class
@@ -370,18 +370,4 @@ void CFunction::RemoveHook(DynamicHooks::HookType_t eType, PyObject* pCallable)
 		return;
 
 	g_mapCallbacks[pHook][eType].remove(pCallable);
-}
-
-
-//-----------------------------------------------------------------------------
-// Functions
-//-----------------------------------------------------------------------------
-dict GetExposedClasses()
-{
-	dict exposed_classes = dict();
-	for(std::map<const char*, object>::iterator iter=g_ExposedClasses.begin(); iter != g_ExposedClasses.end(); ++iter)
-	{
-		exposed_classes[iter->first] = iter->second;
-	}
-	return exposed_classes;
-}
+}

src/core/modules/memory/memory_tools.h

@@ -42,6 +42,7 @@ using namespace boost::python;
 
 // Externals
 extern DCCallVM* g_pCallVM;
+extern dict g_oExposedClasses;
 
 
 //---------------------------------------------------------------------------------
@@ -68,8 +69,8 @@ extern DCCallVM* g_pCallVM;
 
 // Use this macro to add the class to the ExposedClasses dict
 #define STORE_CLASS(classname, pyname) \
-	extern std::map<const char*, object> g_ExposedClasses; \
-	g_ExposedClasses[XSTRINGIFY(classname)] = scope().attr(pyname);
+	extern dict g_oExposedClasses; \
+	g_oExposedClasses[XSTRINGIFY(classname)] = scope().attr(pyname);
 
 // Use this macro to add the class to the three functions
 // Note: This must be at the end of the class definition!
@@ -387,6 +388,4 @@ inline object GetSize(object cls)
 	return cls.attr("_size");
 }
 
-dict GetExposedClasses();
-
 #endif // _MEMORY_TOOLS_H

src/core/modules/memory/memory_wrap_python.cpp

@@ -483,10 +483,7 @@ void export_callbacks()
 
 void export_sizes()
 {
-	def("get_exposed_classes",
-		GetExposedClasses,
-		"Returns a dictionary that contains classes which can be used with get_object_pointer() etc."
-	);
+	scope().attr("EXPOSED_CLASSES") = g_oExposedClasses;
 
 	// Don't remove this! It's required for the ADD_NATIVE_TYPE_SIZE macro.
 	scope().attr("TYPE_SIZES") = dict();