More factorization: added a method getrvforcallit(). This allows a C++

bridge to combine declaration and assignment to the return value
temporary, allowing us to handle functions returning const values.
This commit is contained in:
Jack Jansen 2005-06-30 15:00:13 +00:00
parent 3095ad0650
commit 62cc1233f9
1 changed files with 9 additions and 9 deletions

View File

@ -213,10 +213,7 @@ class FunctionGenerator(BaseFunctionGenerator):
def callit(self):
args = ""
if self.rv:
s = "%s = %s(" % (self.rv.name, self.callname)
else:
s = "%s(" % self.name
s = "%s%s(" % (self.getrvforcallit(), self.callname)
sep = ",\n" + ' '*len(s)
for arg in self.argumentList:
if arg is self.rv:
@ -224,12 +221,15 @@ class FunctionGenerator(BaseFunctionGenerator):
s = arg.passArgument()
if args: s = sep + s
args = args + s
if self.rv:
Output("%s = %s(%s);",
self.rv.name, self.callname, args)
else:
Output("%s(%s);", self.callname, args)
Output("%s%s(%s);",
self.getrvforcallit(), self.callname, args)
def getrvforcallit(self):
if self.rv:
return "%s = " % self.rv.name
else:
return ""
def checkit(self):
for arg in self.argumentList:
arg.errorCheck()