[Python-checkins] python/dist/src/Mac/Modules/file filescan.py,1.5,1.6 filesupport.py,1.9,1.10

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Modules/file
In directory sc8-pr-cvs1:/tmp/cvs-serv18453

Modified Files:
	filescan.py filesupport.py 
Log Message:
Started on implementing support for FSCatalogInfo. Doesn't work yet, don't
try it.


Index: filescan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/file/filescan.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** filescan.py	18 Dec 2002 23:17:26 -0000	1.5
--- filescan.py	9 Jan 2003 23:37:36 -0000	1.6
***************
*** 135,140 ****
  			
  			"CatPositionRec", # State variable, not too difficult
- 			"FSCatalogInfo", # Lots of fields, difficult struct
- 			"FSCatalogInfo_ptr", # Lots of fields, difficult struct
  			"FSIterator", # Should become an object
  			"FSForkInfo", # Lots of fields, difficult struct
--- 135,138 ----
***************
*** 181,184 ****
--- 179,193 ----
  			([('FSRef_ptr', 'fromFile', 'InMode')],
      		 [('OptFSRefPtr', 'fromFile', 'InMode')]),
+     		 
+     		# FSCatalogInfo input handling
+ 			([('FSCatalogInfoBitmap', 'whichInfo', 'InMode'),
+     		  ('FSCatalogInfo_ptr', 'catalogInfo', 'InMode')],
+     		 [('FSCatalogInfoAndBitmap_in', 'catalogInfo', 'InMode')]),
+     		
+     		# FSCatalogInfo output handling
+ 			([('FSCatalogInfoBitmap', 'whichInfo', 'InMode'),
+     		  ('FSCatalogInfo', 'catalogInfo', 'OutMode')],
+     		 [('FSCatalogInfoAndBitmap_out', 'catalogInfo', 'InOutMode')]),
+     		
  
  		]

Index: filesupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/file/filesupport.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** filesupport.py	26 Dec 2002 20:45:43 -0000	1.9
--- filesupport.py	9 Jan 2003 23:37:37 -0000	1.10
***************
*** 51,54 ****
--- 51,101 ----
  		Output("%s %s__buf__;", self.typeName, name)
  		Output("%s *%s = &%s__buf__;", self.typeName, name, name)
+ 
+ class FSCatalogInfoAndBitmapType(InputOnlyType):
+ 	
+ 	def __init__(self):
+ 		InputOnlyType.__init__(self, "BUG", "BUG")
+ 		
+ 	def declare(self, name):
+ 		Output("PyObject *%s__object;", name)
+ 		Output("FSCatalogInfoBitname %s__bitmap;", name)
+ 		Output("FSCatalogInfo %s;", name)
+ 		
+ 	def getargsFormat(self):
+ 		return "lO"
+ 		
+ 	def getargsArgs(self, name):
+ 		return "%s__bitmap, %s__object"%(name, name)
+ 		
+ 	def getargsCheck(self, name):
+ 		Output("convert_FSCatalogInfo(%s__object, %s__bitmap, %s);", name, name, name)
+ 		
+ 	def passOutput(self, name):
+ 		return "%s__bitmap, %s"% (name, name)
+ 		
+ 	def mkvalueFormat(self):
+ 		return "O"
+ 
+ 	def mkvalueArgs(self, name):
+ 		return "%s__object" % (name)
+ 		
+ 	def xxxxmkvalueCheck(self, name):
+ 		Output("%s__object = new_FSCatalogInfo(%s__bitmap, %s);", name, name)
+ 	
+ class FSCatalogInfoAndBitmap_inType(FSCatalogInfoAndBitmapType, InputOnlyMixIn):
+ 	
+ 	def xxxxmkvalueCheck(self, name):
+ 		pass
+ 	
+ class FSCatalogInfoAndBitmap_outType(FSCatalogInfoAndBitmapType):
+ 
+ 	def getargsFormat(self):
+ 		return "l"
+ 		
+ 	def getargsArgs(self, name):
+ 		return "%s__bitmap" % name
+ 		
+ 	def getargsCheck(self, name):
+ 		pass
  	
  FInfo = OpaqueType("FInfo", "FInfo")
***************
*** 61,64 ****
--- 108,113 ----
  FSRef_ptr = OpaqueType("FSRef", "FSRef")
  OptFSRefPtr = OptionalFSxxxType("FSRef", "BUG", "myPyMac_GetOptFSRefPtr")
+ FSCatalogInfoAndBitmap_in = FSCatalogInfoAndBitmap_inType()
+ FSCatalogInfoAndBitmap_out = FSCatalogInfoAndBitmap_outType()
  
  # To be done: