Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 03:20:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Add CppMethods to overload lists if there is already a matching Method.

Browse Source 
* Look at all overloads when adding auto properties

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-10-26 05:21:47 +00:00
parent 7a7c9c3cd7
commit 36e4395f88
2 changed files with 64 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
etgtools/extractors.py
View File

@@ -601,32 +601,38 @@ class ClassDef(BaseDef):
props = dict() props = dict()
for item in self.items: for item in self.items:
if item.ignored:
continue
if isinstance(item, MethodDef) and item.name not in ['Get', 'Set'] \ if isinstance(item, MethodDef) and item.name not in ['Get', 'Set'] \
and (item.name.startswith('Get') or item.name.startswith('Set')): and (item.name.startswith('Get') or item.name.startswith('Set')):
prefix = item.name[:3] prefix = item.name[:3]
name = item.name[3:] name = item.name[3:]
prop = props.get(name, PropertyDef(name)) prop = props.get(name, PropertyDef(name))
if prefix == 'Get': # look at all overloads
prop.getter = item.name ok = False
# Getters must be able to be called with no args, ensure for m in item.all():
# that item has exactly zero args without a default value if m.ignored:
if countNonDefaultArgs(item) != 0:
# TODO: check overloads too
continue continue
# Getters must not be static methods if prefix == 'Get':
if item.isStatic: prop.getter = m.name
continue # Getters must be able to be called with no args, ensure
elif prefix == 'Set': # that item has exactly zero args without a default value
prop.setter = item.name if countNonDefaultArgs(m) != 0:
# Setters must be able to be called with 1 arg, ensure continue
# that item has at least 1 arg and not more than 1 without # Getters must not be static methods
# a default value. if item.isStatic:
if len(item.items) == 0 or countNonDefaultArgs(item) > 1: continue
# TODO: check overloads too ok = True
continue break
props[name] = prop elif prefix == 'Set':
prop.setter = m.name
# Setters must be able to be called with 1 arg, ensure
# that item has at least 1 arg and not more than 1 without
# a default value.
if len(m.items) == 0 or countNonDefaultArgs(m) > 1:
continue
ok = True
break
if ok:
props[name] = prop
if props: if props:
self.addPublic() self.addPublic()
@@ -698,6 +704,12 @@ class ClassDef(BaseDef):
#------------------------------------------------------------------ #------------------------------------------------------------------
def _addMethod(self, md):
if self.findItem(md.name):
self.findItem(md.name).overloads.append(md)
else:
self.items.append(md)
def addCppMethod(self, type, name, argsString, body, doc=None, isConst=False, **kw): def addCppMethod(self, type, name, argsString, body, doc=None, isConst=False, **kw):
""" """
Add a new C++ method to a class. This method doesn't have to actually Add a new C++ method to a class. This method doesn't have to actually
@@ -706,7 +718,7 @@ class ClassDef(BaseDef):
target language. target language.
""" """
md = CppMethodDef(type, name, argsString, body, doc, isConst, klass=self, **kw) md = CppMethodDef(type, name, argsString, body, doc, isConst, klass=self, **kw)
self.items.append(md) self._addMethod(md)
return md return md
@@ -717,7 +729,7 @@ class ClassDef(BaseDef):
md = CppMethodDef('', self.name, argsString, body, doc=doc, md = CppMethodDef('', self.name, argsString, body, doc=doc,
isCtor=True, klass=self, noDerivedCtor=noDerivedCtor, isCtor=True, klass=self, noDerivedCtor=noDerivedCtor,
useDerivedName=useDerivedName, **kw) useDerivedName=useDerivedName, **kw)
self.items.append(md) self._addMethod(md)
return md return md
@@ -727,7 +739,7 @@ class ClassDef(BaseDef):
the code body, instead of using the general purpose implementation. the code body, instead of using the general purpose implementation.
""" """
md = CppMethodDef_sip(type, name, argsString, body, doc, klass=self, **kw) md = CppMethodDef_sip(type, name, argsString, body, doc, klass=self, **kw)
self.items.append(md) self._addMethod(md)
return md return md
def addCppCtor_sip(self, argsString, body, doc=None, noDerivedCtor=True, **kw): def addCppCtor_sip(self, argsString, body, doc=None, noDerivedCtor=True, **kw):
@@ -736,7 +748,7 @@ class ClassDef(BaseDef):
""" """
md = CppMethodDef_sip('', self.name, argsString, body, doc=doc, md = CppMethodDef_sip('', self.name, argsString, body, doc=doc,
isCtor=True, klass=self, noDerivedCtor=noDerivedCtor, **kw) isCtor=True, klass=self, noDerivedCtor=noDerivedCtor, **kw)
self.items.append(md) self._addMethod(md)
return md return md
#------------------------------------------------------------------ #------------------------------------------------------------------
@@ -915,6 +927,7 @@ class CppMethodDef(MethodDef):
self.klass = None self.klass = None
self.noDerivedCtor = False self.noDerivedCtor = False
self.isConst = isConst self.isConst = isConst
self.isPureVirtual = False
self.__dict__.update(kw) self.__dict__.update(kw)
@staticmethod @staticmethod

