[pygccxml-commit] source/pyplusplus/module_builder builder.py,1.6,1.7

[Roman <rom...@us...>]

Update of /cvsroot/pygccxml/source/pyplusplus/module_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28510/pyplusplus/module_builder

Modified Files:
	builder.py 
Log Message:
fixing select API to be more user friendly

Index: builder.py
===================================================================
RCS file: /cvsroot/pygccxml/source/pyplusplus/module_builder/builder.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** builder.py	29 Mar 2006 04:23:45 -0000	1.6
--- builder.py	30 Mar 2006 05:56:17 -0000	1.7
***************
*** 25,29 ****
                    , compilation_verbose=False
                    , compilation_mode=None
!                   , cache=None ):
          object.__init__( self )
          gccxml_config = parser.config_t( 
--- 25,30 ----
                    , compilation_verbose=False
                    , compilation_mode=None
!                   , cache=None
!                   , optimize_queries=True):
          object.__init__( self )
          gccxml_config = parser.config_t( 
***************
*** 40,44 ****
                                                        , cache )
          self.__code_creator = None         
! 
      def _get_global_ns( self ):
          return self.__global_ns
--- 41,47 ----
                                                        , cache )
          self.__code_creator = None         
!         if optimize_queries:
!             self.run_query_optimizer()
!             
      def _get_global_ns( self ):
          return self.__global_ns
***************
*** 77,80 ****
--- 80,87 ----
                     and decl.symbol == '()':
                      decl.alias = '__call__'
+         #if I remove the union I should remove also all variables that have the union type
+             if isinstance( decl, decls_package.class_t ):
+                 if decl.class_type == decls_package.CLASS_TYPES.UNION:
+                    decl.exclude() 
          
      def print_declarations(self):
***************
*** 116,194 ****
  
      #select decl(s) interfaces
!     def decl( self, *args, **keywds ):
!         return self.global_ns.decl( *args, **keywds )
  
!     def decls( self, *args, **keywds ):
!         return self.global_ns.decls( *args, **keywds )
  
!     def class_( self, *args, **keywds ):
!         return self.global_ns.class_( *args, **keywds )
  
!     def classes( self, *args, **keywds ):
!         return self.global_ns.classes( *args, **keywds )
      
!     def variable( self, *args, **keywds ):
!         return self.global_ns.variable( *args, **keywds )
  
!     def variables( self, *args, **keywds ):
!         return self.global_ns.variables( *args, **keywds )
      
!     def calldef( self, *args, **keywds ):
!         return self.global_ns.calldef( *args, **keywds )
  
!     def calldefs( self, *args, **keywds ):
!         return self.global_ns.calldefs( *args, **keywds )
      
!     def operator( self, *args, **keywds ):
!         return self.global_ns.operator( *args, **keywds )
  
!     def operators( self, *args, **keywds ):
!         return self.global_ns.operators( *args, **keywds )
  
!     def member_function( self, *args, **keywds ):
!         return self.global_ns.member_function( *args, **keywds )
      
!     def member_functions( self, *args, **keywds ):
!         return self.global_ns.member_functions( *args, **keywds )
  
!     def constructor( self, *args, **keywds ):
!         return self.global_ns.constructor( *args, **keywds )
!     
!     def constructors( self, *args, **keywds ):
!         return self.global_ns.constructors( *args, **keywds )
      
!     def member_operator( self, *args, **keywds ):
!         return self.global_ns.member_operator( *args, **keywds )
  
!     def member_operators( self, *args, **keywds ):
!         return self.global_ns.member_operators( *args, **keywds )
      
!     def casting_operator( self, *args, **keywds ):
!         return self.global_ns.casting_operator( *args, **keywds )
! 
!     def casting_operators( self, *args, **keywds ):
!         return self.global_ns.casting_operators( *args, **keywds )
! 
!     def enumeration( self, *args, **keywds ):
!         return self.global_ns.enumeration( *args, **keywds )
! 
!     def enumerations( self, *args, **keywds ):
!         return self.global_ns.enumerations( *args, **keywds )
  
!     def namespace( self, *args, **keywds ):
!         return self.global_ns.namespace( *args, **keywds )
  
