Sync PyCallable, PyException and PyStrings

Author: aaronj0

src/PyCallable.h

@@ -1,6 +1,8 @@
 #ifndef CPYCPPYY_PYCALLABLE_H
 #define CPYCPPYY_PYCALLABLE_H
 
+#include <climits>
+
 // Bindings
 #include "CPyCppyy/Reflex.h"
 #include "CallContext.h"
@@ -38,6 +40,8 @@ class PyCallable {
 
     virtual PyCallable* Clone() = 0;
 
+    virtual int GetArgMatchScore(PyObject* /* args_tuple */) { return INT_MAX; }
+
 public:
     virtual PyObject* Call(CPPInstance*& self,
         CPyCppyy_PyArgs_t args, size_t nargsf, PyObject* kwds, CallContext* ctxt = nullptr) = 0;

src/PyException.cxx

@@ -93,16 +93,18 @@ CPyCppyy::PyException::PyException()
     if (fMsg.empty())
         fMsg = "python exception";
 
-// only keeping the filename, not the full path
-    if (!locFile.empty())
+    if (!locFile.empty()) {
+
+        // only keeping the filename, not the full path
         locFile = locFile.substr(locFile.find_last_of("/\\") + 1);
 
-    fMsg += " (at " + locFile + ":" + std::to_string(locLine);
+        fMsg += " (at " + locFile + ":" + std::to_string(locLine);
 
-    if (locName != "<module>")
-        fMsg += " in " + locName;
+        if (locName != "<module>")
+            fMsg += " in " + locName;
 
-    fMsg += ")";
+        fMsg += ")";
+    }
 
 #ifdef WITH_THREAD
     PyGILState_Release(state);

src/PyStrings.cxx

@@ -7,6 +7,7 @@
 PyObject* CPyCppyy::PyStrings::gAssign           = nullptr;
 PyObject* CPyCppyy::PyStrings::gBases            = nullptr;
 PyObject* CPyCppyy::PyStrings::gBase             = nullptr;
+PyObject* CPyCppyy::PyStrings::gCppBool          = nullptr;
 PyObject* CPyCppyy::PyStrings::gCppName          = nullptr;
 PyObject* CPyCppyy::PyStrings::gAnnotations      = nullptr;
 PyObject* CPyCppyy::PyStrings::gCastCpp          = nullptr;
@@ -86,6 +87,11 @@ bool CPyCppyy::CreatePyStrings() {
     CPPYY_INITIALIZE_STRING(gAssign,         __assign__);
     CPPYY_INITIALIZE_STRING(gBases,          __bases__);
     CPPYY_INITIALIZE_STRING(gBase,           __base__);
+#if PY_VERSION_HEX < 0x03000000
+    CPPYY_INITIALIZE_STRING(gCppBool,        __cpp_nonzero__);
+#else
+    CPPYY_INITIALIZE_STRING(gCppBool,        __cpp_bool__);
+#endif
     CPPYY_INITIALIZE_STRING(gCppName,        __cpp_name__);
     CPPYY_INITIALIZE_STRING(gAnnotations,    __annotations__);
     CPPYY_INITIALIZE_STRING(gCastCpp,        __cast_cpp__);
@@ -163,6 +169,7 @@ PyObject* CPyCppyy::DestroyPyStrings() {
 // Remove all cached python strings.
     Py_DECREF(PyStrings::gBases);       PyStrings::gBases       = nullptr;
     Py_DECREF(PyStrings::gBase);        PyStrings::gBase        = nullptr;
+    Py_DECREF(PyStrings::gCppBool);     PyStrings::gCppBool     = nullptr;
     Py_DECREF(PyStrings::gCppName);     PyStrings::gCppName     = nullptr;
     Py_DECREF(PyStrings::gAnnotations); PyStrings::gAnnotations = nullptr;
     Py_DECREF(PyStrings::gCType);       PyStrings::gCType       = nullptr;

src/PyStrings.h

@@ -10,6 +10,7 @@ namespace PyStrings {
     extern PyObject* gAssign;
     extern PyObject* gBases;
     extern PyObject* gBase;
+    extern PyObject* gCppBool;
     extern PyObject* gCppName;
     extern PyObject* gAnnotations;
     extern PyObject* gCastCpp;