refactor pyval_from_enum

Author: Vipul-Cariappa

src/CPPDataMember.cxx

@@ -4,6 +4,7 @@
 #include "PyStrings.h"
 #include "CPPDataMember.h"
 #include "CPPInstance.h"
+#include "CPPEnum.h"
 #include "Dimensions.h"
 #include "LowLevelViews.h"
 #include "ProxyWrappers.h"
@@ -84,22 +85,7 @@ static PyObject* dm_get(CPPDataMember* dm, CPPInstance* pyobj, PyObject* /* kls
 
         if (Cppyy::IsEnumConstant(dm->fScope)) {
             // anonymous enum
-            long long llval = Cppyy::GetEnumDataValue(dm->fScope);
-            const std::string& enum_type = Cppyy::ResolveEnum(dm->fScope);
-            
-            PyObject* bval;
-            if (enum_type == "bool") {
-                bval = (bool)llval ? Py_True : Py_False;
-                Py_INCREF(bval);
-            } else if (enum_type == "char") {
-                char val = (char)llval;
-                bval = CPyCppyy_PyText_FromStringAndSize(&val, 1);
-            } else if (enum_type == "int" || enum_type == "unsigned int")
-                bval = PyInt_FromLong((long)llval);
-            else
-                bval = PyLong_FromLongLong(llval);
-
-            return bval;
+            return pyval_from_enum(Cppyy::ResolveEnum(dm->fScope), nullptr, nullptr, dm->fScope);
         }
     }
 

src/CPPEnum.cxx

@@ -18,7 +18,7 @@ static PyObject* pytype_from_enum_type(const std::string& enum_type)
 }
 
 //----------------------------------------------------------------------------
-static PyObject* pyval_from_enum(const std::string& enum_type, PyObject* pytype,
+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);
 
@@ -37,11 +37,13 @@ static PyObject* pyval_from_enum(const std::string& enum_type, PyObject* pytype,
     else
         bval = PyLong_FromLongLong(llval);
 
-    PyObject* args = PyTuple_New(1);
-    PyTuple_SET_ITEM(args, 0, bval);
-    PyObject* result = ((PyTypeObject*)btype)->tp_new((PyTypeObject*)pytype, args, nullptr);
-    Py_DECREF(args);
-    return result;
+    if (pytype && btype) {
+        PyObject* args = PyTuple_New(1);
+        PyTuple_SET_ITEM(args, 0, bval);
+        bval = ((PyTypeObject*)btype)->tp_new((PyTypeObject*)pytype, args, nullptr);
+        Py_DECREF(args);
+    }
+    return bval;
 }
 
 

src/CPPEnum.h

@@ -11,6 +11,8 @@ typedef PyObject CPPEnum;
 //- creation -----------------------------------------------------------------
 CPPEnum* CPPEnum_New(const std::string& name, Cppyy::TCppScope_t scope);
 
+PyObject* pyval_from_enum(const std::string& enum_type, PyObject* pytype,
+        PyObject* btype, Cppyy::TCppScope_t enum_constant);
 } // namespace CPyCppyy
 
 #endif // !CPYCPPYY_CPPENUM_H