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.

1 files changed, 8 insertions, 8 deletions

diff --git a/Tools/bgen/bgen/bgenGenerator.py b/Tools/bgen/bgen/bgenGenerator.py
index 03e8b45deb..83ff552b0c 100644
--- a/Tools/bgen/bgen/bgenGenerator.py
+++ b/Tools/bgen/bgen/bgenGenerator.py
@@ -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
+        Output("%s%s(%s);",
+               self.getrvforcallit(), self.callname, args)
+
+    def getrvforcallit(self):
         if self.rv:
-            Output("%s = %s(%s);",
-                   self.rv.name, self.callname, args)
+            return "%s = " % self.rv.name
         else:
-            Output("%s(%s);", self.callname, args)
-
+            return ""
+            
     def checkit(self):
         for arg in self.argumentList:
             arg.errorCheck()