!     def namespaces( self, *args, **keywds ):
!         return self.global_ns.namespaces( *args, **keywds )
  
!     def free_function( self, *args, **keywds ):
!         return self.global_ns.free_function( *args, **keywds )
  
!     def free_functions( self, *args, **keywds ):
!         return self.global_ns.free_functions( *args, **keywds )
  
!     def free_operator( self, *args, **keywds ):
!         return self.global_ns.free_operator( *args, **keywds )
  
!     def free_operators( self, *args, **keywds ):
!         return self.global_ns.free_operators( *args, **keywds )
--- 123,341 ----
  
      #select decl(s) interfaces
!     def decl( self, name=None, function=None, header_dir=None, header_file=None, recursive=None ):     
!         return self.global_ns.decl( name=name
!                                     , function=function
!                                     , header_dir=header_dir
!                                     , header_file=header_file
!                                     , recursive=recursive)
  
!     def decls( self, name=None, function=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.decls( name=name
!                                      , function=function
!                                      , header_dir=header_dir
!                                      , header_file=header_file 
!                                      , recursive=recursive)
  
!     def class_( self, name=None, function=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.class_( name=name
!                                       , function=function
!                                       , header_dir=header_dir
!                                       , header_file=header_file 
!                                       , recursive=recursive)
  
!     def classes( self, name=None, function=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.classes( name=name
!                                        , function=function
!                                        , header_dir=header_dir
!                                        , header_file=header_file 
!                                        , recursive=recursive)
      
!     def variable( self, name=None, function=None, type=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.variable( name=name
!                                         , function=function
!                                         , header_dir=header_dir
!                                         , header_file=header_file 
!                                         , recursive=recursive)
  
!     def variables( self, name=None, function=None, type=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.variables( name=name
!                                          , function=function
!                                          , header_dir=header_dir
!                                          , header_file=header_file 
!                                          , recursive=recursive)
      
!     def calldef( self, name=None, function=None, return_type=None, arg_types=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.calldef( name=name
!                                        , function=function
!                                        , return_type=return_type
!                                        , arg_types=arg_types 
!                                        , header_dir=header_dir
!                                        , header_file=header_file 
!                                        , recursive=recursive )
  
!     def calldefs( self, name=None, function=None, return_type=None, arg_types=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.calldefs( name=name
!                                         , function=function
!                                         , return_type=return_type
!                                         , arg_types=arg_types 
!                                         , header_dir=header_dir
!                                         , header_file=header_file
!                                         , recursive=recursive)
      
!     def operator( self, name=None, symbol=None, return_type=None, arg_types=None, decl_type=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.operator( name=name
!                                         , symbol=symbol
!                                         , function=function
!                                         , decl_type=decl_type
!                                         , return_type=return_type
!                                         , arg_types=arg_types 
!                                         , header_dir=header_dir
!                                         , header_file=header_file 
!                                         , recursive=recursive )
  
!     def operators( self, name=None, symbol=None, return_type=None, arg_types=None, decl_type=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.operators( name=name
!                                          , symbol=symbol
!                                          , function=function
!                                          , decl_type=declarations.operator_t
!                                          , return_type=return_type
!                                          , arg_types=arg_types 
!                                          , header_dir=header_dir
!                                          , header_file=header_file 
!                                          , recursive=recursive )
!     def member_function( self, name=None, function=None, return_type=None, arg_types=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.member_function( name=name
!                                                , function=function
!                                                , return_type=return_type
!                                                , arg_types=arg_types 
!                                                , header_dir=header_dir
!                                                , header_file=header_file 
!                                                , recursive=recursive )
  
!     def member_functions( self, name=None, function=None, return_type=None, arg_types=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.member_functions( name=name
!                                                 , function=function
!                                                 , return_type=return_type
!                                                 , arg_types=arg_types 
!                                                 , header_dir=header_dir
!                                                 , header_file=header_file
!                                                 , recursive=recursive)
      
!     def constructor( self, name=None, function=None, return_type=None, arg_types=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.constructor( name=name
!                                            , function=function
!                                            , return_type=return_type
!                                            , arg_types=arg_types 
!                                            , header_dir=header_dir
!                                            , header_file=header_file 
!                                            , recursive=recursive )
  
!     def constructors( self, name=None, function=None, return_type=None, arg_types=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.constructors( name=name
!                                             , function=function
!                                             , return_type=return_type
!                                             , arg_types=arg_types 
!                                             , header_dir=header_dir
!                                             , header_file=header_file
!                                             , recursive=recursive)
      
!     def member_operator( self, name=None, symbol=None, return_type=None, arg_types=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.member_operator( name=name
!                                                , symbol=symbol
!                                                , function=function
!                                                , return_type=return_type
!                                                , arg_types=arg_types 
!                                                , header_dir=header_dir
!                                                , header_file=header_file 
!                                                , recursive=recursive )
  
!     def member_operators( self, name=None, symbol=None, return_type=None, arg_types=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.member_operators( name=name
!                                                 , symbol=symbol
!                                                 , function=function
!                                                 , return_type=return_type
!                                                 , arg_types=arg_types 
!                                                 , header_dir=header_dir
!                                                 , header_file=header_file 
!                                                 , recursive=recursive ) 
      
!     def casting_operator( self, name=None, function=None, return_type=None, arg_types=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.casting_operator( name=name
!                                                 , function=function
!                                                 , return_type=return_type
!                                                 , arg_types=arg_types 
!                                                 , header_dir=header_dir
!                                                 , header_file=header_file 
!                                                 , recursive=recursive )
  
!     def casting_operators( self, name=None, function=None, return_type=None, arg_types=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.casting_operators( name=name
!                                                  , function=function
!                                                  , return_type=return_type
!                                                  , arg_types=arg_types 
!                                                  , header_dir=header_dir
!                                                  , header_file=header_file
!                                                  , recursive=recursive)
  
!     def enumeration( self, name=None, function=None, header_dir=None, header_file=None, recursive=None ):     
!         return self.global_ns.enumeration( name=name
!                                            , function=function
!                                            , header_dir=header_dir
!                                            , header_file=header_file
!                                            , recursive=recursive)
!                                      
!     def enumerations( self, name=None, function=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.enumerations( name=name
!                                             , function=function
!                                             , header_dir=header_dir
!                                             , header_file=header_file 
!                                             , recursive=recursive)
!                                         
!  
!     def namespace( self, name=None, function=None, recursive=None ):
!         return self.global_ns.namespace( name=name
!                                          , function=function
!                                          , recursive=recursive )
  
!     def namespaces( self, name=None, function=None, recursive=None ):
!         return self.global_ns.namespaces( name=name
!                                           , function=function
!                                           , recursive=recursive )
!     
!     def free_function( self, name=None, function=None, return_type=None, arg_types=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.free_function( name=name
!                                              , function=function
!                                              , return_type=return_type
!                                              , arg_types=arg_types 
!                                              , header_dir=header_dir
!                                              , header_file=header_file 
!                                              , recursive=recursive )
  
!     def free_functions( self, name=None, function=None, return_type=None, arg_types=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.free_functions( name=name
!                                               , function=function
!                                               , return_type=return_type
!                                               , arg_types=arg_types 
!                                               , header_dir=header_dir
!                                               , header_file=header_file
!                                               , recursive=recursive)
  
!     def free_operator( self, name=None, function=None, symbol=None, return_type=None, arg_types=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.free_operator( name=name
!                                              , symbol=symbol
!                                              , function=function
!                                              , return_type=return_type
!                                              , arg_types=arg_types 
!                                              , header_dir=header_dir
!                                              , header_file=header_file 
!                                              , recursive=recursive )
  
!     def free_operators( self, name=None, function=None, symbol=None, return_type=None, arg_types=None, header_dir=None, header_file=None, recursive=None ):
!         return self.global_ns.free_operators( name=name
!                                               , symbol=symbol
!                                               , function=function
!                                               , return_type=return_type
!                                               , arg_types=arg_types 
!                                               , header_dir=header_dir
!                                               , header_file=header_file 
!                                               , recursive=recursive )