Bgen now understands more constant definitions, but that means that a few which are not parseable in Python have to be blacklisted.

jackjansen · jackjansen · commit b1b78d85d389 · 1999-12-14T15:47:01.000Z
diff --git a/Mac/Modules/ae/AEmodule.c b/Mac/Modules/ae/AEmodule.c
@@ -813,6 +813,12 @@ static PyObject *AEDesc_getattr(self, name)
 
 #define AEDesc_setattr NULL
 
+#define AEDesc_compare NULL
+
+#define AEDesc_repr NULL
+
+#define AEDesc_hash NULL
+
 PyTypeObject AEDesc_Type = {
 	PyObject_HEAD_INIT(&PyType_Type)
 	0, /*ob_size*/
@@ -824,6 +830,12 @@ PyTypeObject AEDesc_Type = {
 	0, /*tp_print*/
 	(getattrfunc) AEDesc_getattr, /*tp_getattr*/
 	(setattrfunc) AEDesc_setattr, /*tp_setattr*/
+	(cmpfunc) AEDesc_compare, /*tp_compare*/
+	(reprfunc) AEDesc_repr, /*tp_repr*/
+	(PyNumberMethods *)0, /* tp_as_number */
+	(PySequenceMethods *)0, /* tp_as_sequence */
+	(PyMappingMethods *)0, /* tp_as_mapping */
+	(hashfunc) AEDesc_hash, /*tp_hash*/
 };
 
 /* --------------------- End object type AEDesc --------------------- */
diff --git a/Mac/Modules/ae/aescan.py b/Mac/Modules/ae/aescan.py
@@ -70,6 +70,9 @@ def makeblacklistnames(self):
 		return [
 			"AEDisposeDesc",
 #			"AEGetEventHandler",
+			# Constants with funny definitions
+			"kAEDontDisposeOnResume",
+			"kAEUseStandardDispatch",
 			]
 
 	def makeblacklisttypes(self):
diff --git a/Mac/Modules/evt/evtscan.py b/Mac/Modules/evt/evtscan.py
@@ -39,7 +39,9 @@ def makeblacklistnames(self):
 		return [
 			"KeyTranslate",
 			"GetEventMask",		# I cannot seem to find this routine...
-			"WaitNextEvent"		# Manually generated because of optional region
+			"WaitNextEvent",	# Manually generated because of optional region
+			# Constants with funny definitions
+			"osEvtMessageMask",
 			]
 
 	def makeblacklisttypes(self):
diff --git a/Mac/Modules/icn/icnscan.py b/Mac/Modules/icn/icnscan.py
@@ -39,6 +39,10 @@ def makeblacklistnames(self):
 		return [
 			"GetIconCacheData",
 			"SetIconCacheData",
+			# Constants with funny definitions
+			"kSelectorAllHugeData",
+			"kSelectorAllAvailableData",
+			"svAllAvailableData",
 			]
 
 	def makeblacklisttypes(self):
@@ -51,6 +55,9 @@ def makeblacklisttypes(self):
 	def makerepairinstructions(self):
 		return [
 			]
+
+	def writeinitialdefs(self):
+		self.defsfile.write("def FOUR_CHAR_CODE(x): return x\n")
 			
 if __name__ == "__main__":
 	main()
diff --git a/Mac/Modules/snd/sndscan.py b/Mac/Modules/snd/sndscan.py
@@ -55,6 +55,10 @@ def makeblacklistnames(self):
 			# And old calls that are no longer supported
 			'SetSoundVol',
 			'GetSoundVol',
+			# Constants with funny definitions
+			'rate48khz',
+			'rate44khz',
+			'kInvalidSource',
 
 			]
 
diff --git a/Mac/Modules/win/Winmodule.c b/Mac/Modules/win/Winmodule.c
@@ -713,7 +713,7 @@ static PyObject *WinObj_GetWindowProxyFSSpec(_self, _args)
 	                            &outFile);
 	if (_err != noErr) return PyMac_Error(_err);
 	_res = Py_BuildValue("O&",
-	                     PyMac_BuildFSSpec, outFile);
+	                     PyMac_BuildFSSpec, &outFile);
 	return _res;
 }
 
diff --git a/Mac/Modules/win/winscan.py b/Mac/Modules/win/winscan.py
@@ -41,6 +41,8 @@ def makeblacklistnames(self):
 			'GetWindowProperty',
 			'GetWindowPropertySize',
 			'RemoveWindowProperty',
+			# Constants with funny definitions
+			'kMouseUpOutOfSlop',
 			]
 
 	def makeblacklisttypes(self):

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@ def makeblacklistnames(self):`
`70`	`70`	`return [`
`71`	`71`	`"AEDisposeDesc",`
`72`	`72`	`# "AEGetEventHandler",`
	`73`	`+ # Constants with funny definitions`
	`74`	`+ "kAEDontDisposeOnResume",`
	`75`	`+ "kAEUseStandardDispatch",`
`73`	`76`	`]`
`74`	`77`
`75`	`78`	`def makeblacklisttypes(self):`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,10 @@ def makeblacklistnames(self):`
`55`	`55`	`# And old calls that are no longer supported`
`56`	`56`	`'SetSoundVol',`
`57`	`57`	`'GetSoundVol',`
	`58`	`+ # Constants with funny definitions`
	`59`	`+ 'rate48khz',`
	`60`	`+ 'rate44khz',`
	`61`	`+ 'kInvalidSource',`
`58`	`62`
`59`	`63`	`]`
`60`	`64`
Original file line number	Diff line number	Diff line change
`@@ -713,7 +713,7 @@ static PyObject *WinObj_GetWindowProxyFSSpec(_self, _args)`
`713`	`713`	`&outFile);`
`714`	`714`	`if (_err != noErr) return PyMac_Error(_err);`
`715`	`715`	`_res = Py_BuildValue("O&",`
`716`		`- PyMac_BuildFSSpec, outFile);`
	`716`	`+ PyMac_BuildFSSpec, &outFile);`
`717`	`717`	`return _res;`
`718`	`718`	`}`
`719`	`719`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ def makeblacklistnames(self):`
`41`	`41`	`'GetWindowProperty',`
`42`	`42`	`'GetWindowPropertySize',`
`43`	`43`	`'RemoveWindowProperty',`
	`44`	`+ # Constants with funny definitions`
	`45`	`+ 'kMouseUpOutOfSlop',`
`44`	`46`	`]`
`45`	`47`
`46`	`48`	`def makeblacklisttypes(self):`