Ticket #1316: call.patch

boost/python/object_core.hpp

@@ -42 +42 @@
 
 namespace boost { namespace python { 
 
+namespace detail {
+
+class kwds_proxy;
+class args_proxy;
+
+}
+
 namespace converter
 {
   template <class T> struct arg_to_python;
@@ -99 +106 @@
 # define BOOST_PP_ITERATION_PARAMS_1 (3, (1, BOOST_PYTHON_MAX_ARITY, <boost/python/object_call.hpp>))
 # include BOOST_PP_ITERATE()
 
+      detail::args_proxy operator* () const;
+
+      object operator()(detail::args_proxy const &args) const;
+      object operator()(detail::args_proxy const &args,
+                        detail::kwds_proxy const &kwds) const;
+
+
       // truth value testing
       //
       operator bool_type() const;
@@ -410 +424 @@
 // implementation
 //
 
+namespace detail {
+class call_proxy
+{
+public:
+  call_proxy(object target) : m_target(target) {}
+  operator object() const { return m_target;}
+
+ private:
+    object m_target;
+};
+
+class kwds_proxy : public call_proxy
+{
+public:
+  kwds_proxy(object o = object()) : call_proxy(o) {}
+};
+class args_proxy : public call_proxy
+{
+public:
+  args_proxy(object o) : call_proxy(o) {}
+  kwds_proxy operator* () const { return kwds_proxy(*this);}
+};
+}
+
+template <typename U>
+detail::args_proxy api::object_operators<U>::operator* () const
+{
+  object_cref2 x = *static_cast<U const*>(this);
+  return detail::args_proxy(x);
+}
+
+template <typename U>
+object api::object_operators<U>::operator()(detail::args_proxy const &args) const
+{
+  U const& self = *static_cast<U const*>(this);
+  PyObject *result = PyObject_Call(get_managed_object(self, tag),
+                                   args.operator object().ptr(),
+                                   0);
+  return object(detail::new_reference(result));
+
+}
+
+template <typename U>
+object api::object_operators<U>::operator()(detail::args_proxy const &args,
+                                            detail::kwds_proxy const &kwds) const
+{
+  U const& self = *static_cast<U const*>(this);
+  PyObject *result = PyObject_Call(get_managed_object(self, tag),
+                                   args.operator object().ptr(),
+                                   kwds.operator object().ptr());
+  return object(detail::new_reference(result));
+
+}
+
 inline object::object()
     : object_base(python::incref(Py_None))
 {}

libs/python/test/object.cpp

@@ -123 +123 @@
     return !y[key];
 }
 
+object test_call(object c, object args, object kwds)
+{
+    return c(*args, **kwds);
+}
+
 bool check_string_slice()
 {
     object s("hello, world");
@@ -324 +329 @@
     def("test_item", test_item);
     def("test_not_item", test_not_item);
 
+    def("test_call", test_call);
+
     def("check_binary_operators", check_binary_operators);
     def("check_inplace", check_inplace);
     def("check_string_slice", check_string_slice);

libs/python/test/object.py

@@ -15 +15 @@
 'hello, world!'
 >>> number()
 42
+>>> def print_args(*args, **kwds):
+...     print args, kwds
+>>> test_call(print_args, (0, 1, 2, 3), {'a':'A'})
+(0, 1, 2, 3) {'a': 'A'}
 
 >>> test('hi')
 1