Update of /cvsroot/pygccxml/source/pyplusplus/unittests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32522/pyplusplus/unittests Modified Files: algorithms_tester.py call_policies_tester.py class_order_tester.py dwrapper_printer_tester.py enums_tester.py free_function_ignore_bug_tester.py fundamental_tester_base.py mdecl_wrapper_tester.py operators_tester.py recursive_tester.py user_text_tester.py Removed Files: boost_filesystem.py boost_regex.py filesystem_tester.py Log Message: module_builder_t class interface has been changed: as we agrees with Matthias: every step should be done explicitly: declaration parsing in __init__( I decided about this ) build_code_creator() <- creates code creators tree, user has full control on module_creator.creator_t class initialization write_module <- writes module to file split_module <- splits module code to mutliple files I will post about those changes on mailing list later. --- filesystem_tester.py DELETED --- Index: class_order_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/class_order_tester.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** class_order_tester.py 15 Mar 2006 09:27:07 -0000 1.5 --- class_order_tester.py 21 Mar 2006 08:07:30 -0000 1.6 *************** *** 21,25 **** def customize(self, mb ): ! extmodule = mb.module_creator matcher = declarations.match_declaration_t( name='item', type=declarations.class_t ) item_creator = code_creators.creator_finder.find_by_declaration( matcher, extmodule.body.creators )[0] --- 21,26 ---- def customize(self, mb ): ! mb.build_code_creator( self.EXTENSION_NAME ) ! extmodule = mb.code_creator matcher = declarations.match_declaration_t( name='item', type=declarations.class_t ) item_creator = code_creators.creator_finder.find_by_declaration( matcher, extmodule.body.creators )[0] Index: call_policies_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/call_policies_tester.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** call_policies_tester.py 15 Mar 2006 09:27:07 -0000 1.9 --- call_policies_tester.py 21 Mar 2006 08:07:30 -0000 1.10 *************** *** 22,30 **** def customize(self, mb ): ! rsa = mb.calldef( 'return_second_arg' ) ! self.failUnless( rsa ) ! rsa.call_policies = decl_wrappers.return_arg( 2 ) ! rs = mb.calldef( 'return_self' ) ! rs.call_policies = decl_wrappers.return_self() def run_tests(self, module): --- 22,27 ---- def customize(self, mb ): ! mb.calldef( 'return_second_arg' ).call_policies = decl_wrappers.return_arg( 2 ) ! mb.calldef( 'return_self' ).call_policies = decl_wrappers.return_self() def run_tests(self, module): Index: recursive_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/recursive_tester.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** recursive_tester.py 16 Mar 2006 06:34:09 -0000 1.4 --- recursive_tester.py 21 Mar 2006 08:07:30 -0000 1.5 *************** *** 26,38 **** decls = mb.decls( matcher ) decls.ignore = True matcher = declarations.match_declaration_t( name='skip_a' ) found = code_creators.creator_finder.find_by_declaration( matcher ! , mb.module_creator.creators ) self.failUnless( not found, "'skip_a' declaration should not be exported" ) matcher = declarations.match_declaration_t( name='skip_b' ) found = code_creators.creator_finder.find_by_declaration( matcher ! , mb.module_creator.creators ) self.failUnless( not found, "'skip_b' declaration should not be exported" ) --- 26,40 ---- decls = mb.decls( matcher ) decls.ignore = True + + mb.build_code_creator( self.EXTENSION_NAME ) matcher = declarations.match_declaration_t( name='skip_a' ) found = code_creators.creator_finder.find_by_declaration( matcher ! , mb.code_creator.creators ) self.failUnless( not found, "'skip_a' declaration should not be exported" ) matcher = declarations.match_declaration_t( name='skip_b' ) found = code_creators.creator_finder.find_by_declaration( matcher ! , mb.code_creator.creators ) self.failUnless( not found, "'skip_b' declaration should not be exported" ) Index: mdecl_wrapper_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/mdecl_wrapper_tester.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mdecl_wrapper_tester.py 6 Mar 2006 05:02:41 -0000 1.1 --- mdecl_wrapper_tester.py 21 Mar 2006 08:07:30 -0000 1.2 *************** *** 31,40 **** , undefine_symbols=['__MINGW32__']) ! mb = module_builder.module_builder_t( ! 'dummy' ! , self._get_files() ! , config ) classes = filter( lambda d: isinstance( d, decl_wrappers.class_t ) ! , declarations.make_flatten( mb.declarations ) ) mdw = decl_wrappers.mdecl_wrapper_t( classes ) --- 31,37 ---- , undefine_symbols=['__MINGW32__']) ! mb = module_builder.module_builder_t( self._get_files(), config ) classes = filter( lambda d: isinstance( d, decl_wrappers.class_t ) ! , declarations.make_flatten( mb.global_ns ) ) mdw = decl_wrappers.mdecl_wrapper_t( classes ) Index: enums_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/enums_tester.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** enums_tester.py 15 Mar 2006 09:27:07 -0000 1.9 --- enums_tester.py 21 Mar 2006 08:07:30 -0000 1.10 *************** *** 22,26 **** def customize(self, mb ): color = mb.enumeration( 'color' ) - self.failUnless(color) color.alias = 'Color' color.value_aliases['red'] = 'RED' --- 22,25 ---- Index: free_function_ignore_bug_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/free_function_ignore_bug_tester.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** free_function_ignore_bug_tester.py 19 Mar 2006 13:35:39 -0000 1.1 --- free_function_ignore_bug_tester.py 21 Mar 2006 08:07:30 -0000 1.2 *************** *** 22,28 **** def customize(self, mb ): do_nothing = mb.free_functions( 'do_nothing' ) ! do_nothing.exclude() ! code = mb.module_creator.create() ! print code self.failUnless( 'do_nothing' not in code ) --- 22,28 ---- def customize(self, mb ): do_nothing = mb.free_functions( 'do_nothing' ) ! do_nothing.exclude() ! mb.build_code_creator(self.EXTENSION_NAME) ! code = mb.code_creator.create() self.failUnless( 'do_nothing' not in code ) Index: dwrapper_printer_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/dwrapper_printer_tester.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dwrapper_printer_tester.py 6 Mar 2006 05:00:34 -0000 1.1 --- dwrapper_printer_tester.py 21 Mar 2006 08:07:30 -0000 1.2 *************** *** 13,17 **** class tester_t(unittest.TestCase): - def _get_files( self ): files = [ --- 13,16 ---- *************** *** 31,40 **** , undefine_symbols=['__MINGW32__']) ! mb = module_builder.module_builder_t( ! 'dummy' ! , self._get_files() ! , config ) writer = lambda decl: None ! decl_wrappers.print_declarations( mb.declarations, writer=writer ) def create_suite(): --- 30,36 ---- , undefine_symbols=['__MINGW32__']) ! mb = module_builder.module_builder_t( self._get_files(), config ) writer = lambda decl: None ! decl_wrappers.print_declarations( mb.global_ns, writer=writer ) def create_suite(): Index: operators_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/operators_tester.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** operators_tester.py 15 Mar 2006 09:27:07 -0000 1.9 --- operators_tester.py 21 Mar 2006 08:07:30 -0000 1.10 *************** *** 24,39 **** mb.global_ns.exclude() - #I don't want to export base classes of 'rational<long int>' - rational = mb.class_('rational<long int>') rational.include() rational.alias = "pyrational" - foperators = mb.free_operators( lambda decl: 'rational<long int>' in decl.decl_string ) - foperators.include() - r_assign = rational.calldef( 'assign', recursive=False ) r_assign.call_policies = decl_wrappers.return_self() ! bad_rational = mb.class_('bad_rational' ) bad_rational.include() --- 24,37 ---- mb.global_ns.exclude() rational = mb.class_('rational<long int>') rational.include() rational.alias = "pyrational" r_assign = rational.calldef( 'assign', recursive=False ) r_assign.call_policies = decl_wrappers.return_self() ! ! foperators = mb.free_operators( lambda decl: 'rational<long int>' in decl.decl_string ) ! foperators.include() ! bad_rational = mb.class_('bad_rational' ) bad_rational.include() --- boost_regex.py DELETED --- Index: user_text_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/user_text_tester.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** user_text_tester.py 19 Mar 2006 05:45:14 -0000 1.1 --- user_text_tester.py 21 Mar 2006 08:07:30 -0000 1.2 *************** *** 26,31 **** wrapper_code = "/*wrapper code*/" data.add_wrapper_code( wrapper_code ) ! code = mb.module_creator.create() ! self.failUnless( ( class_code in code ) and ( wrapper_code in code ) ) --- 26,31 ---- wrapper_code = "/*wrapper code*/" data.add_wrapper_code( wrapper_code ) ! mb.build_code_creator( self.EXTENSION_NAME ) ! code = mb.code_creator.create() self.failUnless( ( class_code in code ) and ( wrapper_code in code ) ) Index: fundamental_tester_base.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/fundamental_tester_base.py,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** fundamental_tester_base.py 15 Mar 2006 09:27:07 -0000 1.30 --- fundamental_tester_base.py 21 Mar 2006 08:07:30 -0000 1.31 *************** *** 61,73 **** , include_paths=[autoconfig.boost_path] , undefine_symbols=['__MINGW32__']) ! mb = module_builder.module_builder_t( self.__module_name ! , [self.__to_be_exported_header] ! , config ) self.customize( mb ) ! mb.module_creator.std_directories.extend( autoconfig.scons_config.cpppath ) ! mb.module_creator.user_defined_directories.append( autoconfig.package_location ) ! mb.module_creator.precompiled_header = "boost/python.hpp" ! mb.module_creator.license = LICENSE ! mb.write_file( self.__generated_source_file_name ) def _create_sconstruct(self, sources ): --- 61,73 ---- , include_paths=[autoconfig.boost_path] , undefine_symbols=['__MINGW32__']) ! mb = module_builder.module_builder_t( [self.__to_be_exported_header], config ) self.customize( mb ) ! if not mb.has_code_creator(): ! mb.build_code_creator( self.__module_name ) ! mb.code_creator.std_directories.extend( autoconfig.scons_config.cpppath ) ! mb.code_creator.user_defined_directories.append( autoconfig.package_location ) ! mb.code_creator.precompiled_header = "boost/python.hpp" ! mb.code_creator.license = LICENSE ! mb.write_module( self.__generated_source_file_name ) def _create_sconstruct(self, sources ): Index: algorithms_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/algorithms_tester.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** algorithms_tester.py 2 Mar 2006 07:07:13 -0000 1.9 --- algorithms_tester.py 21 Mar 2006 08:07:30 -0000 1.10 *************** *** 24,32 **** config = parser.config_t( gccxml_path=autoconfig.gccxml_path ) mb = module_builder.module_builder_t( ! 'dummy' ! , [ parser.create_text_fc( 'namespace enums{ enum { OK=1 }; }' )] , config ) mb.namespace( name='::enums' ).include() ! flatten = code_creators.make_flatten(mb.module_creator.creators) self.failUnless( filter( lambda inst: isinstance( inst, code_creators.unnamed_enum_t ), flatten ) ) --- 24,32 ---- config = parser.config_t( gccxml_path=autoconfig.gccxml_path ) mb = module_builder.module_builder_t( ! [ parser.create_text_fc( 'namespace enums{ enum { OK=1 }; }' ) ] , config ) mb.namespace( name='::enums' ).include() ! mb.build_code_creator('dummy') ! flatten = code_creators.make_flatten(mb.code_creator.creators) self.failUnless( filter( lambda inst: isinstance( inst, code_creators.unnamed_enum_t ), flatten ) ) *************** *** 35,46 **** config = parser.config_t( gccxml_path=autoconfig.gccxml_path ) mb = module_builder.module_builder_t( ! 'dummy' ! , [ parser.create_text_fc( 'namespace enums{ enum color{ red = 1}; }' )] , config ) mb.namespace( name='::enums' ).include() enum_matcher = declarations.match_declaration_t( name='color' ) enum_found = code_creators.creator_finder.find_by_declaration( enum_matcher ! , mb.module_creator.creators ) self.failUnless( enum_found ) --- 35,46 ---- config = parser.config_t( gccxml_path=autoconfig.gccxml_path ) mb = module_builder.module_builder_t( ! [ parser.create_text_fc( 'namespace enums{ enum color{ red = 1}; }' )] , config ) mb.namespace( name='::enums' ).include() enum_matcher = declarations.match_declaration_t( name='color' ) + mb.build_code_creator( 'dummy' ) enum_found = code_creators.creator_finder.find_by_declaration( enum_matcher ! , mb.code_creator.creators ) self.failUnless( enum_found ) *************** *** 48,58 **** config = parser.config_t( gccxml_path=autoconfig.gccxml_path ) mb = module_builder.module_builder_t( ! 'dummy' ! , [ parser.create_text_fc( 'namespace enums{ enum color{ red = 1}; }' )] , config ) mb.namespace( name='::enums' ).include() enum_found = code_creators.creator_finder.find_by_class_instance( code_creators.enum_t ! , mb.module_creator.creators , recursive=True) self.failUnless( enum_found ) --- 48,58 ---- config = parser.config_t( gccxml_path=autoconfig.gccxml_path ) mb = module_builder.module_builder_t( ! [ parser.create_text_fc( 'namespace enums{ enum color{ red = 1}; }' )] , config ) mb.namespace( name='::enums' ).include() + mb.build_code_creator('dummy') enum_found = code_creators.creator_finder.find_by_class_instance( code_creators.enum_t ! , mb.code_creator.creators , recursive=True) self.failUnless( enum_found ) --- boost_filesystem.py DELETED --- |
