|
From: <rom...@us...> - 2006-05-02 05:25:29
|
Revision: 53 Author: roman_yakovenko Date: 2006-05-01 22:25:23 -0700 (Mon, 01 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=53&view=rev Log Message: ----------- updating writer to use free_function_t code creator, instead of "function_t" one Modified Paths: -------------- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py Modified: pyplusplus_dev/pyplusplus/file_writers/multiple_files.py =================================================================== --- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2006-05-02 05:24:01 UTC (rev 52) +++ pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2006-05-02 05:25:23 UTC (rev 53) @@ -227,8 +227,8 @@ def split_free_functions( self ): """Write all free functions into a separate .h/.cpp file. """ - creators = filter( lambda x: isinstance(x, code_creators.function_t ) - , self.extmodule.body.creators ) + creators = filter( lambda x: isinstance(x, code_creators.free_function_t ) + , self.extmodule.body.creators ) self.split_creators( creators, '_free_functions', 'register_free_functions', -1 ) #TODO: move write_main to __init__ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-06-26 20:05:55
|
Revision: 250 Author: roman_yakovenko Date: 2006-06-26 13:05:50 -0700 (Mon, 26 Jun 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=250&view=rev Log Message: ----------- fixing bug caused by removing precompiled header code creator Modified Paths: -------------- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py Modified: pyplusplus_dev/pyplusplus/file_writers/multiple_files.py =================================================================== --- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2006-06-25 18:01:40 UTC (rev 249) +++ pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2006-06-26 20:05:50 UTC (rev 250) @@ -91,15 +91,11 @@ answer = [] if self.extmodule.license: answer.append( self.extmodule.license.create() ) - - if self.extmodule.precompiled_header: - answer.append( self.extmodule.precompiled_header.create() ) - + answer.append( '#include "%s%s"' % ( file_name, self.HEADER_EXT ) ) # Include all 'global' include files... include_creators = filter( lambda creator: isinstance( creator, code_creators.include_t ) - and not isinstance( creator, code_creators.precompiled_header_t ) , self.extmodule.creators ) includes = map( lambda include_creator: include_creator.create() , include_creators ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-06-29 11:26:03
|
Revision: 265 Author: roman_yakovenko Date: 2006-06-29 04:25:57 -0700 (Thu, 29 Jun 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=265&view=rev Log Message: ----------- fixing small bug Modified Paths: -------------- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py Modified: pyplusplus_dev/pyplusplus/file_writers/multiple_files.py =================================================================== --- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2006-06-29 11:16:59 UTC (rev 264) +++ pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2006-06-29 11:25:57 UTC (rev 265) @@ -204,7 +204,9 @@ """ header_name = self.create_value_traits_header_name( value_traits.declaration ) file_path = os.path.join( self.directory_path, header_name ) - self.write_file( file_path, self.create_header( header_name, value_traits.create() ) ) + self.write_file( file_path + , self.create_header( header_name.replace( '.', '_' ) + , value_traits.create() ) ) value_traits.create = lambda: '' def split_creators( self, creators, pattern, function_name, registrator_pos ): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-07-18 08:13:44
|
Revision: 311 Author: roman_yakovenko Date: 2006-07-18 01:13:37 -0700 (Tue, 18 Jul 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=311&view=rev Log Message: ----------- small refactoring. This refactoring should make easier to introduce new functionality - splitting code of single class to many files Modified Paths: -------------- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py Modified: pyplusplus_dev/pyplusplus/file_writers/multiple_files.py =================================================================== --- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2006-07-18 05:52:30 UTC (rev 310) +++ pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2006-07-18 08:13:37 UTC (rev 311) @@ -91,7 +91,7 @@ value_class = class_traits.get_declaration( element_type ) return self.create_value_traits_header_name( value_class ) - def create_source( self, file_name, function_name, creators ): + def create_source( self, file_name, function_name, registration_creators, declaration_creators=None ): """Return the content of a cpp file. @param file_name: The base name of the corresponding include file (without extension) @@ -103,6 +103,10 @@ @returns: The content for a cpp file @rtype: str """ + + if None is declaration_creators: + declaration_creators = [] + creators = registration_creators + declaration_creators answer = [] if self.extmodule.license: @@ -110,12 +114,13 @@ answer.append( '#include "%s%s"' % ( file_name, self.HEADER_EXT ) ) - # Include all 'global' include files... + # Include all 'global' include files... include_creators = filter( lambda creator: isinstance( creator, code_creators.include_t ) , self.extmodule.creators ) includes = map( lambda include_creator: include_creator.create() - , include_creators ) - for creator in creators: + , include_creators ) + + for creator in registration_creators: value_traits_header = self.find_out_value_traits_header( creator ) if value_traits_header: includes.append( '#include "%s"' % value_traits_header ) @@ -136,38 +141,43 @@ answer.append( os.linesep.join(namespace_aliases) ) # Write wrapper classes... - for creator in creators: - if isinstance( creator, code_creators.class_t ) and creator.wrapper: - answer.append( '' ) - answer.append( creator.wrapper.create() ) + for creator in declaration_creators: + answer.append( '' ) + answer.append( creator.create() ) # Write the register() function... answer.append( '' ) answer.append( 'void %s(){' % function_name ) - for creator in creators: + for creator in registration_creators: answer.append( code_creators.code_creator_t.indent( creator.create() ) ) answer.append( '' ) answer.append( '}' ) return os.linesep.join( answer ) - def __split_class_impl( self, class_creator): + def split_class_impl( self, class_creator): function_name = 'register_%s_class' % class_creator.alias file_path = os.path.join( self.directory_path, class_creator.alias ) # Write the .h file... header_name = file_path + self.HEADER_EXT self.write_file( header_name , self.create_header( class_creator.alias - , self.create_function_code( function_name ) ) ) - # Write the .cpp file... - self.write_file( file_path + self.SOURCE_EXT - , self.create_source( class_creator.alias - , function_name - , [class_creator] )) - if isinstance( class_creator, code_creators.class_t ) and class_creator.wrapper: + , self.create_function_code( function_name ) ) ) + class_wrapper = None + decl_creators = None + if isinstance( class_creator, code_creators.class_t ) and class_creator.wrapper: + class_wrapper = class_creator.wrapper + decl_creators = [ class_creator.wrapper ] + # Write the .cpp file... + cpp_code = self.create_source( class_creator.alias + , function_name + , [class_creator] + , decl_creators ) + self.write_file( file_path + self.SOURCE_EXT, cpp_code ) + if class_wrapper: # The wrapper has already been written above, so replace the create() # method with a new 'method' that just returns an empty string because # this method is later called again for the main source file. - class_creator.wrapper.create = lambda: '' + class_wrapper.create = lambda: '' # Replace the create() method so that only the register() method is called # (this is called later for the main source file). class_creator.create = lambda: function_name +'();' @@ -185,7 +195,7 @@ @type class_creator: class_t """ try: - self.__split_class_impl( class_creator ) + self.split_class_impl( class_creator ) except IOError, error: msg = [ 'Failed to write code for class "%s" into file.' % class_creator.declaration.name ] msg.append( "May be the class name is too long?." ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-08-07 09:57:46
|
Revision: 385 Author: roman_yakovenko Date: 2006-08-07 02:57:39 -0700 (Mon, 07 Aug 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=385&view=rev Log Message: ----------- fixing small bug Modified Paths: -------------- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py Modified: pyplusplus_dev/pyplusplus/file_writers/multiple_files.py =================================================================== --- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2006-08-07 09:56:38 UTC (rev 384) +++ pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2006-08-07 09:57:39 UTC (rev 385) @@ -176,10 +176,12 @@ , self.create_header( class_creator.alias , self.create_function_code( function_name ) ) ) class_wrapper = None - decl_creators = class_creator.user_declarations[:] - if isinstance( class_creator, code_creators.class_t ) and class_creator.wrapper: - class_wrapper = class_creator.wrapper - decl_creators.append( class_creator.wrapper ) + decl_creators = [] + if isinstance( class_creator, code_creators.class_t ): + decl_creators.extend( class_creator.user_declarations ) + if class_creator.wrapper: + class_wrapper = class_creator.wrapper + decl_creators.append( class_creator.wrapper ) # Write the .cpp file... cpp_code = self.create_source( class_creator.alias @@ -210,8 +212,8 @@ """ try: self.split_class_impl( class_creator ) - except IOError, error: - msg = [ 'Failed to write code for class "%s" into file.' % class_creator.declaration.name ] + except IOError, error: + msg = [ 'Failed to write code for class "%s" into file.;' % class_creator.declaration.name ] msg.append( "May be the class name is too long?." ) msg.append( "Error: %s'" % str(error) ) self.logger.error( os.linesep.join( msg ) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-08-16 08:41:22
|
Revision: 408 Author: roman_yakovenko Date: 2006-08-16 01:41:16 -0700 (Wed, 16 Aug 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=408&view=rev Log Message: ----------- fixing small bug - find out value_traits type, should work now for class_declaration_t Modified Paths: -------------- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py Modified: pyplusplus_dev/pyplusplus/file_writers/multiple_files.py =================================================================== --- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2006-08-16 02:20:54 UTC (rev 407) +++ pyplusplus_dev/pyplusplus/file_writers/multiple_files.py 2006-08-16 08:41:16 UTC (rev 408) @@ -88,14 +88,23 @@ return None if not isinstance( code_creator.declaration.indexing_suite, decl_wrappers.indexing_suite2_t ): return None - element_type = code_creator.declaration.indexing_suite.element_type - class_traits = declarations.class_traits - if not class_traits.is_my_case( element_type ): - return None - value_class = class_traits.get_declaration( element_type ) - return self.create_value_traits_header_name( value_class ) - - def create_include_code( self, creators, head_headers=None, tail_headers=None ): + try: + element_type = code_creator.declaration.indexing_suite.element_type + class_traits = declarations.class_traits + if not class_traits.is_my_case( element_type ): + return None + value_class = class_traits.get_declaration( element_type ) + return self.create_value_traits_header_name( value_class ) + except RuntimeError, error: + msg = "%s;%s" \ + % ( str(code_creator.declaration) + , "Py++ can not find out container value_type( mapped_type )." + "The container class is template instantiation declaration and not definition." + "This container class will be exported, but there is a posiblity, that generated code will not compile." + "The solution to the problem is to create a variable of the class." ) + self.logger.warn( msg ) + + def create_include_code( self, creators, head_headers=None, tail_headers=None ): answer = [] normalize = code_creators.include_directories_t.normalize if head_headers: @@ -160,6 +169,7 @@ for creator in declaration_creators: answer.append( '' ) answer.append( creator.create() ) + creator.create = lambda: '' # Write the register() function... answer.append( '' ) @@ -193,11 +203,7 @@ , [class_creator] , decl_creators ) self.write_file( file_path + self.SOURCE_EXT, cpp_code ) - if class_wrapper: - # The wrapper has already been written above, so replace the create() - # method with a new 'method' that just returns an empty string because - # this method is later called again for the main source file. - class_wrapper.create = lambda: '' + # Replace the create() method so that only the register() method is called # (this is called later for the main source file). class_creator.create = lambda: function_name +'();' @@ -298,10 +304,11 @@ def write(self): """ Write out the module. Creates a separate source/header combo for each class and for enums, globals, - and free functions. Post-condition: split_header_names and split_method_names - variables, will contain all the header files and registration methods - used. This can be used by user code to create custom registration - methods if main is not written. + and free functions. + If write_main is True it writes out a main file that calls all the registration methods. + After this call split_header_names and split_method_names will contain + all the header files and registration methods used. This can be used by + user code to create custom registration methods if main is not written. """ self.write_code_repository( self.__directory_path ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