52
etgtools/sip_generator.py
View File

@@ -349,35 +349,17 @@ from %s import *
public = [i for i in klass if i.protection == 'public' and i not in ctors] public = [i for i in klass if i.protection == 'public' and i not in ctors]
protected = [i for i in klass if i.protection == 'protected'] protected = [i for i in klass if i.protection == 'protected']
dispatch = {
extractors.MemberVarDef : self.generateMemberVar,
extractors.PropertyDef : self.generateProperty,
extractors.PyPropertyDef : self.generatePyProperty,
extractors.MethodDef : self.generateMethod,
extractors.EnumDef : self.generateEnum,
extractors.CppMethodDef : self.generateCppMethod,
extractors.CppMethodDef_sip : self.generateCppMethod_sip,
extractors.PyMethodDef : self.generatePyMethod,
extractors.PyCodeDef : self.generatePyCode,
extractors.WigCode : self.generateWigCode,
}
for item in ctors: for item in ctors:
item.klass = klass self.dispatchClassItem(klass, item, stream, indent2)
f = dispatch[item.__class__]
f(item, stream, indent2)
for item in public: for item in public:
item.klass = klass self.dispatchClassItem(klass, item, stream, indent2)
f = dispatch[item.__class__]
f(item, stream, indent2)
if protected and [i for i in protected if not i.ignored]: if protected and [i for i in protected if not i.ignored]:
stream.write('\nprotected:\n') stream.write('\nprotected:\n')
for item in protected: for item in protected:
item.klass = klass self.dispatchClassItem(klass, item, stream, indent2)
f = dispatch[item.__class__]
f(item, stream, indent2)
if klass.convertFromPyObject: if klass.convertFromPyObject:
self.generateConvertCode('%ConvertToTypeCode', self.generateConvertCode('%ConvertToTypeCode',
@@ -394,10 +376,27 @@ from %s import *
# Now generate anything that was deferred until after the class is finished # Now generate anything that was deferred until after the class is finished
klass.generatingInClass = False klass.generatingInClass = False
for item in klass.generateAfterClass: for item in klass.generateAfterClass:
f = dispatch[item.__class__] self.dispatchClassItem(klass, item, stream, indent)
f(item, stream, indent)
def dispatchClassItem(self, klass, item, stream, indent):
dispatch = {
extractors.MemberVarDef : self.generateMemberVar,
extractors.PropertyDef : self.generateProperty,
extractors.PyPropertyDef : self.generatePyProperty,
extractors.MethodDef : self.generateMethod,
extractors.EnumDef : self.generateEnum,
extractors.CppMethodDef : self.generateCppMethod,
extractors.CppMethodDef_sip : self.generateCppMethod_sip,
extractors.PyMethodDef : self.generatePyMethod,
extractors.PyCodeDef : self.generatePyCode,
extractors.WigCode : self.generateWigCode,
}
item.klass = klass
f = dispatch[item.__class__]
f(item, stream, indent)
def generateConvertCode(self, kind, code, stream, indent): def generateConvertCode(self, kind, code, stream, indent):
stream.write('%s%s\n' % (indent, kind)) stream.write('%s%s\n' % (indent, kind))
@@ -457,8 +456,9 @@ from %s import *
item.pyDocstring = nci(text) item.pyDocstring = nci(text)
def generateMethod(self, method, stream, indent, _needDocstring=True): def generateMethod(self, method, stream, indent):
assert isinstance(method, extractors.MethodDef) assert isinstance(method, extractors.MethodDef)
_needDocstring = getattr(method, '_needDocstring', True)
if not method.ignored: if not method.ignored:
if method.isVirtual: if method.isVirtual:
stream.write("%svirtual\n" % indent) stream.write("%svirtual\n" % indent)
@@ -497,9 +497,11 @@ from %s import *
self.generateCppMethod(cm, stream, indent, skipDeclaration=True) self.generateCppMethod(cm, stream, indent, skipDeclaration=True)
stream.write('\n') stream.write('\n')
if method.overloads: if method.overloads:
for m in method.overloads: for m in method.overloads:
self.generateMethod(m, stream, indent, _needDocstring) m._needDocstring = _needDocstring
self.dispatchClassItem(method.klass, m, stream, indent)
def generateCppMethod(self, method, stream, indent='', skipDeclaration=False): def generateCppMethod(self, method, stream, indent='', skipDeclaration=False):