[ctypes-commit] ctypes/sandbox/tools/structures resolve.py,1.1,1.2

[Thomas H. <th...@us...>]

Update of /cvsroot/ctypes/ctypes/sandbox/tools/structures
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1021

Modified Files:
	resolve.py 
Log Message:
About to refactor.


Index: resolve.py
===================================================================
RCS file: /cvsroot/ctypes/ctypes/sandbox/tools/structures/resolve.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** resolve.py	8 Sep 2004 06:30:20 -0000	1.1
--- resolve.py	8 Sep 2004 16:55:31 -0000	1.2
***************
*** 272,275 ****
--- 272,281 ----
              return "Structure(%s)" % self.name
  
+     def isClass(self):
+         for m in self.members:
+             if isinstance(m, Method):
+                 return True
+         return False
+ 
  class Union(Structure):
      def __init__(self, name, members):
***************
*** 492,514 ****
  
      for obj in handler.all.values():
!         if isinstance(obj, (Structure, Union)):
!             print obj.name
              obj.resolve(find_typ)
!             pp(obj.members)
!             print
!         elif isinstance(obj, Typedef):
!             if 1:
! ##            try:
!                 obj.resolve(find_typ)
! ##            except:
! ##                pass
! ##            else:
!                 if isinstance(obj.typ, (Structure, Union)):
!                     print obj
!                     if isinstance(obj, Structure):
!                         print obj.typ.bases
!                     for f in obj.typ.members:
!                         print " ", f
!                     print
  
  ##    pp(handler.all)
--- 498,516 ----
  
      for obj in handler.all.values():
! ##        if isinstance(obj, (Structure, Union)):
! ##            print obj.name
! ##            obj.resolve(find_typ)
! ##            pp(obj.members)
! ##            print
! ##            continue
!         if isinstance(obj, Typedef):
              obj.resolve(find_typ)
!             if isinstance(obj.typ, (Structure, Union)) and not obj.typ.isClass():
!                 print obj, len(obj.typ.members)
! ##                if isinstance(obj, Structure):
! ##                    print obj.typ.bases
! ##                for f in obj.typ.members:
! ##                    print " ", f
! ##                print
  
  ##    pp(handler.all)