|
From: <rom...@us...> - 2007-01-19 19:51:51
|
Revision: 871
http://svn.sourceforge.net/pygccxml/?rev=871&view=rev
Author: roman_yakovenko
Date: 2007-01-19 11:51:51 -0800 (Fri, 19 Jan 2007)
Log Message:
-----------
adding new warnings for X** types in functions
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py
pyplusplus_dev/pyplusplus/messages/warnings_.py
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py 2007-01-18 06:24:12 UTC (rev 870)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py 2007-01-19 19:51:51 UTC (rev 871)
@@ -157,6 +157,13 @@
return self._exportable_impl_derived()
def _readme_impl( self ):
+ def is_double_ptr( type_ ):
+ #check for X**
+ if not declarations.is_pointer( type_ ):
+ return False
+ base = declarations.remove_pointer( type_ )
+ return declarations.is_pointer( base )
+
def suspicious_type( type_ ):
if not declarations.is_reference( type_ ):
return False
@@ -180,10 +187,15 @@
if suspicious_type( self.return_type ) and None is self.call_policies:
msgs.append( messages.W1008 )
+
+ if is_double_ptr( self.return_type ) and None is self.call_policies:
+ msgs.append( messages.W1050 % str(self.return_type) )
for index, arg in enumerate( self.arguments ):
if suspicious_type( arg.type ):
msgs.append( messages.W1009 % ( arg.name, index ) )
+ if is_double_ptr( arg.type ):
+ msgs.append( messages.W1051 % ( arg.name, index, str(arg.type) ) )
if False == self.overridable:
msgs.append( self._non_overridable_reason)
Modified: pyplusplus_dev/pyplusplus/messages/warnings_.py
===================================================================
--- pyplusplus_dev/pyplusplus/messages/warnings_.py 2007-01-18 06:24:12 UTC (rev 870)
+++ pyplusplus_dev/pyplusplus/messages/warnings_.py 2007-01-19 19:51:51 UTC (rev 871)
@@ -148,6 +148,14 @@
W1049 = 'This method could not be overriden in Python - method returns reference ' \
'to local variable!'
+W1050 = 'The function returns "%s" type. You have to specify a call policies.'
+
+
+W1051 = 'The function takes as argument (name=%s, pos=%d) "%s" type. ' \
+ 'You have to specify a call policies or to use "Function Transformation" ' \
+ 'functionality.'
+
+
warnings = globals()
for identifier, explanation in warnings.items():
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-01-20 20:30:16
|
Revision: 873
http://svn.sourceforge.net/pygccxml/?rev=873&view=rev
Author: roman_yakovenko
Date: 2007-01-20 12:30:16 -0800 (Sat, 20 Jan 2007)
Log Message:
-----------
adding new call policy for arrays
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_repository/call_policies.py
pyplusplus_dev/pyplusplus/decl_wrappers/__init__.py
pyplusplus_dev/pyplusplus/decl_wrappers/call_policies.py
pyplusplus_dev/pyplusplus/module_builder/call_policies.py
Modified: pyplusplus_dev/pyplusplus/code_repository/call_policies.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_repository/call_policies.py 2007-01-19 19:52:24 UTC (rev 872)
+++ pyplusplus_dev/pyplusplus/code_repository/call_policies.py 2007-01-20 20:30:16 UTC (rev 873)
@@ -27,6 +27,23 @@
namespace bpl = boost::python;
+namespace memory_managers{
+
+ struct none{
+ template< typename T>
+ static void deallocate(T*){}
+ };
+
+ struct delete_{
+ template< typename T>
+ static void deallocate(T* arr){
+ delete[] arr;
+ }
+ };
+
+}/*memory_managers*/
+
+
namespace detail{
struct make_value_holder{
@@ -78,6 +95,44 @@
return bpl::object( bpl::handle<>( rc( x ) ) );
}
+namespace arrays{
+
+namespace details{
+
+template< unsigned int size, typename MemoryManager, typename CallPolicies>
+struct as_tuple_impl{
+
+ template <class U>
+ inline PyObject* operator()(U const* arr) const{
+ if( !arr ){
+ return bpl::incref( bpl::tuple().ptr() );
+ }
+ bpl::list list_;
+ for( unsigned int i = 0; i < size; ++i ){
+ list_.append( make_object< CallPolicies>( arr[i] ) );
+ }
+ MemoryManager::deallocate( arr );
+ return bpl::incref( bpl::tuple( list_ ).ptr() );
+ }
+};
+
+}
+
+template< unsigned int size, typename MemoryManager, typename MakeObjectCallPolicies=bpl::default_call_policies>
+struct as_tuple{
+public:
+
+ template <class T>
+ struct apply{
+ BOOST_STATIC_CONSTANT( bool, ok = boost::is_pointer<T>::value );
+ typedef details::as_tuple_impl<size, MemoryManager, MakeObjectCallPolicies> type;
+ };
+
+};
+
+} /*arrays*/
+
+
} /*pyplusplus*/ } /*call_policies*/
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/__init__.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/__init__.py 2007-01-19 19:52:24 UTC (rev 872)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/__init__.py 2007-01-20 20:30:16 UTC (rev 873)
@@ -85,6 +85,11 @@
from call_policies import return_pointee_value
from call_policies import is_return_opaque_pointer_policy
from call_policies import is_return_pointee_value_policy
+from call_policies import custom_call_policies_t
+from call_policies import custom_call_policies
+from call_policies import convert_array_to_tuple_t
+from call_policies import convert_array_to_tuple
+from call_policies import memory_managers
from decl_wrapper_printer import decl_wrapper_printer_t
from decl_wrapper_printer import print_declarations
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/call_policies.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/call_policies.py 2007-01-19 19:52:24 UTC (rev 872)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/call_policies.py 2007-01-20 20:30:16 UTC (rev 873)
@@ -231,3 +231,75 @@
return isinstance( policy, return_value_policy_t ) \
and policy.result_converter_generator == return_pointee_value
+
+class custom_call_policies_t(call_policy_t):
+ """implementation for user defined call policies"""
+ def __init__( self, call_policies ):
+ call_policy_t.__init__( self )
+ self.__call_policies = call_policies
+
+ def _create_impl(self, function_creator ):
+ return str( self.__call_policies )
+
+ def __str__(self):
+ return 'custom call policies'
+
+def custom_call_policies(call_policies):
+ """create custom\\user defined call policies"""
+ return custom_call_policies_t(call_policies)
+
+class memory_managers:
+ none = 'none'
+ delete_ = 'delete_'
+ all = [ none, delete_ ]
+
+ @staticmethod
+ def create( manager, function_creator=None):
+ mem_manager = 'pyplusplus::call_policies::memory_managers::' + manager
+ if function_creator:
+ mem_manager = algorithm.create_identifier( function_creator, mem_manager )
+ return mem_manager
+
+class convert_array_to_tuple_t( compound_policy_t ):
+ def __init__( self, array_size, memory_manager, make_object_call_policies=None, base=None):
+ compound_policy_t.__init__( self, base )
+ self._array_size = array_size
+ self._memory_manager = memory_manager
+ self._make_objec_call_policies = make_object_call_policies
+
+ def _get_array_size( self ):
+ return self._array_size
+ def _set_array_size( self, new_array_size):
+ self._array_size = new_array_size
+ array_size = property( _get_array_size, _set_array_size )
+
+ def _get_memory_manager( self ):
+ return self._memory_manager
+ def _set_memory_manager( self, new_memory_manager):
+ self._memory_manager = new_memory_manager
+ memory_manager = property( _get_memory_manager, _set_memory_manager )
+
+ def _get_make_objec_call_policies( self ):
+ if None is self._make_objec_call_policies:
+ self._make_objec_call_policies = default_call_policies()
+ return self._make_objec_call_policies
+ def _set_make_objec_call_policies( self, new_make_objec_call_policies):
+ self._make_objec_call_policies = new_make_objec_call_policies
+ make_objec_call_policies = property( _get_make_objec_call_policies, _set_make_objec_call_policies )
+
+
+ def _get_name(self, function_creator):
+ return '::boost::python::return_value_policy'
+
+ def _get_args(self, function_creator):
+ as_tuple_args = [ str( self.array_size ) ]
+ as_tuple_args.append( memory_managers.create( self.memory_manager, function_creator ) )
+ if not self.make_objec_call_policies.is_default():
+ as_tuple_args.append( self.make_objec_call_policies.create_template_arg( function_creator ) )
+ as_tuple = '::pyplusplus::call_policies::arrays::as_tuple'
+ if function_creator:
+ as_tuple = algorithm.create_identifier( function_creator, as_tuple )
+ return [ declarations.templates.join( as_tuple, as_tuple_args ) ]
+
+def convert_array_to_tuple( array_size, memory_manager, make_object_call_policies=None, base=None ):
+ return convert_array_to_tuple_t( array_size, memory_manager, make_object_call_policies, base )
\ No newline at end of file
Modified: pyplusplus_dev/pyplusplus/module_builder/call_policies.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_builder/call_policies.py 2007-01-19 19:52:24 UTC (rev 872)
+++ pyplusplus_dev/pyplusplus/module_builder/call_policies.py 2007-01-20 20:30:16 UTC (rev 873)
@@ -17,4 +17,7 @@
from pyplusplus.decl_wrappers import return_by_value
from pyplusplus.decl_wrappers import return_opaque_pointer
from pyplusplus.decl_wrappers import return_value_policy
-from pyplusplus.decl_wrappers import return_pointee_value
\ No newline at end of file
+from pyplusplus.decl_wrappers import return_pointee_value
+from pyplusplus.decl_wrappers import custom_call_policies
+from pyplusplus.decl_wrappers import convert_array_to_tuple
+from pyplusplus.decl_wrappers import memory_managers
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-01-28 13:14:56
|
Revision: 881
http://svn.sourceforge.net/pygccxml/?rev=881&view=rev
Author: roman_yakovenko
Date: 2007-01-28 05:14:56 -0800 (Sun, 28 Jan 2007)
Log Message:
-----------
adding initial support for multi-module development
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/calldef.py
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
pyplusplus_dev/pyplusplus/code_creators/enum.py
pyplusplus_dev/pyplusplus/code_creators/exception_translator.py
pyplusplus_dev/pyplusplus/code_creators/global_variable.py
pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py
pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py
pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py
pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py
pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py
pyplusplus_dev/pyplusplus/decl_wrappers/scopedef_wrapper.py
pyplusplus_dev/pyplusplus/file_writers/multiple_files.py
pyplusplus_dev/pyplusplus/module_creator/creator.py
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-01-22 17:36:24 UTC (rev 880)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-01-28 13:14:56 UTC (rev 881)
@@ -80,6 +80,9 @@
raise NotImplementedError()
def _create_impl( self ):
+ if self.declaration.already_exposed:
+ return ''
+
result = []
if not self.works_on_instance:
@@ -1144,6 +1147,9 @@
calldef_overloads_class_t.__init__( self, mem_funs )
def _create_impl(self):
+ if self.max_function.already_exposed:
+ return ''
+
min_, max_ = self.min_max_num_of_args()
return "BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS( %(overloads_cls)s, %(fun)s, %(min)d, %(max)d )" \
% { 'overloads_cls' : self.name
@@ -1159,6 +1165,9 @@
calldef_overloads_class_t.__init__( self, free_funs )
def _create_impl(self):
+ if self.max_function.already_exposed:
+ return ''
+
min_, max_ = self.min_max_num_of_args()
return "BOOST_PYTHON_FUNCTION_OVERLOADS( %(overloads_cls)s, %(fun)s, %(min)d, %(max)d )" \
% { 'overloads_cls' : self.name
Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-01-22 17:36:24 UTC (rev 880)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-01-28 13:14:56 UTC (rev 881)
@@ -75,6 +75,8 @@
return os.linesep.join( result )
def _create_impl(self):
+ if self.declaration.already_exposed:
+ return ''
if self.is_exposed_using_scope():
return self._generate_code_with_scope()
else:
@@ -306,6 +308,8 @@
return bool( filter( lambda cc: not cc.works_on_instance, self.creators ) )
def _create_impl(self):
+ if self.declaration.already_exposed:
+ return ''
if self.is_exposed_using_scope():
return self._generate_code_with_scope()
else:
@@ -374,6 +378,8 @@
return ', '.join( [self.exposed_identifier, self.boost_wrapper_identifier] )
def _create_impl(self):
+ if self.declaration.already_exposed:
+ return ''
answer = ['struct %s : %s {' % ( self.wrapper_alias, self._create_bases() )]
answer.append( '' )
answer.append( self.create_internal_code( self.creators ) )
Modified: pyplusplus_dev/pyplusplus/code_creators/enum.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/enum.py 2007-01-22 17:36:24 UTC (rev 880)
+++ pyplusplus_dev/pyplusplus/code_creators/enum.py 2007-01-28 13:14:56 UTC (rev 881)
@@ -38,6 +38,9 @@
, 'name' : algorithm.create_identifier( self, full_name + '::' + value_name ) }
def _create_impl(self):
+ if self.declaration.already_exposed:
+ return ''
+
bpl_enum = '%(bpl::enum_)s< %(name)s>("%(alias)s")' \
% { 'bpl::enum_' : algorithm.create_identifier( self, '::boost::python::enum_' )
, 'name' : algorithm.create_identifier( self, self.declaration.decl_string )
Modified: pyplusplus_dev/pyplusplus/code_creators/exception_translator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/exception_translator.py 2007-01-22 17:36:24 UTC (rev 880)
+++ pyplusplus_dev/pyplusplus/code_creators/exception_translator.py 2007-01-28 13:14:56 UTC (rev 881)
@@ -22,6 +22,8 @@
return 'translate_%(alias)s' % { 'alias' : self.declaration.alias }
def _create_impl(self):
+ if self.declaration.already_exposed:
+ return ''
return os.linesep.join([
"void translate_%(alias)s( const %(cls_name)s& %(arg_name)s ){" \
, self.indent( self.declaration.exception_translation_code )
@@ -40,9 +42,12 @@
self.translator = exception_translator
def _create_impl( self ):
+ if self.declaration.already_exposed:
+ return ''
+
return '%(register_exception_translator)s< %(cls)s >( &%(translator)s );' \
% { 'register_exception_translator' : algorithm.create_identifier( self, 'boost::python::register_exception_translator' )
, 'cls' : self.decl_identifier
, 'translator' : self.translator.translator_name }
-
\ No newline at end of file
+
Modified: pyplusplus_dev/pyplusplus/code_creators/global_variable.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/global_variable.py 2007-01-22 17:36:24 UTC (rev 880)
+++ pyplusplus_dev/pyplusplus/code_creators/global_variable.py 2007-01-28 13:14:56 UTC (rev 881)
@@ -41,6 +41,9 @@
global_variable_base_t.__init__( self, variable=variable )
def _create_impl(self):
+ if self.declaration.already_exposed:
+ return ''
+
assert isinstance( self.declaration, pygccxml.declarations.variable_t )
result = []
result.append( algorithm.create_identifier( self, '::boost::python::scope' ) )
@@ -59,6 +62,9 @@
global_variable_base_t.__init__( self, variable=variable, wrapper=wrapper )
def _create_impl( self ):
+ if self.declaration.already_exposed:
+ return ''
+
answer = []
answer.append( algorithm.create_identifier( self, '::boost::python::scope' ) )
answer.append( '().attr("%s")' % self.alias )
@@ -122,6 +128,9 @@
return ''.join( temp )
def _create_impl( self ):
+ if self.declaration.already_exposed:
+ return ''
+
answer = [self._create_namespaces_name()]
answer.append( self.wrapper_type.decl_string )
answer.append( ''.join([ self.wrapper_creator_name, '(){']) )
Modified: pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2007-01-22 17:36:24 UTC (rev 880)
+++ pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2007-01-28 13:14:56 UTC (rev 881)
@@ -46,7 +46,7 @@
args.append( no_proxy)
return declarations.templates.join( suite_identifier, args )
- def _create_impl(self):
+ def _create_impl(self):
return "def( %s() )" % self._create_suite_declaration()
@@ -83,6 +83,9 @@
return ''.join( answer )
def _create_impl( self ):
+ if self.declaration.already_exposed:
+ return ''
+
answer = []
if self.does_user_disable_methods():
answer.append( self.generate_algorithm_mask() )
@@ -161,6 +164,8 @@
pass # for inner class this code will generate error :-((((
def _create_impl( self ):
+ if self.declaration.already_exposed:
+ return ''
return self.generate_value_traits()
Modified: pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py 2007-01-22 17:36:24 UTC (rev 880)
+++ pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py 2007-01-28 13:14:56 UTC (rev 881)
@@ -61,6 +61,8 @@
class_creator = property( _get_class_creator, _set_class_creator )
def _create_impl(self):
+ if self.declaration.already_exposed:
+ return ''
if self.class_creator \
and self.class_creator.held_type \
and isinstance( self.class_creator.held_type, held_type_t ) \
@@ -109,4 +111,4 @@
to_arg = self._instantiate_smart_ptr( self.target )
return templates.join(implicitly_convertible, [ from_arg, to_arg ] ) + '();'
-
\ No newline at end of file
+
Modified: pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py 2007-01-22 17:36:24 UTC (rev 880)
+++ pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py 2007-01-28 13:14:56 UTC (rev 881)
@@ -23,6 +23,9 @@
value_aliases = property( _get_value_aliases, _set_value_aliases )
def _create_impl(self):
+ if self.declaration.already_exposed:
+ return ''
+
tmpl = algorithm.create_identifier( self, '::boost::python::scope' ) + '().attr("%s") = (int)%s;'
full_name = pygccxml.declarations.full_name( self.declaration )
result = []
@@ -30,4 +33,4 @@
result.append( tmpl % ( self.value_aliases.get( name, name )
, algorithm.create_identifier( self, full_name + '::' + name ) ) )
return os.linesep.join( result )
-
\ No newline at end of file
+
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py 2007-01-22 17:36:24 UTC (rev 880)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py 2007-01-28 13:14:56 UTC (rev 881)
@@ -127,6 +127,20 @@
+"Thus it will be able to generate code, that uses " \
+" BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID macro in a right places." )
+ def _get_already_exposed_impl( self ):
+ if not self.indexing_suite:
+ return self._already_exposed
+ try:
+ et = self.indexing_suite.element_type
+ et = declarations.remove_const( et )
+ et = declarations.remove_pointer( et )
+ et = declarations.remove_declarated( et )
+ if isinstance(et, declarations.declaration_t):
+ return et._already_exposed
+ return False
+ except:
+ return False
+
#this will only be exported if indexing suite is not None and only when needed
class class_declaration_t( class_common_details_t
, decl_wrapper.decl_wrapper_t
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py 2007-01-22 17:36:24 UTC (rev 880)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py 2007-01-28 13:14:56 UTC (rev 881)
@@ -26,6 +26,7 @@
object.__init__(self)
self._alias = None
self._ignore = False
+ self._already_exposed = False
self._exportable = None
self._exportable_reason = None
self._documentation = None
@@ -100,14 +101,24 @@
ignore = property( _get_ignore, _set_ignore
,doc="If you set ignore to True then this declaration will not be exported." )
+ def _get_already_exposed_impl( self ):
+ return self._already_exposed
+
+ def _get_already_exposed( self ):
+ return self._get_already_exposed_impl()
+ def _set_already_exposed( self, value ):
+ self._already_exposed = value
+ already_exposed = property( _get_already_exposed, _set_already_exposed )
+
def exclude( self ):
"""Exclude "self" and child declarations from being exposed."""
self.ignore = True
- def include( self ):
+ def include( self, already_exposed=False ):
"""Include "self" and child declarations to be exposed."""
self.ignore = False
-
+ self.already_exposed = already_exposed
+
def why_not_exportable( self ):
"""returns strings that explains why this declaration could not be exported or None otherwise"""
if None is self._exportable_reason:
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/scopedef_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/scopedef_wrapper.py 2007-01-22 17:36:24 UTC (rev 880)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/scopedef_wrapper.py 2007-01-28 13:14:56 UTC (rev 881)
@@ -22,7 +22,8 @@
self.ignore = True
map( lambda decl: decl.exclude(), self.declarations )
- def include( self ):
+ def include( self, already_exposed=False ):
"""Include "self" and child declarations to be exposed."""
self.ignore = False
- map( lambda decl: decl.include(), self.declarations )
+ self.already_exposed = already_exposed
+ map( lambda decl: decl.include(already_exposed), self.declarations )
Modified: pyplusplus_dev/pyplusplus/file_writers/multiple_files.py
===================================================================
--- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2007-01-22 17:36:24 UTC (rev 880)
+++ pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2007-01-28 13:14:56 UTC (rev 881)
@@ -251,6 +251,8 @@
@type class_creator: class_t
"""
try:
+ if class_creator.declaration.already_exposed:
+ return
self.split_class_impl( class_creator )
except IOError, error:
msg = [ 'Failed to write code for class "%s" into file.;' % class_creator.declaration.name ]
@@ -267,6 +269,9 @@
Write the value_traits class to header file, that will be included
from files, that uses indexing suite 2
"""
+ if value_traits.declaration.already_exposed:
+ return
+
header_name = self.create_value_traits_header_name( value_traits.declaration )
file_path = os.path.join( self.directory_path, header_name )
self.write_file( file_path
Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-01-22 17:36:24 UTC (rev 880)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-01-28 13:14:56 UTC (rev 881)
@@ -137,7 +137,10 @@
for decl in decls:
if decl.ignore:
continue
-
+
+ if decl.already_exposed:
+ continue
+
#Right now this functionality introduce a bug: declarations that should
#not be exported for some reason are not marked as such. I will need to
#find out.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-02-02 18:46:05
|
Revision: 896
http://svn.sourceforge.net/pygccxml/?rev=896&view=rev
Author: roman_yakovenko
Date: 2007-02-02 10:46:02 -0800 (Fri, 02 Feb 2007)
Log Message:
-----------
removing breaking changes
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/module.py
pyplusplus_dev/pyplusplus/module_creator/creator.py
Modified: pyplusplus_dev/pyplusplus/code_creators/module.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/module.py 2007-02-01 12:15:05 UTC (rev 895)
+++ pyplusplus_dev/pyplusplus/code_creators/module.py 2007-02-02 18:46:02 UTC (rev 896)
@@ -133,7 +133,7 @@
if creator.header in self.__system_headers:
if not leave_system_headers:
self.remove_creator( creator )
- if creator.is_user_defined:
+ elif creator.is_user_defined:
pass
else:
self.remove_creator( creator )
@@ -171,8 +171,8 @@
code = self.unindent(code)
return os.linesep.join( includes ) + 2 * os.linesep + code + os.linesep
- def add_include( self, header, user_defined ):
- self.adopt_include( include.include_t( header=header, user_defined=user_defined ) )
+ def add_include( self, header ):
+ self.adopt_include( include.include_t( header=header, user_defined=True ) )
def add_namespace_usage( self, namespace_name ):
self.adopt_creator( namespace.namespace_using_t( namespace_name )
@@ -202,4 +202,4 @@
-
\ No newline at end of file
+
Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-02-01 12:15:05 UTC (rev 895)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-02-02 18:46:02 UTC (rev 896)
@@ -429,7 +429,8 @@
included = filter( lambda cc: isinstance(cc, code_creators.include_t) and cc.header==header
, self.__extmodule.creators)
if not included:
- self.__extmodule.add_include( header, user_defined=True )
+ self.__extmodule.adopt_include(
+ code_creators.include_t( header=header, user_defined=True ) )
# Check if it is a header from the code repository
if header in code_repository.headers:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-02-04 08:51:09
|
Revision: 897
http://svn.sourceforge.net/pygccxml/?rev=897&view=rev
Author: roman_yakovenko
Date: 2007-02-04 00:51:09 -0800 (Sun, 04 Feb 2007)
Log Message:
-----------
incrementing versions
Modified Paths:
--------------
pygccxml_dev/pygccxml/__init__.py
pygccxml_dev/setup.py
pyplusplus_dev/pyplusplus/__init__.py
pyplusplus_dev/setup.py
Modified: pygccxml_dev/pygccxml/__init__.py
===================================================================
--- pygccxml_dev/pygccxml/__init__.py 2007-02-02 18:46:02 UTC (rev 896)
+++ pygccxml_dev/pygccxml/__init__.py 2007-02-04 08:51:09 UTC (rev 897)
@@ -35,4 +35,6 @@
#TODO:
# 1. Write documentation for filtering functionality.
-# 2. Add "explicit" property for constructors
\ No newline at end of file
+# 2. Add "explicit" property for constructors
+
+__version__ = '0.8.6'
Modified: pygccxml_dev/setup.py
===================================================================
--- pygccxml_dev/setup.py 2007-02-02 18:46:02 UTC (rev 896)
+++ pygccxml_dev/setup.py 2007-02-04 08:51:09 UTC (rev 897)
@@ -52,7 +52,7 @@
setup( name = "pygccxml",
- version = "0.8.5",
+ version = "0.8.6",
description = "GCC-XML generated file reader",
author = "Roman Yakovenko",
author_email = "rom...@gm...",
Modified: pyplusplus_dev/pyplusplus/__init__.py
===================================================================
--- pyplusplus_dev/pyplusplus/__init__.py 2007-02-02 18:46:02 UTC (rev 896)
+++ pyplusplus_dev/pyplusplus/__init__.py 2007-02-04 08:51:09 UTC (rev 897)
@@ -34,7 +34,7 @@
from _logging_ import multi_line_formatter_t
-__version__ = '0.8.3'
+__version__ = '0.8.6'
#Known issues:
#3.
Modified: pyplusplus_dev/setup.py
===================================================================
--- pyplusplus_dev/setup.py 2007-02-02 18:46:02 UTC (rev 896)
+++ pyplusplus_dev/setup.py 2007-02-04 08:51:09 UTC (rev 897)
@@ -90,7 +90,7 @@
setup( name = "Py++",
- version = "0.8.5",
+ version = "0.8.6",
description="Py++ is a framework of components for creating C++ code generator for Boost.Python library",
author="Roman Yakovenko",
author_email="rom...@gm...",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-02-16 08:05:54
|
Revision: 905
http://svn.sourceforge.net/pygccxml/?rev=905&view=rev
Author: roman_yakovenko
Date: 2007-02-16 00:05:54 -0800 (Fri, 16 Feb 2007)
Log Message:
-----------
moving "class_var_name" functionality to decl_wrappers
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py
pyplusplus_dev/pyplusplus/function_transformers/transformers.py
Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-02-16 06:14:14 UTC (rev 904)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-02-16 08:05:54 UTC (rev 905)
@@ -36,9 +36,9 @@
result.append( ';' )
return ''.join( result )
- def _get_class_var_name(self):
- return self.alias + '_exposer'
- class_var_name = property( _get_class_var_name )
+ @property
+ def class_var_name(self):
+ return self.declaration.class_var_name
def is_exposed_using_scope(self):
if self.declaration.always_expose_using_scope:
@@ -246,11 +246,11 @@
result.append( ';' )
return ''.join( result )
- def _get_class_var_name(self):
- return self.alias + '_exposer'
- class_var_name = property( _get_class_var_name )
-
@property
+ def class_var_name(self):
+ return self.declaration.class_var_name
+
+ @property
def typedef_name( self ):
return self.class_var_name + '_t'
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py 2007-02-16 06:14:14 UTC (rev 904)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py 2007-02-16 08:05:54 UTC (rev 905)
@@ -160,6 +160,10 @@
return False
except:
return False
+
+ @property
+ def class_var_name(self):
+ return self.alias + '_exposer'
#this will only be exported if indexing suite is not None and only when needed
class class_declaration_t( class_common_details_t
Modified: pyplusplus_dev/pyplusplus/function_transformers/transformers.py
===================================================================
--- pyplusplus_dev/pyplusplus/function_transformers/transformers.py 2007-02-16 06:14:14 UTC (rev 904)
+++ pyplusplus_dev/pyplusplus/function_transformers/transformers.py 2007-02-16 08:05:54 UTC (rev 905)
@@ -129,7 +129,10 @@
def __configure_sealed( self, controller ):
w_arg = controller.find_wrapper_arg( self.arg.name )
w_arg.type = self.modifier( self.arg.type )
-
+ if not declarations.is_convertible( w_arg.type, self.arg.type ):
+ casting_code = 'reinterpret_cast< %s >( %s )' % ( self.arg.type, w_arg.name )
+ controller.modify_arg_expression(self.arg_index, casting_code)
+
def __configure_v_mem_fun_default( self, controller ):
self.__configure_sealed( controller )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-02-19 19:33:02
|
Revision: 915
http://svn.sourceforge.net/pygccxml/?rev=915&view=rev
Author: roman_yakovenko
Date: 2007-02-19 11:33:01 -0800 (Mon, 19 Feb 2007)
Log Message:
-----------
changing "TGetSize" interface to get all arguments
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_repository/call_policies.py
pyplusplus_dev/pyplusplus/module_creator/creator.py
Modified: pyplusplus_dev/pyplusplus/code_repository/call_policies.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_repository/call_policies.py 2007-02-18 20:04:59 UTC (rev 914)
+++ pyplusplus_dev/pyplusplus/code_repository/call_policies.py 2007-02-19 19:33:01 UTC (rev 915)
@@ -195,13 +195,12 @@
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 ) ) );
+ bpl::tuple args_w( bpl::handle<>( bpl::borrowed( args ) ) );
register_range_class_on_demand();
get_size_type get_size;
- range_type the_range( raw_data, raw_data + get_size( self ) );
+ range_type the_range( raw_data, raw_data + get_size( args_w ) );
bpl::object range_obj( the_range );
Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-02-18 20:04:59 UTC (rev 914)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-02-19 19:33:01 UTC (rev 915)
@@ -153,7 +153,10 @@
#self.__types_db.update( decl )
if doc_extractor and decl.exportable:
- decl.documentation = doc_extractor( decl )
+ if decl.documentation:
+ decl.documentation = decl.documentation + doc_extractor( decl )
+ else:
+ decl.documentation = doc_extractor( decl )
readme = decl.readme()
if not readme:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-02-20 19:41:58
|
Revision: 918
http://svn.sourceforge.net/pygccxml/?rev=918&view=rev
Author: roman_yakovenko
Date: 2007-02-20 11:41:57 -0800 (Tue, 20 Feb 2007)
Log Message:
-----------
Adding more information to some warnings
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py
pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py
pyplusplus_dev/pyplusplus/messages/warnings_.py
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py 2007-02-20 19:41:19 UTC (rev 917)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py 2007-02-20 19:41:57 UTC (rev 918)
@@ -184,11 +184,12 @@
if ft.alias == ft.unique_name:
msgs.append( messages.W1044 % ft.alias )
return msgs
-
+
if suspicious_type( self.return_type ) and None is self.call_policies:
msgs.append( messages.W1008 )
- if is_double_ptr( self.return_type ) and None is self.call_policies:
+ if ( declarations.is_pointer( self.return_type ) or is_double_ptr( self.return_type ) ) \
+ and None is self.call_policies:
msgs.append( messages.W1050 % str(self.return_type) )
for index, arg in enumerate( self.arguments ):
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py 2007-02-20 19:41:19 UTC (rev 917)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py 2007-02-20 19:41:57 UTC (rev 918)
@@ -484,30 +484,32 @@
if self.copy_constructor_body:
explanation.append( messages.W1022 )
- if self.redefined_funcs():
- explanation.append( messages.W1023 )
+ redefined_funcs = self.redefined_funcs()
+ if redefined_funcs:
+ funcs = map( lambda f: f.name, redefined_funcs )
+ explanation.append( messages.W1023 % ', '.join(funcs) )
for member in self.get_exportable_members():
if isinstance( member, declarations.destructor_t ):
continue
if isinstance( member, declarations.variable_t ):
if member.bits:
- explanation.append( messages.W1024 )
+ explanation.append( messages.W1024 % member.name )
if declarations.is_pointer( member.type ):
- explanation.append( messages.W1025 )
+ explanation.append( messages.W1025 % member.name )
if declarations.is_reference( member.type ):
- explanation.append( messages.W1026 )
+ explanation.append( messages.W1026 % member.name )
if declarations.is_array( member.type ):
- explanation.append( messages.W1027 )
+ explanation.append( messages.W1027 % member.name)
if isinstance( member, declarations.class_t ) and member.is_wrapper_needed():
- explanation.append( messages.W1028 )
+ explanation.append( messages.W1028 % member.name)
if isinstance( member, declarations.calldef_t ):
if isinstance( member, declarations.constructor_t ) and member.body:
explanation.append( messages.W1029 )
if member.virtuality != VIRTUALITY_TYPES.NOT_VIRTUAL:
- explanation.append( messages.W1030 )
+ explanation.append( messages.W1030 % member.name )
if member.access_type in ( ACCESS_TYPES.PROTECTED, ACCESS_TYPES.PRIVATE ):
- explanation.append( messages.W1031 )
+ explanation.append( messages.W1031 % member.name)
return explanation
def _readme_impl( self ):
Modified: pyplusplus_dev/pyplusplus/messages/warnings_.py
===================================================================
--- pyplusplus_dev/pyplusplus/messages/warnings_.py 2007-02-20 19:41:19 UTC (rev 917)
+++ pyplusplus_dev/pyplusplus/messages/warnings_.py 2007-02-20 19:41:57 UTC (rev 918)
@@ -73,23 +73,24 @@
W1022 = "Py++ will generate class wrapper - hand written code should be added to the wrapper class copy constructor body"
-W1023 = "Py++ will generate class wrapper - there are few functions that should be redefined in class wrapper"
+W1023 = "Py++ will generate class wrapper - there are few functions that should be redefined in class wrapper. " \
+ "The functions are: %s."
-W1024 = "Py++ will generate class wrapper - class contains bit field member variable"
+W1024 = 'Py++ will generate class wrapper - class contains "%s" - bit field member variable'
-W1025 = "Py++ will generate class wrapper - class contains T* member variable"
+W1025 = 'Py++ will generate class wrapper - class contains "%s" - T* member variable'
-W1026 = "Py++ will generate class wrapper - class contains T& member variable"
+W1026 = 'Py++ will generate class wrapper - class contains "%s" - T& member variable'
-W1027 = "Py++ will generate class wrapper - class contains array member variable"
+W1027 = 'Py++ will generate class wrapper - class contains "%s" - array member variable'
-W1028 = "Py++ will generate class wrapper - class contains definition of nested class that requires wrapper class"
+W1028 = 'Py++ will generate class wrapper - class contains definition of nested class "%s", which requires wrapper class'
W1029 = "Py++ will generate class wrapper - hand written code should be added to the wrapper class constructor body"
-W1030 = "Py++ will generate class wrapper - class contains definition of virtual or pure virtual member function"
+W1030 = 'Py++ will generate class wrapper - class contains "%s" - [pure] virtual member function'
-W1031 = "Py++ will generate class wrapper - user asked to expose non - public member function"
+W1031 = 'Py++ will generate class wrapper - user asked to expose non - public member function "%s"'
W1032 = "Boost.Python library does not support enums with duplicate values. " \
"You can read more about this here: " \
@@ -148,7 +149,9 @@
W1049 = 'This method could not be overriden in Python - method returns reference ' \
'to local variable!'
-W1050 = 'The function returns "%s" type. You have to specify a call policies.'
+W1050 = 'The function returns "%s" type. You have to specify a call policies.' \
+ 'Be sure to take a look on Py++ defined call policies: ' \
+ 'http://language-binding.net/pyplusplus/documentation/functions/call_policies.html#py-defined-call-policies'
W1051 = 'The function takes as argument (name=%s, pos=%d) "%s" type. ' \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-02-25 11:04:28
|
Revision: 930
http://svn.sourceforge.net/pygccxml/?rev=930&view=rev
Author: roman_yakovenko
Date: 2007-02-25 03:04:28 -0800 (Sun, 25 Feb 2007)
Log Message:
-----------
fixing bug, which will prevent creation of __call_policies.hpp file
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/decl_wrappers/__init__.py
pyplusplus_dev/pyplusplus/decl_wrappers/call_policies.py
pyplusplus_dev/pyplusplus/module_creator/creator.py
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/__init__.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/__init__.py 2007-02-25 09:13:50 UTC (rev 929)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/__init__.py 2007-02-25 11:04:28 UTC (rev 930)
@@ -84,7 +84,6 @@
from call_policies import return_value_policy
from call_policies import return_pointee_value
from call_policies import is_return_opaque_pointer_policy
-from call_policies import is_return_pointee_value_policy
from call_policies import custom_call_policies_t
from call_policies import custom_call_policies
from call_policies import convert_array_to_tuple_t
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/call_policies.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/call_policies.py 2007-02-25 09:13:50 UTC (rev 929)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/call_policies.py 2007-02-25 11:04:28 UTC (rev 930)
@@ -50,6 +50,10 @@
#Small hack that allows to write nicer code
return False
+ def is_predefined( self ):
+ """Returns True if call policy is defined in Boost.Python library, False otherwise"""
+ return True
+
def _create_impl( self, function_creator ):
raise NotImplementedError()
@@ -214,6 +218,16 @@
else:
return [self.result_converter_generator]
+ def is_predefined( self ):
+ """Returns True if call policy is defined in Boost.Python library, False otherwise"""
+ global return_pointee_value
+ if self.result_converter_generator == return_pointee_value:
+ return False
+ else:
+ return True
+
+
+
copy_const_reference = '::boost::python::copy_const_reference'
copy_non_const_reference = '::boost::python::copy_non_const_reference'
manage_new_object = '::boost::python::manage_new_object'
@@ -230,12 +244,6 @@
return isinstance( policy, return_value_policy_t ) \
and policy.result_converter_generator == return_opaque_pointer
-def is_return_pointee_value_policy( policy ):
- """returns True is policy represents return_value_policy<return_pointee_value>, False otherwise"""
- return isinstance( policy, return_value_policy_t ) \
- and policy.result_converter_generator == return_pointee_value
-
-
class custom_call_policies_t(call_policy_t):
"""implementation for user defined call policies"""
def __init__( self, call_policies ):
@@ -271,6 +279,10 @@
self._memory_manager = memory_manager
self._make_objec_call_policies = make_object_call_policies
+ def is_predefined( self ):
+ """Returns True if call policy is defined in Boost.Python library, False otherwise"""
+ return False
+
def _get_array_size( self ):
return self._array_size
def _set_array_size( self, new_array_size):
@@ -315,6 +327,10 @@
self._get_size_class = get_size_class
self._value_policies = value_policies
+ def is_predefined( self ):
+ """Returns True if call policy is defined in Boost.Python library, False otherwise"""
+ return False
+
def _get_get_size_class( self ):
return self._get_size_class
def _set_get_size_class( self, new_get_size_class):
Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-02-25 09:13:50 UTC (rev 929)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-02-25 11:04:28 UTC (rev 930)
@@ -127,7 +127,7 @@
self.__free_operators = []
self.__exposed_free_fun_overloads = set()
self.__opaque_types_manager = opaque_types_manager.manager_t( self.__extmodule )
- self.__return_pointee_value_exists = False
+ self.__custom_call_policies_included = False
self.__dependencies_manager = dependencies_manager.manager_t(self.decl_logger)
@@ -347,13 +347,16 @@
self.__module_body.adopt_creators( creators, 0 )
def __on_demand_include_call_policies( self, call_policy ):
- if not self.__return_pointee_value_exists \
- and decl_wrappers.is_return_pointee_value_policy( call_policy ):
- self.__return_pointee_value_exists = True
- self.__extmodule.add_include( code_repository.call_policies.file_name )
- self.__extmodule.add_system_header( code_repository.call_policies.file_name )
+ if self.__custom_call_policies_included:
+ return
+ if call_policy.is_predefined():
+ return
+ self.__custom_call_policies_included = True
+ self.__extmodule.add_include( code_repository.call_policies.file_name )
+ self.__extmodule.add_system_header( code_repository.call_policies.file_name )
+
def create(self, decl_headers=None):
"""Create and return the module for the extension.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-02-26 21:43:03
|
Revision: 934
http://svn.sourceforge.net/pygccxml/?rev=934&view=rev
Author: roman_yakovenko
Date: 2007-02-26 13:43:00 -0800 (Mon, 26 Feb 2007)
Log Message:
-----------
adding initial support for str( self ) ( operator<< ) support
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/calldef.py
pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py
pyplusplus_dev/pyplusplus/module_creator/creator.py
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-02-26 21:28:13 UTC (rev 933)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-02-26 21:43:00 UTC (rev 934)
@@ -1003,8 +1003,13 @@
assert not "Unable to find out boost::python::self position. " + str( self.declaration )
def _create_binary_operator(self):
+ self_identifier = algorithm.create_identifier( self, '::boost::python::self' )
+
+ if self.declaration.symbol == '<<':
+ str_identifier = algorithm.create_identifier( self, '::boost::python::self_ns::str' )
+ return '%s( %s )' % ( str_identifier, self_identifier )
+
answer = [ None, self.declaration.symbol, None ]
- self_identifier = algorithm.create_identifier( self, '::boost::python::self' )
self_position = self._findout_self_position()
if self_position == self.SELF_POSITION.FIRST:
answer[0] = self_identifier
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py 2007-02-26 21:28:13 UTC (rev 933)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py 2007-02-26 21:43:00 UTC (rev 934)
@@ -317,7 +317,7 @@
"""helps Py++ to deal with C++ operators"""
inplace = [ '+=', '-=', '*=', '/=', '%=', '>>=', '<<=', '&=', '^=', '|=' ]
comparison = [ '==', '!=', '<', '>', '<=', '>=' ]
- non_member = [ '+', '-', '*', '/', '%', '&', '^', '|' ] #'>>', '<<', not implemented
+ non_member = [ '+', '-', '*', '/', '%', '&', '^', '|', ]
unary = [ '!', '~', '+', '-' ]
all = inplace + comparison + non_member + unary
@@ -328,7 +328,24 @@
if oper.symbol == '*' and len( oper.arguments ) == 0:
#dereference does not make sense
return False
- return oper.symbol in operators_helper.all
+ if oper.symbol != '<<':
+ return oper.symbol in operators_helper.all
+
+ args_len = len( oper.arguments )
+ if isinstance( oper, declarations.member_operator_t ):# and args_len != 1:
+ return False #Boost.Python does not support member operator<< :-(
+ if isinstance( oper, declarations.free_operator_t ) and args_len != 2:
+ return False
+ if not declarations.is_same( oper.return_type, oper.arguments[0].type ):
+ return False
+ type_ = oper.return_type
+ if not declarations.is_reference( type_ ):
+ return False
+ type_ = declarations.remove_reference( type_ )
+ if declarations.is_const( type_ ):
+ return False
+ return declarations.is_std_ostream( type_ ) \
+ or declarations.is_std_wostream( type_ )
@staticmethod
def exportable( oper ):
Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-02-26 21:28:13 UTC (rev 933)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-02-26 21:43:00 UTC (rev 934)
@@ -201,6 +201,10 @@
arg_type = declarations.base_type( operator.arguments[0].type )
if isinstance( arg_type, declarations.fundamental_t ):
arg_type = declarations.base_type( operator.arguments[1].type )
+ elif isinstance( arg_type, declarations.declarated_t ) and arg_type.declaration.ignore:
+ arg_type = declarations.base_type( operator.arguments[1].type )
+ else:
+ pass
assert isinstance( arg_type, declarations.declarated_t )
found = find( lambda decl: arg_type.declaration is decl
, self.__extmodule.body.creators )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-04-04 20:21:23
|
Revision: 967
http://svn.sourceforge.net/pygccxml/?rev=967&view=rev
Author: roman_yakovenko
Date: 2007-04-04 13:21:23 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
fixing a bug, which could cause duplicated include directives
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_repository/call_policies.py
pyplusplus_dev/pyplusplus/code_repository/return_range.py
pyplusplus_dev/pyplusplus/decl_wrappers/call_policies.py
pyplusplus_dev/pyplusplus/module_creator/creator.py
Added Paths:
-----------
pyplusplus_dev/pyplusplus/module_creator/header_files_manager.py
Modified: pyplusplus_dev/pyplusplus/code_repository/call_policies.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_repository/call_policies.py 2007-04-01 20:08:17 UTC (rev 966)
+++ pyplusplus_dev/pyplusplus/code_repository/call_policies.py 2007-04-04 20:21:23 UTC (rev 967)
@@ -7,10 +7,11 @@
This file contains C++ code - custom call policies
"""
+from pyplusplus.decl_wrappers import call_policies
namespace = "pyplusplus::call_policies"
-file_name = "__call_policies.pypp.hpp"
+file_name = call_policies.PYPP_CALL_POLICIES_HEADER_FILE
code = \
"""// Copyright 2004 Roman Yakovenko.
Modified: pyplusplus_dev/pyplusplus/code_repository/return_range.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_repository/return_range.py 2007-04-01 20:08:17 UTC (rev 966)
+++ pyplusplus_dev/pyplusplus/code_repository/return_range.py 2007-04-04 20:21:23 UTC (rev 967)
@@ -7,9 +7,11 @@
This file contains C++ code - "return_range" call policies
"""
+from pyplusplus.decl_wrappers import call_policies
+
namespace = "pyplusplus::call_policies"
-file_name = "__return_range.pypp.hpp"
+file_name = call_policies.return_range_t.HEADER_FILE
code = \
"""// Copyright 2004 Roman Yakovenko.
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/call_policies.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/call_policies.py 2007-04-01 20:08:17 UTC (rev 966)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/call_policies.py 2007-04-04 20:21:23 UTC (rev 967)
@@ -15,6 +15,8 @@
import python_traits
from pygccxml import declarations
+PYPP_CALL_POLICIES_HEADER_FILE = "__call_policies.pypp.hpp"
+
class CREATION_POLICY:
"""Implementation details"""
AS_INSTANCE = 'as instance'
@@ -57,6 +59,11 @@
def _create_impl( self, function_creator ):
raise NotImplementedError()
+ @property
+ def header_file(self):
+ """Return name of the header file to be included"""
+ return "boost/python.hpp"
+
class default_call_policies_t(call_policy_t):
"""implementation for ::boost::python::default_call_policies"""
def __init__( self ):
@@ -226,6 +233,13 @@
else:
return True
+ @property
+ def header_file(self):
+ """Return name of the header file to be included"""
+ if self.is_predefined():
+ return super( return_value_policy_t, self ).header_file
+ else:
+ return PYPP_CALL_POLICIES_HEADER_FILE
copy_const_reference = '::boost::python::copy_const_reference'
@@ -246,9 +260,10 @@
class custom_call_policies_t(call_policy_t):
"""implementation for user defined call policies"""
- def __init__( self, call_policies ):
+ def __init__( self, call_policies, header_file=None ):
call_policy_t.__init__( self )
self.__call_policies = call_policies
+ self.__header_file = header_file
def _create_impl(self, function_creator ):
return str( self.__call_policies )
@@ -256,9 +271,16 @@
def __str__(self):
return 'custom call policies'
-def custom_call_policies(call_policies):
+ def get_header_file( self ):
+ return self.__header_file
+ def set_header_file( self, header_file_name ):
+ self.__header_file = header_file_name
+ header_file = property( get_header_file, set_header_file
+ , doc="""Return name of the header file to be included""" )
+
+def custom_call_policies(call_policies, header_file=None):
"""create custom\\user defined call policies"""
- return custom_call_policies_t(call_policies)
+ return custom_call_policies_t(call_policies, header_file)
class memory_managers:
none = 'none'
@@ -282,7 +304,12 @@
def is_predefined( self ):
"""Returns True if call policy is defined in Boost.Python library, False otherwise"""
return False
-
+
+ @property
+ def header_file(self):
+ """Return name of the header file to be included"""
+ return PYPP_CALL_POLICIES_HEADER_FILE
+
def _get_array_size( self ):
return self._array_size
def _set_array_size( self, new_array_size):
@@ -321,6 +348,7 @@
return convert_array_to_tuple_t( array_size, memory_manager, make_object_call_policies, base )
class return_range_t( call_policy_t ):
+ HEADER_FILE = "__return_range.pypp.hpp"
def __init__( self, get_size_class, value_type, value_policies):
call_policy_t.__init__( self )
self._value_type = value_type
@@ -331,6 +359,11 @@
"""Returns True if call policy is defined in Boost.Python library, False otherwise"""
return False
+ @property
+ def header_file(self):
+ """Return name of the header file to be included"""
+ return self.HEADER_FILE
+
def _get_get_size_class( self ):
return self._get_size_class
def _set_get_size_class( self, new_get_size_class):
Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-04-01 20:08:17 UTC (rev 966)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-04-04 20:21:23 UTC (rev 967)
@@ -8,7 +8,9 @@
import sort_algorithms
import dependencies_manager
import opaque_types_manager
+import header_files_manager
import call_policies_resolver
+
from pygccxml import declarations
from pyplusplus import decl_wrappers
from pyplusplus import code_creators
@@ -107,8 +109,7 @@
self.__types_db = types_database.types_database_t()
self.__extmodule = code_creators.module_t()
- self.__extmodule.add_system_header( "boost/python.hpp" )
- self.__extmodule.adopt_creator( code_creators.include_t( header="boost/python.hpp" ) )
+ self.__header_files_manager = header_files_manager.manager_t( self.__extmodule )
if boost_python_ns_name:
bp_ns_alias = code_creators.namespace_alias_t( alias=boost_python_ns_name
, full_namespace_name='::boost::python' )
@@ -122,14 +123,10 @@
self.curr_code_creator = self.__module_body
self.curr_decl = None
- self.__cr_array_1_included = False
self.__array_1_registered = set() #(type.decl_string,size)
self.__free_operators = []
self.__exposed_free_fun_overloads = set()
self.__opaque_types_manager = opaque_types_manager.manager_t( self.__extmodule )
- self.__custom_call_policies_included = False
- self.__return_range_call_policies_included = False
-
self.__dependencies_manager = dependencies_manager.manager_t(self.decl_logger)
def _prepare_decls( self, decls, doc_extractor ):
@@ -351,25 +348,6 @@
creators.reverse()
self.__module_body.adopt_creators( creators, 0 )
- def __on_demand_include_call_policies( self, call_policy ):
- if self.__custom_call_policies_included and self.__return_range_call_policies_included:
- return
-
- if not call_policy:
- return
-
- if call_policy.is_predefined():
- return
-
- if isinstance( call_policy, decl_wrappers.call_policies.return_range_t ):
- self.__return_range_call_policies_included = True
- self.__extmodule.add_include( code_repository.return_range.file_name )
- self.__extmodule.add_system_header( code_repository.return_range.file_name )
- else:
- self.__custom_call_policies_included = True
- self.__extmodule.add_include( code_repository.call_policies.file_name )
- self.__extmodule.add_system_header( code_repository.call_policies.file_name )
-
def create(self, decl_headers=None):
"""Create and return the module for the extension.
@@ -379,10 +357,11 @@
@rtype: L{module_t<code_creators.module_t>}
"""
if decl_headers is None:
- self._create_includes()
- else:
- for h in decl_headers:
- self.__extmodule.adopt_include(code_creators.include_t(header=h))
+ decl_headers = declarations.declaration_files( self.__decls )
+
+ map( lambda header: self.__header_files_manager.include( header )
+ , decl_headers )
+
# Invoke the appropriate visit_*() method on all decls
for decl in self.__decls:
self.curr_decl = decl
@@ -399,18 +378,13 @@
self.__dependencies_manager.inform_user()
return self.__extmodule
- def _create_includes(self):
- for fn in declarations.declaration_files( self.__decls ):
- include = code_creators.include_t( header=fn )
- self.__extmodule.adopt_include(include)
-
def visit_member_function( self ):
fwrapper = None
self.__types_db.update( self.curr_decl )
self.__dependencies_manager.add_exported( self.curr_decl )
if None is self.curr_decl.call_policies:
self.curr_decl.call_policies = self.__call_policies_resolver( self.curr_decl )
- self.__on_demand_include_call_policies( self.curr_decl.call_policies )
+ self.__header_files_manager.include_call_policy( self.curr_decl.call_policies )
maker_cls, fwrapper_cls = creators_wizard.find_out_mem_fun_creator_classes( self.curr_decl )
@@ -437,23 +411,10 @@
self.curr_code_creator.adopt_creator( maker )
self.__opaque_types_manager.register_opaque( maker, self.curr_decl )
- if self.curr_decl.transformations:
+ if self.curr_decl.transformations:
required_headers = self.curr_decl.transformations[0].required_headers()
- for header in required_headers:
- # Check whether the header is already included
- included = filter( lambda cc: isinstance(cc, code_creators.include_t) and cc.header==header
- , self.__extmodule.creators)
- if not included:
- self.__extmodule.adopt_include(
- code_creators.include_t( header=header, user_defined=True ) )
-
- # Check if it is a header from the code repository
- if header in code_repository.headers:
- self.__extmodule.add_system_header( header )
+ self.__header_files_manager.include_ft( required_headers )
- if not self.__extmodule.is_system_header( code_repository.named_tuple.file_name ):
- self.__extmodule.add_system_header( code_repository.named_tuple.file_name )
-
if self.curr_decl.has_static:
#static_method should be created only once.
found = filter( lambda creator: isinstance( creator, code_creators.static_method_t )
@@ -479,7 +440,7 @@
maker = code_creators.constructor_t( constructor=self.curr_decl, wrapper=cwrapper )
if None is self.curr_decl.call_policies:
self.curr_decl.call_policies = self.__call_policies_resolver( self.curr_decl )
- self.__on_demand_include_call_policies( self.curr_decl.call_policies )
+ self.__header_files_manager.include_call_policy( self.curr_decl.call_policies )
self.curr_code_creator.adopt_creator( maker )
def visit_destructor( self ):
@@ -498,7 +459,7 @@
self.__dependencies_manager.add_exported( self.curr_decl )
if None is self.curr_decl.call_policies:
self.curr_decl.call_policies = self.__call_policies_resolver( self.curr_decl )
- self.__on_demand_include_call_policies( self.curr_decl.call_policies )
+ self.__header_files_manager.include_call_policy( self.curr_decl.call_policies )
self.__types_db.update( self.curr_decl )
if not self.curr_decl.parent.is_abstract and not declarations.is_reference( self.curr_decl.return_type ):
@@ -530,7 +491,7 @@
self.__dependencies_manager.add_exported( f )
if None is f.call_policies:
f.call_policies = self.__call_policies_resolver( f )
- self.__on_demand_include_call_policies( f.call_policies )
+ self.__header_files_manager.include_call_policy( f.call_policies )
overloads_cls_creator = code_creators.free_fun_overloads_class_t( overloads )
self.__extmodule.adopt_declaration_creator( overloads_cls_creator )
@@ -551,10 +512,13 @@
self.__dependencies_manager.add_exported( self.curr_decl )
if None is self.curr_decl.call_policies:
self.curr_decl.call_policies = self.__call_policies_resolver( self.curr_decl )
- self.__on_demand_include_call_policies( self.curr_decl.call_policies )
+ self.__header_files_manager.include_call_policy( self.curr_decl.call_policies )
maker = None
if self.curr_decl.transformations:
+ required_headers = self.curr_decl.transformations[0].required_headers()
+ self.__header_files_manager.include_ft( required_headers )
+
wrapper = code_creators.free_fun_transformed_wrapper_t( self.curr_decl )
self.__extmodule.adopt_declaration_creator( wrapper )
maker = code_creators.free_fun_transformed_t( self.curr_decl, wrapper )
@@ -595,7 +559,7 @@
self.__dependencies_manager.add_exported( f )
if None is f.call_policies:
f.call_policies = self.__call_policies_resolver( f )
- self.__on_demand_include_call_policies( f.call_policies )
+ self.__header_files_manager.include_call_policy( f.call_policies )
overloads_cls_creator = code_creators.mem_fun_overloads_class_t( overloads )
self.__extmodule.adopt_declaration_creator( overloads_cls_creator )
@@ -707,11 +671,7 @@
self.__dependencies_manager.add_exported( self.curr_decl )
if declarations.is_array( self.curr_decl.type ):
- if not self.__cr_array_1_included:
- self.__extmodule.add_system_header( code_repository.array_1.file_name )
- self.__extmodule.adopt_creator( code_creators.include_t( code_repository.array_1.file_name )
- , self.__extmodule.first_include_index() + 1)
- self.__cr_array_1_included = True
+ self.__header_files_manager.include(code_repository.array_1.file_name, system=True )
if self._register_array_1( self.curr_decl.type ):
array_1_registrator = code_creators.array_1_registrator_t( array_type=self.curr_decl.type )
self.curr_code_creator.adopt_creator( array_1_registrator )
@@ -741,10 +701,10 @@
elif declarations.is_reference( self.curr_decl.type ):
if None is self.curr_decl.getter_call_policies:
self.curr_decl.getter_call_policies = self.__call_policies_resolver( self.curr_decl, 'get' )
- self.__on_demand_include_call_policies( self.curr_decl.getter_call_policies )
+ self.__header_files_manager.include_call_policy( self.curr_decl.getter_call_policies )
if None is self.curr_decl.setter_call_policies:
self.curr_decl.setter_call_policies = self.__call_policies_resolver( self.curr_decl, 'set' )
- self.__on_demand_include_call_policies( self.curr_decl.setter_call_policies )
+ self.__header_files_manager.include_call_policy( self.curr_decl.setter_call_policies )
wrapper = code_creators.mem_var_ref_wrapper_t( variable=self.curr_decl )
maker = code_creators.mem_var_ref_t( variable=self.curr_decl, wrapper=wrapper )
self.__opaque_types_manager.register_opaque( maker, self.curr_decl )
Added: pyplusplus_dev/pyplusplus/module_creator/header_files_manager.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/header_files_manager.py (rev 0)
+++ pyplusplus_dev/pyplusplus/module_creator/header_files_manager.py 2007-04-04 20:21:23 UTC (rev 967)
@@ -0,0 +1,53 @@
+# 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)
+
+from pygccxml import declarations
+from pyplusplus import code_creators
+from pyplusplus import code_repository
+
+class manager_t( object ):
+ def __init__( self, extmodule ):
+ object.__init__( self )
+ self.__extmodule = extmodule
+ self.__already_included = set()
+ self.normalize = code_creators.include_directories_t.normalize
+
+ self.__extmodule.add_system_header( "boost/python.hpp" )
+ self.__extmodule.adopt_creator( code_creators.include_t( header="boost/python.hpp" ) )
+
+ def include( self, header, system=False, once=True, user_defined=False ):
+ if once:
+ normalized_header = self.normalize( header )
+ if normalized_header in self.__already_included:
+ return
+ self.__extmodule.add_system_header( header )
+ self.__extmodule.adopt_include( code_creators.include_t( header, user_defined=user_defined ) )
+ if system:
+ self.__extmodule.add_system_header( header )
+
+
+ def include_call_policy( self, call_policy ):
+ if not call_policy:
+ return
+ if call_policy.is_predefined():
+ #boost/python.hpp is already included
+ return
+ self.include( call_policy.header_file, system=True )
+
+ def include_ft( self, required_headers ): #include function transformation headers
+ for header in required_headers:
+ # Check whether the header is already included
+ system = bool( header in code_repository.headers )
+ self.include( header, system=system, user_defined=True )
+
+ if not self.__extmodule.is_system_header( code_repository.named_tuple.file_name ):
+ self.__extmodule.add_system_header( code_repository.named_tuple.file_name )
+
+
+
+
+
+
+
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-04-09 19:22:52
|
Revision: 973
http://svn.sourceforge.net/pygccxml/?rev=973&view=rev
Author: roman_yakovenko
Date: 2007-04-09 12:22:53 -0700 (Mon, 09 Apr 2007)
Log Message:
-----------
small refactoring before implementing better control over included files
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/decl_wrappers/indexing_suite1.py
pyplusplus_dev/pyplusplus/decl_wrappers/indexing_suite2.py
pyplusplus_dev/pyplusplus/module_creator/creator.py
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/indexing_suite1.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/indexing_suite1.py 2007-04-05 18:55:54 UTC (rev 972)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/indexing_suite1.py 2007-04-09 19:22:53 UTC (rev 973)
@@ -12,10 +12,16 @@
#proxy. This can be disabled by supplying true in the NoProxy template parameter.
#We want to disable NoProxy when we deal with immutable objects.
+containers = {
+ 'vector' : "boost/python/suite/indexing/vector_indexing_suite.hpp"
+ , 'map' : "boost/python/suite/indexing/map_indexing_suite.hpp"
+}
+
+
class indexing_suite1_t( object ):
"""
- This class helps user to export STD containers, using Boost.Python
- indexing suite V2.
+ This class helps user to export STD containers, using built-in Boost.Python
+ indexing suite.
"""
def __init__( self, container_class, container_traits, no_proxy=None, derived_policies=None ):
@@ -24,6 +30,7 @@
self.__derived_policies = derived_policies
self.__container_class = container_class
self.__container_traits = container_traits
+ self.__include_files = None
def _get_container_class( self ):
return self.__container_class
@@ -55,3 +62,14 @@
derived_policies = property( _get_derived_policies, _set_derived_policies
, doc="This proprty contains DerivedPolicies string. "
+"It will be added as is to the generated code.")
+
+ @property
+ def include_files( self ):
+ """Return list of header files to be included in generated code"""
+ if self.__include_files is None:
+ name = self.container_class.name.split( '<' )[0]
+ if name not in containers:
+ self.__include_files = [] #not supported
+ else:
+ self.__include_files = [containers[ name ]]
+ return self.__include_files
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/indexing_suite2.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/indexing_suite2.py 2007-04-05 18:55:54 UTC (rev 972)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/indexing_suite2.py 2007-04-09 19:22:53 UTC (rev 973)
@@ -33,6 +33,18 @@
"""
+containers = {
+ 'vector' : "boost/python/suite/indexing/vector.hpp"
+ , 'deque' : "boost/python/suite/indexing/deque.hpp"
+ , 'list' : "boost/python/suite/indexing/list.hpp"
+ , 'map' : "boost/python/suite/indexing/map.hpp"
+ , 'multimap' : "boost/python/suite/indexing/multimap.hpp"
+ , 'hash_map' : "boost/python/suite/indexing/map.hpp"
+ , 'set' : "boost/python/suite/indexing/set.hpp"
+ , 'hash_set' : "boost/python/suite/indexing/set.hpp"
+ #TODO: queue, priority, stack, multimap, hash_multimap, multiset, hash_multiset
+}
+
class indexing_suite2_t( object ):
"""
This class helps user to export STD containers, using Boost.Python
@@ -63,6 +75,7 @@
self._disabled_groups = set()
self._default_applied = False
self._use_container_suite = False
+ self.__include_files = None
def get_use_container_suite( self ):
return self._use_container_suite
@@ -153,3 +166,16 @@
return self._disabled_groups
disabled_methods_groups = property( _get_disabled_methods_groups
, doc="list of all disabled methods group")
+
+ @property
+ def include_files( self ):
+ """Return list of header files to be included in generated code"""
+ if self.__include_files is None:
+ name = self.container_class.name.split( '<' )[0]
+ if name not in containers:
+ self.__include_files = [] #not supported
+ else:
+ #impl details: the order of header files is IMPORTANT
+ self.__include_files = [ "boost/python/suite/indexing/container_suite.hpp"
+ , containers[ name ] ]
+ return self.__include_files
Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-04-05 18:55:54 UTC (rev 972)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-04-09 19:22:53 UTC (rev 973)
@@ -31,25 +31,6 @@
# };
# };
-INDEXING_SUITE_1_CONTAINERS = {
- 'vector<' : "boost/python/suite/indexing/vector_indexing_suite.hpp"
- , 'map<' : "boost/python/suite/indexing/map_indexing_suite.hpp"
-}
-
-INDEXING_SUITE_2_CONTAINERS = {
- 'vector<' : "boost/python/suite/indexing/vector.hpp"
- , 'deque<' : "boost/python/suite/indexing/deque.hpp"
- , 'list<' : "boost/python/suite/indexing/list.hpp"
- , 'map<' : "boost/python/suite/indexing/map.hpp"
- , 'multimap<' : "boost/python/suite/indexing/multimap.hpp"
- , 'hash_map<' : "boost/python/suite/indexing/map.hpp"
- , 'set<' : "boost/python/suite/indexing/set.hpp"
- , 'hash_set<' : "boost/python/suite/indexing/set.hpp"
- #TODO: queue, priority, stack, multimap, hash_multimap, multiset, hash_multiset
-}
-
-INDEXING_SUITE_2_MAIN_HEADER = "boost/python/suite/indexing/container_suite.hpp"
-
class creator_t( declarations.decl_visitor_t ):
"""Creating code creators.
@@ -267,10 +248,6 @@
cls_creator.associated_decl_creators.extend( uc_creators )
def _treat_indexing_suite( self ):
- global INDEXING_SUITE_1_CONTAINERS
- global INDEXING_SUITE_2_CONTAINERS
- global INDEXING_SUITE_2_MAIN_HEADER
-
def create_explanation(cls):
msg = '//WARNING: the next line of code will not compile, because "%s" does not have operator== !'
msg = msg % cls.indexing_suite.element_type.decl_string
@@ -285,33 +262,21 @@
if not self.__types_db.used_containers:
return
- used_headers = set()
-
creators = []
created_value_traits = set()
cmp_by_name = lambda cls1, cls2: cmp( cls1.decl_string, cls2.decl_string )
used_containers = list( self.__types_db.used_containers )
+ used_containers = filter( lambda cls: cls.indexing_suite.include_files
+ , used_containers )
used_containers.sort( cmp_by_name )
for cls in used_containers:
- container_name = cls.name.split( '<' )[0] + '<'
-
- if isinstance( cls.indexing_suite, decl_wrappers.indexing_suite1_t ):
- isuite = INDEXING_SUITE_1_CONTAINERS
- else:
- isuite = INDEXING_SUITE_2_CONTAINERS
-
- if not isuite.has_key( container_name ):
- continue #not supported
-
+ map( lambda header: self.__header_files_manager.include(header, system=True)
+ , cls.indexing_suite.include_files )
+
for msg in cls.readme():
self.decl_logger.warn( "%s;%s" % ( cls, msg ) )
- if isuite is INDEXING_SUITE_2_CONTAINERS:
- used_headers.add( INDEXING_SUITE_2_MAIN_HEADER )
-
- used_headers.add( isuite[ container_name ] )
-
cls_creator = create_cls_cc( cls )
self.__dependencies_manager.add_exported( cls )
creators.append( cls_creator )
@@ -319,7 +284,8 @@
element_type = cls.indexing_suite.element_type
except:
element_type = None
- if isuite is INDEXING_SUITE_1_CONTAINERS:
+
+ if isinstance( cls.indexing_suite, decl_wrappers.indexing_suite1_t ):
if not ( None is element_type ) \
and declarations.is_class( element_type ) \
and not declarations.has_public_equal( element_type ):
@@ -334,17 +300,7 @@
element_type_cc = code_creators.value_traits_t( value_cls )
self.__extmodule.adopt_declaration_creator( element_type_cc )
cls_creator.adopt_creator( code_creators.indexing_suite2_t(cls) )
-
- if INDEXING_SUITE_2_MAIN_HEADER in used_headers:
- #I want this header to be the first one.
- used_headers.remove( INDEXING_SUITE_2_MAIN_HEADER )
- self.__extmodule.add_system_header( INDEXING_SUITE_2_MAIN_HEADER )
- self.__extmodule.add_include( INDEXING_SUITE_2_MAIN_HEADER )
-
- for header in used_headers:
- self.__extmodule.add_system_header( header )
- self.__extmodule.add_include( header )
-
+
creators.reverse()
self.__module_body.adopt_creators( creators, 0 )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-04-10 20:23:56
|
Revision: 979
http://svn.sourceforge.net/pygccxml/?rev=979&view=rev
Author: roman_yakovenko
Date: 2007-04-10 13:23:57 -0700 (Tue, 10 Apr 2007)
Log Message:
-----------
fixing bug - redefining CLASS_TYPE
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py
Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-04-10 20:12:42 UTC (rev 978)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-04-10 20:23:57 UTC (rev 979)
@@ -178,7 +178,7 @@
held_type = self._generated_held_type()
if self.wrapper:
- if self.declaration.class_type == self.declaration.CLASS_TYPE.WRAPPER:
+ if self.declaration.exposed_class_type == self.declaration.EXPOSED_CLASS_TYPE.WRAPPER:
args.append( self.wrapper.full_name )
else:
if not self.target_configuration.boost_python_has_wrapper_held_type \
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py 2007-04-10 20:12:42 UTC (rev 978)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py 2007-04-10 20:23:57 UTC (rev 979)
@@ -178,10 +178,10 @@
, scopedef_wrapper.scopedef_t
, declarations.class_t):
- class CLASS_TYPE:
- DEFAULT = 'default'
+ class EXPOSED_CLASS_TYPE:
+ DECLARED = 'declared'
WRAPPER = 'wrapper'
- ALL = ( DEFAULT, WRAPPER )
+ ALL = ( DECLARED, WRAPPER )
def __init__(self, *arguments, **keywords):
class_common_details_t.__init__( self )
@@ -201,7 +201,7 @@
self._properties = []
self._redefined_funcs = None
self._require_self_reference = False
- self._class_type = self.CLASS_TYPE.DEFAULT
+ self._exposed_class_type = self.EXPOSED_CLASS_TYPE.DECLARED
def _get_redefine_operators( self ):
return self._redefine_operators
@@ -210,11 +210,12 @@
redefine_operators = property( _get_redefine_operators, _set_redefine_operators
, doc="tells Py++ to redefine operators from base class in this class, False by default")
- def _get_class_type(self):
- return self._class_type
- def _set_class_type(self, class_type):
+ def _get_exposed_class_type(self):
+ return self._exposed_class_type
+ def _set_exposed_class_type(self, class_type):
+ assert class_type in self.EXPOSED_CLASS_TYPE.ALL
self._class_type = class_type
- class_type = property( _get_class_type, _set_class_type
+ exposed_class_type = property( _get_exposed_class_type, _set_exposed_class_type
, doc="set this value to CLASS_TYPE.WRAPPER, if you need to transfer ownership of" \
"polymorphic class" )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-04-15 18:51:56
|
Revision: 988
http://svn.sourceforge.net/pygccxml/?rev=988&view=rev
Author: roman_yakovenko
Date: 2007-04-15 11:51:57 -0700 (Sun, 15 Apr 2007)
Log Message:
-----------
improving system header file handling + simplifying creator_t class implementation
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/code_creator.py
pyplusplus_dev/pyplusplus/code_creators/compound.py
pyplusplus_dev/pyplusplus/code_creators/module.py
pyplusplus_dev/pyplusplus/module_creator/creator.py
Modified: pyplusplus_dev/pyplusplus/code_creators/code_creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/code_creator.py 2007-04-15 10:45:52 UTC (rev 987)
+++ pyplusplus_dev/pyplusplus/code_creators/code_creator.py 2007-04-15 18:51:57 UTC (rev 988)
@@ -114,10 +114,13 @@
"""Return list of system header files the generated code depends on"""
raise NotImplementedError(self.__class__.__name__)
- def get_system_headers( self, recursive=False ):
+ def get_system_headers( self, recursive=False, unique=False ):
files = [ "boost/python.hpp" ]
files.extend( self._get_system_headers_impl() )
- return filter( None, files)
+ files = filter( None, files)
+ if unique:
+ files = self.unique_headers( files )
+ return files
def beautify( self, code ):
"""
Modified: pyplusplus_dev/pyplusplus/code_creators/compound.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/compound.py 2007-04-15 10:45:52 UTC (rev 987)
+++ pyplusplus_dev/pyplusplus/code_creators/compound.py 2007-04-15 18:51:57 UTC (rev 988)
@@ -76,10 +76,13 @@
internals[index] = internals[index] + os.linesep
return os.linesep.join( internals )
- def get_system_headers( self, recursive=False ):
+ def get_system_headers( self, recursive=False, unique=False ):
files = [ "boost/python.hpp" ]
files.extend( self._get_system_headers_impl() )
if recursive:
for creator in self._creators:
- files.extend( creator.get_system_headers(recursive) )
+ files.extend( creator.get_system_headers(recursive, unique=False) )
+ files = filter( None, files )
+ if unique:
+ files = self.unique_headers( files )
return files
Modified: pyplusplus_dev/pyplusplus/code_creators/module.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/module.py 2007-04-15 10:45:52 UTC (rev 987)
+++ pyplusplus_dev/pyplusplus/code_creators/module.py 2007-04-15 18:51:57 UTC (rev 988)
@@ -150,7 +150,15 @@
@param include_creator: Include creator object
@type include_creator: L{include_t}
"""
- self.adopt_creator( include_creator, self.last_include_index() + 1 )
+ lii = self.last_include_index()
+ if lii == 0:
+ if not self.creators:
+ lii = -1
+ elif not isinstance( self.creators[0], include.include_t ):
+ lii = -1
+ else:
+ pass
+ self.adopt_creator( include_creator, lii + 1 )
def do_include_dirs_optimization(self):
include_dirs = self._get_include_dirs()
Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-04-15 10:45:52 UTC (rev 987)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-04-15 18:51:57 UTC (rev 988)
@@ -8,7 +8,6 @@
import sort_algorithms
import dependencies_manager
import opaque_types_manager
-import header_files_manager
import call_policies_resolver
from pygccxml import declarations
@@ -90,7 +89,6 @@
self.__types_db = types_database.types_database_t()
self.__extmodule = code_creators.module_t()
- self.__header_files_manager = header_files_manager.manager_t( self.__extmodule )
if boost_python_ns_name:
bp_ns_alias = code_creators.namespace_alias_t( alias=boost_python_ns_name
, full_namespace_name='::boost::python' )
@@ -270,10 +268,7 @@
used_containers = filter( lambda cls: cls.indexing_suite.include_files
, used_containers )
used_containers.sort( cmp_by_name )
- for cls in used_containers:
- map( lambda header: self.__header_files_manager.include(header, system=True)
- , cls.indexing_suite.include_files )
-
+ for cls in used_containers:
for msg in cls.readme():
self.decl_logger.warn( "%s;%s" % ( cls, msg ) )
@@ -304,6 +299,11 @@
creators.reverse()
self.__module_body.adopt_creators( creators, 0 )
+ def __include_header( self, header, system=False ):
+ self.__extmodule.adopt_include( code_creators.include_t( header ) )
+ if system:
+ self.__extmodule.add_system_header( header )
+
def create(self, decl_headers=None):
"""Create and return the module for the extension.
@@ -312,12 +312,6 @@
@returns: Returns the root of the code creators tree
@rtype: L{module_t<code_creators.module_t>}
"""
- if decl_headers is None:
- decl_headers = declarations.declaration_files( self.__decls )
-
- map( lambda header: self.__header_files_manager.include( header )
- , decl_headers )
-
# Invoke the appropriate visit_*() method on all decls
for decl in self.__decls:
self.curr_decl = decl
@@ -331,7 +325,18 @@
creator.target_configuration = self.__target_configuration
#last action.
self._append_user_code()
+ #add system headers
+ system_headers = self.__extmodule.get_system_headers( recursive=True, unique=True )
+ map( lambda header: self.__include_header( header, system=True )
+ , system_headers )
+ #add user defined header files
+ if decl_headers is None:
+ decl_headers = declarations.declaration_files( self.__decls )
+ map( lambda header: self.__include_header( header )
+ , decl_headers )
+
self.__dependencies_manager.inform_user()
+
return self.__extmodule
def visit_member_function( self ):
@@ -340,7 +345,6 @@
self.__dependencies_manager.add_exported( self.curr_decl )
if None is self.curr_decl.call_policies:
self.curr_decl.call_policies = self.__call_policies_resolver( self.curr_decl )
- self.__header_files_manager.include_call_policy( self.curr_decl.call_policies )
maker_cls, fwrapper_cls = creators_wizard.find_out_mem_fun_creator_classes( self.curr_decl )
@@ -367,10 +371,6 @@
self.curr_code_creator.adopt_creator( maker )
self.__opaque_types_manager.register_opaque( maker, self.curr_decl )
- if self.curr_decl.transformations:
- required_headers = self.curr_decl.transformations[0].required_headers()
- self.__header_files_manager.include_ft( required_headers )
-
if self.curr_decl.has_static:
#static_method should be created only once.
found = filter( lambda creator: isinstance( creator, code_creators.static_method_t )
@@ -396,7 +396,6 @@
maker = code_creators.constructor_t( constructor=self.curr_decl, wrapper=cwrapper )
if None is self.curr_decl.call_policies:
self.curr_decl.call_policies = self.__call_policies_resolver( self.curr_decl )
- self.__header_files_manager.include_call_policy( self.curr_decl.call_policies )
self.curr_code_creator.adopt_creator( maker )
def visit_destructor( self ):
@@ -415,7 +414,6 @@
self.__dependencies_manager.add_exported( self.curr_decl )
if None is self.curr_decl.call_policies:
self.curr_decl.call_policies = self.__call_policies_resolver( self.curr_decl )
- self.__header_files_manager.include_call_policy( self.curr_decl.call_policies )
self.__types_db.update( self.curr_decl )
if not self.curr_decl.parent.is_abstract and not declarations.is_reference( self.curr_decl.return_type ):
@@ -447,7 +445,6 @@
self.__dependencies_manager.add_exported( f )
if None is f.call_policies:
f.call_policies = self.__call_policies_resolver( f )
- self.__header_files_manager.include_call_policy( f.call_policies )
overloads_cls_creator = code_creators.free_fun_overloads_class_t( overloads )
self.__extmodule.adopt_declaration_creator( overloads_cls_creator )
@@ -468,13 +465,9 @@
self.__dependencies_manager.add_exported( self.curr_decl )
if None is self.curr_decl.call_policies:
self.curr_decl.call_policies = self.__call_policies_resolver( self.curr_decl )
- self.__header_files_manager.include_call_policy( self.curr_decl.call_policies )
maker = None
if self.curr_decl.transformations:
- required_headers = self.curr_decl.transformations[0].required_headers()
- self.__header_files_manager.include_ft( required_headers )
-
wrapper = code_creators.free_fun_transformed_wrapper_t( self.curr_decl )
self.__extmodule.adopt_declaration_creator( wrapper )
maker = code_creators.free_fun_transformed_t( self.curr_decl, wrapper )
@@ -516,7 +509,6 @@
self.__dependencies_manager.add_exported( f )
if None is f.call_policies:
f.call_policies = self.__call_policies_resolver( f )
- self.__header_files_manager.include_call_policy( f.call_policies )
overloads_cls_creator = code_creators.mem_fun_overloads_class_t( overloads )
self.__extmodule.adopt_declaration_creator( overloads_cls_creator )
@@ -628,7 +620,6 @@
self.__dependencies_manager.add_exported( self.curr_decl )
if declarations.is_array( self.curr_decl.type ):
- self.__header_files_manager.include(code_repository.array_1.file_name, system=True )
if self._register_array_1( self.curr_decl.type ):
array_1_registrator = code_creators.array_1_registrator_t( array_type=self.curr_decl.type )
self.curr_code_creator.adopt_creator( array_1_registrator )
@@ -658,10 +649,8 @@
elif declarations.is_reference( self.curr_decl.type ):
if None is self.curr_decl.getter_call_policies:
self.curr_decl.getter_call_policies = self.__call_policies_resolver( self.curr_decl, 'get' )
- self.__header_files_manager.include_call_policy( self.curr_decl.getter_call_policies )
if None is self.curr_decl.setter_call_policies:
self.curr_decl.setter_call_policies = self.__call_policies_resolver( self.curr_decl, 'set' )
- self.__header_files_manager.include_call_policy( self.curr_decl.setter_call_policies )
wrapper = code_creators.mem_var_ref_wrapper_t( variable=self.curr_decl )
maker = code_creators.mem_var_ref_t( variable=self.curr_decl, wrapper=wrapper )
self.__opaque_types_manager.register_opaque( maker, self.curr_decl )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-04-17 21:07:12
|
Revision: 997
http://svn.sourceforge.net/pygccxml/?rev=997&view=rev
Author: roman_yakovenko
Date: 2007-04-17 14:07:13 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
adding user defined header files to generated code
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/compound.py
pyplusplus_dev/pyplusplus/code_creators/declaration_based.py
pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py
pyplusplus_dev/pyplusplus/file_writers/single_file.py
Modified: pyplusplus_dev/pyplusplus/code_creators/compound.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/compound.py 2007-04-17 12:40:13 UTC (rev 996)
+++ pyplusplus_dev/pyplusplus/code_creators/compound.py 2007-04-17 21:07:13 UTC (rev 997)
@@ -86,3 +86,4 @@
if unique:
files = self.unique_headers( files )
return files
+
\ No newline at end of file
Modified: pyplusplus_dev/pyplusplus/code_creators/declaration_based.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/declaration_based.py 2007-04-17 12:40:13 UTC (rev 996)
+++ pyplusplus_dev/pyplusplus/code_creators/declaration_based.py 2007-04-17 21:07:13 UTC (rev 997)
@@ -50,4 +50,7 @@
if None is self.declaration.documentation:
return ''
return self.declaration.documentation
-
\ No newline at end of file
+
+ def get_user_headers( self, recursive=False, unique=False ):
+ """return list of user header files to be included from the generated file"""
+ return self.declaration.include_files
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py 2007-04-17 12:40:13 UTC (rev 996)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py 2007-04-17 21:07:13 UTC (rev 997)
@@ -31,6 +31,7 @@
self._exportable_reason = None
self._documentation = None
self.__msgs_to_ignore = set()
+ self._include_files = []
@property
def logger( self ):
@@ -150,7 +151,6 @@
def _readme_impl( self ):
return []
-
def readme( self, skip_ignored=True ):
"""This function will returns some hints/tips/description of problems
that applied to the declarations. For example function that has argument
@@ -192,3 +192,8 @@
raise RuntimeError( "Unable to find out message id. The message is: " + msg )
self.__msgs_to_ignore.add( msg )
disable_warnings = disable_messages
+
+ @property
+ def include_files( self ):
+ """list of header files, to be included from the file, the generated code will be placed-in"""
+ return self._include_files
\ No newline at end of file
Modified: pyplusplus_dev/pyplusplus/file_writers/single_file.py
===================================================================
--- pyplusplus_dev/pyplusplus/file_writers/single_file.py 2007-04-17 12:40:13 UTC (rev 996)
+++ pyplusplus_dev/pyplusplus/file_writers/single_file.py 2007-04-17 21:07:13 UTC (rev 997)
@@ -7,11 +7,10 @@
import os
import writer
+from pyplusplus import code_creators
class single_file_t(writer.writer_t):
- """
- This class writes all code into single file.
- """
+ """generates all code into single cpp file"""
def __init__(self, extmodule, file_name):
writer.writer_t.__init__(self, extmodule)
@@ -21,6 +20,15 @@
return self.__fname
file_name = property( _get_file_name )
- def write(self):
+ def write(self):
+ user_headers = []
+ creators = filter( lambda creator: isinstance( creator, code_creators.declaration_based_t )
+ , code_creators.make_flatten( self.extmodule ) )
+ map( lambda creator: user_headers.extend( creator.get_user_headers() )
+ , creators )
+ user_headers = code_creators.code_creator_t.unique_headers( user_headers )
+ map( lambda header: self.extmodule.add_include( header )
+ , user_headers )
self.write_code_repository( os.path.split( self.file_name )[0] )
- self.write_file( self.file_name, self.extmodule.create() )
\ No newline at end of file
+ self.write_file( self.file_name, self.extmodule.create() )
+
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-04-19 06:52:35
|
Revision: 1000
http://svn.sourceforge.net/pygccxml/?rev=1000&view=rev
Author: roman_yakovenko
Date: 2007-04-18 23:52:25 -0700 (Wed, 18 Apr 2007)
Log Message:
-----------
small optimization to message treatment
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py
pyplusplus_dev/pyplusplus/messages/__init__.py
pyplusplus_dev/pyplusplus/messages/warnings_.py
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py 2007-04-18 18:51:07 UTC (rev 999)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py 2007-04-19 06:52:25 UTC (rev 1000)
@@ -3,8 +3,7 @@
# accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
-"""defines base class for all classes, that will keep Py++ code generator engine
-instructions."""
+"""defines base class for all code generator configuration classes"""
import algorithm
from pyplusplus import _logging_
@@ -12,15 +11,12 @@
from pyplusplus import messages
class decl_wrapper_t(object):
- SPECIAL_TYPEDEF_PICK_ANY = True
- """Declaration interface.
+ """code generator declaration configuration base class
- This class represents the interface to the declaration tree. Its
- main purpose is to "decorate" the nodes in the tree with
- information about how the binding is to be created. Instances of
- this class are never created by the user, instead they are
- returned by the API.
+ This class contains configuration that could be applied to all declarations.
"""
+
+ SPECIAL_TYPEDEF_PICK_ANY = True
def __init__(self):
object.__init__(self)
@@ -35,7 +31,7 @@
@property
def logger( self ):
- """returns reference to L{_logging_.loggers.declarations}"""
+ """reference to L{_logging_.loggers.declarations}"""
return _logging_.loggers.declarations
def _get_documentation( self ):
@@ -43,7 +39,7 @@
def _set_documentation( self, value ):
self._documentation = value
documentation = property( _get_documentation, _set_documentation
- , doc="Using this property you can set documentation of the declaration." )
+ , doc="exposed declaration Python documentation string" )
def _generate_valid_name(self, name=None):
if name == None:
@@ -89,10 +85,10 @@
def _set_alias(self, alias):
self._alias = alias
alias = property( _get_alias, _set_alias
- , doc="Using this property you can easily change Python name of declaration" )
+ , doc="the name under which, Python will know the declaration" )
def rename( self, new_name ):
- """renames the declaration name, under which it is exposed"""
+ """give new name to the declaration, under which Python will know the declaration"""
self.alias = new_name
def _get_ignore( self ):
@@ -100,28 +96,32 @@
def _set_ignore( self, value ):
self._ignore = value
ignore = property( _get_ignore, _set_ignore
- ,doc="If you set ignore to True then this declaration will not be exported." )
+ , doc="boolean flag, which says whether to export declaration to Python or not" )
def _get_already_exposed_impl( self ):
return self._already_exposed
-
+
def _get_already_exposed( self ):
return self._get_already_exposed_impl()
def _set_already_exposed( self, value ):
self._already_exposed = value
- already_exposed = property( _get_already_exposed, _set_already_exposed )
+ already_exposed = property( _get_already_exposed, _set_already_exposed
+ , doc="boolean flag, which says whether the declaration is already exposed or not" )
def exclude( self ):
- """Exclude "self" and child declarations from being exposed."""
+ """exclude "self" and child declarations from being exposed."""
self.ignore = True
def include( self, already_exposed=False ):
- """Include "self" and child declarations to be exposed."""
+ """include "self" and child declarations to be exposed."""
self.ignore = False
self.already_exposed = already_exposed
def why_not_exportable( self ):
- """returns strings that explains why this declaration could not be exported or None otherwise"""
+ """return the reason( string ) that explains why this declaration could not be exported
+
+ If declaration could be exported, than method will return None
+ """
if None is self._exportable_reason:
self.get_exportable()
return self._exportable_reason
@@ -130,6 +130,7 @@
return ''
def get_exportable( self ):
+ """return True if declaration could be exposed to Python, False otherwise"""
if self._exportable is None:
if self.name.startswith( '__' ) or '.' in self.name:
self._exportable_reason = messages.W1000
@@ -143,6 +144,10 @@
self._exportable = not bool( self._exportable_reason )
return self._exportable
def set_exportable( self, exportable ):
+ """change "exportable" status
+
+ This function should be use in case Py++ made a mistake and signed the
+ declaration as unexportable."""
self._exportable = exportable
exportable = property( get_exportable, set_exportable
@@ -152,13 +157,11 @@
return []
def readme( self, skip_ignored=True ):
- """This function will returns some hints/tips/description of problems
- that applied to the declarations. For example function that has argument
- reference to some fundamental type could be exported, but could not be called
- from Python
-
- @param skip_ignored: if True, messages that user asked to not reported
- will not be returned
+ """return important information( hints/tips/warning message ) Py++ has about
+ this declaration.
+
+ skip_ignored argument allows you to control the information reported to you.
+ For more information please read: http://www.language-binding.net/pyplusplus/documentation/warnings.html
"""
msgs = []
if not self.exportable:
@@ -179,12 +182,13 @@
@property
def disabled_messaged( self ):
+ """list of messages to ignore"""
return self.__msgs_to_ignore
def disable_messages( self, *args ):
- """Using this method you can tell to Py++ to not report some specifiec warnings.
+ """set messages, which should not be reported to you
- Usage example: decl.ignore_warnings( messages.W1001, messages.W1040 )
+ Usage example: decl.disable_messages( messages.W1001, messages.W1040 )
"""
for msg in args:
msg_id = messages.find_out_message_id( msg )
Modified: pyplusplus_dev/pyplusplus/messages/__init__.py
===================================================================
--- pyplusplus_dev/pyplusplus/messages/__init__.py 2007-04-18 18:51:07 UTC (rev 999)
+++ pyplusplus_dev/pyplusplus/messages/__init__.py 2007-04-19 06:52:25 UTC (rev 1000)
@@ -8,16 +8,19 @@
"""
from warnings_ import *
-import re
-__RE_GET_WARNING_ID = re.compile( r'warning\s(?P<id>W(\d){4})' )
+#implementation using regular expression is deprecated, I will leave it here for
+#some time to be sure that the new one does not cause any problems.
+#import re
+#__RE_GET_WARNING_ID = re.compile( r'warning\s(?P<id>W(\d){4})' )
+#match_obj = __RE_GET_WARNING_ID.search(msg)
+# if not match_obj:
+# return None
+# else:
+# return match_obj.group( 'id' )
+
def find_out_message_id( msg ):
- match_obj = __RE_GET_WARNING_ID.search(msg)
- if not match_obj:
- return None
- else:
- return match_obj.group( 'id' )
+ return msg.identifier
-
DISABLE_MESSAGES = [
W1000, W1001, W1002, W1011, W1012, W1013, W1015, W1019, W1030, W1034, W1039
]
Modified: pyplusplus_dev/pyplusplus/messages/warnings_.py
===================================================================
--- pyplusplus_dev/pyplusplus/messages/warnings_.py 2007-04-18 18:51:07 UTC (rev 999)
+++ pyplusplus_dev/pyplusplus/messages/warnings_.py 2007-04-19 06:52:25 UTC (rev 1000)
@@ -7,6 +7,22 @@
reported to user.
"""
+class message_type(str):
+ """implementation details"""
+ def __new__(self, value, identifier):
+ return str.__new__(self, value )
+
+ def __init__(self, value, identifier ):
+ self.__identifier = identifier
+
+ @property
+ def identifier( self ):
+ return self.__identifier
+
+ def __mod__( self, values ):
+ str_value = super( message_type, self ).__str__()
+ return message_type( str_value % values, self.identifier )
+
W1000 = 'Py++, by default, does not expose internal compilers declarations. '\
'Names of those declarations usually start with "__".'
@@ -153,7 +169,6 @@
'Be sure to take a look on Py++ defined call policies: ' \
'http://language-binding.net/pyplusplus/documentation/functions/call_policies.html#py-defined-call-policies'
-
W1051 = 'The function takes as argument (name=%s, pos=%d) "%s" type. ' \
'You have to specify a call policies or to use "Function Transformation" ' \
'functionality.'
@@ -170,13 +185,20 @@
int( identifier[1:] )
except:
continue
-
- globals()[ identifier ] = 'warning %s: %s' % ( identifier, explanation )
+ msg = '%s %s: %s' % ( 'warning', identifier, explanation)
+ globals()[ identifier ] = message_type( msg, identifier )
del warnings
del identifier
del explanation
+if __name__ == '__main__':
+ x = W1051 % ( 'xxxxxxxx', 122, 'yyyyyyyyyy' )
+ print x, x.__class__.__name__
+ print '\n\n\n'
+ y = W1000
+ print y
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-04-19 16:28:14
|
Revision: 1007
http://svn.sourceforge.net/pygccxml/?rev=1007&view=rev
Author: roman_yakovenko
Date: 2007-04-19 09:28:15 -0700 (Thu, 19 Apr 2007)
Log Message:
-----------
bug fix
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py
pyplusplus_dev/pyplusplus/messages/warnings_.py
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py 2007-04-19 16:26:58 UTC (rev 1006)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py 2007-04-19 16:28:15 UTC (rev 1007)
@@ -115,7 +115,7 @@
mark these functions and provide and explanation to the user.
"""
self.overridable = False
- self._non_overridable_reason = reason
+ self._non_overridable_reason = messages.W0000 % reason
@property
def transformations(self):
Modified: pyplusplus_dev/pyplusplus/messages/warnings_.py
===================================================================
--- pyplusplus_dev/pyplusplus/messages/warnings_.py 2007-04-19 16:26:58 UTC (rev 1006)
+++ pyplusplus_dev/pyplusplus/messages/warnings_.py 2007-04-19 16:28:15 UTC (rev 1007)
@@ -22,7 +22,9 @@
def __mod__( self, values ):
str_value = super( message_type, self ).__str__()
return message_type( str_value % values, self.identifier )
-
+
+W0000 = '%s' #general message, usefull in few cases
+
W1000 = 'Py++, by default, does not expose internal compilers declarations. '\
'Names of those declarations usually start with "__".'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-11-10 22:37:09
|
Revision: 1133
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1133&view=rev
Author: roman_yakovenko
Date: 2007-11-10 14:37:12 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
adding treatment to trivial [copy] constructors
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/calldef.py
pyplusplus_dev/pyplusplus/code_creators/declaration_based.py
pyplusplus_dev/pyplusplus/module_creator/creator.py
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-11-10 22:29:29 UTC (rev 1132)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-11-10 22:37:12 UTC (rev 1133)
@@ -932,18 +932,18 @@
"""
Creates wrapper class constructor from wrapped class instance.
"""
- def __init__( self, constructor ):
+ def __init__( self, class_ ):
code_creator.code_creator_t.__init__( self )
- declaration_based.declaration_based_t.__init__( self, declaration=constructor )
+ declaration_based.declaration_based_t.__init__( self, declaration=class_ )
def _create_declaration(self):
result = []
- result.append( self.parent.declaration.wrapper_alias )
+ result.append( self.declaration.wrapper_alias )
result.append( '(' )
if not self.target_configuration.boost_python_has_wrapper_held_type \
- or self.declaration.parent.require_self_reference:
+ or self.declaration.require_self_reference:
result.append( 'PyObject* self, ' )
- declarated = declarations.declarated_t( self.declaration.parent )
+ declarated = declarations.declarated_t( self.declaration )
const_decl = declarations.const_t( declarated )
const_ref_decl = declarations.reference_t( const_decl )
identifier = algorithm.create_identifier( self, const_ref_decl.decl_string )
@@ -952,7 +952,7 @@
return ''.join( result )
def _create_constructor_call( self ):
- answer = [ algorithm.create_identifier( self, self.parent.declaration.decl_string ) ]
+ answer = [ algorithm.create_identifier( self, self.declaration.decl_string ) ]
answer.append( '( arg )' )
return ''.join( answer )
@@ -961,7 +961,7 @@
answer.append( ': ' + self._create_constructor_call() )
answer.append( ' , ' + self.parent.boost_wrapper_identifier + '(){' )
answer.append( self.indent( '// copy constructor' ) )
- answer.append( self.indent( self.parent.declaration.copy_constructor_body ) )
+ answer.append( self.indent( self.declaration.copy_constructor_body ) )
answer.append( '}' )
return os.linesep.join( answer )
@@ -973,23 +973,23 @@
"""
Creates wrapper for compiler generated null constructor.
"""
- def __init__( self, constructor ):
+ def __init__( self, class_ ):
code_creator.code_creator_t.__init__( self )
- declaration_based.declaration_based_t.__init__( self, declaration=constructor )
+ declaration_based.declaration_based_t.__init__( self, declaration=class_ )
def _create_constructor_call( self ):
- return algorithm.create_identifier( self, self.parent.declaration.decl_string ) + '()'
+ return algorithm.create_identifier( self, self.declaration.decl_string ) + '()'
def _create_impl(self):
- answer = [ self.parent.declaration.wrapper_alias + '(' ]
+ answer = [ self.declaration.wrapper_alias + '(' ]
if not self.target_configuration.boost_python_has_wrapper_held_type \
- or self.declaration.parent.require_self_reference:
+ or self.declaration.require_self_reference:
answer[0] = answer[0] + 'PyObject* self'
answer[0] = answer[0] + ')'
answer.append( ': ' + self._create_constructor_call() )
answer.append( ' , ' + self.parent.boost_wrapper_identifier + '(){' )
answer.append( self.indent( '// null constructor' ) )
- answer.append( self.indent( self.parent.declaration.null_constructor_body ) )
+ answer.append( self.indent( self.declaration.null_constructor_body ) )
answer.append( '}' )
return os.linesep.join( answer )
Modified: pyplusplus_dev/pyplusplus/code_creators/declaration_based.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/declaration_based.py 2007-11-10 22:29:29 UTC (rev 1132)
+++ pyplusplus_dev/pyplusplus/code_creators/declaration_based.py 2007-11-10 22:37:12 UTC (rev 1133)
@@ -41,9 +41,9 @@
self.declaration.alias = alias
alias = property( _get_alias, _set_alias )
- def _get_decl_identifier( self ):
+ @property
+ def decl_identifier( self ):
return algorithm.create_identifier( self, self.declaration.decl_string )
- decl_identifier = property( _get_decl_identifier )
@property
def documentation( self ):
Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-11-10 22:29:29 UTC (rev 1132)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-11-10 22:37:12 UTC (rev 1133)
@@ -571,18 +571,32 @@
else:
self.__extmodule.adopt_declaration_creator( wrapper )
if declarations.has_trivial_copy( self.curr_decl ):
- #~ #I don't know but sometimes boost.python requieres
- #~ #to construct wrapper from wrapped classe
- copy_constr = self.curr_decl.constructor( lambda c: c.is_copy_constructor, recursive=False )
- if not self.curr_decl.noncopyable and copy_constr.is_artificial:
- cccc = code_creators.copy_constructor_wrapper_t( constructor=copy_constr )
- wrapper.adopt_creator( cccc )
- null_constr = declarations.find_trivial_constructor(self.curr_decl)
- if null_constr and null_constr.is_artificial:
- #this constructor is not going to be exposed
- tcons = code_creators.null_constructor_wrapper_t( constructor=null_constr )
- wrapper.adopt_creator( tcons )
-
+ #next constructors are not present in code, but compiler generated
+ #Boost.Python requiers them to be declared in the wrapper class
+ if '0.9' in self.curr_decl.compiler:
+ copy_constr = self.curr_decl.constructors( lambda c: c.is_copy_constructor
+ , recursive=False
+ , allow_empty=True)
+ if not copy_constr:
+ cccc = code_creators.copy_constructor_wrapper_t( class_=self.curr_decl)
+ wrapper.adopt_creator( cccc )
+ trivial_constr = self.curr_decl.constructors( lambda c: c.is_trivial_constructor
+ , recursive=False
+ , allow_empty=True)
+ if not trivial_constr:
+ tcons = code_creators.null_constructor_wrapper_t( class_=self.curr_decl )
+ wrapper.adopt_creator( tcons )
+ else:
+ copy_constr = self.curr_decl.constructor( lambda c: c.is_copy_constructor, recursive=False )
+ if not self.curr_decl.noncopyable and copy_constr.is_artificial:
+ cccc = code_creators.copy_constructor_wrapper_t( class_=self.curr_decl)
+ wrapper.adopt_creator( cccc )
+ null_constr = declarations.find_trivial_constructor(self.curr_decl)
+ if null_constr and null_constr.is_artificial:
+ #this constructor is not going to be exposed
+ tcons = code_creators.null_constructor_wrapper_t( class_=self.curr_decl )
+ wrapper.adopt_creator( tcons )
+
exposed = self.expose_overloaded_mem_fun_using_macro( cls_decl, cls_cc )
cls_parent_cc.adopt_creator( cls_cc )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-11-20 21:29:54
|
Revision: 1163
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1163&view=rev
Author: roman_yakovenko
Date: 2007-11-20 13:29:57 -0800 (Tue, 20 Nov 2007)
Log Message:
-----------
switching to new and better implementation of "already exposed" database and algorithms
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/file_writers/writer.py
pyplusplus_dev/pyplusplus/module_builder/builder.py
pyplusplus_dev/pyplusplus/module_creator/creator.py
pyplusplus_dev/pyplusplus/module_creator/dependencies_manager.py
pyplusplus_dev/pyplusplus/utils/__init__.py
Modified: pyplusplus_dev/pyplusplus/file_writers/writer.py
===================================================================
--- pyplusplus_dev/pyplusplus/file_writers/writer.py 2007-11-20 21:25:57 UTC (rev 1162)
+++ pyplusplus_dev/pyplusplus/file_writers/writer.py 2007-11-20 21:29:57 UTC (rev 1163)
@@ -32,7 +32,7 @@
if None is files_sum_repository:
self.__files_sum_repository = md5sum_repository.dummy_repository_t()
self.__exposed_decls_db = utils.exposed_decls_db_t()
- self.__extmodule.register_exposed( self.__exposed_decls_db )
+ self.__exposed_decls_db.register_decls( extmodule.global_ns )
@property
def encoding( self ):
@@ -143,4 +143,4 @@
def save_exposed_decls_db( self, file_path ):
self.__exposed_decls_db.save( file_path )
-
\ No newline at end of file
+
Modified: pyplusplus_dev/pyplusplus/module_builder/builder.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_builder/builder.py 2007-11-20 21:25:57 UTC (rev 1162)
+++ pyplusplus_dev/pyplusplus/module_builder/builder.py 2007-11-20 21:29:57 UTC (rev 1163)
@@ -97,7 +97,6 @@
self.__registrations_code_head = []
self.__registrations_code_tail = []
- self.__already_exposed_modules = []
@property
def global_ns( self ):
@@ -109,7 +108,9 @@
return self.__encoding
def register_module_dependency( self, other_module_generate_code_dir ):
- self.__already_exposed_modules.append( other_module_generate_code_dir )
+ db = utils.exposed_decls_db_t()
+ db.load( other_module_generate_code_dir )
+ db.update_decls( self.global_ns )
def run_query_optimizer(self):
"""
@@ -255,8 +256,7 @@
, types_db
, target_configuration
, enable_indexing_suite
- , doc_extractor
- , self.__already_exposed_modules)
+ , doc_extractor)
self.__code_creator = creator.create()
self.__code_creator.replace_included_headers(self.__parsed_files)
#I think I should ask users, what they expect
@@ -266,11 +266,12 @@
return self.__code_creator
- def _get_module( self ):
+ @property
+ def code_creator( self ):
+ "reference to L{code_creators.module_t} instance"
if not self.__code_creator:
raise RuntimeError( "self.module is equal to None. Did you forget to call build_code_creator function?" )
return self.__code_creator
- code_creator = property( _get_module, doc="reference to L{code_creators.module_t} instance" )
def has_code_creator( self ):
"""
Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-11-20 21:25:57 UTC (rev 1162)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-11-20 21:29:57 UTC (rev 1163)
@@ -52,8 +52,7 @@
, types_db=None
, target_configuration=None
, enable_indexing_suite=True
- , doc_extractor=None
- , already_exposed_dbs=None):
+ , doc_extractor=None ):
"""Constructor.
@param decls: Declarations that should be exposed in the final module.
@@ -91,7 +90,7 @@
if not self.__types_db:
self.__types_db = types_database.types_database_t()
- self.__extmodule = code_creators.module_t()
+ self.__extmodule = code_creators.module_t( declarations.get_global_namespace(decls) )
if boost_python_ns_name:
bp_ns_alias = code_creators.namespace_alias_t( alias=boost_python_ns_name
, full_namespace_name='::boost::python' )
@@ -102,7 +101,7 @@
self.__extmodule.adopt_creator( self.__module_body )
self.__opaque_types_manager = opaque_types_manager.manager_t( self.__extmodule )
- self.__dependencies_manager = dependencies_manager.manager_t(self.decl_logger, already_exposed_dbs)
+ self.__dependencies_manager = dependencies_manager.manager_t(self.decl_logger)
prepared_decls = self._prepare_decls( decls, doc_extractor )
self.__decls = sort_algorithms.sort( prepared_decls )
@@ -141,9 +140,8 @@
self.__print_readme( decl )
continue
- if self.__dependencies_manager.is_already_exposed( decl ):
+ if decl.already_exposed:
#check wether this is already exposed in other module
- decl.already_exposed = True
continue
if isinstance( decl.parent, declarations.namespace_t ):
@@ -286,8 +284,7 @@
for cls in used_containers:
self.__print_readme( cls )
- if self.__dependencies_manager.is_already_exposed( cls ):
- cls.already_exposed = True
+ if cls.already_exposed:
continue
cls_creator = create_cls_cc( cls )
Modified: pyplusplus_dev/pyplusplus/module_creator/dependencies_manager.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/dependencies_manager.py 2007-11-20 21:25:57 UTC (rev 1162)
+++ pyplusplus_dev/pyplusplus/module_creator/dependencies_manager.py 2007-11-20 21:29:57 UTC (rev 1163)
@@ -13,20 +13,14 @@
class manager_t( object ):
- def __init__( self, logger, already_exposed=None ):
+ def __init__( self, logger ):
object.__init__( self )
self.__exported_decls = []
self.__logger = logger
- self.__already_exposed_db = utils.exposed_decls_db_t()
- if already_exposed:
- map( self.__already_exposed_db.load, already_exposed )
def add_exported( self, decl ):
self.__exported_decls.append( decl )
- def is_already_exposed( self, decl ):
- return decl.already_exposed or self.__already_exposed_db.is_exposed( decl )
-
def __select_duplicate_aliases( self, decls ):
duplicated = {}
for decl in decls:
@@ -79,7 +73,7 @@
if self.__is_std_decl( decl ):
#TODO add element_type to the list of dependencies
return [] #std declarations should be exported by Py++!
- if self.is_already_exposed( decl ):
+ if decl.already_exposed:
return []
dependencies = decl.i_depend_on_them(recursive=False)
if isinstance( decl, declarations.class_t ):
Modified: pyplusplus_dev/pyplusplus/utils/__init__.py
===================================================================
--- pyplusplus_dev/pyplusplus/utils/__init__.py 2007-11-20 21:25:57 UTC (rev 1162)
+++ pyplusplus_dev/pyplusplus/utils/__init__.py 2007-11-20 21:29:57 UTC (rev 1163)
@@ -55,96 +55,113 @@
class exposed_decls_db_t( object ):
DEFAULT_FILE_NAME = 'exposed_decl.pypp.txt'
- class row_creator_t( declarations.decl_visitor_t ):
- def __init__( self, field_delimiter ):
- self.__decl = None
- self.__formatted = None
- self.__field_delimiter = field_delimiter
+ class row_t( declarations.decl_visitor_t ):
+ FIELD_DELIMITER = '@'
+ EXPOSED_DECL_SIGN = '+'
+ UNEXPOSED_DECL_SIGN = '~'
+ CALLDEF_SIGNATURE_DELIMITER = '#'
+
+ def __init__( self, decl_or_string ):
+ self.key = ''
+ self.signature = ''
+ self.exposed_sign = ''
+ self.normalized_name = ''
+ if isinstance( decl_or_string, declarations.declaration_t ):
+ self.__init_from_decl( decl_or_string )
+ else:
+ self.__init_from_str( decl_or_string )
- def get_full_name(self):
- return declarations.full_name( self.__decl )
+ def find_out_normalized_name( self, decl ):
+ if decl.name:
+ return decl.name
+ else:#unnamed enums, classes, unions
+ return str( decl.location.as_tuple() )
- def __call__( self, decl ):
- self.__decl = decl
- self.__formatted = None
- try:
- declarations.apply_visitor( self, decl )
- except NotImplementedError:
- pass
- return self.__formatted
+ def __init_from_str( self, row ):
+ self.exposed_sign, self.key, self.normalized_name, self.signature \
+ = row.split( self.FIELD_DELIMITER )
- def visit_free_function( self ):
- self.__formatted = '%s%s%s' % ( self.get_full_name()
- , self.__field_delimiter
- , self.__decl.function_type().decl_string )
-
- def visit_class_declaration(self ):
- self.__formatted = self.get_full_name()
+ def __init_from_decl( self, decl ):
+ if decl.ignore:
+ self.exposed_sign = self.UNEXPOSED_DECL_SIGN
+ else:
+ self.exposed_sign = self.EXPOSED_DECL_SIGN
+ self.key = decl.__class__.__name__
+ self.signature = decl.decl_string
+ if isinstance( decl, declarations.calldef_t ):
+ self.signature = self.signature + decl.function_type().decl_string
+ self.normalized_name = self.find_out_normalized_name( decl )
- def visit_class(self ):
- self.__formatted = self.get_full_name()
-
- def visit_enumeration(self ):
- self.__formatted = self.get_full_name()
-
- def visit_variable(self ):
- self.__formatted = self.get_full_name()
+ def __str__( self ):
+ return self.FIELD_DELIMITER.join([ self.exposed_sign
+ , self.key
+ , self.normalized_name
+ , self.signature])
+ def does_refer_same_decl( self, other ):
+ return self.key == other.key \
+ and self.signature == other.signature \
+ and self.normalized_name == other.normalized_name
+
def __init__( self ):
- self.__exposed = {}
- self.__row_creator = self.row_creator_t(field_delimiter='@')
- self.__key_delimiter = '?'
+ self.__registry = {} # key : { name : set(row) }
self.__row_delimiter = os.linesep
def save( self, fpath ):
if os.path.isdir( fpath ):
fpath = os.path.join( fpath, self.DEFAULT_FILE_NAME )
f = file( fpath, 'w+b' )
- for key, items in self.__exposed.iteritems():
- for item in items:
- f.write( '%s%s%s%s' % ( key, self.__key_delimiter, item, self.__row_delimiter ) )
+ for name2rows in self.__registry.itervalues():
+ for rows in name2rows.itervalues():
+ for row in rows:
+ f.write( '%s%s' % ( str(row), self.__row_delimiter ) )
f.close()
-
+
def load( self, fpath ):
if os.path.isdir( fpath ):
fpath = os.path.join( fpath, self.DEFAULT_FILE_NAME )
f = file( fpath, 'r+b' )
for line in f:
- key, row = line.split( self.__key_delimiter)
- row = row.replace( self.__row_delimiter, '' )
- if not self.__exposed.has_key( key ):
- self.__exposed[ key ] = set()
- self.__exposed[ key ].add( row )
-
- def __create_key( self, decl ):
- return decl.__class__.__name__
+ row = self.row_t( line.replace( self.__row_delimiter, '' ) )
+ self.__update_registry( row )
- def expose( self, decl ):
- if not isinstance( decl.parent, declarations.namespace_t ):
- return None #we don't want to dump class internal declarations
- row = self.__row_creator( decl )
- if row is None:
+ def __update_registry( self, row ):
+ if not self.__registry.has_key( row.key ):
+ self.__registry[ row.key ] = { row.normalized_name : [row] }
+ else:
+ if not self.__registry[ row.key ].has_key( row.normalized_name ):
+ self.__registry[ row.key ][row.normalized_name] = [row]
+ else:
+ self.__registry[ row.key ][row.normalized_name].append(row)
+
+ def __find_in_registry( self, decl ):
+ row = self.row_t( decl )
+ try:
+ decls = filter( lambda rrow: rrow.does_refer_same_decl( row )
+ , self.__registry[ row.key ][ row.normalized_name ] )
+ if decls:
+ return decls[0]
+ else:
+ return None
+ except KeyError:
return None
- key = self.__create_key( decl )
- if not self.__exposed.has_key( key ):
- self.__exposed[ key ] = set()
- self.__exposed[ key ].add( row )
-
- def __get_under_ns_decl( self, decl ):
- while True:
- if isinstance( decl.parent, declarations.namespace_t ):
- return decl
+
+ def is_exposed( self, decl ):
+ row = self.__find_in_registry( decl)
+ return row and self.row_t.EXPOSED_DECL_SIGN == row.exposed_sign
+
+ def update_decls( self, global_ns ):
+ for decl in global_ns.decls():
+ row = self.__find_in_registry( decl )
+ if not row:
+ continue
+ if self.row_t.EXPOSED_DECL_SIGN == row.exposed_sign:
+ decl.ignore = False
+ decl.already_exposed = True
else:
- decl = decl.parent
+ decl.ignore = True
+ decl.already_exposed = False
- def is_exposed( self, decl_ ):
- if isinstance( decl_, declarations.namespace_t ):
- return False#namespaces are always exposed
- decl = self.__get_under_ns_decl( decl_ )
- key = self.__create_key( decl )
- if not self.__exposed.has_key( key ):
- return False
- row = self.__row_creator( decl )
- return row in self.__exposed[ key ]
-
-
+ def register_decls( self, global_ns ):
+ for decl in global_ns.decls():
+ self.__update_registry( self.row_t( decl ) )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-11-22 21:52:41
|
Revision: 1170
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1170&view=rev
Author: roman_yakovenko
Date: 2007-11-22 13:52:44 -0800 (Thu, 22 Nov 2007)
Log Message:
-----------
rename has_trivial_copy with has_copy_constructor to better reflect what function does
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/member_variable.py
pyplusplus_dev/pyplusplus/module_creator/call_policies_resolver.py
pyplusplus_dev/pyplusplus/module_creator/creator.py
Modified: pyplusplus_dev/pyplusplus/code_creators/member_variable.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/member_variable.py 2007-11-22 21:51:07 UTC (rev 1169)
+++ pyplusplus_dev/pyplusplus/code_creators/member_variable.py 2007-11-22 21:52:44 UTC (rev 1170)
@@ -621,7 +621,7 @@
return False
if declarations.has_destructor( decl ) and not declarations.has_public_destructor( decl ):
return False
- if not declarations.has_trivial_copy(decl):
+ if not declarations.has_copy_constructor(decl):
return False
return True
has_setter = property( _get_has_setter )
Modified: pyplusplus_dev/pyplusplus/module_creator/call_policies_resolver.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/call_policies_resolver.py 2007-11-22 21:51:07 UTC (rev 1169)
+++ pyplusplus_dev/pyplusplus/module_creator/call_policies_resolver.py 2007-11-22 21:52:44 UTC (rev 1170)
@@ -161,7 +161,7 @@
return None
if declarations.has_destructor( decl ) and not declarations.has_public_destructor( decl ):
return None
- if not declarations.has_trivial_copy(decl):
+ if not declarations.has_copy_constructor(decl):
return None
if hint == 'get':
#if we rich this line, it means that we are able to create an obect using
Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-11-22 21:51:07 UTC (rev 1169)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-11-22 21:52:44 UTC (rev 1170)
@@ -572,7 +572,7 @@
if '0.9' in self.curr_decl.compiler:
copy_constr = self.curr_decl.find_copy_constructor()
add_to_wrapper = False
- if declarations.has_trivial_copy( self.curr_decl ):
+ if declarations.has_copy_constructor( self.curr_decl ):
#find out whether user or compiler defined it
if self.curr_decl.noncopyable:
add_to_wrapper = False
@@ -594,7 +594,7 @@
tcons = code_creators.null_constructor_wrapper_t( class_=self.curr_decl )
wrapper.adopt_creator( tcons )
else:
- if declarations.has_trivial_copy( self.curr_decl ):
+ if declarations.has_copy_constructor( self.curr_decl ):
copy_constr = self.curr_decl.find_copy_constructor()
if not self.curr_decl.noncopyable and copy_constr.is_artificial:
cccc = code_creators.copy_constructor_wrapper_t( class_=self.curr_decl)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-11-27 20:00:31
|
Revision: 1178
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1178&view=rev
Author: roman_yakovenko
Date: 2007-11-27 12:00:35 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
adding support for class partial name - name without default template arguments
STL containers will be generated using partial name
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/calldef.py
pyplusplus_dev/pyplusplus/code_creators/calldef_utils.py
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
pyplusplus_dev/pyplusplus/code_creators/declaration_based.py
pyplusplus_dev/pyplusplus/code_creators/global_variable.py
pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py
pyplusplus_dev/pyplusplus/code_creators/member_variable.py
pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-11-27 19:57:39 UTC (rev 1177)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-11-27 20:00:35 UTC (rev 1178)
@@ -126,7 +126,7 @@
if not self.works_on_instance:
#indenting and adding scope
code = ''.join( result )
- result = [ '{ //%s' % declarations.full_name( self.declaration ) ]
+ result = [ '{ //%s' % self.decl_identifier ]
result.append( os.linesep * 2 )
result.append( self.indent( code ) )
result.append( os.linesep * 2 )
@@ -158,7 +158,7 @@
return arg_utils.args_declaration()
def wrapped_class_identifier( self ):
- return algorithm.create_identifier( self, declarations.full_name( self.declaration.parent ) )
+ return algorithm.create_identifier( self, self.declaration.parent.partial_decl_string )
def unoverriden_function_body( self ):
return 'throw std::logic_error("%s");' % self.declaration.non_overridable_reason
@@ -168,7 +168,7 @@
if not self.declaration.exceptions:
return ''
else:
- exceptions = map( lambda exception: algorithm.create_identifier( self, exception.decl_string )
+ exceptions = map( lambda exception: algorithm.create_identifier( self, exception.partial_decl_string )
, self.declaration.exceptions )
return ' throw( ' + self.PARAM_SEPARATOR.join( exceptions ) + ' )'
else:
@@ -192,7 +192,8 @@
return self.def_identifier()
def create_function_type_alias_code( self, exported_class_alias=None ):
- return 'typedef ' + self.declaration.function_type().create_typedef( self.function_type_alias ) + ';'
+ f_type = self.declaration.function_type()
+ return 'typedef ' + f_type.create_typedef( self.function_type_alias, with_defaults=False ) + ';'
def create_function_ref_code(self, use_function_alias=False):
if use_function_alias:
@@ -200,7 +201,7 @@
% ( self.function_type_alias, declarations.full_name( self.declaration ) )
elif self.declaration.create_with_signature:
return '(%s)( &%s )' \
- % ( self.declaration.function_type().decl_string
+ % ( self.declaration.function_type().partial_decl_string
, declarations.full_name( self.declaration ) )
else:
return '&%s' % declarations.full_name( self.declaration )
@@ -212,7 +213,7 @@
def create_function_type_alias_code( self, exported_class_alias=None ):
ftype = self.declaration.function_type()
- return 'typedef %s;' % ftype.create_typedef( self.function_type_alias, exported_class_alias )
+ return 'typedef %s;' % ftype.create_typedef( self.function_type_alias, exported_class_alias, with_defaults=False )
def create_function_ref_code(self, use_function_alias=False):
if use_function_alias:
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef_utils.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef_utils.py 2007-11-27 19:57:39 UTC (rev 1177)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef_utils.py 2007-11-27 20:00:35 UTC (rev 1178)
@@ -57,7 +57,8 @@
if declarations.is_fundamental( arg_type_no_alias ) \
and declarations.is_integral( arg_type_no_alias ) \
and not arg.default_value.startswith( arg_type_no_alias.decl_string ):
- result.append( '=(%s)(%s)' % ( arg_type_no_alias.decl_string, arg.default_value ) )
+ result.append( '=(%s)(%s)' % ( arg_type_no_alias.partial_decl_string
+ , arg.default_value ) )
elif self.__should_use_enum_wa( arg ):
#Work around for bug/missing functionality in boost.python.
#registration order
@@ -79,7 +80,7 @@
def args_declaration( self ):
args = []
for index, arg in enumerate( self.__args ):
- result = arg.type.decl_string + ' ' + self.argument_name(index)
+ result = arg.type.partial_decl_string + ' ' + self.argument_name(index)
if arg.default_value:
result += '=%s' % arg.default_value
args.append( result )
Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-11-27 19:57:39 UTC (rev 1177)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-11-27 20:00:35 UTC (rev 1178)
@@ -159,9 +159,9 @@
if base_desc.access != declarations.ACCESS_TYPES.PUBLIC:
continue
if base_creators.has_key( id(base_desc.related_class) ):
- bases.append( algorithm.create_identifier( self, base_desc.related_class.decl_string ) )
+ bases.append( algorithm.create_identifier( self, base_desc.related_class.partial_decl_string ) )
elif base_desc.related_class.already_exposed:
- bases.append( base_desc.related_class.decl_string )
+ bases.append( base_desc.related_class.partial_decl_string )
if not bases:
return None
bases_identifier = algorithm.create_identifier( self, '::boost::python::bases' )
@@ -186,14 +186,14 @@
else:
if not self.target_configuration.boost_python_has_wrapper_held_type \
or self.declaration.require_self_reference:
- args.append( algorithm.create_identifier( self, self.declaration.decl_string ) )
+ args.append( self.decl_identifier )
if self.declaration.require_self_reference:
if not held_type:
args.append( self.wrapper.full_name )
else:
args.append( self.wrapper.full_name )
else:
- args.append( algorithm.create_identifier( self, self.declaration.decl_string ) )
+ args.append( self.decl_identifier )
bases = self._generate_bases(base_creators)
if bases:
@@ -308,7 +308,7 @@
code = os.linesep.join( result )
- result = [ '{ //%s' % declarations.full_name( self.declaration ) ]
+ result = [ '{ //%s' % declarations.full_name( self.declaration, with_defaults=False ) ]
result.append( self.indent( code ) )
result.append( '}' )
Modified: pyplusplus_dev/pyplusplus/code_creators/declaration_based.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/declaration_based.py 2007-11-27 19:57:39 UTC (rev 1177)
+++ pyplusplus_dev/pyplusplus/code_creators/declaration_based.py 2007-11-27 20:00:35 UTC (rev 1178)
@@ -43,7 +43,7 @@
@property
def decl_identifier( self ):
- return algorithm.create_identifier( self, self.declaration.decl_string )
+ return algorithm.create_identifier( self, self.declaration.partial_decl_string )
@property
def documentation( self ):
Modified: pyplusplus_dev/pyplusplus/code_creators/global_variable.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/global_variable.py 2007-11-27 19:57:39 UTC (rev 1177)
+++ pyplusplus_dev/pyplusplus/code_creators/global_variable.py 2007-11-27 20:00:35 UTC (rev 1178)
@@ -112,7 +112,8 @@
def _get_wrapper_creator_type(self):
return declarations.free_function_type_t.create_decl_string(
return_type=self.wrapper_type
- , arguments_types=[] )
+ , arguments_types=[]
+ , with_defaults=False)
wrapper_creator_type = property( _get_wrapper_creator_type )
def _get_wrapper_creator_name(self):
Modified: pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2007-11-27 19:57:39 UTC (rev 1177)
+++ pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2007-11-27 20:00:35 UTC (rev 1178)
@@ -33,7 +33,7 @@
def _create_suite_declaration( self ):
suite_identifier = algorithm.create_identifier( self, self.guess_suite_name() )
- args = [ self.container.decl_string ]
+ args = [ self.container.partial_decl_string ]
try:
no_proxy = str( self.configuration.no_proxy ).lower()
except:
Modified: pyplusplus_dev/pyplusplus/code_creators/member_variable.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/member_variable.py 2007-11-27 19:57:39 UTC (rev 1177)
+++ pyplusplus_dev/pyplusplus/code_creators/member_variable.py 2007-11-27 20:00:35 UTC (rev 1178)
@@ -222,7 +222,8 @@
return declarations.free_function_type_t.create_decl_string(
return_type=self.declaration.type
- , arguments_types=arguments_types )
+ , arguments_types=arguments_types
+ , with_defaults=False)
getter_type = property( _get_getter_type )
def _get_setter_full_name(self):
@@ -237,7 +238,8 @@
return declarations.free_function_type_t.create_decl_string(
return_type=declarations.void_t()
- , arguments_types=arguments_types )
+ , arguments_types=arguments_types
+ , with_defaults=False)
setter_type = property( _get_setter_type )
def _get_has_setter( self ):
@@ -344,7 +346,8 @@
return_type=self.declaration.type
, class_decl_string=self.parent.full_name
, arguments_types=[]
- , has_const=True )
+ , has_const=True
+ , with_defaults=False)
getter_type = property( _get_getter_type )
def _get_setter_full_name(self):
@@ -356,7 +359,8 @@
return_type=declarations.void_t()
, class_decl_string=self.parent.full_name
, arguments_types=[self.declaration.type]
- , has_const=False )
+ , has_const=False
+ , with_defaults=False)
setter_type = property( _get_setter_type )
def _get_has_setter( self ):
Modified: pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py 2007-11-27 19:57:39 UTC (rev 1177)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/decl_wrapper.py 2007-11-27 20:00:35 UTC (rev 1178)
@@ -78,9 +78,9 @@
and self.aliases[0].name not in container_aliases:
self._alias = self.aliases[0].name
else:
- self._alias = self._generate_valid_name()
+ self._alias = algorithm.create_valid_name( self.partial_name )
else:
- self._alias = self.name
+ self._alias = self.partial_name
return self._alias
def _set_alias(self, alias):
self._alias = alias
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-04-07 21:41:43
|
Revision: 1301
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1301&view=rev
Author: roman_yakovenko
Date: 2008-04-07 14:41:50 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
bug fix: don't create _xxx_value_traits.pypp.hpp file ( and class ) if the class has both "=" and "<" available operators
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/file_writers/multiple_files.py
pyplusplus_dev/pyplusplus/module_creator/creator.py
Modified: pyplusplus_dev/pyplusplus/file_writers/multiple_files.py
===================================================================
--- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2008-04-07 21:38:11 UTC (rev 1300)
+++ pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2008-04-07 21:41:50 UTC (rev 1301)
@@ -149,6 +149,9 @@
if not class_traits.is_my_case( element_type ):
return None
value_class = class_traits.get_declaration( element_type )
+ if value_class.less_than_comparable and value_class.equality_comparable:
+ return None #Py++ doesn't create value traits for class that has
+ # = and < operators available
return self.create_value_traits_header_name( value_class )
except RuntimeError, error:
decls_logger = _logging_.loggers.declarations
Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py 2008-04-07 21:38:11 UTC (rev 1300)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2008-04-07 21:41:50 UTC (rev 1301)
@@ -305,7 +305,9 @@
class_traits = declarations.class_traits
if not ( None is element_type ) and class_traits.is_my_case( element_type ):
value_cls = class_traits.get_declaration( element_type )
- if value_cls not in created_value_traits:
+ has_prerequisits = value_cls.less_than_comparable \
+ and value_cls.equality_comparable
+ if ( not has_prerequisits ) and ( value_cls not in created_value_traits ):
created_value_traits.add( value_cls )
element_type_cc = code_creators.value_traits_t( value_cls )
self.__extmodule.adopt_declaration_creator( element_type_cc )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
