Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 01:30:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Instead of passing sipIsErr into custom functions made for CppMethodDefs and etc. just check PyErr_Occurred after the function returns and then set sipIsErr there.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-10-13 04:58:46 +00:00
parent d1bdbd0155
commit a87c196def
7 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
etgtools/sip_generator.py
View File

@@ -520,8 +520,6 @@ from %s import *
name = re.split(r'[ \*\&]+', name)[-1]
pnames[idx] = name
pnames = ', '.join(pnames)
if pnames:
pnames = ', ' + pnames
typ = method.type
if not skipDeclaration:
@@ -553,11 +551,9 @@ from %s import *
arg = arg.replace('&', '*') # SIP will always want to use pointers for parameters
fargs[idx] = arg
fargs = ', '.join(fargs)
if fargs:
fargs = ', ' + fargs
if method.isCtor:
fname = '_%s_newCtor' % klass.name
fargs = '(int& _isErr%s)' % fargs
fargs = '(%s)' % fargs
fstream.write('%s%%TypeCode\n' % indent)
typ = klass.name
if method.useDerivedName:
@@ -574,13 +570,15 @@ from %s import *
if method.isStatic:
# If the method is static then there is no sipCpp to send to
# the new function, so it should not have a self parameter.
fargs = '(int& _isErr%s)' % fargs
fargs = '(%s)' % fargs
else:
fargs = '(%s* self, int& _isErr%s)' % (klass.name, fargs)
if fargs:
fargs = ', ' + fargs
fargs = '(%s* self%s)' % (klass.name, fargs)
fstream.write('%s%%TypeCode\n' % indent)
else:
fname = '_%s_function' % method.name
fargs = '(int& _isErr%s)' % fargs
fargs = '(%s)' % fargs
fstream.write('%s%%ModuleCode\n' % indent)
# If the return type is in the forcePtrTypes list then make sure
@@ -603,7 +601,7 @@ from %s import *
stream.write('%s%%MethodCode\n' % indent)
stream.write(indent+' '*4)
if method.isCtor:
stream.write('sipCpp = %s(sipIsErr%s);\n' % (fname, pnames))
stream.write('sipCpp = %s(%s);\n' % (fname, pnames))
else:
if method.type != 'void':
stream.write('sipRes = ')
@@ -611,11 +609,15 @@ from %s import *
if method.isStatic:
# If the method is static then there is no sipCpp to send to
# the new function, so it should not have a self parameter.
stream.write('%s(sipIsErr%s);\n' % (fname, pnames))
stream.write('%s(%s);\n' % (fname, pnames))
else:
stream.write('%s(sipCpp, sipIsErr%s);\n' % (fname, pnames))
if pnames:
pnames = ', ' + pnames
stream.write('%s(sipCpp%s);\n' % (fname, pnames))
else:
stream.write('%s(sipIsErr%s);\n' % (fname, pnames))
stream.write('%s(%s);\n' % (fname, pnames))
stream.write(indent+' '*4)
stream.write('if (PyErr_Occurred()) sipIsErr = 1;\n')
stream.write('%s%%End\n' % indent)
# and finally, add the new function itself
@@ -640,7 +642,6 @@ from %s import *
stream.write('%s%%MethodCode\n' % indent)
stream.write(nci(method.body, len(indent)+4))
stream.write('%s%%End\n\n' % indent)
# TODO: add the %Docstring...