Sync CPPEnum

Author: aaronj0

src/CPPEnum.cxx

@@ -2,6 +2,7 @@
 #include "CPyCppyy.h"
 #include "CPPEnum.h"
 #include "PyStrings.h"
+#include "TypeManip.h"
 #include "Utility.h"
 
 
@@ -18,9 +19,9 @@ static PyObject* pytype_from_enum_type(const std::string& enum_type)
 }
 
 //----------------------------------------------------------------------------
-PyObject* CPyCppyy::pyval_from_enum(const std::string& enum_type, PyObject* pytype,
-        PyObject* btype, Cppyy::TCppScope_t enum_constant) {
-    long long llval = Cppyy::GetEnumDataValue(enum_constant);
+static PyObject* pyval_from_enum(const std::string& enum_type, PyObject* pytype,
+        PyObject* btype, Cppyy::TCppEnum_t etype, Cppyy::TCppIndex_t idata) {
+    long long llval = Cppyy::GetEnumDataValue(etype, idata);
 
     if (enum_type == "bool") {
         PyObject* result = (bool)llval ? Py_True : Py_False;
@@ -37,13 +38,11 @@ PyObject* CPyCppyy::pyval_from_enum(const std::string& enum_type, PyObject* pyty
     else
         bval = PyLong_FromLongLong(llval);
 
-    if (pytype && btype) {
         PyObject* args = PyTuple_New(1);
         PyTuple_SET_ITEM(args, 0, bval);
-        bval = ((PyTypeObject*)btype)->tp_new((PyTypeObject*)pytype, args, nullptr);
+        PyObject* result = ((PyTypeObject*)btype)->tp_new((PyTypeObject*)pytype, args, nullptr);
         Py_DECREF(args);
-    }
-    return bval;
+    return result;
 }
 
 
@@ -60,8 +59,6 @@ static PyObject* enum_repr(PyObject* self)
 {
     using namespace CPyCppyy;
 
-    PyObject* kls_scope = PyObject_GetAttr((PyObject*)Py_TYPE(self), PyStrings::gThisModule);
-    if (!kls_scope) PyErr_Clear();
     PyObject* kls_cppname = PyObject_GetAttr((PyObject*)Py_TYPE(self), PyStrings::gCppName);
     if (!kls_cppname) PyErr_Clear();
     PyObject* obj_cppname = PyObject_GetAttr(self, PyStrings::gCppName);
@@ -70,7 +67,7 @@ static PyObject* enum_repr(PyObject* self)
 
     PyObject* repr = nullptr;
     if (kls_cppname && obj_cppname && obj_str) {
-        const std::string resolved = Cppyy::ResolveEnum(PyLong_AsVoidPtr(kls_scope));
+        const std::string resolved = Cppyy::ResolveEnum(CPyCppyy_PyText_AsString(kls_cppname));
         repr = CPyCppyy_PyText_FromFormat("(%s::%s) : (%s) %s",
             CPyCppyy_PyText_AsString(kls_cppname), CPyCppyy_PyText_AsString(obj_cppname),
             resolved.c_str(), CPyCppyy_PyText_AsString(obj_str));
@@ -140,12 +137,12 @@ CPyCppyy::CPPEnum* CPyCppyy::CPPEnum_New(const std::string& name, Cppyy::TCppSco
 
     CPPEnum* pyenum = nullptr;
 
-    Cppyy::TCppScope_t etype = scope;
-    const std::string& ename = Cppyy::GetScopedFinalName(scope);
+    const std::string& ename = scope == Cppyy::gGlobalScope ? name : Cppyy::GetScopedFinalName(scope)+"::"+name;
+    Cppyy::TCppEnum_t etype = Cppyy::GetEnum(scope, name);
     if (etype) {
     // create new enum type with labeled values in place, with a meta-class
     // to make sure the enum values are read-only
-        const std::string& resolved = Cppyy::ResolveEnum(etype);
+        const std::string& resolved = Cppyy::ResolveEnum(ename);
         PyObject* pyside_type = pytype_from_enum_type(resolved);
         PyObject* pymetabases = PyTuple_New(1);
         PyObject* btype = (PyObject*)Py_TYPE(pyside_type);
@@ -173,6 +170,14 @@ CPyCppyy::CPPEnum* CPyCppyy::CPPEnum_New(const std::string& name, Cppyy::TCppSco
         PyDict_SetItem(dct, PyStrings::gUnderlying, pyresolved);
         Py_DECREF(pyresolved);
 
+    // add the __module__ to allow pickling
+        std::string modname = TypeManip::extract_namespace(ename);
+        TypeManip::cppscope_to_pyscope(modname);      // :: -> .
+        if (!modname.empty()) modname = "."+modname;
+        PyObject* pymodname = CPyCppyy_PyText_FromString(("cppyy.gbl"+modname).c_str());
+        PyDict_SetItem(dct, PyStrings::gModule, pymodname);
+        Py_DECREF(pymodname);
+
     // create the actual enum class
         args = Py_BuildValue((char*)"sOO", name.c_str(), pybases, dct);
         Py_DECREF(pybases);
@@ -186,10 +191,10 @@ CPyCppyy::CPPEnum* CPyCppyy::CPPEnum_New(const std::string& name, Cppyy::TCppSco
         ((PyTypeObject*)pyenum)->tp_str  = ((PyTypeObject*)pyside_type)->tp_repr;
 
     // collect the enum values
-        std::vector<Cppyy::TCppScope_t> econstants = Cppyy::GetEnumConstants(etype);
-        for (auto *econstant : econstants) {
-            PyObject* val = pyval_from_enum(resolved, pyenum, pyside_type, econstant);
-            PyObject* pydname = CPyCppyy_PyText_FromString(Cppyy::GetFinalName(econstant).c_str());
+        Cppyy::TCppIndex_t ndata = Cppyy::GetNumEnumData(etype);
+        for (Cppyy::TCppIndex_t idata = 0; idata < ndata; ++idata) {
+            PyObject* val = pyval_from_enum(resolved, pyenum, pyside_type, etype, idata);
+            PyObject* pydname = CPyCppyy_PyText_FromString(Cppyy::GetEnumDataName(etype, idata).c_str());
             PyObject_SetAttr(pyenum, pydname, val);
             PyObject_SetAttr(val, PyStrings::gCppName, pydname);
             Py_DECREF(pydname);