|
From: <rom...@us...> - 2006-05-18 06:24:31
|
Revision: 134 Author: roman_yakovenko Date: 2006-05-17 23:24:17 -0700 (Wed, 17 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=134&view=rev Log Message: ----------- porting recent changes to windows Modified Paths: -------------- pyplusplus_dev/examples/pyboost_dev/dev/date_time/customization_data.py pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py pyplusplus_dev/pyplusplus/code_creators/module.py Modified: pyplusplus_dev/examples/pyboost_dev/dev/date_time/customization_data.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/dev/date_time/customization_data.py 2006-05-18 05:18:19 UTC (rev 133) +++ pyplusplus_dev/examples/pyboost_dev/dev/date_time/customization_data.py 2006-05-18 06:24:17 UTC (rev 134) @@ -199,7 +199,7 @@ } if sys.platform == 'win32': - name2alias[ "time_duration<boost::posix_time::time_duration,boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, micro, 1000000, 6, long> >" ] \ + name2alias[ "time_duration<boost::posix_time::time_duration, boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, (boost::date_time::time_resolutions)5, (long long)1000000, 6, long> >" ] \ = "time_duration_impl" else: name2alias[ "time_duration<boost::posix_time::time_duration, boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, (boost::date_time::time_resolutions)5, (long long)1000000, 6, int> >" ] \ Modified: pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py 2006-05-18 05:18:19 UTC (rev 133) +++ pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py 2006-05-18 06:24:17 UTC (rev 134) @@ -42,12 +42,13 @@ , undefine_symbols=date_time_settings.undefined_symbols , optimize_queries=False) if sys.platform == 'win32': - linux_name = "time_duration<boost::posix_time::time_duration,boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, micro, 1000000, 6, int> >" - win_name = "time_duration<boost::posix_time::time_duration,boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, micro, 1000000, 6, long int> >" + linux_name = "time_duration<boost::posix_time::time_duration, boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, (boost::date_time::time_resolutions)5, (long long)1000000, 6, int> >" + win_name = "time_duration<boost::posix_time::time_duration, boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, (boost::date_time::time_resolutions)5, (long long)1000000, 6, long> >" time_duration_impl = mb.class_( linux_name ) #small price for generating code from xml and not from sources time_duration_impl.name = win_name - + time_duration_impl.demangled = None + for f_decl in mb.free_functions(): f_decl.alias = f_decl.name f_decl.name = f_decl.demangled_name @@ -151,7 +152,6 @@ extmodule.user_defined_directories.append( date_time_settings.generated_files_dir ) extmodule.license = customization_data.license extmodule.precompiled_header = 'boost/python.hpp' - mb.code_creator.replace_included_headers( customization_data.includes ) self.beautify_code( mb ) def write_files( self, mb ): Modified: pyplusplus_dev/pyplusplus/code_creators/module.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/module.py 2006-05-18 05:18:19 UTC (rev 133) +++ pyplusplus_dev/pyplusplus/code_creators/module.py 2006-05-18 06:24:17 UTC (rev 134) @@ -94,7 +94,7 @@ if isinstance( self.creators[i], include.include_t ): return i else: - raise RuntimeError( "include_t creator has not been found." ) + return 0 def first_include_index(self): """Return the children index of the first L{include_t} object. @@ -119,11 +119,12 @@ elif isinstance( creator, module_body.module_body_t ): break + boost_python_header = include_directories.include_directories_t.normalize( 'boost/python.hpp' ) boost_python_treated = False for creator in to_be_removed: if not boost_python_treated: boost_python_treated = True - if 'boost/python.hpp' in creator.header: + if boost_python_header in creator.header: if not leave_boost_python_header: self.remove_creator( creator ) else: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-30 18:02:54
|
Revision: 183 Author: roman_yakovenko Date: 2006-05-30 11:02:44 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=183&view=rev Log Message: ----------- fixing bug in module_t.replace_included_headers function 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 2006-05-29 19:43:29 UTC (rev 182) +++ pyplusplus_dev/pyplusplus/code_creators/module.py 2006-05-30 18:02:44 UTC (rev 183) @@ -21,8 +21,13 @@ def __init__(self): """Constructor. """ - compound.compound_t.__init__(self, None) + compound.compound_t.__init__(self, None) + self.__system_headers = [] + def add_system_header( self, header ): + normalize = include_directories.include_directories_t.normalize + self.__system_headers.append( normalize( header ) ) + def _get_include_dirs(self): include_dirs = algorithm.creator_finder.find_by_class_instance( what=include_directories.include_directories_t @@ -111,7 +116,7 @@ else: raise RuntimeError( "include_t creator has not been found." ) - def replace_included_headers( self, headers, leave_boost_python_header=True ): + def replace_included_headers( self, headers, leave_system_headers=True ): to_be_removed = [] for creator in self.creators: if isinstance( creator, include.include_t ): @@ -119,16 +124,10 @@ elif isinstance( creator, module_body.module_body_t ): break - boost_python_header = include_directories.include_directories_t.normalize( 'boost/python.hpp' ) - boost_python_suite_header \ - = include_directories.include_directories_t.normalize( "boost/python/suite/indexing/vector_indexing_suite.hpp" ) for creator in to_be_removed: - if boost_python_header in creator.header: - if not leave_boost_python_header: + if creator.header in self.__system_headers: + if not leave_system_headers: self.remove_creator( creator ) - elif boost_python_suite_header in creator.header: - if not leave_boost_python_header: - self.remove_creator( creator ) else: self.remove_creator( creator ) map( lambda header: self.adopt_include( include.include_t( header=header ) ) Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py =================================================================== --- pyplusplus_dev/pyplusplus/module_creator/creator.py 2006-05-29 19:43:29 UTC (rev 182) +++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2006-05-30 18:02:44 UTC (rev 183) @@ -82,6 +82,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.__create_castinig_constructor = create_castinig_constructor if boost_python_ns_name: @@ -100,7 +101,7 @@ self.__cr_array_1_included = False self.__array_1_registered = set() #(type.decl_string,size) self.__free_operators = [] - + def _prepare_decls( self, decls ): #leave only declarations defined under namespace, but remove namespaces decls = filter( lambda x: not isinstance( x, declarations.namespace_t ) \ @@ -382,6 +383,7 @@ if not isinstance( cls, decl_wrappers.class_t ): continue if cls.indexing_suites: + self.__extmodule.add_system_header( "boost/python/suite/indexing/vector_indexing_suite.hpp" ) include = code_creators.include_t( header="boost/python/suite/indexing/vector_indexing_suite.hpp" ) self.__extmodule.adopt_include(include) break @@ -642,6 +644,7 @@ 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-06-29 06:19:13
|
Revision: 262 Author: roman_yakovenko Date: 2006-06-28 23:18:44 -0700 (Wed, 28 Jun 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=262&view=rev Log Message: ----------- fixing code creators interface - parent should not be passed in __init__ Modified Paths: -------------- pyplusplus_dev/pyplusplus/code_creators/array_1_registrator.py pyplusplus_dev/pyplusplus/code_creators/calldef.py pyplusplus_dev/pyplusplus/code_creators/class_declaration.py pyplusplus_dev/pyplusplus/code_creators/code_creator.py pyplusplus_dev/pyplusplus/code_creators/compound.py pyplusplus_dev/pyplusplus/code_creators/custom.py pyplusplus_dev/pyplusplus/code_creators/declaration_based.py pyplusplus_dev/pyplusplus/code_creators/enum.py pyplusplus_dev/pyplusplus/code_creators/global_variable.py pyplusplus_dev/pyplusplus/code_creators/include.py pyplusplus_dev/pyplusplus/code_creators/include_directories.py pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py pyplusplus_dev/pyplusplus/code_creators/instruction.py pyplusplus_dev/pyplusplus/code_creators/license.py pyplusplus_dev/pyplusplus/code_creators/member_variable.py pyplusplus_dev/pyplusplus/code_creators/module.py pyplusplus_dev/pyplusplus/code_creators/module_body.py pyplusplus_dev/pyplusplus/code_creators/namespace.py pyplusplus_dev/pyplusplus/code_creators/scoped.py pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py pyplusplus_dev/pyplusplus/module_creator/creator.py Modified: pyplusplus_dev/pyplusplus/code_creators/array_1_registrator.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/array_1_registrator.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/array_1_registrator.py 2006-06-29 06:18:44 UTC (rev 262) @@ -14,8 +14,8 @@ """ This class creates code that register static sized array """ - def __init__( self, array_type, parent=None ): - code_creator.code_creator_t.__init__(self, parent=parent) + def __init__( self, array_type ): + code_creator.code_creator_t.__init__( self ) self._array_type = array_type self._call_policies = self._guess_call_policies() self.works_on_instance = False Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2006-06-29 06:18:44 UTC (rev 262) @@ -24,10 +24,8 @@ #private - override class calldef_t( declaration_based.declaration_based_t): - def __init__(self, function, wrapper=None, parent=None ): - declaration_based.declaration_based_t.__init__( self - , declaration=function - , parent=parent ) + def __init__(self, function, wrapper=None ): + declaration_based.declaration_based_t.__init__( self, declaration=function ) self._wrapper = wrapper def _get_wrapper( self ): @@ -63,10 +61,8 @@ return ''.join( result ) class calldef_wrapper_t( declaration_based.declaration_based_t): - def __init__(self, function, parent=None ): - declaration_based.declaration_based_t.__init__( self - , declaration=function - , parent=parent ) + def __init__(self, function ): + declaration_based.declaration_based_t.__init__( self, declaration=function ) def argument_name( self, index ): arg = self.declaration.arguments[ index ] @@ -125,8 +121,8 @@ return ' throw( ' + self.PARAM_SEPARATOR.join( exceptions ) + ' )' class free_function_t( calldef_t ): - def __init__( self, function, parent=None ): - calldef_t.__init__( self, function=function, parent=parent ) + def __init__( self, function ): + calldef_t.__init__( self, function=function ) def _create_impl(self): param_sep = self.param_sep() @@ -154,8 +150,8 @@ return ''.join( result ) class mem_fun_t( calldef_t ): - def __init__( self, function, parent=None ): - calldef_t.__init__( self, function=function, parent=parent ) + def __init__( self, function ): + calldef_t.__init__( self, function=function ) def _create_impl(self): param_sep = self.param_sep() @@ -184,8 +180,8 @@ class mem_fun_pv_t( calldef_t ): - def __init__( self, function, wrapper, parent=None ): - calldef_t.__init__( self, function=function, wrapper=wrapper, parent=parent ) + def __init__( self, function, wrapper ): + calldef_t.__init__( self, function=function, wrapper=wrapper ) def _create_impl(self): param_sep = self.param_sep() @@ -216,8 +212,8 @@ return ''.join( result ) class mem_fun_pv_wrapper_t( calldef_wrapper_t ): - def __init__( self, function, parent=None): - calldef_wrapper_t.__init__( self, function=function, parent=parent ) + def __init__( self, function ): + calldef_wrapper_t.__init__( self, function=function ) def create_declaration(self): template = 'virtual %(return_type)s %(name)s( %(args)s )%(constness)s%(throw)s' @@ -260,8 +256,8 @@ return os.linesep.join( answer ) class mem_fun_v_t( calldef_t ): - def __init__( self, function, wrapper=None, parent=None ): - calldef_t.__init__( self, function=function, wrapper=wrapper, parent=parent ) + def __init__( self, function, wrapper=None ): + calldef_t.__init__( self, function=function, wrapper=wrapper ) def _create_impl(self): param_sep = self.param_sep() @@ -296,8 +292,8 @@ return ''.join( result ) class mem_fun_v_wrapper_t( calldef_wrapper_t ): - def __init__( self, function, parent=None): - calldef_wrapper_t.__init__( self, function=function, parent=parent ) + def __init__( self, function ): + calldef_wrapper_t.__init__( self, function=function ) def default_full_name(self): return self.parent.full_name + '::default_' + self.declaration.alias @@ -378,8 +374,8 @@ class mem_fun_protected_t( calldef_t ): - def __init__( self, function, wrapper, parent=None ): - calldef_t.__init__( self, function=function, wrapper=wrapper, parent=parent ) + def __init__( self, function, wrapper ): + calldef_t.__init__( self, function=function, wrapper=wrapper ) def _create_impl(self): param_sep = self.param_sep() @@ -407,8 +403,8 @@ return ''.join( result ) class mem_fun_protected_wrapper_t( calldef_wrapper_t ): - def __init__( self, function, parent=None): - calldef_wrapper_t.__init__( self, function=function, parent=parent ) + def __init__( self, function ): + calldef_wrapper_t.__init__( self, function=function ) def full_name(self): return '::'.join( [self.parent.full_name, self.declaration.name] ) @@ -461,8 +457,8 @@ class mem_fun_protected_s_t( calldef_t ): - def __init__( self, function, wrapper, parent=None ): - calldef_t.__init__( self, function=function, wrapper=wrapper, parent=parent ) + def __init__( self, function, wrapper ): + calldef_t.__init__( self, function=function, wrapper=wrapper ) def _create_impl(self): param_sep = self.param_sep() @@ -490,8 +486,8 @@ return ''.join( result ) class mem_fun_protected_s_wrapper_t( calldef_wrapper_t ): - def __init__( self, function, parent=None): - calldef_wrapper_t.__init__( self, function=function, parent=parent ) + def __init__( self, function ): + calldef_wrapper_t.__init__( self, function=function ) def full_name(self): return '::'.join( [self.parent.full_name, self.declaration.name] ) @@ -535,8 +531,8 @@ return self.create_function() class mem_fun_protected_v_t( calldef_t ): - def __init__( self, function, wrapper, parent=None ): - calldef_t.__init__( self, function=function, wrapper=wrapper, parent=parent ) + def __init__( self, function, wrapper ): + calldef_t.__init__( self, function=function, wrapper=wrapper ) def _create_impl(self): param_sep = self.param_sep() @@ -564,8 +560,8 @@ class mem_fun_protected_v_wrapper_t( calldef_wrapper_t ): - def __init__( self, function, parent=None): - calldef_wrapper_t.__init__( self, function=function, parent=parent ) + def __init__( self, function): + calldef_wrapper_t.__init__( self, function=function ) def full_name(self): return self.parent.full_name + '::' + self.declaration.name @@ -623,8 +619,8 @@ return self.create_function() class mem_fun_protected_pv_t( calldef_t ): - def __init__( self, function, wrapper,parent=None ): - calldef_t.__init__( self, function=function, wrapper=wrapper, parent=parent ) + def __init__( self, function, wrapper ): + calldef_t.__init__( self, function=function, wrapper=wrapper ) def _create_impl(self): param_sep = self.param_sep() @@ -652,8 +648,8 @@ return ''.join( result ) class mem_fun_protected_pv_wrapper_t( calldef_wrapper_t ): - def __init__( self, function, parent=None): - calldef_wrapper_t.__init__( self, function=function, parent=parent ) + def __init__( self, function): + calldef_wrapper_t.__init__( self, function=function ) def full_name(self): return self.parent.full_name + '::' + self.declaration.name @@ -707,8 +703,8 @@ return os.linesep.join( answer ) class mem_fun_private_v_wrapper_t( calldef_wrapper_t ): - def __init__( self, function, parent=None): - calldef_wrapper_t.__init__( self, function=function, parent=parent ) + def __init__( self, function): + calldef_wrapper_t.__init__( self, function=function ) def full_name(self): return self.parent.full_name + '::' + self.declaration.name @@ -783,8 +779,8 @@ """ Creates boost.python code needed to expose constructor. """ - def __init__(self, constructor, wrapper=None, parent=None ): - calldef_t.__init__( self, function=constructor, wrapper=wrapper, parent=parent ) + def __init__(self, constructor, wrapper=None ): + calldef_t.__init__( self, function=constructor, wrapper=wrapper ) def _create_arg_code( self, arg ): temp = arg.type @@ -833,10 +829,8 @@ """ Creates boost.python code that expose member function as static function. """ - def __init__(self, function, function_code_creator=None, parent=None ): - declaration_based.declaration_based_t.__init__( self - , declaration=function - , parent=parent ) + def __init__(self, function, function_code_creator=None ): + declaration_based.declaration_based_t.__init__( self, declaration=function ) self._function_code_creator = function_code_creator @@ -854,8 +848,8 @@ Creates C++ code that builds wrapper arround exposed constructor. """ - def __init__( self, constructor, parent=None ): - calldef_wrapper_t.__init__( self, function=constructor, parent=parent ) + def __init__( self, constructor ): + calldef_wrapper_t.__init__( self, function=constructor ) def _create_declaration(self): result = [] @@ -900,10 +894,8 @@ """ Creates wrapper class constructor from wrapped class instance. """ - def __init__( self, class_inst, parent=None ): - declaration_based.declaration_based_t.__init__( self - , declaration=class_inst - , parent=parent ) + def __init__( self, class_inst ): + declaration_based.declaration_based_t.__init__( self, declaration=class_inst ) def _create_declaration(self): result = [] @@ -938,10 +930,8 @@ """ Creates wrapper for compiler generated null constructor. """ - def __init__( self, class_inst, parent=None ): - declaration_based.declaration_based_t.__init__( self - , declaration=class_inst - , parent=parent ) + def __init__( self, class_inst ): + declaration_based.declaration_based_t.__init__( self, declaration=class_inst ) def _create_constructor_call( self ): return algorithm.create_identifier( self, self.parent.declaration.decl_string ) + '()' @@ -969,10 +959,10 @@ SECOND = 'second' BOTH = 'both' - def __init__(self, operator, parent=None ): + def __init__(self, operator ): declaration_based.declaration_based_t.__init__( self , declaration=operator - , parent=parent ) + ) def _call_type_constructor( self, type ): x = declarations.remove_reference( type ) @@ -1038,10 +1028,8 @@ """ Creates boost.python code needed to register type conversions( implicitly_convertible ) """ - def __init__( self, operator, parent=None ): - declaration_based.declaration_based_t.__init__( self - , declaration=operator - , parent=parent ) + def __init__( self, operator ): + declaration_based.declaration_based_t.__init__( self, declaration=operator ) def _create_impl(self): #TODO add comment in case of non const operator @@ -1061,10 +1049,8 @@ operators Pythonic name is given: __int__, __long__, __float__, __str__ """ - def __init__( self, operator, parent=None ): - declaration_based.declaration_based_t.__init__( self - , declaration=operator - , parent=parent ) + def __init__( self, operator ): + declaration_based.declaration_based_t.__init__( self, declaration=operator ) self._call_policies = None def _create_impl(self): @@ -1089,10 +1075,8 @@ This case treat situation when class has public non explicit constuctor from another type. """ - def __init__( self, constructor, parent=None ): - declaration_based.declaration_based_t.__init__( self - , declaration=constructor - , parent=parent ) + def __init__( self, constructor ): + declaration_based.declaration_based_t.__init__( self, declaration=constructor ) def _create_impl(self): implicitly_convertible = algorithm.create_identifier( self, '::boost::python::implicitly_convertible' ) Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2006-06-29 06:18:44 UTC (rev 262) @@ -13,10 +13,8 @@ from pygccxml import declarations class class_declaration_t( scoped.scoped_t ): - def __init__(self, class_inst, parent=None ): - scoped.scoped_t.__init__( self - , parent=parent - , declaration=class_inst ) + def __init__(self, class_inst ): + scoped.scoped_t.__init__( self, declaration=class_inst ) self.works_on_instance = False def _generate_class_definition(self): @@ -84,10 +82,8 @@ """ Creates boost.python code that needed to export a class """ - def __init__(self, class_inst, wrapper=None, parent=None ): - scoped.scoped_t.__init__( self - , parent=parent - , declaration=class_inst ) + def __init__(self, class_inst, wrapper=None ): + scoped.scoped_t.__init__( self, declaration=class_inst ) self._wrapper = wrapper self.works_on_instance = False @@ -299,10 +295,8 @@ Creates C++ code that creates wrapper arround some class """ - def __init__(self, declaration, class_creator, parent=None ): - scoped.scoped_t.__init__( self - , parent=parent - , declaration=declaration ) + def __init__(self, declaration, class_creator ): + scoped.scoped_t.__init__( self, declaration=declaration ) self._class_creator = class_creator self._base_wrappers = [] Modified: pyplusplus_dev/pyplusplus/code_creators/code_creator.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/code_creator.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/code_creator.py 2006-06-29 06:18:44 UTC (rev 262) @@ -23,16 +23,14 @@ __INDENTATION = ' ' LINE_LENGTH = 80 PARAM_SEPARATOR = ', ' - def __init__(self, parent=None): + def __init__(self): """Constructor. @param parent: Parent code creator. @type parent: code_creator_t """ object.__init__(self) - if parent: - assert isinstance( parent, code_creator_t ) - self._parent = parent + self._parent = None self._target_configuration = None self._works_on_instance = True Modified: pyplusplus_dev/pyplusplus/code_creators/compound.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/compound.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/compound.py 2006-06-29 06:18:44 UTC (rev 262) @@ -7,13 +7,13 @@ import code_creator class compound_t(code_creator.code_creator_t): - def __init__(self, parent=None): + def __init__(self ): """Constructor. @param parent: Parent code creator. @type parent: L{code_creator_t} """ - code_creator.code_creator_t.__init__( self, parent ) + code_creator.code_creator_t.__init__( self ) self._creators = [] def _get_creators(self): Modified: pyplusplus_dev/pyplusplus/code_creators/custom.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/custom.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/custom.py 2006-06-29 06:18:44 UTC (rev 262) @@ -6,20 +6,20 @@ import code_creator class custom_t(code_creator.code_creator_t): - def __init__(self, parent=None, works_on_instance=True): + def __init__(self, works_on_instance=True): """ Base class for custom code. works_on_instance: If true, the custom code can be applied directly to obj inst. Ex: ObjInst."CustomCode" """ - code_creator.code_creator_t.__init__(self, parent) + code_creator.code_creator_t.__init__(self) self.works_on_instance = works_on_instance def _create_impl(self): raise NotImplementedError() class custom_text_t(custom_t): - def __init__(self, text, parent=None, works_on_instance=True): - custom_t.__init__(self, parent, works_on_instance) + def __init__(self, text, works_on_instance=True): + custom_t.__init__(self, works_on_instance) self._text = text def _get_text(self): Modified: pyplusplus_dev/pyplusplus/code_creators/declaration_based.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/declaration_based.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/declaration_based.py 2006-06-29 06:18:44 UTC (rev 262) @@ -9,7 +9,7 @@ class declaration_based_t(code_creator.code_creator_t): """Code creator that is based on a declaration. """ - def __init__(self, declaration, parent=None ): + def __init__(self, declaration ): """Constructor. @param declaration: Declaration object @@ -17,7 +17,7 @@ @param parent: Parent code creator. @type parent: code_creator_t """ - code_creator.code_creator_t.__init__(self, parent) + code_creator.code_creator_t.__init__(self) self._decl = declaration def _create_impl(self): Modified: pyplusplus_dev/pyplusplus/code_creators/enum.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/enum.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/enum.py 2006-06-29 06:18:44 UTC (rev 262) @@ -11,10 +11,8 @@ """ Creates boost.python code that expose C++ enum """ - def __init__(self, enum, parent=None ): - declaration_based.declaration_based_t.__init__( self - , parent=parent - , declaration=enum) + def __init__(self, enum ): + declaration_based.declaration_based_t.__init__( self, declaration=enum) self.works_on_instance = False def _get_value_aliases(self): Modified: pyplusplus_dev/pyplusplus/code_creators/global_variable.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/global_variable.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/global_variable.py 2006-06-29 06:18:44 UTC (rev 262) @@ -17,10 +17,8 @@ Base class for all global variables code creators. Mainly exists to simplify file writers algorithms. """ - def __init__(self, variable, wrapper=None, parent=None ): - declaration_based.declaration_based_t.__init__( self - , parent=parent - , declaration=variable) + def __init__(self, variable, wrapper=None ): + declaration_based.declaration_based_t.__init__( self, declaration=variable) self._wrapper = wrapper def _get_wrapper( self ): @@ -33,10 +31,8 @@ """ Creates boost.python code that exposes global variable. """ - def __init__(self, variable, parent=None ): - global_variable_base_t.__init__( self - , variable=variable - , parent=parent ) + def __init__(self, variable ): + global_variable_base_t.__init__( self, variable=variable ) def _create_impl(self): assert isinstance( self.declaration, pygccxml.declarations.variable_t ) @@ -53,11 +49,8 @@ """ _PARAM_SEPARATOR = ', ' - def __init__(self, variable, wrapper, parent=None ): - global_variable_base_t.__init__( self - , variable=variable - , wrapper=wrapper - , parent=parent ) + def __init__(self, variable, wrapper ): + global_variable_base_t.__init__( self, variable=variable, wrapper=wrapper ) def _create_impl( self ): answer = [] @@ -73,10 +66,8 @@ Creates C++ code that register array class. """ - def __init__(self, variable, parent=None ): - declaration_based.declaration_based_t.__init__( self - , parent=parent - , declaration=variable) + def __init__(self, variable ): + declaration_based.declaration_based_t.__init__( self, declaration=variable) def _get_wrapper_type( self ): ns_name = code_repository.array_1.namespace Modified: pyplusplus_dev/pyplusplus/code_creators/include.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/include.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/include.py 2006-06-29 06:18:44 UTC (rev 262) @@ -12,8 +12,8 @@ """ Creates C++ code for include directive """ - def __init__( self, header, parent=None ): - code_creator.code_creator_t.__init__(self, parent) + def __init__( self, header ): + code_creator.code_creator_t.__init__(self) self._header = include_directories.include_directories_t.normalize( header ) self._include_dirs_optimization = None #This parameter will be set from module_t.create function Modified: pyplusplus_dev/pyplusplus/code_creators/include_directories.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/include_directories.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/include_directories.py 2006-06-29 06:18:44 UTC (rev 262) @@ -13,8 +13,8 @@ L{include_t} and {precompiled_header_t} code creators use it to generate relative include directives. """ - def __init__(self, parent=None ): - instruction.instruction_t.__init__(self, parent) + def __init__(self): + instruction.instruction_t.__init__(self) self._user_defined = [] self._std = [] Modified: pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2006-06-29 06:18:44 UTC (rev 262) @@ -11,8 +11,8 @@ from pygccxml import declarations class indexing_suite1_t( declaration_based.declaration_based_t ): - def __init__(self, container, parent=None ): - declaration_based.declaration_based_t.__init__( self, declaration=container, parent=parent ) + def __init__(self, container ): + declaration_based.declaration_based_t.__init__( self, declaration=container ) def _get_configuration( self ): return self.declaration.indexing_suite @@ -47,8 +47,8 @@ class indexing_suite2_t( declaration_based.declaration_based_t ): - def __init__(self, container, parent=None ): - declaration_based.declaration_based_t.__init__( self, declaration=container, parent=parent ) + def __init__(self, container ): + declaration_based.declaration_based_t.__init__( self, declaration=container ) self.__method_mask_var_name = "methods_mask" self.works_on_instance = not self.does_user_disable_methods() @@ -104,15 +104,15 @@ return ''.join( answer ) class value_traits_t( declaration_based.declaration_based_t ): - def __init__( self, value_class, parent=None ): - declaration_based.declaration_based_t.__init__( self, declaration=value_class, parent=parent ) + def __init__( self, value_class ): + declaration_based.declaration_based_t.__init__( self, declaration=value_class ) def generate_value_traits( self ): tmpl = os.linesep.join([ "namespace boost { namespace python { namespace indexing {" , "" , "template<>" - , "struct value_traits<%(value_class)s>{" + , "struct value_traits< %(value_class)s >{" , "" , self.indent( "static bool const equality_comparable = %(has_equal)s;" ) , self.indent( "static bool const less_than_comparable = %(has_lessthan)s;" ) Modified: pyplusplus_dev/pyplusplus/code_creators/instruction.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/instruction.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/instruction.py 2006-06-29 06:18:44 UTC (rev 262) @@ -11,8 +11,8 @@ This class is used as a base class for different instruction for code creators. """ #TODO: add silent option and make it default - def __init__(self, parent, silent=True): - code_creator.code_creator_t.__init__(self, parent) + def __init__(self, silent=True): + code_creator.code_creator_t.__init__(self) self._silent = silent def get_silent(self): Modified: pyplusplus_dev/pyplusplus/code_creators/license.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/license.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/license.py 2006-06-29 06:18:44 UTC (rev 262) @@ -10,8 +10,8 @@ This class allows user to put his license on the top of every generated file. License text will be generated as is. """ - def __init__(self, text, parent=None): - code_creator.code_creator_t.__init__(self, parent) + def __init__(self, text ): + code_creator.code_creator_t.__init__(self) self._text = text def _get_text(self): Modified: pyplusplus_dev/pyplusplus/code_creators/member_variable.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/member_variable.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/member_variable.py 2006-06-29 06:18:44 UTC (rev 262) @@ -16,10 +16,8 @@ simplify file writers algorithms. """ - def __init__(self, variable, wrapper=None, parent=None ): - declaration_based.declaration_based_t.__init__( self - , parent=parent - , declaration=variable) + def __init__(self, variable, wrapper=None ): + declaration_based.declaration_based_t.__init__( self, declaration=variable) self._wrapper = wrapper def _get_wrapper( self ): @@ -32,8 +30,8 @@ """ Creates boost.python code that exposes member variable. """ - def __init__(self, variable, wrapper=None, parent=None ): - member_variable_base_t.__init__( self, variable=variable, wrapper=wrapper, parent=parent) + def __init__(self, variable, wrapper=None ): + member_variable_base_t.__init__( self, variable=variable, wrapper=wrapper ) #> On Wednesday, 19. April 2006 23:05, Ralf W. Grosse-Kunstleve wrote: #> .add_property("p", make_function(&A::get_p, return_value_policy<reference_existing_object>())) @@ -159,10 +157,8 @@ , '' ]) - def __init__(self, variable, parent=None ): - declaration_based.declaration_based_t.__init__( self - , parent=parent - , declaration=variable) + def __init__(self, variable ): + declaration_based.declaration_based_t.__init__( self, declaration=variable) def _get_getter_full_name(self): return self.parent.full_name + '::' + 'get_' + self.declaration.name @@ -232,11 +228,8 @@ """ Creates boost.python code that exposes bit fields member variables """ - def __init__(self, variable, wrapper, parent=None ): - member_variable_base_t.__init__( self - , variable=variable - , wrapper=wrapper - , parent=parent) + def __init__(self, variable, wrapper ): + member_variable_base_t.__init__( self, variable=variable, wrapper=wrapper ) def _create_impl( self ): if self.declaration.type_qualifiers.has_static: @@ -285,10 +278,8 @@ , '' ]) - def __init__(self, variable, parent=None ): - declaration_based.declaration_based_t.__init__( self - , parent=parent - , declaration=variable) + def __init__(self, variable ): + declaration_based.declaration_based_t.__init__( self, declaration=variable) def _get_getter_full_name(self): return self.parent.full_name + '::' + 'get_' + self.declaration.name @@ -331,11 +322,8 @@ """ Creates boost.python code that exposes array member variable. """ - def __init__(self, variable, wrapper, parent=None ): - member_variable_base_t.__init__( self - , variable=variable - , wrapper=wrapper - , parent=parent ) + def __init__(self, variable, wrapper ): + member_variable_base_t.__init__( self, variable=variable, wrapper=wrapper ) def _create_impl( self ): assert isinstance( self.wrapper, array_mv_wrapper_t ) @@ -366,10 +354,8 @@ Creates C++ code that register array class. """ - def __init__(self, variable, parent=None ): - declaration_based.declaration_based_t.__init__( self - , parent=parent - , declaration=variable) + def __init__(self, variable ): + declaration_based.declaration_based_t.__init__( self, declaration=variable) def _get_wrapper_type( self ): ns_name = code_repository.array_1.namespace @@ -420,11 +406,8 @@ """ Creates C++ code that creates accessor for class member variable, that has type reference. """ - def __init__(self, variable, wrapper, parent=None ): - member_variable_base_t.__init__( self - , variable=variable - , wrapper=wrapper - , parent=parent) + def __init__(self, variable, wrapper ): + member_variable_base_t.__init__( self, variable=variable, wrapper=wrapper ) self.param_sep = os.linesep + self.indent( self.PARAM_SEPARATOR, 2 ) self.works_on_instance = False @@ -488,10 +471,8 @@ , '' ]) - def __init__(self, variable, parent=None ): - declaration_based.declaration_based_t.__init__( self - , parent=parent - , declaration=variable) + def __init__(self, variable ): + declaration_based.declaration_based_t.__init__( self, declaration=variable) def _get_getter_full_name(self): return self.parent.full_name + '::' + 'get_' + self.declaration.name Modified: pyplusplus_dev/pyplusplus/code_creators/module.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/module.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/module.py 2006-06-29 06:18:44 UTC (rev 262) @@ -21,7 +21,7 @@ def __init__(self): """Constructor. """ - compound.compound_t.__init__(self, None) + compound.compound_t.__init__(self) self.__system_headers = [] def add_system_header( self, header ): @@ -38,7 +38,7 @@ , where=self.creators , recursive=False) if 0 == len( include_dirs ): - include_dirs = include_directories.include_directories_t(parent=self) + include_dirs = include_directories.include_directories_t() if self.license: self.adopt_creator( include_dirs, 1 ) else: Modified: pyplusplus_dev/pyplusplus/code_creators/module_body.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/module_body.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/module_body.py 2006-06-29 06:18:44 UTC (rev 262) @@ -7,8 +7,8 @@ import compound class module_body_t(compound.compound_t): - def __init__( self, name, parent=None ): - compound.compound_t.__init__(self, parent) + def __init__( self, name ): + compound.compound_t.__init__(self ) self._name = name def _get_name(self): Modified: pyplusplus_dev/pyplusplus/code_creators/namespace.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/namespace.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/namespace.py 2006-06-29 06:18:44 UTC (rev 262) @@ -6,8 +6,8 @@ import code_creator class namespace_alias_t(code_creator.code_creator_t): - def __init__( self, alias, full_namespace_name, parent=None ): - code_creator.code_creator_t.__init__(self, parent) + def __init__( self, alias, full_namespace_name ): + code_creator.code_creator_t.__init__( self ) self._alias = alias self._full_namespace_name = full_namespace_name @@ -27,8 +27,8 @@ return 'namespace %s = %s;' % ( self.alias, self.full_namespace_name ) class namespace_using_t(code_creator.code_creator_t): - def __init__( self, namespace_name, parent=None ): - code_creator.code_creator_t.__init__(self, parent) + def __init__( self, namespace_name ): + code_creator.code_creator_t.__init__(self ) self._namespace_name = namespace_name def _get_namespace_name( self ): Modified: pyplusplus_dev/pyplusplus/code_creators/scoped.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/scoped.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/scoped.py 2006-06-29 06:18:44 UTC (rev 262) @@ -8,11 +8,9 @@ import declaration_based class scoped_t(declaration_based.declaration_based_t, compound.compound_t): - def __init__( self, declaration, parent=None ): - declaration_based.declaration_based_t.__init__( self - , parent=parent - , declaration=declaration) - compound.compound_t.__init__( self, parent ) + def __init__( self, declaration ): + declaration_based.declaration_based_t.__init__( self, declaration=declaration) + compound.compound_t.__init__( self ) def _create_impl(self): #template method pattern should be used. Modified: pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py 2006-06-29 06:18:44 UTC (rev 262) @@ -37,9 +37,9 @@ Lets boost python know that it can use smart_ptr to hold a an object. See: http://www.boost.org/libs/python/doc/v2/register_ptr_to_python.html """ - def __init__( self, smart_ptr, class_creator, parent=None ): + def __init__( self, smart_ptr, class_creator ): """ smart_ptr: string of ptr type. Ex: 'boost::shared_ptr' """ - declaration_based.declaration_based_t.__init__( self, class_creator.declaration, parent ) + declaration_based.declaration_based_t.__init__( self, class_creator.declaration ) self._smart_ptr = smart_ptr self._class_creator = class_creator self.works_on_instance = False @@ -73,8 +73,8 @@ conversion from source to target. See: http://www.boost.org/libs/python/doc/v2/implicit.html """ - def __init__( self, smart_ptr, source, target, parent=None ): - declaration_based.declaration_based_t.__init__( self, source, parent ) + def __init__( self, smart_ptr, source, target ): + declaration_based.declaration_based_t.__init__( self, source ) self._target = target self._smart_ptr = smart_ptr self.works_on_instance = False Modified: pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py 2006-06-29 06:18:44 UTC (rev 262) @@ -9,10 +9,8 @@ import declaration_based class unnamed_enum_t( declaration_based.declaration_based_t ): - def __init__(self, unnamed_enum, parent=None ): - declaration_based.declaration_based_t.__init__( self - , parent=parent - , declaration=unnamed_enum) + def __init__(self, unnamed_enum ): + declaration_based.declaration_based_t.__init__( self, declaration=unnamed_enum) self.works_on_instance = False def _get_value_aliases(self): Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py =================================================================== --- pyplusplus_dev/pyplusplus/module_creator/creator.py 2006-06-28 20:16:11 UTC (rev 261) +++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2006-06-29 06:18:44 UTC (rev 262) @@ -371,19 +371,24 @@ #supported container : [ header file, is already used ] + used_headers = set() isuite1 = { - 'vector<' : [ "boost/python/suite/indexing/vector_indexing_suite.hpp", False ] - , 'map<' : [ "boost/python/suite/indexing/map_indexing_suite.hpp", False ] + 'vector<' : "boost/python/suite/indexing/vector_indexing_suite.hpp" + , 'map<' : "boost/python/suite/indexing/map_indexing_suite.hpp" } - #include <boost/python/suite/indexing/vector.hpp> - - container_suite_header_was_used = False - container_suite_header = "boost/python/suite/indexing/container_suite.hpp" isuite2 = { - 'vector<' : [ "boost/python/suite/indexing/vector.hpp", False ] + '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" + , '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 } + container_suite_header = "boost/python/suite/indexing/container_suite.hpp" for cls in self.__types_db.used_containers: container_name = cls.name.split( '<' )[0] + '<' @@ -395,15 +400,10 @@ if not isuite.has_key( container_name ): continue #not supported - if isuite is isuite2 and not container_suite_header_was_used: - container_suite_header_was_used = True - self.__extmodule.add_system_header( container_suite_header ) - self.__extmodule.add_include( container_suite_header ) + if isuite is isuite2: + used_headers.add( container_suite_header ) - if not isuite[ container_name ][1]: - isuite[ container_name ][1] = True - self.__extmodule.add_system_header( isuite[ container_name ][0] ) - self.__extmodule.add_include( header=isuite[ container_name ][0] ) + used_headers.add( isuite[ container_name ] ) cls_creator = create_cls_cc( cls ) value_type = cls.indexing_suite.value_type() @@ -420,7 +420,17 @@ self.__extmodule.adopt_creator( value_type_cc, self.__extmodule.creators.index( self.__module_body ) ) cls_creator.adopt_creator( code_creators.indexing_suite2_t(cls) ) self.__module_body.adopt_creator( cls_creator ) - + + if container_suite_header in used_headers: + #I want this header to be the first one. + used_headers.remove( container_suite_header ) + self.__extmodule.add_system_header( container_suite_header ) + self.__extmodule.add_include( container_suite_header ) + + for header in used_headers: + self.__extmodule.add_system_header( header ) + self.__extmodule.add_include( header ) + 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...> - 2006-07-08 18:48:58
|
Revision: 280 Author: roman_yakovenko Date: 2006-07-08 11:48:46 -0700 (Sat, 08 Jul 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=280&view=rev Log Message: ----------- improve readability and bug fix for msvc7.1 operator() Modified Paths: -------------- pyplusplus_dev/pyplusplus/code_creators/calldef.py pyplusplus_dev/pyplusplus/code_creators/class_declaration.py pyplusplus_dev/pyplusplus/code_creators/declaration_based.py Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2006-07-08 18:27:50 UTC (rev 279) +++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2006-07-08 18:48:46 UTC (rev 280) @@ -41,7 +41,7 @@ return algorithm.create_identifier( self, '::boost::python::pure_virtual' ) def param_sep(self): - return os.linesep + self.indent( self.PARAM_SEPARATOR, 2 ) + return os.linesep + self.indent( self.PARAM_SEPARATOR ) def keywords_args(self): boost_arg = algorithm.create_identifier( self, '::boost::python::arg' ) @@ -66,21 +66,34 @@ result.append( ' )' ) return ''.join( result ) - def create_def_code( self ): - return 'def' + def create_def_code( self ): + if not self.works_on_instance: + return '%s.def' % self.parent.class_var_name + else: + return 'def' - def create_function_ref_code( self ): + def create_function_ref_code( self, use_function_alias=False ): raise NotImplementedError() + + def _get_function_type_alias( self ): + return 'function_ptr_t' + function_type_alias = property( _get_function_type_alias ) + def create_function_type_alias_code( self ): + raise NotImplementedError() + def _create_impl( self ): result = [] - result.append( self.create_def_code() ) - result.append( '( ' ) - result.append( os.linesep + self.indent( '"%s"' % self.alias, 2 ) ) + if False == self.works_on_instance: + result.append( self.create_function_type_alias_code() ) + result.append( os.linesep * 2 ) + + result.append( self.create_def_code() + '( ' ) + result.append( os.linesep + self.indent( '"%s"' % self.alias ) ) result.append( self.param_sep() ) - result.append( self.create_function_ref_code() ) + result.append( self.create_function_ref_code( not self.works_on_instance ) ) if self.declaration.use_keywords: result.append( self.param_sep() ) @@ -96,6 +109,15 @@ if not self.works_on_instance: result.append( ';' ) + if not self.works_on_instance: + #indenting and adding scope + code = ''.join( result ) + result = [ '{ //%s' % declarations.full_name( self.declaration ) ] + result.append( os.linesep * 2 ) + result.append( self.indent( code ) ) + result.append( os.linesep * 2 ) + result.append( '}' ) + return ''.join( result ) @@ -164,12 +186,18 @@ def __init__( self, function ): calldef_t.__init__( self, function=function ) self.works_on_instance = False - + def create_def_code( self ): return self.def_identifier() - def create_function_ref_code(self): - if self.declaration.create_with_signature: + def create_function_type_alias_code( self ): + return 'typedef ' + self.declaration.function_type().create_typedef( self.function_type_alias ) + ';' + + def create_function_ref_code(self, use_function_alias=False): + if use_function_alias: + return '%s( &%s )' \ + % ( self.function_type_alias, declarations.full_name( self.declaration ) ) + elif self.declaration.create_with_signature: return '(%s)( &%s )' \ % ( self.declaration.function_type().decl_string , declarations.full_name( self.declaration ) ) @@ -179,9 +207,15 @@ class mem_fun_t( calldef_t ): def __init__( self, function ): calldef_t.__init__( self, function=function ) - - def create_function_ref_code(self): - if self.declaration.create_with_signature: + + def create_function_type_alias_code( self ): + return 'typedef ' + self.declaration.function_type().create_typedef( self.function_type_alias ) + ';' + + def create_function_ref_code(self, use_function_alias=False): + if use_function_alias: + return '%s( &%s )' \ + % ( self.function_type_alias, declarations.full_name( self.declaration ) ) + elif self.declaration.create_with_signature: return '(%s)( &%s )' \ % ( self.declaration.function_type().decl_string , declarations.full_name( self.declaration ) ) @@ -192,9 +226,17 @@ class mem_fun_pv_t( calldef_t ): def __init__( self, function, wrapper ): calldef_t.__init__( self, function=function, wrapper=wrapper ) - - def create_function_ref_code(self): - if self.declaration.create_with_signature: + + def create_function_type_alias_code( self ): + return 'typedef ' + self.declaration.function_type().create_typedef( self.function_type_alias ) + ';' + + def create_function_ref_code(self, use_function_alias=False): + if use_function_alias: + return '%s( %s(&%s) )' \ + % ( self.pure_virtual_identifier() + , self.function_type_alias + , declarations.full_name( self.declaration ) ) + elif self.declaration.create_with_signature: return '%s( (%s)(&%s) )' \ % ( self.pure_virtual_identifier() , self.declaration.function_type().decl_string @@ -251,10 +293,26 @@ class mem_fun_v_t( calldef_t ): def __init__( self, function, wrapper=None ): calldef_t.__init__( self, function=function, wrapper=wrapper ) + self.default_function_type_alias = 'default_' + self.function_type_alias + + def create_function_type_alias_code( self ): + result = [] + result.append( 'typedef ' + self.declaration.function_type().create_typedef( self.function_type_alias ) + ';' ) + if self.wrapper: + result.append( os.linesep ) + result.append( 'typedef ' + self.wrapper.function_type().create_typedef( self.default_function_type_alias ) + ';' ) + return ''.join( result ) - def create_function_ref_code(self): - result = [] - if self.declaration.create_with_signature: + def create_function_ref_code(self, use_function_alias=False): + result = [] + if use_function_alias: + result.append( '%s(&%s)' + % ( self.function_type_alias, declarations.full_name( self.declaration ) ) ) + if self.wrapper: + result.append( self.param_sep() ) + result.append( '%s(&%s)' + % ( self.default_function_type_alias, self.wrapper.default_full_name() ) ) + elif self.declaration.create_with_signature: result.append( '(%s)(&%s)' % ( self.declaration.function_type().decl_string , declarations.full_name( self.declaration ) ) ) @@ -355,8 +413,14 @@ def __init__( self, function, wrapper ): calldef_t.__init__( self, function=function, wrapper=wrapper ) - def create_function_ref_code(self): - if self.declaration.create_with_signature: + def create_function_type_alias_code( self ): + return 'typedef ' + self.wrapper.function_type().create_typedef( self.function_type_alias ) + ';' + + def create_function_ref_code(self, use_function_alias=False): + if use_function_alias: + return '%s( &%s )' \ + % ( self.function_type_alias, self.wrapper.full_name() ) + elif self.declaration.create_with_signature: return '(%s)(&%s)' \ % ( self.wrapper.function_type().decl_string, self.wrapper.full_name() ) else: @@ -419,9 +483,15 @@ class mem_fun_protected_s_t( calldef_t ): def __init__( self, function, wrapper ): calldef_t.__init__( self, function=function, wrapper=wrapper ) - - def create_function_ref_code(self): - if self.declaration.create_with_signature: + + def create_function_type_alias_code( self ): + return 'typedef ' + self.wrapper.function_type().create_typedef( self.function_type_alias ) + ';' + + def create_function_ref_code(self, use_function_alias=False): + if use_function_alias: + return '%s( &%s )' \ + % ( self.function_type_alias, self.wrapper.full_name() ) + elif self.declaration.create_with_signature: return '(%s)(&%s)' \ % ( self.wrapper.function_type().decl_string, self.wrapper.full_name() ) else: @@ -475,9 +545,15 @@ class mem_fun_protected_v_t( calldef_t ): def __init__( self, function, wrapper ): calldef_t.__init__( self, function=function, wrapper=wrapper ) - - def create_function_ref_code(self): - if self.declaration.create_with_signature: + + def create_function_type_alias_code( self ): + return 'typedef ' + self.wrapper.function_type().create_typedef( self.function_type_alias ) + ';' + + def create_function_ref_code(self, use_function_alias=False): + if use_function_alias: + return '%s( &%s )' \ + % ( self.function_type_alias, self.wrapper.full_name() ) + elif self.declaration.create_with_signature: return '(%s)(&%s)' \ % ( self.wrapper.function_type().decl_string, self.wrapper.full_name() ) else: @@ -545,9 +621,15 @@ class mem_fun_protected_pv_t( calldef_t ): def __init__( self, function, wrapper ): calldef_t.__init__( self, function=function, wrapper=wrapper ) + + def create_function_type_alias_code( self ): + return 'typedef ' + self.wrapper.function_type().create_typedef( self.function_type_alias ) + ';' - def create_function_ref_code(self): - if self.declaration.create_with_signature: + def create_function_ref_code(self, use_function_alias=False): + if use_function_alias: + return '%s( &%s )' \ + % ( self.function_type_alias, self.wrapper.full_name() ) + elif self.declaration.create_with_signature: return '(%s)(&%s)' \ % ( self.wrapper.function_type().decl_string, self.wrapper.full_name() ) else: @@ -729,7 +811,10 @@ return ''.join( answer ) def _create_impl( self ): - return 'def( %s )' % self.create_init_code() + code = 'def( %s )' % self.create_init_code() + if not self.works_on_instance: + code = self.parent.class_var_name + '.' + code + ';' + return code class static_method_t( declaration_based.declaration_based_t ): """ Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2006-07-08 18:27:50 UTC (rev 279) +++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2006-07-08 18:48:46 UTC (rev 280) @@ -263,6 +263,10 @@ for x in creators: if x is used_init: continue + if isinstance( x, calldef.calldef_t ): + x.works_on_instance = False + result.append( x.create() ) + continue if not x.works_on_instance: result.append( x.create() ) else: @@ -270,9 +274,9 @@ code = os.linesep.join( result ) - result = [ '{ //scope begin' ] + result = [ '{ //%s' % declarations.full_name( self.declaration ) ] result.append( self.indent( code ) ) - result.append( '} //scope end' ) + result.append( '}' ) return os.linesep.join( result ) Modified: pyplusplus_dev/pyplusplus/code_creators/declaration_based.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/declaration_based.py 2006-07-08 18:27:50 UTC (rev 279) +++ pyplusplus_dev/pyplusplus/code_creators/declaration_based.py 2006-07-08 18:48:46 UTC (rev 280) @@ -44,4 +44,5 @@ def _get_decl_identifier( self ): return algorithm.create_identifier( self, self.declaration.decl_string ) - decl_identifier = property( _get_decl_identifier ) \ No newline at end of file + decl_identifier = property( _get_decl_identifier ) + \ 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...> - 2006-09-20 19:57:43
|
Revision: 567
http://svn.sourceforge.net/pygccxml/?rev=567&view=rev
Author: roman_yakovenko
Date: 2006-09-20 12:57:24 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
small refactoring, that introduce new base class:
registration_based_t code creator. It keeps list of
associated global declaration creators
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/array_1_registrator.py
pyplusplus_dev/pyplusplus/code_creators/calldef.py
pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
pyplusplus_dev/pyplusplus/code_creators/declaration_based.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/member_variable.py
pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py
pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py
Added Paths:
-----------
pyplusplus_dev/pyplusplus/code_creators/registration_based.py
Modified: pyplusplus_dev/pyplusplus/code_creators/array_1_registrator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/array_1_registrator.py 2006-09-20 18:26:26 UTC (rev 566)
+++ pyplusplus_dev/pyplusplus/code_creators/array_1_registrator.py 2006-09-20 19:57:24 UTC (rev 567)
@@ -6,18 +6,18 @@
import os
import algorithm
-import code_creator
+import registration_based
from pyplusplus import code_repository
from pyplusplus.decl_wrappers import call_policies
from pyplusplus.decl_wrappers import python_traits
from pygccxml import declarations
-class array_1_registrator_t( code_creator.code_creator_t ):
+class array_1_registrator_t( registration_based.registration_based_t ):
"""
This class creates code that register static sized array
"""
def __init__( self, array_type ):
- code_creator.code_creator_t.__init__( self )
+ registration_based.registration_based_t.__init__( self )
self._array_type = array_type
self._call_policies = self._guess_call_policies()
self.works_on_instance = False
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2006-09-20 18:26:26 UTC (rev 566)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2006-09-20 19:57:24 UTC (rev 567)
@@ -7,6 +7,7 @@
import algorithm
import code_creator
import declaration_based
+import registration_based
import class_declaration
from pygccxml import declarations
from pyplusplus import decl_wrappers
@@ -26,8 +27,10 @@
#protected member functions - call, override
#private - override
-class calldef_t( declaration_based.declaration_based_t):
+class calldef_t( registration_based.registration_based_t
+ , declaration_based.declaration_based_t ):
def __init__(self, function, wrapper=None ):
+ registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=function )
self._wrapper = wrapper
self._associated_decl_creators = []
@@ -154,8 +157,10 @@
return ''.join( result )
-class calldef_wrapper_t( declaration_based.declaration_based_t):
+class calldef_wrapper_t( code_creator.code_creator_t
+ , declaration_based.declaration_based_t):
def __init__(self, function ):
+ code_creator.code_creator_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=function )
def argument_name( self, index ):
@@ -795,22 +800,6 @@
mem_fun_private_pv_wrapper_t = mem_fun_private_v_wrapper_t
-
-#class protected_helper_t( object ):
- #def __init__( self ):
- #object.__init__( self )
-
- #def wclass_inst_arg_type( self ):
- #inst_arg_type = declarations.declarated_t( self.declaration.parent )
- #if self.declaration.has_const:
- #inst_arg_type = declarations.const_t(inst_arg_type)
- #inst_arg_type = declarations.reference_t(inst_arg_type)
- #return inst_arg_type
-
- #def wclass_inst_arg( self ):
- #return self.wclass_inst_arg_type().decl_string + ' wcls_inst'
-
-
class constructor_t( calldef_t ):
"""
Creates boost.python code needed to expose constructor.
@@ -867,11 +856,13 @@
code = self.parent.class_var_name + '.' + code + ';'
return code
-class static_method_t( declaration_based.declaration_based_t ):
+class static_method_t( declaration_based.declaration_based_t
+ , registration_based.registration_based_t ):
"""
Creates boost.python code that expose member function as static function.
"""
def __init__(self, function, function_code_creator=None ):
+ registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=function )
self._function_code_creator = function_code_creator
@@ -932,11 +923,13 @@
#There are usecases when boost.python requeres
#constructor for wrapper class from exposed class
#I should understand this more
-class copy_constructor_wrapper_t( declaration_based.declaration_based_t ):
+class copy_constructor_wrapper_t( code_creator.code_creator_t
+ , declaration_based.declaration_based_t ):
"""
Creates wrapper class constructor from wrapped class instance.
"""
def __init__( self, class_inst ):
+ code_creator.code_creator_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=class_inst )
def _create_declaration(self):
@@ -968,11 +961,13 @@
return os.linesep.join( answer )
-class null_constructor_wrapper_t( declaration_based.declaration_based_t ):
+class null_constructor_wrapper_t( code_creator.code_creator_t
+ , declaration_based.declaration_based_t ):
"""
Creates wrapper for compiler generated null constructor.
"""
def __init__( self, class_inst ):
+ code_creator.code_creator_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=class_inst )
def _create_constructor_call( self ):
@@ -992,7 +987,8 @@
#in python all operators are members of class, while in C++
#you can define operators that are not.
-class operator_t( declaration_based.declaration_based_t ):
+class operator_t( registration_based.registration_based_t
+ , declaration_based.declaration_based_t ):
"""
Creates boost.python code needed to expose supported subset of C++ operators.
"""
@@ -1002,9 +998,8 @@
BOTH = 'both'
def __init__(self, operator ):
- declaration_based.declaration_based_t.__init__( self
- , declaration=operator
- )
+ registration_based.registration_based_t.__init__( self )
+ declaration_based.declaration_based_t.__init__( self, declaration=operator )
def _call_type_constructor( self, type ):
x = declarations.remove_reference( type )
@@ -1066,11 +1061,13 @@
code = self._create_unary_operator()
return 'def( %s )' % code
-class casting_operator_t( declaration_based.declaration_based_t ):
+class casting_operator_t( registration_based.registration_based_t
+ , declaration_based.declaration_based_t ):
"""
Creates boost.python code needed to register type conversions( implicitly_convertible )
"""
def __init__( self, operator ):
+ registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=operator )
def _create_impl(self):
@@ -1085,13 +1082,15 @@
, [ from_arg , to_arg ] ) \
+ '();'
-class casting_member_operator_t( declaration_based.declaration_based_t ):
+class casting_member_operator_t( registration_based.registration_based_t
+ , declaration_based.declaration_based_t ):
"""
Creates boost.python code needed to register casting operators. For some
operators Pythonic name is given: __int__, __long__, __float__, __str__
"""
def __init__( self, operator ):
+ registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=operator )
def _create_impl(self):
@@ -1118,13 +1117,15 @@
, 'doc' : doc
}
-class casting_constructor_t( declaration_based.declaration_based_t ):
+class casting_constructor_t( registration_based.registration_based_t
+ , declaration_based.declaration_based_t ):
"""
Creates boost.python code needed to register type conversions( implicitly_convertible ).
This case treat situation when class has public non explicit constuctor from
another type.
"""
def __init__( self, constructor ):
+ registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=constructor )
def _create_impl(self):
@@ -1221,9 +1222,9 @@
, 'max' : max_
}
-class calldef_overloads_t( code_creator.code_creator_t ):
+class calldef_overloads_t( registration_based.registration_based_t ):
def __init__( self, overloads_class ):
- code_creator.code_creator_t.__init__( self )
+ registration_based.registration_based_t.__init__( self )
self._overloads_class = overloads_class
@property
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py 2006-09-20 18:26:26 UTC (rev 566)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py 2006-09-20 19:57:24 UTC (rev 567)
@@ -502,4 +502,3 @@
self.declaration.arguments = self._subst_manager.wrapper_func.arg_list
return answer
-
Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2006-09-20 18:26:26 UTC (rev 566)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2006-09-20 19:57:24 UTC (rev 567)
@@ -10,11 +10,14 @@
import algorithm
import smart_pointers
import declaration_based
+import registration_based
from pygccxml import declarations
-class class_declaration_t( scoped.scoped_t ):
+class class_declaration_t( scoped.scoped_t
+ , registration_based.registration_based_t ):
def __init__(self, class_inst ):
scoped.scoped_t.__init__( self, declaration=class_inst )
+ registration_based.registration_based_t.__init__( self )
self.works_on_instance = False
def _generate_class_definition(self):
@@ -78,12 +81,13 @@
return self._generate_code_no_scope()
-class class_t( scoped.scoped_t ):
+class class_t( scoped.scoped_t, registration_based.registration_based_t ):
"""
Creates boost.python code that needed to export a class
"""
def __init__(self, class_inst, wrapper=None ):
scoped.scoped_t.__init__( self, declaration=class_inst )
+ registration_based.registration_based_t.__init__( self )
self._wrapper = wrapper
self.works_on_instance = False
self._associated_decl_creators = []
Modified: pyplusplus_dev/pyplusplus/code_creators/declaration_based.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/declaration_based.py 2006-09-20 18:26:26 UTC (rev 566)
+++ pyplusplus_dev/pyplusplus/code_creators/declaration_based.py 2006-09-20 19:57:24 UTC (rev 567)
@@ -6,7 +6,7 @@
import algorithm
import code_creator
-class declaration_based_t(code_creator.code_creator_t):
+class declaration_based_t:
"""Code creator that is based on a declaration.
"""
def __init__(self, declaration ):
@@ -17,12 +17,8 @@
@param parent: Parent code creator.
@type parent: code_creator_t
"""
- code_creator.code_creator_t.__init__(self)
self._decl = declaration
- def _create_impl(self):
- raise NotImplementedError()
-
def _generate_valid_name(self, name=None):
if name == None:
name = self.declaration.name
@@ -49,4 +45,5 @@
def documentation( self ):
if None is self.declaration.documentation:
return ''
- return self.declaration.documentation
\ No newline at end of file
+ return self.declaration.documentation
+
\ No newline at end of file
Modified: pyplusplus_dev/pyplusplus/code_creators/enum.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/enum.py 2006-09-20 18:26:26 UTC (rev 566)
+++ pyplusplus_dev/pyplusplus/code_creators/enum.py 2006-09-20 19:57:24 UTC (rev 567)
@@ -6,12 +6,15 @@
import os
import algorithm
import declaration_based
+import registration_based
-class enum_t( declaration_based.declaration_based_t ):
+class enum_t( registration_based.registration_based_t
+ , declaration_based.declaration_based_t ):
"""
Creates boost.python code that expose C++ enum
"""
def __init__(self, enum ):
+ registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=enum)
self.works_on_instance = False
Modified: pyplusplus_dev/pyplusplus/code_creators/exception_translator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/exception_translator.py 2006-09-20 18:26:26 UTC (rev 566)
+++ pyplusplus_dev/pyplusplus/code_creators/exception_translator.py 2006-09-20 19:57:24 UTC (rev 567)
@@ -8,10 +8,13 @@
import algorithm
import code_creator
import declaration_based
+import registration_based
from pygccxml import declarations
-class exception_translator_t( declaration_based.declaration_based_t ):
+class exception_translator_t( code_creator.code_creator_t
+ , declaration_based.declaration_based_t ):
def __init__(self, exception_class ):
+ code_creator.code_creator_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=exception_class )
@property
@@ -28,8 +31,10 @@
, 'arg_name' : self.declaration.exception_argument_name }
-class exception_translator_register_t( declaration_based.declaration_based_t ):
+class exception_translator_register_t( registration_based.registration_based_t
+ , declaration_based.declaration_based_t ):
def __init__(self, exception_class, exception_translator):
+ registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=exception_class )
self.works_on_instance = False
self.translator = exception_translator
Modified: pyplusplus_dev/pyplusplus/code_creators/global_variable.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/global_variable.py 2006-09-20 18:26:26 UTC (rev 566)
+++ pyplusplus_dev/pyplusplus/code_creators/global_variable.py 2006-09-20 19:57:24 UTC (rev 567)
@@ -6,17 +6,21 @@
import os
import pygccxml
import algorithm
+import code_creator
import declaration_based
+import registration_based
from pygccxml import declarations
from pyplusplus import code_repository
#TODO: if variable is not const, then export it using boost::python::ptr
-class global_variable_base_t( declaration_based.declaration_based_t ):
+class global_variable_base_t( registration_based.registration_based_t
+ , declaration_based.declaration_based_t ):
"""
Base class for all global variables code creators. Mainly exists to
simplify file writers algorithms.
"""
def __init__(self, variable, wrapper=None ):
+ registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=variable)
self._wrapper = wrapper
@@ -60,12 +64,14 @@
answer.append( '();' )
return ''.join( answer )
-class array_gv_wrapper_t( declaration_based.declaration_based_t ):
+class array_gv_wrapper_t( code_creator.code_creator_t
+ , declaration_based.declaration_based_t ):
"""
Creates C++ code that register array class.
"""
def __init__(self, variable ):
+ code_creator.code_creator_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=variable)
def _get_wrapper_type( self ):
Modified: pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2006-09-20 18:26:26 UTC (rev 566)
+++ pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2006-09-20 19:57:24 UTC (rev 567)
@@ -8,10 +8,13 @@
import algorithm
import code_creator
import declaration_based
+import registration_based
from pygccxml import declarations
-class indexing_suite1_t( declaration_based.declaration_based_t ):
+class indexing_suite1_t( registration_based.registration_based_t
+ , declaration_based.declaration_based_t ):
def __init__(self, container ):
+ registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=container )
def _get_configuration( self ):
@@ -47,8 +50,10 @@
return "def( %s() )" % self._create_suite_declaration()
-class indexing_suite2_t( declaration_based.declaration_based_t ):
+class indexing_suite2_t( registration_based.registration_based_t
+ , declaration_based.declaration_based_t ):
def __init__(self, container ):
+ registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=container )
self.__method_mask_var_name = "methods_mask"
self.works_on_instance = not self.does_user_disable_methods()
@@ -104,8 +109,10 @@
answer.append( ';' )
return ''.join( answer )
-class value_traits_t( declaration_based.declaration_based_t ):
+class value_traits_t( code_creator.code_creator_t
+ , declaration_based.declaration_based_t ):
def __init__( self, value_class ):
+ code_creator.code_creator_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=value_class )
def generate_value_traits( self ):
Modified: pyplusplus_dev/pyplusplus/code_creators/member_variable.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/member_variable.py 2006-09-20 18:26:26 UTC (rev 566)
+++ pyplusplus_dev/pyplusplus/code_creators/member_variable.py 2006-09-20 19:57:24 UTC (rev 567)
@@ -5,19 +5,23 @@
import os
import algorithm
+import code_creator
import declaration_based
from pyplusplus import code_repository
from pyplusplus.decl_wrappers import call_policies
from pyplusplus.decl_wrappers import python_traits
+import registration_based
from pygccxml import declarations
-class member_variable_base_t( declaration_based.declaration_based_t ):
+class member_variable_base_t( registration_based.registration_based_t
+ , declaration_based.declaration_based_t ):
"""
Base class for all member variables code creators. Mainly exists to
simplify file writers algorithms.
"""
def __init__(self, variable, wrapper=None ):
+ registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=variable)
self._wrapper = wrapper
@@ -131,13 +135,14 @@
def _create_impl(self):
return self._generate_variable()
-class member_variable_wrapper_t( declaration_based.declaration_based_t ):
+class member_variable_wrapper_t( code_creator.code_creator_t
+ , declaration_based.declaration_based_t ):
"""
Creates C++ code that creates accessor for pointer class variables
"""
#TODO: give user a way to set call policies
# treat void* pointer
- indent = declaration_based.declaration_based_t.indent
+ indent = code_creator.code_creator_t.indent
MV_GET_TEMPLATE = os.linesep.join([
'static %(type)s get_%(name)s(%(cls_type)s inst ){'
, indent( 'return inst.%(name)s;' )
@@ -167,6 +172,7 @@
])
def __init__(self, variable ):
+ code_creator.code_creator_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=variable)
def _get_getter_full_name(self):
@@ -273,12 +279,13 @@
answer[i] = os.linesep + self.indent( self.indent( self.indent( answer[i] ) ) )
return ''.join( answer )
-class bit_field_wrapper_t( declaration_based.declaration_based_t ):
+class bit_field_wrapper_t( code_creator.code_creator_t
+ , declaration_based.declaration_based_t ):
"""
Creates C++ code that creates accessor for bit fields
"""
- indent = declaration_based.declaration_based_t.indent
+ indent = code_creator.code_creator_t.indent
BF_GET_TEMPLATE = os.linesep.join([
'%(type)s get_%(name)s() const {'
, indent( 'return %(name)s;' )
@@ -294,6 +301,7 @@
])
def __init__(self, variable ):
+ code_creator.code_creator_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=variable)
def _get_getter_full_name(self):
@@ -370,12 +378,14 @@
#TODO: generated fucntion should be static and take instance of the wrapped class
#as first argument.
-class array_mv_wrapper_t( declaration_based.declaration_based_t ):
+class array_mv_wrapper_t( code_creator.code_creator_t
+ , declaration_based.declaration_based_t ):
"""
Creates C++ code that register array class.
"""
def __init__(self, variable ):
+ code_creator.code_creator_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=variable)
def _get_wrapper_type( self ):
@@ -477,12 +487,13 @@
answer.append( "%s.%s;" % (class_var_name, self._create_setter() ) )
return ''.join( answer )
-class mem_var_ref_wrapper_t( declaration_based.declaration_based_t ):
+class mem_var_ref_wrapper_t( code_creator.code_creator_t
+ , declaration_based.declaration_based_t ):
"""
Creates C++ code that creates accessor for class member variable, that has type reference.
"""
- indent = declaration_based.declaration_based_t.indent
+ indent = code_creator.code_creator_t.indent
GET_TEMPLATE = os.linesep.join([
'static %(type)s get_%(name)s( %(class_type)s& inst ) {'
, indent( 'return inst.%(name)s;' )
@@ -498,6 +509,7 @@
])
def __init__(self, variable ):
+ code_creator.code_creator_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=variable)
def _get_getter_full_name(self):
Added: pyplusplus_dev/pyplusplus/code_creators/registration_based.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/registration_based.py (rev 0)
+++ pyplusplus_dev/pyplusplus/code_creators/registration_based.py 2006-09-20 19:57:24 UTC (rev 567)
@@ -0,0 +1,21 @@
+# 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)
+
+import algorithm
+import code_creator
+
+class registration_based_t(code_creator.code_creator_t):
+ """Code creator that is based on a declaration.
+ """
+ def __init__(self, associated_decl_creators=None ):
+ code_creator.code_creator_t.__init__(self)
+ if None is associated_decl_creators:
+ associated_decl_creators = []
+ self._associated_decl_creators = associated_decl_creators
+
+ @property
+ def associated_decl_creators( self ):
+ """ references to global declaration code creators. """
+ return self._associated_decl_creators
Modified: pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py 2006-09-20 18:26:26 UTC (rev 566)
+++ pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py 2006-09-20 19:57:24 UTC (rev 567)
@@ -5,8 +5,10 @@
import os
import algorithm
+import declaration_based
+import registration_based
from pygccxml import declarations
-import declaration_based
+
templates = declarations.templates
class held_type_t(object):
@@ -32,13 +34,15 @@
arg = algorithm.create_identifier( creator, creator.declaration.decl_string )
return templates.join( smart_ptr, [ arg ] )
-class smart_pointer_registrator_t( declaration_based.declaration_based_t ):
+class smart_pointer_registrator_t( registration_based.registration_based_t
+ , declaration_based.declaration_based_t ):
""" Convertor for boost::python::register_ptr_to_python<PTR>.
Lets boost python know that it can use smart_ptr to hold a an object.
See: http://www.boost.org/libs/python/doc/v2/register_ptr_to_python.html
"""
def __init__( self, smart_ptr, class_creator ):
""" smart_ptr: string of ptr type. Ex: 'boost::shared_ptr' """
+ registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, class_creator.declaration )
self._smart_ptr = smart_ptr
self._class_creator = class_creator
@@ -67,13 +71,15 @@
held_type = held_type_t(self.smart_ptr).create( self )
return templates.join( rptp, [ held_type ] ) + '();'
-class smart_pointers_converter_t( declaration_based.declaration_based_t ):
+class smart_pointers_converter_t( registration_based.registration_based_t
+ , declaration_based.declaration_based_t ):
""" creator for boost::python::implicitly_convertible.
This creates a statemnt that allows the usage of C++ implicit
conversion from source to target.
See: http://www.boost.org/libs/python/doc/v2/implicit.html
"""
def __init__( self, smart_ptr, source, target ):
+ registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, source )
self._target = target
self._smart_ptr = smart_ptr
Modified: pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py 2006-09-20 18:26:26 UTC (rev 566)
+++ pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py 2006-09-20 19:57:24 UTC (rev 567)
@@ -7,9 +7,12 @@
import pygccxml
import algorithm
import declaration_based
+import registration_based
-class unnamed_enum_t( declaration_based.declaration_based_t ):
+class unnamed_enum_t( registration_based.registration_based_t
+ , declaration_based.declaration_based_t ):
def __init__(self, unnamed_enum ):
+ registration_based.registration_based_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=unnamed_enum)
self.works_on_instance = False
@@ -26,4 +29,5 @@
for name, value in self.declaration.values:
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
+ return os.linesep.join( result )
+
\ 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...> - 2006-09-23 07:47:45
|
Revision: 576
http://svn.sourceforge.net/pygccxml/?rev=576&view=rev
Author: roman_yakovenko
Date: 2006-09-23 00:47:39 -0700 (Sat, 23 Sep 2006)
Log Message:
-----------
operators & wrapper bug work around
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/calldef.py
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2006-09-22 06:47:02 UTC (rev 575)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2006-09-23 07:47:39 UTC (rev 576)
@@ -889,7 +889,7 @@
result.append( self.parent.wrapper_alias )
result.append( '(' )
args = []
- if self.parent.held_type and not self.target_configuration.boost_python_has_wrapper_held_type:
+ if not self.target_configuration.boost_python_has_wrapper_held_type:
args.append( 'PyObject*' )
args_decl = self.args_declaration()
if args_decl:
@@ -936,7 +936,7 @@
result = []
result.append( self.parent.wrapper_alias )
result.append( '(' )
- if self.parent.held_type and not self.target_configuration.boost_python_has_wrapper_held_type:
+ if not self.target_configuration.boost_python_has_wrapper_held_type:
result.append( 'PyObject*, ' )
declarated = declarations.declarated_t( self.declaration )
const_decl = declarations.const_t( declarated )
@@ -975,7 +975,7 @@
def _create_impl(self):
answer = [ self.parent.wrapper_alias + '(' ]
- if self.parent.held_type and not self.target_configuration.boost_python_has_wrapper_held_type:
+ if not self.target_configuration.boost_python_has_wrapper_held_type:
answer[0] = answer[0] + 'PyObject*'
answer[0] = answer[0] + ')'
answer.append( ': ' + self._create_constructor_call() )
Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2006-09-22 06:47:02 UTC (rev 575)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2006-09-23 07:47:39 UTC (rev 576)
@@ -176,7 +176,7 @@
held_type = self._generated_held_type()
if self.wrapper:
- if held_type and not self.target_configuration.boost_python_has_wrapper_held_type:
+ if not self.target_configuration.boost_python_has_wrapper_held_type:
args.append( algorithm.create_identifier( self, self.declaration.decl_string ) )
args.append( self.wrapper.full_name )
else:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2006-11-21 08:45:01
|
Revision: 738
http://svn.sourceforge.net/pygccxml/?rev=738&view=rev
Author: roman_yakovenko
Date: 2006-11-21 00:44:59 -0800 (Tue, 21 Nov 2006)
Log Message:
-----------
small refactoring, which will allow FT to be implemented without side effects
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/calldef.py
Added Paths:
-----------
pyplusplus_dev/pyplusplus/code_creators/calldef_utils.py
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2006-11-20 20:20:17 UTC (rev 737)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2006-11-21 08:44:59 UTC (rev 738)
@@ -6,27 +6,22 @@
import os
import algorithm
import code_creator
+import calldef_utils
import declaration_based
import registration_based
import class_declaration
from pygccxml import declarations
from pyplusplus import decl_wrappers
-#virtual functions that returns const reference to something
-#could not be overriden by Python. The reason is simple:
-#in boost::python::override::operator(...) result of marshaling
-#(Python 2 C++) is saved on stack, after functions returns the result
-#will be reference to no where - access violetion.
-#For example see temporal variable tester
-
-use_enum_workaround = False
-
#TODO:
#Add to docs:
#public memebr functions - call, override, call base implementation
#protected member functions - call, override
#private - override
+def make_id_creator( code_creator ):
+ return lambda decl_string: algorithm.create_identifier( code_creator, decl_string )
+
class calldef_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
def __init__(self, function, wrapper=None ):
@@ -55,44 +50,9 @@
def param_sep(self):
return os.linesep + self.indent( self.PARAM_SEPARATOR )
- def should_use_enum_wa( self, arg ):
- global use_enum_workaround
- if not declarations.is_enum( arg.type ):
- return False
- if use_enum_workaround:
- return True
- #enum belongs to the class we are working on
- if self.declaration.parent is declarations.enum_declaration( arg.type ).parent \
- and isinstance( self.declaration, declarations.constructor_t ):
- return True
- return False
-
def keywords_args(self):
- boost_arg = algorithm.create_identifier( self, '::boost::python::arg' )
- boost_obj = algorithm.create_identifier( self, '::boost::python::object' )
- result = ['( ']
- for arg in self.declaration.arguments:
- if 1 < len( result ):
- result.append( self.PARAM_SEPARATOR )
- result.append( boost_arg )
- result.append( '("%s")' % arg.name )
- if self.declaration.use_default_arguments and arg.default_value:
- if not declarations.is_pointer( arg.type ) or arg.default_value != '0':
- arg_type_no_alias = declarations.remove_alias( arg.type )
- 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 ) )
- elif self.should_use_enum_wa( arg ):
- #Work around for bug/missing functionality in boost.python.
- #registration order
- result.append( '=(long)(%s)' % arg.default_value )
- else:
- result.append( '=%s' % arg.default_value )
- else:
- result.append( '=%s()' % boost_obj )
- result.append( ' )' )
- return ''.join( result )
+ arg_utils = calldef_utils.argument_utils_t( self.declaration, make_id_creator( self ) )
+ return arg_utils.keywords_args()
def create_def_code( self ):
if not self.works_on_instance:
@@ -175,33 +135,17 @@
code_creator.code_creator_t.__init__( self )
declaration_based.declaration_based_t.__init__( self, declaration=function )
- def argument_name( self, index ):
- arg = self.declaration.arguments[ index ]
- if arg.name:
- return arg.name
- else:
- return 'p%d' % index
-
- def args_declaration( self ):
- args = []
- for index, arg in enumerate( self.declaration.arguments ):
- result = arg.type.decl_string + ' ' + self.argument_name(index)
- if arg.default_value:
- result += '=%s' % arg.default_value
- args.append( result )
- if len( args ) == 1:
- return args[ 0 ]
- return ', '.join( args )
-
def override_identifier(self):
return algorithm.create_identifier( self, '::boost::python::override' )
def function_call_args( self ):
- params = []
- for index, arg in enumerate( self.declaration.arguments ):
- params.append( decl_wrappers.python_traits.call_traits( arg.type ) % self.argument_name( index ) )
- return ', '.join( params )
+ arg_utils = calldef_utils.argument_utils_t( self.declaration, make_id_creator( self ) )
+ return arg_utils.call_args()
+ def args_declaration( self ):
+ arg_utils = calldef_utils.argument_utils_t( self.declaration, make_id_creator( self ) )
+ return arg_utils.args_declaration()
+
def wrapped_class_identifier( self ):
return algorithm.create_identifier( self, declarations.full_name( self.declaration.parent ) )
@@ -897,10 +841,9 @@
def _create_constructor_call( self ):
answer = [ algorithm.create_identifier( self, self.parent.declaration.decl_string ) ]
answer.append( '( ' )
- params = []
- for index in range( len( self.declaration.arguments ) ):
- params.append( self.argument_name( index ) )
- answer.append( ', '.join( params ) )
+ arg_utils = calldef_utils.argument_utils_t( self.declaration, make_id_creator( self ) )
+ params = arg_utils.call_args()
+ answer.append( params )
if params:
answer.append(' ')
answer.append( ')' )
Added: pyplusplus_dev/pyplusplus/code_creators/calldef_utils.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef_utils.py (rev 0)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef_utils.py 2006-11-21 08:44:59 UTC (rev 738)
@@ -0,0 +1,93 @@
+# 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)
+
+import code_creator
+from pygccxml import declarations
+from pyplusplus import decl_wrappers
+#virtual functions that returns const reference to something
+#could not be overriden by Python. The reason is simple:
+#in boost::python::override::operator(...) result of marshaling
+#(Python 2 C++) is saved on stack, after functions returns the result
+#will be reference to no where - access violetion.
+#For example see temporal variable tester
+
+use_enum_workaround = False
+
+class argument_utils_t:
+
+ PARAM_SEPARATOR = code_creator.code_creator_t.PARAM_SEPARATOR
+
+ def __init__( self, declaration, identifier_creator, arguments=None ):
+ self.__decl = declaration
+ if None is arguments:
+ arguments = self.__decl.arguments
+ self.__args = arguments
+ self.__id_creator = identifier_creator
+
+ def __should_use_enum_wa( self, arg ):
+ global use_enum_workaround
+ if not declarations.is_enum( arg.type ):
+ return False
+ if use_enum_workaround:
+ return True
+ #enum belongs to the class we are working on
+ if self.__decl.parent is declarations.enum_declaration( arg.type ).parent \
+ and isinstance( self.__decl, declarations.constructor_t ):
+ return True
+ return False
+
+ def keywords_args(self):
+ boost_arg = self.__id_creator( '::boost::python::arg' )
+ boost_obj = self.__id_creator( '::boost::python::object' )
+ result = ['( ']
+ for arg in self.__args:
+ if 1 < len( result ):
+ result.append( self.PARAM_SEPARATOR )
+ result.append( boost_arg )
+ result.append( '("%s")' % arg.name )
+ if self.__decl.use_default_arguments and arg.default_value:
+ if not declarations.is_pointer( arg.type ) or arg.default_value != '0':
+ arg_type_no_alias = declarations.remove_alias( arg.type )
+ 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 ) )
+ elif self.__should_use_enum_wa( arg ):
+ #Work around for bug/missing functionality in boost.python.
+ #registration order
+ result.append( '=(long)(%s)' % arg.default_value )
+ else:
+ result.append( '=%s' % arg.default_value )
+ else:
+ result.append( '=%s()' % boost_obj )
+ result.append( ' )' )
+ return ''.join( result )
+
+ def argument_name( self, index ):
+ arg = self.__args[ index ]
+ if arg.name:
+ return arg.name
+ else:
+ return 'p%d' % index
+
+ def args_declaration( self ):
+ args = []
+ for index, arg in enumerate( self.__args ):
+ result = arg.type.decl_string + ' ' + self.argument_name(index)
+ if arg.default_value:
+ result += '=%s' % arg.default_value
+ args.append( result )
+ if len( args ) == 1:
+ return args[ 0 ]
+ return self.PARAM_SEPARATOR.join( args )
+
+ def call_args( self ):
+ params = []
+ for index, arg in enumerate( self.__args ):
+ params.append( decl_wrappers.python_traits.call_traits( arg.type ) % self.argument_name( index ) )
+ return ', '.join( params )
+
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-04-14 19:44:47
|
Revision: 980
http://svn.sourceforge.net/pygccxml/?rev=980&view=rev
Author: roman_yakovenko
Date: 2007-04-14 12:44:48 -0700 (Sat, 14 Apr 2007)
Log Message:
-----------
adding new functionality to code creators - to report system header files the generated code will depend on
this functionality will allow better code generation and simpler "creator_t" class implementation
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/array_1_registrator.py
pyplusplus_dev/pyplusplus/code_creators/calldef.py
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
pyplusplus_dev/pyplusplus/code_creators/code_creator.py
pyplusplus_dev/pyplusplus/code_creators/custom.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/include.py
pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py
pyplusplus_dev/pyplusplus/code_creators/instruction.py
pyplusplus_dev/pyplusplus/code_creators/license.py
pyplusplus_dev/pyplusplus/code_creators/member_variable.py
pyplusplus_dev/pyplusplus/code_creators/module.py
pyplusplus_dev/pyplusplus/code_creators/module_body.py
pyplusplus_dev/pyplusplus/code_creators/namespace.py
pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py
pyplusplus_dev/pyplusplus/code_creators/properties.py
pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py
pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py
Modified: pyplusplus_dev/pyplusplus/code_creators/array_1_registrator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/array_1_registrator.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/array_1_registrator.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -62,3 +62,6 @@
fn_def = templates.join( '::'.join( [ns_name, fn_name] ), fn_def_tmpl_args )
return call_invocation.join( fn_def, [ '"%s"' % self._create_name() ] ) + ';'
+
+ def _get_system_headers_impl( self ):
+ return [code_repository.array_1.file_name]
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -134,6 +134,11 @@
return ''.join( result )
+ def _get_system_headers_impl( self ):
+ files = []
+ if self.declaration.call_policies:
+ files.append( self.declaration.call_policies.header_file )
+ return files
class calldef_wrapper_t( code_creator.code_creator_t
, declaration_based.declaration_based_t):
@@ -170,6 +175,13 @@
else:
return ' throw()'
+ def _get_system_headers_impl( self ):
+ files = []
+ if self.declaration.transformations:
+ ft = self.declaration.transformations[0]
+ files.extend( ft.required_headers() )
+ return files
+
class free_function_t( calldef_t ):
def __init__( self, function ):
calldef_t.__init__( self, function=function )
@@ -849,6 +861,9 @@
def _create_impl( self ):
return 'staticmethod( "%s" )' % self.function_code_creator.alias
+ def _get_system_headers_impl( self ):
+ return []
+
class constructor_wrapper_t( calldef_wrapper_t ):
"""
Creates C++ code that builds wrapper arround exposed constructor.
@@ -939,6 +954,8 @@
answer.append( '}' )
return os.linesep.join( answer )
+ def _get_system_headers_impl( self ):
+ return []
class null_constructor_wrapper_t( code_creator.code_creator_t
, declaration_based.declaration_based_t ):
@@ -965,6 +982,9 @@
answer.append( '}' )
return os.linesep.join( answer )
+ def _get_system_headers_impl( self ):
+ return []
+
#in python all operators are members of class, while in C++
#you can define operators that are not.
class operator_t( registration_based.registration_based_t
@@ -1046,6 +1066,9 @@
code = self._create_unary_operator()
return 'def( %s )' % code
+ def _get_system_headers_impl( self ):
+ return []
+
class casting_operator_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
"""
@@ -1067,6 +1090,9 @@
, [ from_arg , to_arg ] ) \
+ '();'
+ def _get_system_headers_impl( self ):
+ return []
+
class casting_member_operator_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
"""
@@ -1102,6 +1128,9 @@
, 'doc' : doc
}
+ def _get_system_headers_impl( self ):
+ return []
+
class casting_constructor_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
"""
@@ -1124,6 +1153,8 @@
, [ from_arg , to_arg ] ) \
+ '();'
+ def _get_system_headers_impl( self ):
+ return []
class calldef_overloads_class_t( code_creator.code_creator_t ):
@@ -1196,6 +1227,9 @@
, 'max' : max_
}
+ def _get_system_headers_impl( self ):
+ return []
+
class free_fun_overloads_class_t( calldef_overloads_class_t ):
def __init__( self, free_funs ):
#precondition: all member functions belong to same class and
@@ -1214,6 +1248,9 @@
, 'max' : max_
}
+ def _get_system_headers_impl( self ):
+ return []
+
class calldef_overloads_t( registration_based.registration_based_t ):
def __init__( self, overloads_class ):
registration_based.registration_based_t.__init__( self )
@@ -1298,6 +1335,9 @@
return ''.join( result )
+ def _get_system_headers_impl( self ):
+ return []
+
class mem_fun_overloads_t( calldef_overloads_t ):
def __init__( self, overloads_class ):
calldef_overloads_t.__init__( self, overloads_class )
Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -82,6 +82,8 @@
else:
return self._generate_code_no_scope()
+ def _get_system_headers_impl( self ):
+ return []
class class_t( scoped.scoped_t, registration_based.registration_based_t ):
"""
@@ -323,6 +325,9 @@
return self._generate_code_with_scope()
else:
return self._generate_code_no_scope()
+
+ def _get_system_headers_impl( self ):
+ return []
#open question: should I put class wrapper under some specifiec namespace?
class class_wrapper_t( scoped.scoped_t ):
@@ -396,6 +401,8 @@
answer.append( '};' )
return os.linesep.join( answer )
+ def _get_system_headers_impl( self ):
+ return []
@@ -403,3 +410,4 @@
+
Modified: pyplusplus_dev/pyplusplus/code_creators/code_creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/code_creator.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/code_creator.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -100,6 +100,15 @@
assert isinstance( code, types.StringTypes )
return self.beautify( code )
+ def get_system_headers( self ):
+ files = [ "boost/python.hpp" ]
+ files.extend( self._get_system_headers_impl() )
+ return filter( None, files)
+
+ def _get_system_headers_impl( self ):
+ """Return list of system header files the generated code depends on"""
+ raise NotImplementedError(self.__class__.__name__)
+
def beautify( self, code ):
"""
function that returns code without leading and trailing whitespaces.
@@ -155,4 +164,4 @@
"""
assert isinstance( line, types.StringTypes )
l = line.lstrip()
- return l.startswith( '//' ) or l.startswith( '/*' )
\ No newline at end of file
+ return l.startswith( '//' ) or l.startswith( '/*' )
Modified: pyplusplus_dev/pyplusplus/code_creators/custom.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/custom.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/custom.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -17,6 +17,9 @@
def _create_impl(self):
raise NotImplementedError()
+ def _get_system_headers_impl( self ):
+ return []
+
class custom_text_t(custom_t):
def __init__(self, text, works_on_instance=True):
custom_t.__init__(self, works_on_instance)
@@ -29,4 +32,7 @@
text = property( _get_text, _set_text )
def _create_impl(self):
- return self.text
\ No newline at end of file
+ return self.text
+
+ def _get_system_headers_impl( self ):
+ return []
Modified: pyplusplus_dev/pyplusplus/code_creators/enum.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/enum.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/enum.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -63,3 +63,6 @@
values = self.indent( os.linesep.join( values ) )
return bpl_enum + os.linesep + values
+
+ def _get_system_headers_impl( self ):
+ return []
Modified: pyplusplus_dev/pyplusplus/code_creators/exception_translator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/exception_translator.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/exception_translator.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -32,7 +32,10 @@
, 'cls_name' : self.decl_identifier
, 'arg_name' : self.declaration.exception_argument_name }
+ def _get_system_headers_impl( self ):
+ return []
+
class exception_translator_register_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
def __init__(self, exception_class, exception_translator):
@@ -49,5 +52,6 @@
% { 'register_exception_translator' : algorithm.create_identifier( self, 'boost::python::register_exception_translator' )
, 'cls' : self.decl_identifier
, 'translator' : self.translator.translator_name }
-
-
+
+ def _get_system_headers_impl( self ):
+ return []
Modified: pyplusplus_dev/pyplusplus/code_creators/global_variable.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/global_variable.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/global_variable.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -30,6 +30,9 @@
self._wrapper = new_wrapper
wrapper = property( _get_wrapper, _set_wrapper )
+ def _get_system_headers_impl( self ):
+ return []
+
class global_variable_t( global_variable_base_t ):
"""
Creates boost.python code that exposes global variable.
@@ -65,6 +68,9 @@
def __init__(self, variable, wrapper ):
global_variable_base_t.__init__( self, variable=variable, wrapper=wrapper )
+ def _get_system_headers_impl( self ):
+ return []
+
def _create_impl( self ):
if self.declaration.already_exposed:
return ''
@@ -147,3 +153,6 @@
answer.append('}')
answer.append( '}' * len( self._create_namespaces() ) )
return os.linesep.join( answer )
+
+ def _get_system_headers_impl( self ):
+ return [code_repository.array_1.file_name]
Modified: pyplusplus_dev/pyplusplus/code_creators/include.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/include.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/include.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -46,4 +46,7 @@
if self.include_dirs_optimization.is_std(self.header):
return '#include <%s>' % normalize_header
else:
- return '#include "%s"' % normalize_header
\ No newline at end of file
+ return '#include "%s"' % normalize_header
+
+ def _get_system_headers_impl( self ):
+ return []
Modified: pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -49,6 +49,8 @@
def _create_impl(self):
return "def( %s() )" % self._create_suite_declaration()
+ def _get_system_headers_impl( self ):
+ return self.configuration.include_files
class indexing_suite2_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
@@ -116,6 +118,9 @@
answer.append( ';' )
return ''.join( answer )
+ def _get_system_headers_impl( self ):
+ return self.declaration.indexing_suite.include_files
+
class value_traits_t( code_creator.code_creator_t
, declaration_based.declaration_based_t ):
def __init__( self, value_class ):
@@ -168,15 +173,5 @@
return ''
return self.generate_value_traits()
-
-
-
-
-
-
-
-
-
-
-
-
+ def _get_system_headers_impl( self ):
+ return ['boost/python/suite/indexing/value_traits.hpp']
Modified: pyplusplus_dev/pyplusplus/code_creators/instruction.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/instruction.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/instruction.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -35,4 +35,7 @@
return os.linesep.join( answer )
def _generate_description(self):
- raise NotImplementedError()
\ No newline at end of file
+ raise NotImplementedError()
+
+ def _get_system_headers_impl( self ):
+ return []
Modified: pyplusplus_dev/pyplusplus/code_creators/license.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/license.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/license.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -20,6 +20,9 @@
self._text = new_text
text = property( _get_text, _set_text )
+ def _get_system_headers_impl( self ):
+ return []
+
def _create_impl(self):
return self.text
Modified: pyplusplus_dev/pyplusplus/code_creators/member_variable.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/member_variable.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/member_variable.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -30,6 +30,14 @@
def _set_wrapper( self, new_wrapper ):
self._wrapper = new_wrapper
wrapper = property( _get_wrapper, _set_wrapper )
+
+ def _get_system_headers_impl( self ):
+ files = []
+ if self.declaration.getter_call_policies:
+ files.append( self.declaration.getter_call_policies.header_file )
+ if self.declaration.setter_call_policies:
+ files.append( self.declaration.setter_call_policies.header_file )
+ return files
class member_variable_t( member_variable_base_t ):
"""
@@ -257,6 +265,9 @@
, 'cls_type' : self.inst_arg_type( has_const=False ) })
return os.linesep.join( answer )
+ def _get_system_headers_impl( self ):
+ return []
+
class bit_field_t( member_variable_base_t ):
"""
Creates boost.python code that exposes bit fields member variables
@@ -359,6 +370,9 @@
answer.append( self.BF_SET_TEMPLATE % substitutions )
return os.linesep.join( answer )
+ def _get_system_headers_impl( self ):
+ return []
+
class array_mv_t( member_variable_base_t ):
"""
Creates boost.python code that exposes array member variable.
@@ -405,7 +419,11 @@
answer.append( os.linesep )
answer.append( '}' )
return ''.join( answer )
+
+ def _get_system_headers_impl( self ):
+ return []
+
#TODO: generated fucntion should be static and take instance of the wrapped class
#as first argument.
class array_mv_wrapper_t( code_creator.code_creator_t
@@ -468,6 +486,9 @@
, 'mem_var_ref' : self.declaration.name
}
+ def _get_system_headers_impl( self ):
+ return [code_repository.array_1.file_name]
+
class mem_var_ref_t( member_variable_base_t ):
"""
@@ -614,3 +635,6 @@
if self.has_setter:
answer.append( self.SET_TEMPLATE % substitutions )
return os.linesep.join( answer )
+
+ def _get_system_headers_impl( self ):
+ return []
Modified: pyplusplus_dev/pyplusplus/code_creators/module.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/module.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/module.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -140,7 +140,6 @@
map( lambda header: self.adopt_include( include.include_t( header=header ) )
, headers )
-
def adopt_include(self, include_creator):
"""Insert an L{include_t} object.
@@ -157,7 +156,10 @@
, self.creators )
for include_creator in includes:
include_creator.include_dirs_optimization = include_dirs
-
+
+ def _get_system_headers_impl( self ):
+ return []
+
def _create_impl(self):
self.do_include_dirs_optimization()
index = 0
Modified: pyplusplus_dev/pyplusplus/code_creators/module_body.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/module_body.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/module_body.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -20,4 +20,7 @@
result.append( "BOOST_PYTHON_MODULE(%s){" % self.name )
result.append( compound.compound_t.create_internal_code( self.creators ) )
result.append( "}" )
- return os.linesep.join( result )
\ No newline at end of file
+ return os.linesep.join( result )
+
+ def _get_system_headers_impl( self ):
+ return []
Modified: pyplusplus_dev/pyplusplus/code_creators/namespace.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/namespace.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/namespace.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -26,6 +26,9 @@
def _create_impl(self):
return 'namespace %s = %s;' % ( self.alias, self.full_namespace_name )
+ def _get_system_headers_impl( self ):
+ return []
+
class namespace_using_t(code_creator.code_creator_t):
def __init__( self, namespace_name ):
code_creator.code_creator_t.__init__(self )
@@ -38,4 +41,7 @@
namespace_name = property( _get_namespace_name, _set_namespace_name )
def _create_impl(self):
- return 'using namespace %s;' % self.namespace_name
\ No newline at end of file
+ return 'using namespace %s;' % self.namespace_name
+
+ def _get_system_headers_impl( self ):
+ return []
Modified: pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -19,4 +19,8 @@
def _create_impl(self):
return 'BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID( %s )' % self.decl_identifier
+
+ def _get_system_headers_impl( self ):
+ return []
+
Modified: pyplusplus_dev/pyplusplus/code_creators/properties.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/properties.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/properties.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -80,7 +80,6 @@
cls_name = 'exported_class_t'
return ( 'typedef %s %s;' % ( cls_identifier, cls_name ), cls_name )
-
def create_property_code( self ):
result = []
param_sep = ', '
@@ -146,6 +145,8 @@
result.append( '}' )
return os.linesep.join( result )
+ def _get_system_headers_impl( self ):
+ return []
Modified: pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -73,6 +73,9 @@
rptp = algorithm.create_identifier( self, '::boost::python::register_ptr_to_python' )
held_type = held_type_t(self.smart_ptr).create( self )
return templates.join( rptp, [ held_type ] ) + '();'
+
+ def _get_system_headers_impl( self ):
+ return []
class smart_pointers_converter_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
@@ -112,4 +115,6 @@
to_arg = self._instantiate_smart_ptr( self.target )
return templates.join(implicitly_convertible, [ from_arg, to_arg ] ) + '();'
+ def _get_system_headers_impl( self ):
+ return []
Modified: pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py 2007-04-10 20:23:57 UTC (rev 979)
+++ pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py 2007-04-14 19:44:48 UTC (rev 980)
@@ -34,3 +34,5 @@
, algorithm.create_identifier( self, full_name + '::' + name ) ) )
return os.linesep.join( result )
+ def _get_system_headers_impl( self ):
+ return []
\ 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-15 06:33:35
|
Revision: 983
http://svn.sourceforge.net/pygccxml/?rev=983&view=rev
Author: roman_yakovenko
Date: 2007-04-14 23:33:36 -0700 (Sat, 14 Apr 2007)
Log Message:
-----------
adding few small convenience methods
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/code_creator.py
pyplusplus_dev/pyplusplus/code_creators/compound.py
Modified: pyplusplus_dev/pyplusplus/code_creators/code_creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/code_creator.py 2007-04-15 06:31:35 UTC (rev 982)
+++ pyplusplus_dev/pyplusplus/code_creators/code_creator.py 2007-04-15 06:33:36 UTC (rev 983)
@@ -100,15 +100,25 @@
assert isinstance( code, types.StringTypes )
return self.beautify( code )
- def get_system_headers( self ):
- files = [ "boost/python.hpp" ]
- files.extend( self._get_system_headers_impl() )
- return filter( None, files)
+ @staticmethod
+ def unique_headers( headers ):
+ used = set()
+ uheaders = []
+ for h in headers:
+ if h not in used:
+ used.add( h )
+ uheaders.append( h )
+ return uheaders
def _get_system_headers_impl( self ):
"""Return list of system header files the generated code depends on"""
raise NotImplementedError(self.__class__.__name__)
-
+
+ def get_system_headers( self, recursive=False ):
+ files = [ "boost/python.hpp" ]
+ files.extend( self._get_system_headers_impl() )
+ return filter( None, files)
+
def beautify( self, code ):
"""
function that returns code without leading and trailing whitespaces.
Modified: pyplusplus_dev/pyplusplus/code_creators/compound.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/compound.py 2007-04-15 06:31:35 UTC (rev 982)
+++ pyplusplus_dev/pyplusplus/code_creators/compound.py 2007-04-15 06:33:36 UTC (rev 983)
@@ -74,4 +74,12 @@
, internals )
for index in range( len( internals ) - 1):
internals[index] = internals[index] + os.linesep
- return os.linesep.join( internals )
\ No newline at end of file
+ return os.linesep.join( internals )
+
+ def get_system_headers( self, recursive=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) )
+ return files
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-04-15 10:15:45
|
Revision: 985
http://svn.sourceforge.net/pygccxml/?rev=985&view=rev
Author: roman_yakovenko
Date: 2007-04-15 03:15:47 -0700 (Sun, 15 Apr 2007)
Log Message:
-----------
fixing required headers reporting
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/calldef.py
pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py
pyplusplus_dev/pyplusplus/code_creators/module.py
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-04-15 10:10:24 UTC (rev 984)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-04-15 10:15:47 UTC (rev 985)
@@ -180,6 +180,8 @@
if self.declaration.transformations:
ft = self.declaration.transformations[0]
files.extend( ft.required_headers() )
+ if self.declaration.call_policies:
+ files.append( self.declaration.call_policies.header_file )
return files
class free_function_t( calldef_t ):
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py 2007-04-15 10:10:24 UTC (rev 984)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py 2007-04-15 10:15:47 UTC (rev 985)
@@ -9,9 +9,9 @@
import calldef_utils
import class_declaration
from pygccxml import declarations
+from pyplusplus import code_repository
from calldef import calldef_t, calldef_wrapper_t
import pyplusplus.function_transformers as function_transformers
-from pyplusplus import code_repository
#TODO: constructors also can have transformation defined. We should use make _init
# function for this purpose
@@ -416,3 +416,8 @@
def _create_impl(self):
return os.linesep.join([ self.create_override(), '', self.create_default() ])
+
+ def _get_system_headers_impl( self ):
+ files = super( mem_fun_v_transformed_wrapper_t, self )._get_system_headers_impl()
+ files.append( code_repository.convenience.file_name )
+ return files
Modified: pyplusplus_dev/pyplusplus/code_creators/module.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/module.py 2007-04-15 10:10:24 UTC (rev 984)
+++ pyplusplus_dev/pyplusplus/code_creators/module.py 2007-04-15 10:15:47 UTC (rev 985)
@@ -27,7 +27,9 @@
def add_system_header( self, header ):
normalize = include_directories.include_directories_t.normalize
- self.__system_headers.append( normalize( header ) )
+ normalized_header = normalize( header )
+ if normalized_header not in self.__system_headers:
+ self.__system_headers.append( normalized_header )
def is_system_header( self, header ):
normalize = include_directories.include_directories_t.normalize
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-04-17 07:16:20
|
Revision: 994
http://svn.sourceforge.net/pygccxml/?rev=994&view=rev
Author: roman_yakovenko
Date: 2007-04-17 00:16:21 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
introducing few small optimizations:
include and namespace code creators always generate same code - from now they will do it only once
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/include.py
pyplusplus_dev/pyplusplus/code_creators/namespace.py
Modified: pyplusplus_dev/pyplusplus/code_creators/include.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/include.py 2007-04-17 07:13:00 UTC (rev 993)
+++ pyplusplus_dev/pyplusplus/code_creators/include.py 2007-04-17 07:16:21 UTC (rev 994)
@@ -3,25 +3,30 @@
# accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
-import os
import code_creator
-import algorithm
import include_directories
class include_t(code_creator.code_creator_t):
"""
Creates C++ code for include directive
"""
- def __init__( self, header, user_defined=False ):
+ def __init__( self, header, user_defined=False, system=False ):
code_creator.code_creator_t.__init__(self)
self._header = include_directories.include_directories_t.normalize( header )
self._include_dirs_optimization = None #This parameter will be set from module_t.create function
self._user_defined = user_defined
+ self._system = system
+ self.__created_code = None
@property
def is_user_defined(self):
return self._user_defined
+ @property
+ def is_system(self):
+ """Return True if header file is system( Boost.Python or Py++ ) header file"""
+ return self._system
+
def _get_header(self):
return self._header
def _set_header(self, header):
@@ -34,7 +39,7 @@
self._include_dirs_optimization = include_dirs
include_dirs_optimization = property( _get_include_dirs_optimization, _set_include_dirs_optimization )
- def _create_impl(self):
+ def _create_include_directive_code(self):
header = self.header.strip()
if header.startswith( '"' ) or header.startswith( '<' ):
return '#include %s' % self.header
@@ -48,5 +53,10 @@
else:
return '#include "%s"' % normalize_header
+ def _create_impl(self):
+ if not self.__created_code:
+ self.__created_code = self._create_include_directive_code()
+ return self.__created_code
+
def _get_system_headers_impl( self ):
return []
Modified: pyplusplus_dev/pyplusplus/code_creators/namespace.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/namespace.py 2007-04-17 07:13:00 UTC (rev 993)
+++ pyplusplus_dev/pyplusplus/code_creators/namespace.py 2007-04-17 07:16:21 UTC (rev 994)
@@ -10,6 +10,7 @@
code_creator.code_creator_t.__init__( self )
self._alias = alias
self._full_namespace_name = full_namespace_name
+ self.__created_code = None
def _get_alias( self ):
return self._alias
@@ -24,7 +25,11 @@
full_namespace_name = property( _get_full_namespace_name, _set_full_namespace_name )
def _create_impl(self):
- return 'namespace %s = %s;' % ( self.alias, self.full_namespace_name )
+ if self.__created_code:
+ return self.__created_code
+ else:
+ self.__created_code = 'namespace %s = %s;' % ( self.alias, self.full_namespace_name )
+ return self.__created_code
def _get_system_headers_impl( self ):
return []
@@ -33,6 +38,7 @@
def __init__( self, namespace_name ):
code_creator.code_creator_t.__init__(self )
self._namespace_name = namespace_name
+ self.__created_code = None
def _get_namespace_name( self ):
return self._namespace_name.lstrip( '::' )
@@ -41,7 +47,11 @@
namespace_name = property( _get_namespace_name, _set_namespace_name )
def _create_impl(self):
- return 'using namespace %s;' % self.namespace_name
+ if self.__created_code:
+ return self.__created_code
+ else:
+ self.__created_code = 'using namespace %s;' % self.namespace_name
+ return self.__created_code
def _get_system_headers_impl( self ):
return []
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-09-20 18:44:52
|
Revision: 1115
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1115&view=rev
Author: roman_yakovenko
Date: 2007-09-20 11:44:54 -0700 (Thu, 20 Sep 2007)
Log Message:
-----------
fixing "already_exposed" functionality
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/calldef.py
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
pyplusplus_dev/pyplusplus/code_creators/declaration_based.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/member_variable.py
pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py
pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py
pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-09-18 20:49:07 UTC (rev 1114)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-09-20 18:44:54 UTC (rev 1115)
@@ -140,6 +140,11 @@
files.append( self.declaration.call_policies.header_file )
return files
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
+
class calldef_wrapper_t( code_creator.code_creator_t
, declaration_based.declaration_based_t):
def __init__(self, function ):
@@ -183,6 +188,11 @@
files.append( self.declaration.call_policies.header_file )
return files
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
+
class free_function_t( calldef_t ):
def __init__( self, function ):
calldef_t.__init__( self, function=function )
@@ -863,7 +873,7 @@
return 'staticmethod( "%s" )' % self.function_code_creator.alias
def _get_system_headers_impl( self ):
- return []
+ return []
class constructor_wrapper_t( calldef_wrapper_t ):
"""
@@ -1070,6 +1080,10 @@
def _get_system_headers_impl( self ):
return []
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
class casting_operator_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
"""
@@ -1094,6 +1108,11 @@
def _get_system_headers_impl( self ):
return []
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
+
class casting_member_operator_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
"""
@@ -1131,7 +1150,13 @@
def _get_system_headers_impl( self ):
return []
+
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
+
class casting_constructor_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
"""
@@ -1209,6 +1234,11 @@
@property
def name( self ):
return '%s_%s_overloads' % ( self.parent_decl.alias, self.alias )
+
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ for f in self.functions:
+ exposed_db.expose( f )
class mem_fun_overloads_class_t( calldef_overloads_class_t ):
def __init__( self, mem_funs ):
Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-09-18 20:49:07 UTC (rev 1114)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-09-20 18:44:54 UTC (rev 1115)
@@ -405,10 +405,12 @@
def _get_system_headers_impl( self ):
return []
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
-
Modified: pyplusplus_dev/pyplusplus/code_creators/declaration_based.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/declaration_based.py 2007-09-18 20:49:07 UTC (rev 1114)
+++ pyplusplus_dev/pyplusplus/code_creators/declaration_based.py 2007-09-20 18:44:54 UTC (rev 1115)
@@ -54,7 +54,3 @@
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
-
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
Modified: pyplusplus_dev/pyplusplus/code_creators/enum.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/enum.py 2007-09-18 20:49:07 UTC (rev 1114)
+++ pyplusplus_dev/pyplusplus/code_creators/enum.py 2007-09-20 18:44:54 UTC (rev 1115)
@@ -66,3 +66,7 @@
def _get_system_headers_impl( self ):
return []
+
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
Modified: pyplusplus_dev/pyplusplus/code_creators/exception_translator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/exception_translator.py 2007-09-18 20:49:07 UTC (rev 1114)
+++ pyplusplus_dev/pyplusplus/code_creators/exception_translator.py 2007-09-20 18:44:54 UTC (rev 1115)
@@ -35,7 +35,11 @@
def _get_system_headers_impl( self ):
return []
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
class exception_translator_register_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
def __init__(self, exception_class, exception_translator):
@@ -55,3 +59,8 @@
def _get_system_headers_impl( self ):
return []
+
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
Modified: pyplusplus_dev/pyplusplus/code_creators/global_variable.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/global_variable.py 2007-09-18 20:49:07 UTC (rev 1114)
+++ pyplusplus_dev/pyplusplus/code_creators/global_variable.py 2007-09-20 18:44:54 UTC (rev 1115)
@@ -32,7 +32,12 @@
def _get_system_headers_impl( self ):
return []
-
+
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
+
class global_variable_t( global_variable_base_t ):
"""
Creates boost.python code that exposes global variable.
Modified: pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2007-09-18 20:49:07 UTC (rev 1114)
+++ pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2007-09-20 18:44:54 UTC (rev 1115)
@@ -51,6 +51,11 @@
def _get_system_headers_impl( self ):
return self.configuration.include_files
+
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
class indexing_suite2_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
@@ -121,6 +126,11 @@
def _get_system_headers_impl( self ):
return self.declaration.indexing_suite.include_files
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
+
class value_traits_t( code_creator.code_creator_t
, declaration_based.declaration_based_t ):
def __init__( self, value_class ):
@@ -178,3 +188,8 @@
def _get_system_headers_impl( self ):
return ['boost/python/suite/indexing/value_traits.hpp']
+
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
Modified: pyplusplus_dev/pyplusplus/code_creators/member_variable.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/member_variable.py 2007-09-18 20:49:07 UTC (rev 1114)
+++ pyplusplus_dev/pyplusplus/code_creators/member_variable.py 2007-09-20 18:44:54 UTC (rev 1115)
@@ -38,7 +38,12 @@
if self.declaration.setter_call_policies:
files.append( self.declaration.setter_call_policies.header_file )
return files
+
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
class member_variable_t( member_variable_base_t ):
"""
Creates boost.python code that exposes member variable.
Modified: pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py 2007-09-18 20:49:07 UTC (rev 1114)
+++ pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py 2007-09-20 18:44:54 UTC (rev 1115)
@@ -23,4 +23,7 @@
def _get_system_headers_impl( self ):
return []
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
Modified: pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py 2007-09-18 20:49:07 UTC (rev 1114)
+++ pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py 2007-09-20 18:44:54 UTC (rev 1115)
@@ -76,6 +76,11 @@
def _get_system_headers_impl( self ):
return []
+
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
class smart_pointers_converter_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
@@ -118,3 +123,7 @@
def _get_system_headers_impl( self ):
return []
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
Modified: pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py 2007-09-18 20:49:07 UTC (rev 1114)
+++ pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py 2007-09-20 18:44:54 UTC (rev 1115)
@@ -35,4 +35,9 @@
return os.linesep.join( result )
def _get_system_headers_impl( self ):
- return []
\ No newline at end of file
+ return []
+
+ def register_exposed( self, exposed_db ):
+ """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
+ exposed_db.expose( self.declaration )
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2006-06-20 05:15:35
|
Revision: 235 Author: roman_yakovenko Date: 2006-06-19 22:15:25 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=235&view=rev Log Message: ----------- small refactoring: constructor(wrapper) now derives from calldef.py( wrapper ) and not from declaration_based_t Modified Paths: -------------- pyplusplus_dev/pyplusplus/code_creators/calldef.py pyplusplus_dev/pyplusplus/module_creator/creator.py Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2006-06-19 20:10:30 UTC (rev 234) +++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2006-06-20 05:15:25 UTC (rev 235) @@ -779,59 +779,13 @@ #return self.wclass_inst_arg_type().decl_string + ' wcls_inst' -class constructor_t( declaration_based.declaration_based_t ): +class constructor_t( calldef_t ): """ Creates boost.python code needed to expose constructor. """ def __init__(self, constructor, wrapper=None, parent=None ): - declaration_based.declaration_based_t.__init__( self - , declaration=constructor - , parent=parent ) - self._wrapper = wrapper + calldef_t.__init__( self, function=constructor, wrapper=wrapper, parent=parent ) - def _get_wrapper( self ): - return self._wrapper - def _set_wrapper( self, new_wrapper ): - self._wrapper = new_wrapper - wrapper = property( _get_wrapper, _set_wrapper ) - - def _get_call_policies(self): - return self.declaration.call_policies - def _set_call_policies(self, call_policies): - self.declaration.call_policies = call_policies - call_policies = property( _get_call_policies, _set_call_policies ) - - def _get_use_keywords(self): - return self.declaration.use_keywords - def _set_use_keywords(self, use_keywords): - self.declaration.use_keywords = use_keywords - use_keywords = property( _get_use_keywords, _set_use_keywords ) - - def _get_use_default_arguments(self): - return self.declaration.use_default_arguments - def _set_use_default_arguments(self, use_default_arguments): - self.declaration.use_default_arguments = use_default_arguments - use_default_arguments = property( _get_use_default_arguments, _set_use_default_arguments ) - - def _keywords_args(self): - if not self.declaration.arguments: - return '' - boost_arg = algorithm.create_identifier( self, '::boost::python::arg' ) - boost_obj = algorithm.create_identifier( self, '::boost::python::object' ) - result = ['( '] - for arg in self.declaration.arguments: - if 1 < len( result ): - result.append( ', ' ) - result.append( boost_arg ) - result.append( '("%s")' % arg.name ) - if self.use_default_arguments and arg.default_value: - if not declarations.is_pointer( arg.type ) or arg.default_value != '0': - result.append( '=%s' % arg.default_value ) - else: - result.append( '=%s()' % boost_obj ) - result.append( ' )' ) - return ''.join( result ) - def _create_arg_code( self, arg ): temp = arg.type if declarations.is_const( temp ): @@ -857,17 +811,16 @@ answer.append( optionals_str ) return ', '.join( answer ) - def create_init_code(self): init_identifier = algorithm.create_identifier( self, '::boost::python::init' ) args = [ self._generate_definition_args() ] answer = [ '%s' % declarations.templates.join( init_identifier, args ) ] - if self.use_keywords: - answer.append( '(%s)' % self._keywords_args() ) + if self.declaration.use_keywords: + answer.append( '(%s)' % self.keywords_args() ) else: answer.append( '()' ) - if self.call_policies: - answer.append('[%s]' % self.call_policies.create( self ) ) + if self.declaration.call_policies: + answer.append('[%s]' % self.declaration.call_policies.create( self ) ) #I think it better not to print next line #else: # answer.append( '/*[ undefined call policies ]*/' ) @@ -896,22 +849,13 @@ def _create_impl( self ): return 'staticmethod( "%s" )' % self.function_code_creator.alias -class constructor_wrapper_t( declaration_based.declaration_based_t ): +class constructor_wrapper_t( calldef_wrapper_t ): """ Creates C++ code that builds wrapper arround exposed constructor. """ def __init__( self, constructor, parent=None ): - declaration_based.declaration_based_t.__init__( self - , declaration=constructor - , parent=parent ) - - def argument_name( self, index ): - arg = self.declaration.arguments[ index ] - if arg.name: - return arg.name - else: - return 'p%d' % index + calldef_wrapper_t.__init__( self, function=constructor, parent=parent ) def _create_declaration(self): result = [] @@ -920,11 +864,9 @@ args = [] if self.parent.held_type and not self.target_configuration.boost_python_has_wrapper_held_type: args.append( 'PyObject*' ) - for index, arg in enumerate( self.declaration.arguments ): - arg_text = arg.type.decl_string + ' ' + self.argument_name(index) - if arg.default_value: - arg_text = arg_text + '=%s' % arg.default_value - args.append( arg_text ) + args_decl = self.args_declaration() + if args_decl: + args.append( args_decl ) result.append( ', '.join( args ) ) result.append( ' )' ) return ''.join( result ) Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py =================================================================== --- pyplusplus_dev/pyplusplus/module_creator/creator.py 2006-06-19 20:10:30 UTC (rev 234) +++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2006-06-20 05:15:25 UTC (rev 235) @@ -506,8 +506,8 @@ cwrapper = code_creators.constructor_wrapper_t( constructor=self.curr_decl ) class_wrapper.adopt_creator( cwrapper ) maker = code_creators.constructor_t( constructor=self.curr_decl, wrapper=cwrapper ) - if None is maker.call_policies: - maker.call_policies = self.__call_policies_resolver( self.curr_decl ) + if None is self.curr_decl.call_policies: + self.curr_decl.call_policies = self.__call_policies_resolver( self.curr_decl ) self.curr_code_creator.adopt_creator( maker ) def visit_destructor( self ): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-06-21 19:50:37
|
Revision: 241 Author: roman_yakovenko Date: 2006-06-21 12:50:27 -0700 (Wed, 21 Jun 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=241&view=rev Log Message: ----------- adding constructor to class declaration generated code Modified Paths: -------------- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py pyplusplus_dev/pyplusplus/module_builder/builder.py Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2006-06-20 13:34:35 UTC (rev 240) +++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2006-06-21 19:50:27 UTC (rev 241) @@ -27,7 +27,7 @@ def _generate_code_no_scope(self): result = [] - result.append( self._generate_class_definition() ) + result.append( self._generate_class_definition() + '("%s")' % self.declaration.alias ) for x in self.creators: code = x.create() tmpl = '%s.%s' @@ -47,7 +47,7 @@ typedef_name = self.class_var_name + '_t' result.append( 'typedef ' + self._generate_class_definition() + ' ' + typedef_name + ';') result.append( typedef_name + ' ' + self.class_var_name ) - result[-1] = result[-1] + ' = '+ typedef_name + '();' + result[-1] = result[-1] + ' = '+ typedef_name + '(%s);' % self.declaration.alias result.append( algorithm.create_identifier( self, '::boost::python::scope' ) ) result[-1] = result[-1] + ' ' + scope_var_name Modified: pyplusplus_dev/pyplusplus/module_builder/builder.py =================================================================== --- pyplusplus_dev/pyplusplus/module_builder/builder.py 2006-06-20 13:34:35 UTC (rev 240) +++ pyplusplus_dev/pyplusplus/module_builder/builder.py 2006-06-21 19:50:27 UTC (rev 241) @@ -472,3 +472,9 @@ , header_dir=header_dir , header_file=header_file , recursive=recursive ) + + def _get_BOOST_PYTHON_MAX_ARITY( self ): + return decl_wrappers.calldef_t.BOOST_PYTHON_MAX_ARITY + def _set_BOOST_PYTHON_MAX_ARITY( self, value ): + decl_wrappers.calldef_t.BOOST_PYTHON_MAX_ARITY = value + BOOST_PYTHON_MAX_ARITY = property( _get_BOOST_PYTHON_MAX_ARITY, _set_BOOST_PYTHON_MAX_ARITY ) \ 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...> - 2006-07-09 07:33:16
|
Revision: 285 Author: roman_yakovenko Date: 2006-07-09 00:33:06 -0700 (Sun, 09 Jul 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=285&view=rev Log Message: ----------- fixing bugs in indexing suite v2 code generation Modified Paths: -------------- pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py pyplusplus_dev/pyplusplus/module_creator/creator.py Modified: pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2006-07-09 05:31:25 UTC (rev 284) +++ pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2006-07-09 07:33:06 UTC (rev 285) @@ -114,8 +114,11 @@ , "template<>" , "struct value_traits< %(value_class)s >{" , "" - , self.indent( "static bool const equality_comparable = %(has_equal)s;" ) + , self.indent( "static bool const equality_comparable = %(has_equal)s;" ) + , self.indent( "%(equal_to)s" ) + , "" , self.indent( "static bool const less_than_comparable = %(has_lessthan)s;" ) + , self.indent( "%(less)s" ) , "" , self.indent( "template<typename PythonClass, typename Policy>" ) , self.indent( "static void visit_container_class(PythonClass &, Policy const &){" ) @@ -126,10 +129,20 @@ , "" , "}/*indexing*/ } /*python*/ } /*boost*/" ]) + + less = '' + if self.declaration.less_than_comparable: + less = "typedef std::less< %s > less;" % self.decl_identifier + + equal_to = '' + if self.declaration.equality_comparable: + equal_to = "typedef std::equal_to< %s > equal_to;" % self.decl_identifier return tmpl % { 'value_class' : self.decl_identifier - , 'has_equal' : str( bool( self.declaration.equality_comparable ) ) .lower() - , 'has_lessthan' : str( bool( self.declaration.less_than_comparable ) ).lower() + , 'has_equal' : str( bool( self.declaration.equality_comparable ) ) .lower() + , 'equal_to' : equal_to + , 'has_lessthan' : str( bool( self.declaration.less_than_comparable ) ).lower() + , 'less' : less , 'visitor_helper_body' : '' } def generate_value_class_fwd_declaration( self ): Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py =================================================================== --- pyplusplus_dev/pyplusplus/module_creator/creator.py 2006-07-09 05:31:25 UTC (rev 284) +++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2006-07-09 07:33:06 UTC (rev 285) @@ -415,9 +415,8 @@ class_traits = declarations.class_traits if class_traits.is_my_case( element_type ): value_cls = class_traits.get_declaration( element_type ) - if not ( value_cls.equality_comparable and value_cls.less_than_comparable ): - element_type_cc = code_creators.value_traits_t( value_cls ) - self.__extmodule.adopt_creator( element_type_cc, self.__extmodule.creators.index( self.__module_body ) ) + element_type_cc = code_creators.value_traits_t( value_cls ) + self.__extmodule.adopt_creator( element_type_cc, self.__extmodule.creators.index( self.__module_body ) ) cls_creator.adopt_creator( code_creators.indexing_suite2_t(cls) ) self.__module_body.adopt_creator( cls_creator ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-09-18 20:03:17
|
Revision: 554
http://svn.sourceforge.net/pygccxml/?rev=554&view=rev
Author: roman_yakovenko
Date: 2006-09-18 13:03:06 -0700 (Mon, 18 Sep 2006)
Log Message:
-----------
adding opaque type registrator
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/__init__.py
Added Paths:
-----------
pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py
Modified: pyplusplus_dev/pyplusplus/code_creators/__init__.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/__init__.py 2006-09-18 20:01:34 UTC (rev 553)
+++ pyplusplus_dev/pyplusplus/code_creators/__init__.py 2006-09-18 20:03:06 UTC (rev 554)
@@ -120,3 +120,5 @@
from exception_translator import exception_translator_t
from exception_translator import exception_translator_register_t
+
+from opaque_type_registrator import opaque_type_registrator_t
\ No newline at end of file
Added: pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py (rev 0)
+++ pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py 2006-09-18 20:03:06 UTC (rev 554)
@@ -0,0 +1,19 @@
+# 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)
+
+import os
+import declaration_based
+
+class opaque_type_registrator_t( declaration_based.declaration_based_t ):
+ """
+ This class creates code that register static sized array
+ """
+ def __init__( self, pointee ):
+ declaration_based.declaration_based_t.__init__( self, pointee )
+ self.works_on_instance = False
+
+ def _create_impl(self):
+ return 'BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID( %s )' % self.decl_identifier
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-07-28 18:04:23
|
Revision: 1090
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1090&view=rev
Author: roman_yakovenko
Date: 2007-07-28 11:04:26 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
adding FT for constructor as comments
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/__init__.py
pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py
Modified: pyplusplus_dev/pyplusplus/code_creators/__init__.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/__init__.py 2007-07-28 17:59:35 UTC (rev 1089)
+++ pyplusplus_dev/pyplusplus/code_creators/__init__.py 2007-07-28 18:04:26 UTC (rev 1090)
@@ -82,7 +82,11 @@
from calldef_transformed import free_fun_transformed_wrapper_t
from calldef_transformed import mem_fun_v_transformed_t
from calldef_transformed import mem_fun_v_transformed_wrapper_t
+#TODO: FT for constructor
+#~ from calldef_transformed import constructor_transformed_t
+#~ from calldef_transformed import constructor_transformed_wrapper_t
+
from global_variable import global_variable_base_t
from global_variable import global_variable_t
from global_variable import array_gv_t
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py 2007-07-28 17:59:35 UTC (rev 1089)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py 2007-07-28 18:04:26 UTC (rev 1090)
@@ -421,3 +421,80 @@
files = super( mem_fun_v_transformed_wrapper_t, self )._get_system_headers_impl()
files.append( code_repository.convenience.file_name )
return files
+
+
+class constructor_transformed_t( calldef_t ):
+ def __init__( self, constructor, wrapper=None ):
+ calldef_t.__init__( self, function=constructor, wrapper=wrapper )
+
+ @property
+ def ft( self ): #function transformation
+ return self.declaration.transformations[0]
+
+ @property
+ def controller( self ):
+ return self.ft.controller
+
+ def create_call_policies( self ):
+ return ''
+
+ def _create_impl( self ):
+ make_constructor = algorithm.create_identifier( self, 'boost::python::make_constructor' )
+
+ code = 'def( "__init__, %s( &::%s ) )' % self.wrapper.wrapper_name()
+ if not self.works_on_instance:
+ code = self.parent.class_var_name + '.' + code + ';'
+ return code
+
+#TODO: FT for constructor
+#~ class constructor_transformed_wrapper_t( calldef_wrapper_t ):
+ #~ def __init__( self, constructor ):
+ #~ calldef_wrapper_t.__init__( self, function=constructor )
+
+ #~ @property
+ #~ def ft( self ): #function transformation
+ #~ return self.declaration.transformations[0]
+
+ #~ @property
+ #~ def controller( self ):
+ #~ return self.ft.controller
+
+ #~ def resolve_function_ref( self ):
+ #~ raise NotImplementedError()
+
+ #~ def wrapper_name( self ):
+ #~ return self.ft.unique_name()
+
+ #~ def create_fun_definition(self):
+ #~ cntrl = self.controller
+
+ #~ tmpl_values = dict()
+
+ #~ tmpl_values['unique_function_name'] = self.wrapper_name()
+ #~ tmpl_values['exposed_class'] = self.decl_identifier
+ #~ tmpl_values['arg_declarations'] = self.args_declaration()
+ #~ tmpl_values['result'] = self.ft.result_variable
+
+ #~ tmpl_values['declare_variables'] \
+ #~ = os.linesep + os.linesep.join( map( lambda var: self.indent( var.declare_var_string() )
+ #~ , cntrl.variables ) )
+
+ #~ tmpl_values['pre_call'] = os.linesep + self.indent( os.linesep.join( cntrl.pre_call ) )
+
+ #~ tmpl_values['arg_expressions'] = self.PARAM_SEPARATOR.join( cntrl.arg_expressions )
+ #~ return_stmt_creator = calldef_utils.return_stmt_creator_t( self
+ #~ , self.controller
+ #~ , self.controller.result_variable
+ #~ , self.controller.return_variables )
+
+ #~ tmpl_values['post_call'] = os.linesep + self.indent( os.linesep.join( cntrl.post_call ) )
+ #~ if return_stmt_creator.pre_return_code:
+ #~ tmpl_values['post_call'] \
+ #~ = os.linesep.join([ tmpl_values['post_call']
+ #~ , self.indent( return_stmt_creator.pre_return_code )])
+
+ #~ f_def = self.controller.template.substitute(tmpl_values)
+ #~ return remove_duplicate_linesep( f_def )
+
+ #~ def _create_impl(self):
+ #~ return self.create_fun_definition()
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:25:52
|
Revision: 1162
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1162&view=rev
Author: roman_yakovenko
Date: 2007-11-20 13:25:57 -0800 (Tue, 20 Nov 2007)
Log Message:
-----------
remove_register_exposed functionality
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/calldef.py
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
pyplusplus_dev/pyplusplus/code_creators/code_creator.py
pyplusplus_dev/pyplusplus/code_creators/compound.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/member_variable.py
pyplusplus_dev/pyplusplus/code_creators/module.py
pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py
pyplusplus_dev/pyplusplus/code_creators/scoped.py
pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py
pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py
Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-11-20 21:25:05 UTC (rev 1161)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2007-11-20 21:25:57 UTC (rev 1162)
@@ -140,11 +140,6 @@
files.append( self.declaration.call_policies.header_file )
return files
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
-
class calldef_wrapper_t( code_creator.code_creator_t
, declaration_based.declaration_based_t):
def __init__(self, function ):
@@ -188,11 +183,6 @@
files.append( self.declaration.call_policies.header_file )
return files
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
-
class free_function_t( calldef_t ):
def __init__( self, function ):
calldef_t.__init__( self, function=function )
@@ -1080,10 +1070,6 @@
def _get_system_headers_impl( self ):
return []
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
class casting_operator_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
"""
@@ -1108,11 +1094,6 @@
def _get_system_headers_impl( self ):
return []
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
-
class casting_member_operator_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
"""
@@ -1151,12 +1132,6 @@
def _get_system_headers_impl( self ):
return []
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
-
-
class casting_constructor_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
"""
@@ -1235,11 +1210,6 @@
def name( self ):
return '%s_%s_overloads' % ( self.parent_decl.alias, self.alias )
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- for f in self.functions:
- exposed_db.expose( f )
-
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/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-11-20 21:25:05 UTC (rev 1161)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-11-20 21:25:57 UTC (rev 1162)
@@ -404,13 +404,3 @@
def _get_system_headers_impl( self ):
return []
-
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
-
-
-
-
-
Modified: pyplusplus_dev/pyplusplus/code_creators/code_creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/code_creator.py 2007-11-20 21:25:05 UTC (rev 1161)
+++ pyplusplus_dev/pyplusplus/code_creators/code_creator.py 2007-11-20 21:25:57 UTC (rev 1162)
@@ -178,12 +178,4 @@
assert isinstance( line, types.StringTypes )
l = line.lstrip()
return l.startswith( '//' ) or l.startswith( '/*' )
-
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}
-
- The default implementation of the function does nothing.
- """
- pass
-
\ No newline at end of file
Modified: pyplusplus_dev/pyplusplus/code_creators/compound.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/compound.py 2007-11-20 21:25:05 UTC (rev 1161)
+++ pyplusplus_dev/pyplusplus/code_creators/compound.py 2007-11-20 21:25:57 UTC (rev 1162)
@@ -86,11 +86,4 @@
if unique:
files = self.unique_headers( files )
return files
-
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}
-
- The default implementation of the function does nothing.
- """
- map( lambda creator: creator.register_exposed( exposed_db )
- , self._creators )
+
\ No newline at end of file
Modified: pyplusplus_dev/pyplusplus/code_creators/enum.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/enum.py 2007-11-20 21:25:05 UTC (rev 1161)
+++ pyplusplus_dev/pyplusplus/code_creators/enum.py 2007-11-20 21:25:57 UTC (rev 1162)
@@ -66,7 +66,3 @@
def _get_system_headers_impl( self ):
return []
-
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
Modified: pyplusplus_dev/pyplusplus/code_creators/exception_translator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/exception_translator.py 2007-11-20 21:25:05 UTC (rev 1161)
+++ pyplusplus_dev/pyplusplus/code_creators/exception_translator.py 2007-11-20 21:25:57 UTC (rev 1162)
@@ -35,11 +35,7 @@
def _get_system_headers_impl( self ):
return []
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
class exception_translator_register_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
def __init__(self, exception_class, exception_translator):
@@ -59,8 +55,4 @@
def _get_system_headers_impl( self ):
return []
-
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
+
\ No newline at end of file
Modified: pyplusplus_dev/pyplusplus/code_creators/global_variable.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/global_variable.py 2007-11-20 21:25:05 UTC (rev 1161)
+++ pyplusplus_dev/pyplusplus/code_creators/global_variable.py 2007-11-20 21:25:57 UTC (rev 1162)
@@ -33,11 +33,6 @@
def _get_system_headers_impl( self ):
return []
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
-
class global_variable_t( global_variable_base_t ):
"""
Creates boost.python code that exposes global variable.
Modified: pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2007-11-20 21:25:05 UTC (rev 1161)
+++ pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2007-11-20 21:25:57 UTC (rev 1162)
@@ -52,11 +52,6 @@
def _get_system_headers_impl( self ):
return self.configuration.include_files
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
-
class indexing_suite2_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
def __init__(self, container ):
@@ -126,11 +121,6 @@
def _get_system_headers_impl( self ):
return self.declaration.indexing_suite.include_files
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
-
class value_traits_t( code_creator.code_creator_t
, declaration_based.declaration_based_t ):
def __init__( self, value_class ):
@@ -188,8 +178,4 @@
def _get_system_headers_impl( self ):
return ['boost/python/suite/indexing/value_traits.hpp']
-
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
+
\ No newline at end of file
Modified: pyplusplus_dev/pyplusplus/code_creators/member_variable.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/member_variable.py 2007-11-20 21:25:05 UTC (rev 1161)
+++ pyplusplus_dev/pyplusplus/code_creators/member_variable.py 2007-11-20 21:25:57 UTC (rev 1162)
@@ -39,11 +39,6 @@
files.append( self.declaration.setter_call_policies.header_file )
return files
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
-
class member_variable_t( member_variable_base_t ):
"""
Creates boost.python code that exposes member variable.
Modified: pyplusplus_dev/pyplusplus/code_creators/module.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/module.py 2007-11-20 21:25:05 UTC (rev 1161)
+++ pyplusplus_dev/pyplusplus/code_creators/module.py 2007-11-20 21:25:57 UTC (rev 1162)
@@ -18,11 +18,17 @@
The root of the code creator tree is always a module_t object.
"""
- def __init__(self):
+ def __init__(self, global_ns):
"""Constructor.
"""
compound.compound_t.__init__(self)
self.__body = None
+ self.__global_ns = global_ns
+
+ @property
+ def global_ns(self):
+ "reference to global_ns ( namespace_t ) declaration"
+ return self.__global_ns
def _get_include_dirs(self):
include_dirs = algorithm.creator_finder.find_by_class_instance(
Modified: pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py 2007-11-20 21:25:05 UTC (rev 1161)
+++ pyplusplus_dev/pyplusplus/code_creators/opaque_type_registrator.py 2007-11-20 21:25:57 UTC (rev 1162)
@@ -22,8 +22,3 @@
def _get_system_headers_impl( self ):
return []
-
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
Modified: pyplusplus_dev/pyplusplus/code_creators/scoped.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/scoped.py 2007-11-20 21:25:05 UTC (rev 1161)
+++ pyplusplus_dev/pyplusplus/code_creators/scoped.py 2007-11-20 21:25:57 UTC (rev 1162)
@@ -16,9 +16,3 @@
#template method pattern should be used.
raise NotImplementedError()
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
- map( lambda creator: creator.register_exposed( exposed_db )
- , self._creators )
-
Modified: pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py 2007-11-20 21:25:05 UTC (rev 1161)
+++ pyplusplus_dev/pyplusplus/code_creators/smart_pointers.py 2007-11-20 21:25:57 UTC (rev 1162)
@@ -76,11 +76,6 @@
def _get_system_headers_impl( self ):
return []
-
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
class smart_pointers_converter_t( registration_based.registration_based_t
, declaration_based.declaration_based_t ):
@@ -122,8 +117,4 @@
def _get_system_headers_impl( self ):
return []
-
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
+
\ No newline at end of file
Modified: pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py 2007-11-20 21:25:05 UTC (rev 1161)
+++ pyplusplus_dev/pyplusplus/code_creators/unnamed_enum.py 2007-11-20 21:25:57 UTC (rev 1162)
@@ -36,8 +36,4 @@
def _get_system_headers_impl( self ):
return []
-
- def register_exposed( self, exposed_db ):
- """Register exposed declaration in L{exposed data base<utils.exposed_decls_db_t>}"""
- exposed_db.expose( self.declaration )
-
+
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
