Whitespace normalization, via reindent.py.
diff --git a/Mac/Modules/cm/cmscan.py b/Mac/Modules/cm/cmscan.py
index 6e56cb2..087f239 100644
--- a/Mac/Modules/cm/cmscan.py
+++ b/Mac/Modules/cm/cmscan.py
@@ -10,80 +10,80 @@
SHORT = "cm"
def main():
- input = "Components.h"
- output = SHORT + "gen.py"
- defsoutput = TOOLBOXDIR + LONG + ".py"
- scanner = MyScanner(input, output, defsoutput)
- scanner.scan()
- scanner.close()
- print "=== Testing definitions output code ==="
- execfile(defsoutput, {}, {})
- print "=== Done scanning and generating, now importing the generated code... ==="
- exec "import " + SHORT + "support"
- print "=== Done. It's up to you to compile it now! ==="
+ input = "Components.h"
+ output = SHORT + "gen.py"
+ defsoutput = TOOLBOXDIR + LONG + ".py"
+ scanner = MyScanner(input, output, defsoutput)
+ scanner.scan()
+ scanner.close()
+ print "=== Testing definitions output code ==="
+ execfile(defsoutput, {}, {})
+ print "=== Done scanning and generating, now importing the generated code... ==="
+ exec "import " + SHORT + "support"
+ print "=== Done. It's up to you to compile it now! ==="
class MyScanner(Scanner):
- def destination(self, type, name, arglist):
- classname = "Function"
- listname = "functions"
- if arglist:
- t, n, m = arglist[0]
- #
- # FindNextComponent is a special case, since it call also be called
- # with None as the argument. Hence, we make it a function
- #
- if t == "Component" and m == "InMode" and name != "FindNextComponent":
- classname = "Method"
- listname = "c_methods"
- elif t == "ComponentInstance" and m == "InMode":
- classname = "Method"
- listname = "ci_methods"
- return classname, listname
+ def destination(self, type, name, arglist):
+ classname = "Function"
+ listname = "functions"
+ if arglist:
+ t, n, m = arglist[0]
+ #
+ # FindNextComponent is a special case, since it call also be called
+ # with None as the argument. Hence, we make it a function
+ #
+ if t == "Component" and m == "InMode" and name != "FindNextComponent":
+ classname = "Method"
+ listname = "c_methods"
+ elif t == "ComponentInstance" and m == "InMode":
+ classname = "Method"
+ listname = "ci_methods"
+ return classname, listname
- def writeinitialdefs(self):
- self.defsfile.write("def FOUR_CHAR_CODE(x): return x\n")
+ def writeinitialdefs(self):
+ self.defsfile.write("def FOUR_CHAR_CODE(x): return x\n")
- def makeblacklistnames(self):
- return [
- "OpenADefaultComponent",
- "GetComponentTypeModSeed",
- "OpenAComponentResFile",
- "CallComponentUnregister",
- "CallComponentTarget",
- "CallComponentRegister",
- "CallComponentVersion",
- "CallComponentCanDo",
- "CallComponentClose",
- "CallComponentOpen",
- "OpenAComponent",
- "GetComponentPublicResource", # Missing in CW Pro 6
- "CallComponentGetPublicResource", # Missing in CW Pro 6
- 'SetComponentInstanceA5',
- 'GetComponentInstanceA5',
- ]
+ def makeblacklistnames(self):
+ return [
+ "OpenADefaultComponent",
+ "GetComponentTypeModSeed",
+ "OpenAComponentResFile",
+ "CallComponentUnregister",
+ "CallComponentTarget",
+ "CallComponentRegister",
+ "CallComponentVersion",
+ "CallComponentCanDo",
+ "CallComponentClose",
+ "CallComponentOpen",
+ "OpenAComponent",
+ "GetComponentPublicResource", # Missing in CW Pro 6
+ "CallComponentGetPublicResource", # Missing in CW Pro 6
+ 'SetComponentInstanceA5',
+ 'GetComponentInstanceA5',
+ ]
- def makeblacklisttypes(self):
- return [
- "ResourceSpec",
- "ComponentResource",
- "ComponentPlatformInfo",
- "ComponentResourceExtension",
- "ComponentPlatformInfoArray",
- "ExtComponentResource",
- "ComponentParameters",
-
- "ComponentRoutineUPP",
- "ComponentMPWorkFunctionUPP",
- "ComponentFunctionUPP",
- "GetMissingComponentResourceUPP",
- ]
+ def makeblacklisttypes(self):
+ return [
+ "ResourceSpec",
+ "ComponentResource",
+ "ComponentPlatformInfo",
+ "ComponentResourceExtension",
+ "ComponentPlatformInfoArray",
+ "ExtComponentResource",
+ "ComponentParameters",
- def makerepairinstructions(self):
- return [
- ([('ComponentDescription', 'looking', 'OutMode')],
- [('ComponentDescription', '*', 'InMode')]),
- ]
-
+ "ComponentRoutineUPP",
+ "ComponentMPWorkFunctionUPP",
+ "ComponentFunctionUPP",
+ "GetMissingComponentResourceUPP",
+ ]
+
+ def makerepairinstructions(self):
+ return [
+ ([('ComponentDescription', 'looking', 'OutMode')],
+ [('ComponentDescription', '*', 'InMode')]),
+ ]
+
if __name__ == "__main__":
- main()
+ main()
diff --git a/Mac/Modules/cm/cmsupport.py b/Mac/Modules/cm/cmsupport.py
index 98018c4..4109dba 100644
--- a/Mac/Modules/cm/cmsupport.py
+++ b/Mac/Modules/cm/cmsupport.py
@@ -6,15 +6,15 @@
import string
# Declarations that change for each manager
-MACHEADERFILE = 'Components.h' # The Apple header file
-MODNAME = '_Cm' # The name of the module
+MACHEADERFILE = 'Components.h' # The Apple header file
+MODNAME = '_Cm' # The name of the module
# The following is *usually* unchanged but may still require tuning
-MODPREFIX = 'Cm' # The prefix for module-wide routines
-C_OBJECTPREFIX = 'CmpObj' # The prefix for object methods
+MODPREFIX = 'Cm' # The prefix for module-wide routines
+C_OBJECTPREFIX = 'CmpObj' # The prefix for object methods
CI_OBJECTPREFIX = 'CmpInstObj'
INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
-OUTPUTFILE = MODNAME + "module.c" # The file generated by this program
+OUTPUTFILE = MODNAME + "module.c" # The file generated by this program
from macsupport import *
@@ -42,30 +42,30 @@
CmpDesc_New(ComponentDescription *itself)
{
- return Py_BuildValue("O&O&O&ll",
- PyMac_BuildOSType, itself->componentType,
- PyMac_BuildOSType, itself->componentSubType,
- PyMac_BuildOSType, itself->componentManufacturer,
- itself->componentFlags, itself->componentFlagsMask);
+ return Py_BuildValue("O&O&O&ll",
+ PyMac_BuildOSType, itself->componentType,
+ PyMac_BuildOSType, itself->componentSubType,
+ PyMac_BuildOSType, itself->componentManufacturer,
+ itself->componentFlags, itself->componentFlagsMask);
}
static int
CmpDesc_Convert(PyObject *v, ComponentDescription *p_itself)
{
- return PyArg_ParseTuple(v, "O&O&O&ll",
- PyMac_GetOSType, &p_itself->componentType,
- PyMac_GetOSType, &p_itself->componentSubType,
- PyMac_GetOSType, &p_itself->componentManufacturer,
- &p_itself->componentFlags, &p_itself->componentFlagsMask);
+ return PyArg_ParseTuple(v, "O&O&O&ll",
+ PyMac_GetOSType, &p_itself->componentType,
+ PyMac_GetOSType, &p_itself->componentSubType,
+ PyMac_GetOSType, &p_itself->componentManufacturer,
+ &p_itself->componentFlags, &p_itself->componentFlagsMask);
}
"""
initstuff = initstuff + """
- PyMac_INIT_TOOLBOX_OBJECT_NEW(Component, CmpObj_New);
- PyMac_INIT_TOOLBOX_OBJECT_CONVERT(Component, CmpObj_Convert);
- PyMac_INIT_TOOLBOX_OBJECT_NEW(ComponentInstance, CmpInstObj_New);
- PyMac_INIT_TOOLBOX_OBJECT_CONVERT(ComponentInstance, CmpInstObj_Convert);
+ PyMac_INIT_TOOLBOX_OBJECT_NEW(Component, CmpObj_New);
+ PyMac_INIT_TOOLBOX_OBJECT_CONVERT(Component, CmpObj_Convert);
+ PyMac_INIT_TOOLBOX_OBJECT_NEW(ComponentInstance, CmpInstObj_New);
+ PyMac_INIT_TOOLBOX_OBJECT_CONVERT(ComponentInstance, CmpInstObj_Convert);
"""
ComponentDescription = OpaqueType('ComponentDescription', 'CmpDesc')
@@ -76,30 +76,30 @@
ComponentResourceHandle = OpaqueByValueType("ComponentResourceHandle", "ResObj")
class MyCIObjectDefinition(PEP253Mixin, GlobalObjectDefinition):
- def outputCheckNewArg(self):
- Output("""if (itself == NULL) {
- PyErr_SetString(Cm_Error,"NULL ComponentInstance");
- return NULL;
- }""")
+ def outputCheckNewArg(self):
+ Output("""if (itself == NULL) {
+ PyErr_SetString(Cm_Error,"NULL ComponentInstance");
+ return NULL;
+ }""")
class MyCObjectDefinition(PEP253Mixin, GlobalObjectDefinition):
- def outputCheckNewArg(self):
- Output("""if (itself == NULL) {
- /* XXXX Or should we return None? */
- PyErr_SetString(Cm_Error,"No such component");
- return NULL;
- }""")
-
- def outputCheckConvertArg(self):
- Output("""if ( v == Py_None ) {
- *p_itself = 0;
- return 1;
- }""")
+ def outputCheckNewArg(self):
+ Output("""if (itself == NULL) {
+ /* XXXX Or should we return None? */
+ PyErr_SetString(Cm_Error,"No such component");
+ return NULL;
+ }""")
+
+ def outputCheckConvertArg(self):
+ Output("""if ( v == Py_None ) {
+ *p_itself = 0;
+ return 1;
+ }""")
# Create the generator groups and link them
module = MacModule(MODNAME, MODPREFIX, includestuff, finalstuff, initstuff)
ci_object = MyCIObjectDefinition('ComponentInstance', CI_OBJECTPREFIX,
- 'ComponentInstance')
+ 'ComponentInstance')
c_object = MyCObjectDefinition('Component', C_OBJECTPREFIX, 'Component')
module.addobject(ci_object)
module.addobject(c_object)
@@ -123,4 +123,3 @@
# generate output (open the output file as late as possible)
SetOutputFileName(OUTPUTFILE)
module.generate()
-