Various improvements.

[tools/py2cpp.git] / src / PyFunction.hxx

diff --git a/src/PyFunction.hxx b/src/PyFunction.hxx
index 2a94118fa292320f5f93b3e85ace794b07a120e3..65cb05265a0d1e24cbdf99cb87efc062091fec1f 100644 (file)
--- a/src/PyFunction.hxx
+++ b/src/PyFunction.hxx
@@ -21,6 +21,8 @@
 #include <Python.h>
 #include <tuple>
 #include "TypeConversions.hxx"
+#include "Errors.hxx"
+
 namespace py2cpp
 {
 class PyFunction : public PyPtr
@@ -32,6 +34,12 @@ public:
   bool load(const PyPtr& obj, const std::string& function);
   bool load(PyObject* obj, const std::string& function);
 
+  // The following versions of the functions throw ExecutionException in case of
+  // failure.
+  void loadExp(const std::string& module, const std::string& function);
+  void loadExp(const PyPtr& obj, const std::string& function);
+  void loadExp(PyObject* obj, const std::string& function);
+
   /*!
    * The evaluation returns nullptr if the python function throws an exception.
    * See PyObject_CallObject documentation.
@@ -40,15 +48,20 @@ public:
   template <class ...Ts>
   PyPtr operator()(const Ts&... args)
   {
-    PyObject * result = nullptr;
+    PyPtr result;
     PyObject * myFunc = get();
     if(myFunc && PyCallable_Check(myFunc))
     {
       std::tuple<const Ts&...> tupleArgs(args...);
       PyPtr pyArgs(toPy(tupleArgs));
-      result = PyObject_CallObject(myFunc, pyArgs.get());
+      result.reset(PyObject_CallObject(myFunc, pyArgs.get()));
+    }
+    if(!result)
+    {
+      std::string errorMessage = "Failed to execute python function.\n";
+      throw ExecutionException(errorMessage+getLastPyError());
     }
-    return PyPtr(result);
+    return result;
   }
 };
 }