[pygccxml-commit] source/pyplusplus/experimental declwrapper.py,1.8,1.9

[Matthias B. <mb...@us...>]

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

Modified Files:
	declwrapper.py 
Log Message:
Some minor bug fixes

Index: declwrapper.py
===================================================================
RCS file: /cvsroot/pygccxml/source/pyplusplus/experimental/declwrapper.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** declwrapper.py	28 Mar 2006 12:12:09 -0000	1.8
--- declwrapper.py	6 Apr 2006 09:22:59 -0000	1.9
***************
*** 417,421 ****
          if args!=None:
              filters.append(ArgsFilter(args))
!             type |= CALLABLE
          # anyarg filter
          if anyarg!=None:
--- 417,421 ----
          if args!=None:
              filters.append(ArgsFilter(args))
!             itype |= CALLABLE
          # anyarg filter
          if anyarg!=None:
***************
*** 431,435 ****
          if accesstype!=None:
              addFilter(accesstype, AccessTypeFilter)
!             type |= METHOD
          # custom filters
          if filter!=None:
--- 431,435 ----
          if accesstype!=None:
              addFilter(accesstype, AccessTypeFilter)
!             itype |= METHOD
          # custom filters
          if filter!=None:
***************
*** 443,447 ****
              if type==None:
                  type = 0
!             type |= itype
          addFilter(type, TypeFilter)
  
--- 443,448 ----
              if type==None:
                  type = 0
!             if (type & CALLABLE)==0:
!                 type |= itype
          addFilter(type, TypeFilter)
  
***************
*** 502,522 ****
          return self.Decls(name=name, type=type|NAMESPACE, **args)
  
!     # Class
      def Classes(self, name=None, type=0, **args):
          return self.Decls(name=name, type=type|CLASS, **args)
  
!     # Method
      def Methods(self, name=None, type=0, **args):
!         return self.Decls(name=name, type=type|METHOD, **args)
  
!     # Constructor
      def Constructors(self, name=None, type=0, **args):
          return self.Decls(name=name, type=type|CONSTRUCTOR, **args)
  
!     # Function
      def Functions(self, name=None, type=0, **args):
          return self.Decls(name=name, type=type|FUNCTION, **args)
  
!     # Enum
      def Enums(self, name=None, type=0, **args):
          return self.Decls(name=name, type=type|ENUM, **args)
--- 503,523 ----
          return self.Decls(name=name, type=type|NAMESPACE, **args)
  
!     # Classes
      def Classes(self, name=None, type=0, **args):
          return self.Decls(name=name, type=type|CLASS, **args)
  
!     # Methods
      def Methods(self, name=None, type=0, **args):
!         return self.Decls(name=name, type=type|METHOD|CONSTRUCTOR, **args)
  
!     # Constructors
      def Constructors(self, name=None, type=0, **args):
          return self.Decls(name=name, type=type|CONSTRUCTOR, **args)
  
!     # Functions
      def Functions(self, name=None, type=0, **args):
          return self.Decls(name=name, type=type|FUNCTION, **args)
  
!     # Enums
      def Enums(self, name=None, type=0, **args):
          return self.Decls(name=name, type=type|ENUM, **args)