|
From: <rom...@us...> - 2006-11-13 19:58:10
|
Revision: 714
http://svn.sourceforge.net/pygccxml/?rev=714&view=rev
Author: roman_yakovenko
Date: 2006-11-11 23:23:32 -0800 (Sat, 11 Nov 2006)
Log Message:
-----------
integrating return_pointee_value with Py++
Added Paths:
-----------
pyplusplus_dev/pyplusplus/code_repository/call_policies.py
Added: pyplusplus_dev/pyplusplus/code_repository/call_policies.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_repository/call_policies.py (rev 0)
+++ pyplusplus_dev/pyplusplus/code_repository/call_policies.py 2006-11-12 07:23:32 UTC (rev 714)
@@ -0,0 +1,78 @@
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+"""
+This file contains C++ code - custom call policies
+"""
+
+
+namespace = "pyplusplus::call_policies"
+
+file_name = "__call_policies.pypp.hpp"
+
+code = \
+"""// Copyright 2004 Roman Yakovenko.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef call_policies_pyplusplus_hpp__
+#define call_policies_pyplusplus_hpp__
+
+#include "boost/python.hpp"
+
+namespace pyplusplus{ namespace call_policies{
+
+namespace bpl = boost::python;
+
+namespace detail{
+
+struct make_value_holder{
+
+ template <class T>
+ static PyObject* execute(T* p){
+ if (p == 0){
+ return bpl::detail::none();
+ }
+ else{
+ bpl::object p_value( *p );
+ return bpl::incref( p_value.ptr() );
+ }
+ }
+
+};
+
+template <class R>
+struct return_pointee_value_requires_a_pointer_return_type
+# if defined(__GNUC__) && __GNUC__ >= 3 || defined(__EDG__)
+{}
+# endif
+;
+
+} //detail
+
+struct return_pointee_value{
+
+ template <class T>
+ struct apply{
+
+ BOOST_STATIC_CONSTANT( bool, ok = boost::is_pointer<T>::value );
+
+ typedef typename boost::mpl::if_c<
+ ok
+ , bpl::to_python_indirect<T, detail::make_value_holder>
+ , detail::return_pointee_value_requires_a_pointer_return_type<T>
+ >::type type;
+
+ };
+
+};
+
+} /*pyplusplus*/ } /*call_policies*/
+
+
+#endif//call_policies_pyplusplus_hpp__
+
+"""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-01-21 07:17:10
|
Revision: 875
http://svn.sourceforge.net/pygccxml/?rev=875&view=rev
Author: roman_yakovenko
Date: 2007-01-20 23:17:10 -0800 (Sat, 20 Jan 2007)
Log Message:
-----------
change deallocate to deallocate_array
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_repository/call_policies.py
Modified: pyplusplus_dev/pyplusplus/code_repository/call_policies.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_repository/call_policies.py 2007-01-20 20:30:38 UTC (rev 874)
+++ pyplusplus_dev/pyplusplus/code_repository/call_policies.py 2007-01-21 07:17:10 UTC (rev 875)
@@ -31,12 +31,12 @@
struct none{
template< typename T>
- static void deallocate(T*){}
+ static void deallocate_array(T*){}
};
struct delete_{
template< typename T>
- static void deallocate(T* arr){
+ static void deallocate_array(T* arr){
delete[] arr;
}
};
@@ -111,7 +111,7 @@
for( unsigned int i = 0; i < size; ++i ){
list_.append( make_object< CallPolicies>( arr[i] ) );
}
- MemoryManager::deallocate( arr );
+ MemoryManager::deallocate_array( arr );
return bpl::incref( bpl::tuple( list_ ).ptr() );
}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-02-16 20:41:44
|
Revision: 908
http://svn.sourceforge.net/pygccxml/?rev=908&view=rev
Author: roman_yakovenko
Date: 2007-02-16 12:41:45 -0800 (Fri, 16 Feb 2007)
Log Message:
-----------
initial implementation of return_range call policies
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_repository/call_policies.py
Modified: pyplusplus_dev/pyplusplus/code_repository/call_policies.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_repository/call_policies.py 2007-02-16 10:01:39 UTC (rev 907)
+++ pyplusplus_dev/pyplusplus/code_repository/call_policies.py 2007-02-16 20:41:45 UTC (rev 908)
@@ -22,6 +22,10 @@
#define call_policies_pyplusplus_hpp__
#include "boost/python.hpp"
+#include "boost/mpl/int.hpp"
+#include "boost/function.hpp"
+#include "boost/python/suite/indexing/iterator_range.hpp"
+#include "boost/python/object/class_detail.hpp"
namespace pyplusplus{ namespace call_policies{
@@ -132,7 +136,89 @@
} /*arrays*/
+namespace detail{
+struct return_raw_data_ref{
+
+ template <class T>
+ struct apply{
+
+ BOOST_STATIC_ASSERT( boost::is_pointer<T>::value );
+
+ struct type{
+ static bool convertible()
+ { return true; }
+
+ PyObject*
+ operator()( T return_value) const{
+ if( !return_value ){
+ return bpl::detail::none();
+ }
+ else{
+ typedef typename boost::remove_pointer< T >::type value_type;
+ typedef typename boost::remove_const< value_type >::type non_const_value_type;
+ non_const_value_type* data = const_cast<non_const_value_type*>( return_value );
+ return PyCObject_FromVoidPtr( data, NULL );
+ }
+ }
+ };
+
+ };
+
+};
+
+} //detail
+
+template < typename ValueType, typename SizeGetter, typename GetItemCallPolicies=bpl::default_call_policies >
+struct return_range : bpl::default_call_policies
+{
+ typedef return_range< ValueType, SizeGetter, GetItemCallPolicies > this_type;
+public:
+ //result converter generator should return PyCObject instance
+ //postcall will destruct it
+ typedef typename detail::return_raw_data_ref result_converter;
+ typedef GetItemCallPolicies get_item_call_policies;
+ typedef ValueType value_type;
+ typedef bpl::indexing::iterator_range<value_type*> range_type;
+
+ static void register_range_class_on_demand(){
+
+ // Check the registry. If one is already registered, return it.
+ bpl::handle<> class_obj(
+ bpl::objects::registered_class_object(bpl::type_id<range_type>()));
+
+ if (class_obj.get() == 0){
+ bpl::class_<range_type>( "_range_iterator_", bpl::init<value_type*, value_type*>() )
+ .def(bpl::indexing::container_suite<range_type>() );
+ }
+ }
+
+ template <class ArgumentPackage>
+ static PyObject* postcall(ArgumentPackage const& args, PyObject* result)
+ {
+ if( result == bpl::detail::none() ){
+ return result;
+ }
+ if( !PyCObject_Check( result ) ){
+ throw std::runtime_error( "Internal error: expected to get PyCObject" );
+ }
+ value_type* raw_data = reinterpret_cast<value_type*>( PyCObject_AsVoidPtr( result ) );
+ Py_DECREF(result);//we don't need result anymore
+
+ PyObject* self_impl = bpl::detail::get(boost::mpl::int_<0>(),args);
+ bpl::object self( bpl::handle<>( bpl::borrowed( self_impl ) ) );
+
+ register_range_class_on_demand();
+
+ SizeGetter get_size;
+ ssize_t size = get_size( self );
+ range_type the_range( raw_data, raw_data+size );
+ bpl::object range_obj( the_range );
+
+ return bpl::incref( range_obj.ptr() );
+ }
+};
+
} /*pyplusplus*/ } /*call_policies*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-02-17 19:25:14
|
Revision: 912
http://svn.sourceforge.net/pygccxml/?rev=912&view=rev
Author: roman_yakovenko
Date: 2007-02-17 11:25:02 -0800 (Sat, 17 Feb 2007)
Log Message:
-----------
adding ability to use return_range call policy for classes
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_repository/call_policies.py
Modified: pyplusplus_dev/pyplusplus/code_repository/call_policies.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_repository/call_policies.py 2007-02-17 11:54:13 UTC (rev 911)
+++ pyplusplus_dev/pyplusplus/code_repository/call_policies.py 2007-02-17 19:25:02 UTC (rev 912)
@@ -184,24 +184,6 @@
typedef bpl::indexing::iterator_range<value_type*> range_type;
- static void register_range_class_on_demand(){
- //Check the registry. If the class doesn't exist, register it.
- bpl::handle<> class_obj(
- bpl::objects::registered_class_object(bpl::type_id<range_type>()));
-
- if (class_obj.get() == 0){
- bpl::class_<range_type> registrator( "_impl_details_range_iterator_", bpl::init<value_type*, value_type*>() );
- if( boost::is_same< bpl::default_call_policies, value_policies_type>::value ){
- registrator.def(bpl::indexing::container_suite<range_type>() );
- }
- else{
- //I need to find out why this code does not compiles
- //typedef bpl::indexing::iterator_range_suite< range_type > suite_type;
- //registrator.def(suite_type::with_policies( value_policies_type() ) );
- }
- }
- }
-
template <class ArgumentPackage>
static PyObject* postcall(ArgumentPackage const& args, PyObject* result){
if( result == bpl::detail::none() ){
@@ -225,6 +207,35 @@
return bpl::incref( range_obj.ptr() );
}
+private:
+
+ static void register_range_class( boost::mpl::true_ ){
+ //register range class with default call policies
+ bpl::class_<range_type>( "_impl_details_range_iterator_", bpl::init<value_type*, value_type*>() )
+ .def(bpl::indexing::container_suite<range_type>() );
+ }
+
+ static void register_range_class( boost::mpl::false_ ){
+ //register range class with non default call policies
+ unsigned long const methods_mask
+ = bpl::indexing::all_methods
+ & ~( bpl::indexing::reorder_methods | bpl::indexing::search_methods ) ;
+
+ typedef bpl::indexing::iterator_range_suite< range_type, methods_mask > suite_type;
+ bpl::class_<range_type>( "_impl_details_range_iterator_", bpl::init<value_type*, value_type*>() )
+ .def( suite_type::with_policies( value_policies_type() ) );
+ }
+
+ static void register_range_class_on_demand(){
+ //Check the registry. If the class doesn't exist, register it.
+ bpl::handle<> class_obj(
+ bpl::objects::registered_class_object(bpl::type_id<range_type>()));
+
+ if( class_obj.get() == 0 ){
+ register_range_class( boost::is_same< bpl::default_call_policies, value_policies_type>() );
+ }
+ }
+
};
} /*pyplusplus*/ } /*call_policies*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
