[pygccxml-commit] SF.net SVN: pygccxml: [1234] pyplusplus_dev
Brought to you by:
mbaas,
roman_yakovenko
Menu
▾
▴
[pygccxml-commit] SF.net SVN: pygccxml: [1234] pyplusplus_dev
|
From: <rom...@us...> - 2008-02-06 10:07:05
|
Revision: 1234
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1234&view=rev
Author: roman_yakovenko
Date: 2008-02-06 02:07:10 -0800 (Wed, 06 Feb 2008)
Log Message:
-----------
casting constructor will be generated in the same file as the exposed class
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/calldef.py
pyplusplus_dev/pyplusplus/module_creator/creator.py
pyplusplus_dev/unittests/data/split_module_to_be_exported.hpp
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2008-02-06 07:55:18 UTC (rev 1233)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2008-02-06 10:07:10 UTC (rev 1234)
@@ -55,7 +55,7 @@
if self.declaration.call_policies.is_default():
return ''
return self.declaration.call_policies.create( self )
-
+
def create_def_code( self ):
if not self.works_on_instance:
return '%s.def' % self.parent.class_var_name
@@ -180,7 +180,7 @@
ft = self.declaration.transformations[0]
files.extend( ft.required_headers() )
if self.declaration.call_policies:
- files.append( self.declaration.call_policies.header_file )
+ files.append( self.declaration.call_policies.header_file )
return files
class free_function_t( calldef_t ):
@@ -213,7 +213,7 @@
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):
- fname = declarations.full_name( self.declaration, with_defaults=False )
+ fname = declarations.full_name( self.declaration, with_defaults=False )
if use_function_alias:
return '%s( &%s )' % ( self.function_type_alias, fname )
elif self.declaration.create_with_signature:
@@ -230,7 +230,7 @@
return 'typedef %s;' % ftype.create_typedef( self.function_type_alias, exported_class_alias )
def create_function_ref_code(self, use_function_alias=False):
- fname = declarations.full_name( self.declaration, with_defaults=False )
+ fname = declarations.full_name( self.declaration, with_defaults=False )
if use_function_alias:
return '%s( %s(&%s) )' \
% ( self.pure_virtual_identifier()
@@ -300,14 +300,14 @@
result = []
ftype = self.declaration.function_type()
- result.append( 'typedef %s;'
+ result.append( 'typedef %s;'
% ftype.create_typedef( self.function_type_alias
, exported_class_alias
, with_defaults=False) )
if self.wrapper:
result.append( os.linesep )
ftype = self.wrapper.function_type()
- result.append( 'typedef %s;'
+ result.append( 'typedef %s;'
% ftype.create_typedef( self.default_function_type_alias
, with_defaults=False) )
return ''.join( result )
@@ -613,7 +613,7 @@
def create_virtual_body(self):
template = []
-
+
precall_code = self.declaration.override_precall_code
if precall_code:
template.append( os.linesep.join( precall_code ) )
@@ -758,7 +758,7 @@
return self.unoverriden_function_body()
template = []
-
+
precall_code = self.declaration.override_precall_code
if precall_code:
template.append( os.linesep.join( precall_code ) )
@@ -863,7 +863,7 @@
return 'staticmethod( "%s" )' % self.function_code_creator.alias
def _get_system_headers_impl( self ):
- return []
+ return []
class constructor_wrapper_t( calldef_wrapper_t ):
"""
@@ -966,7 +966,7 @@
def __init__( self, class_ ):
code_creator.code_creator_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=class_ )
-
+
def _create_constructor_call( self ):
return algorithm.create_identifier( self, self.declaration.decl_string ) + '()'
@@ -1037,7 +1037,7 @@
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_position = self._findout_self_position()
if self_position == self.SELF_POSITION.FIRST:
@@ -1130,7 +1130,7 @@
def _get_system_headers_impl( self ):
return []
-
+
class casting_constructor_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
"""
@@ -1141,6 +1141,7 @@
def __init__( self, constructor ):
registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=constructor )
+ self.works_on_instance = False
def _create_impl(self):
implicitly_convertible = algorithm.create_identifier( self, '::boost::python::implicitly_convertible' )
@@ -1207,7 +1208,7 @@
@property
def name( self ):
return '%s_%s_overloads' % ( self.parent_decl.alias, self.alias )
-
+
class mem_fun_overloads_class_t( calldef_overloads_class_t ):
def __init__( self, mem_funs ):
#precondition: all member functions belong to same class and
Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py 2008-02-06 07:55:18 UTC (rev 1233)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2008-02-06 10:07:10 UTC (rev 1234)
@@ -99,10 +99,10 @@
self.__module_body = code_creators.module_body_t( name=module_name )
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)
-
+
prepared_decls = self._prepare_decls( decls, doc_extractor )
self.__decls = sort_algorithms.sort( prepared_decls )
@@ -116,8 +116,8 @@
def __print_readme( self, decl ):
readme = decl.readme()
if not readme:
- return
-
+ return
+
if not decl.exportable:
reason = readme[0]
readme = readme[1:]
@@ -134,20 +134,20 @@
if isinstance( decl, declarations.namespace_t ):
continue
-
+
if not decl.exportable:
#leave only decls that user wants to export and that could be exported
self.__print_readme( decl )
continue
-
+
if decl.already_exposed:
#check wether this is already exposed in other module
continue
-
+
if isinstance( decl.parent, declarations.namespace_t ):
#leave only declarations defined under namespace, but remove namespaces
to_be_exposed.append( decl )
-
+
#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.
@@ -158,12 +158,12 @@
#if isinstance( decl, declarations.variable_t ):
#self.__types_db.update( decl )
-
+
if doc_extractor:
decl.documentation = doc_extractor( decl )
self.__print_readme( decl )
-
+
return to_be_exposed
def _adopt_free_operator( self, operator ):
@@ -281,7 +281,7 @@
used_containers = filter( lambda cls: cls.indexing_suite.include_files
, used_containers )
used_containers.sort( cmp_by_name )
- for cls in used_containers:
+ for cls in used_containers:
self.__print_readme( cls )
if cls.already_exposed:
@@ -310,7 +310,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) )
-
+
creators.reverse()
self.__module_body.adopt_creators( creators, 0 )
@@ -335,7 +335,7 @@
creator.target_configuration = self.__target_configuration
#last action.
self._append_user_code()
-
+
add_include = self.__extmodule.add_include
#add system headers
system_headers = self.__extmodule.get_system_headers( recursive=True, unique=True )
@@ -343,12 +343,12 @@
, system_headers )
#add user defined header files
if decl_headers is None:
- decl_headers = declarations.declaration_files( self.__decls )
+ decl_headers = declarations.declaration_files( self.__decls )
map( lambda header: add_include( header, user_defined=False, system=False )
, decl_headers )
-
+
self.__dependencies_manager.inform_user()
-
+
return self.__extmodule
def visit_member_function( self ):
@@ -357,7 +357,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 )
-
+
maker_cls, fwrapper_cls = creators_wizard.find_out_mem_fun_creator_classes( self.curr_decl )
maker = None
@@ -382,7 +382,7 @@
maker = maker_cls( function=self.curr_decl )
self.curr_code_creator.adopt_creator( maker )
self.__opaque_types_manager.register_opaque( maker, self.curr_decl )
-
+
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,16 +396,13 @@
def visit_constructor( self ):
self.__types_db.update( self.curr_decl )
self.__dependencies_manager.add_exported( self.curr_decl )
- if self.curr_decl.allow_implicit_conversion:
- maker = code_creators.casting_constructor_t( constructor=self.curr_decl )
- self.__module_body.adopt_creator( maker )
cwrapper = None
if self.curr_decl.parent.is_wrapper_needed():
class_wrapper = self.curr_code_creator.wrapper
cwrapper = code_creators.constructor_wrapper_t( constructor=self.curr_decl )
class_wrapper.adopt_creator( cwrapper )
-#TODO: FT for constructor
+ #TODO: FT for constructor
#~ if self.curr_decl.transformations:
#~ cwrapper = code_creators.constructor_transformed_wrapper_t( constructor=self.curr_decl )
#~ class_wrapper.adopt_creator( cwrapper )
@@ -415,7 +412,6 @@
#~ class_wrapper.adopt_creator( cwrapper )
#~ self.__module_body.adopt_creator( cwrapper )
#~ self.curr_code_creator.associated_decl_creators.append( cwrapper )
-
#~ maker = None
#~ if self.curr_decl.transformations:
#~ maker = code_creators.constructor_transformed_t( constructor=self.curr_decl )
@@ -425,6 +421,12 @@
self.curr_decl.call_policies = self.__call_policies_resolver( self.curr_decl )
self.curr_code_creator.adopt_creator( maker )
+ if self.curr_decl.allow_implicit_conversion:
+ maker = code_creators.casting_constructor_t( constructor=self.curr_decl )
+ #casting constructor will be generated in the same file as class
+ self.curr_code_creator.adopt_creator( maker )
+
+
def visit_destructor( self ):
pass
@@ -441,13 +443,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.__types_db.update( self.curr_decl )
if not self.curr_decl.parent.is_abstract and not declarations.is_reference( self.curr_decl.return_type ):
maker = code_creators.casting_operator_t( operator=self.curr_decl )
self.__module_body.adopt_creator( maker )
self.__opaque_types_manager.register_opaque( maker, self.curr_decl )
-
+
#what to do if class is abstract
maker = code_creators.casting_member_operator_t( operator=self.curr_decl )
self.curr_code_creator.adopt_creator( maker )
@@ -480,7 +482,7 @@
self.curr_code_creator.adopt_creator( overloads_reg )
overloads_reg.associated_decl_creators.append( overloads_cls_creator )
self.__opaque_types_manager.register_opaque( overloads_reg, overloads )
-
+
ctext_t = code_creators.custom_text_t
for f in overloads:
uc_creators = map( lambda uc: ctext_t( uc.text ), f.declaration_code )
@@ -492,7 +494,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 )
-
+
maker = None
if self.curr_decl.transformations:
wrapper = code_creators.free_fun_transformed_wrapper_t( self.curr_decl )
@@ -509,7 +511,7 @@
insert_pos = self.__extmodule.creators.index( self.__module_body )
self.__extmodule.adopt_creators( uc_creators, insert_pos )
maker.associated_decl_creators.extend( uc_creators )
-
+
def visit_free_operator( self ):
self.__types_db.update( self.curr_decl )
self.__free_operators.append( self.curr_decl )
@@ -576,7 +578,7 @@
#find out whether user or compiler defined it
if self.curr_decl.noncopyable:
add_to_wrapper = False
- elif not copy_constr:
+ elif not copy_constr:
add_to_wrapper = True #compiler defined will not be exposed manually later
elif copy_constr.is_artificial:
add_to_wrapper = True #compiler defined will not be exposed manually later
@@ -592,7 +594,7 @@
add_to_wrapper = True
if add_to_wrapper:
tcons = code_creators.null_constructor_wrapper_t( class_=self.curr_decl )
- wrapper.adopt_creator( tcons )
+ wrapper.adopt_creator( tcons )
else:
if declarations.has_copy_constructor( self.curr_decl ):
copy_constr = self.curr_decl.find_copy_constructor()
@@ -604,7 +606,7 @@
#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 )
@@ -670,7 +672,7 @@
def visit_variable(self):
self.__types_db.update( self.curr_decl )
self.__dependencies_manager.add_exported( self.curr_decl )
-
+
if declarations.is_array( self.curr_decl.type ):
if self._register_array_1( self.curr_decl.type ):
array_1_registrator = code_creators.array_1_registrator_t( array_type=self.curr_decl.type )
Modified: pyplusplus_dev/unittests/data/split_module_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/split_module_to_be_exported.hpp 2008-02-06 07:55:18 UTC (rev 1233)
+++ pyplusplus_dev/unittests/data/split_module_to_be_exported.hpp 2008-02-06 10:07:10 UTC (rev 1234)
@@ -57,6 +57,14 @@
return str2item_t();
}
+class CodeInject
+{
+public:
+CodeInject(int value_) : value(value_) {}
+
+int value;
+};
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
