From 22c7b2e24212b41fc941121f8df83eb238f8e0d3 Mon Sep 17 00:00:00 2001
From: Marcelo Lira <marcelo.lira@openbossa.org>
Date: Mon, 1 Aug 2011 12:57:44 -0300
Subject: Moved many variables names used in generated code to macros.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also fixed ShibokenGenerator::pythonFunctionWrapperUsesListOfArguments()
method to consider call operators. Fixed code snippet variable
replacement for when there's only one Python argument in the function.
And CppGenerator::writeArgumentsInitializer() was sanitized, with never
used code erased.

Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Reviewed by Renato Araújo <renato.filho@openbossa.org>
---
 tests/samplebinding/typesystem_sample.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'tests/samplebinding')

diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index aa5ca9885..25301973e 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -1127,25 +1127,27 @@
 
         <add-function signature="__reduce__" return-type="PyObject*">
             <inject-code class="target" position="beginning">
-            PyObject *type = PyObject_Type(%PYSELF);
-            PyObject *args = NULL;
+            PyObject* type = PyObject_Type(%PYSELF);
+            PyObject* args = NULL;
 
             args = Py_BuildValue("(dd)", %CPPSELF.x(), %CPPSELF.y());
 
             %PYARG_0 = Py_BuildValue("(OO)", type, args);
             </inject-code>
         </add-function>
+        <template name="return_self">
+            %PYARG_0 = %PYARG_1;
+            Py_INCREF(%PYARG_1);
+        </template>
         <add-function signature="operator-(PyUnicode)">
             <inject-code>
-                %PYARG_0 = arg;
-                Py_INCREF(arg);
+                <insert-template name="return_self" />
             </inject-code>
         </add-function>
         <!-- A reverse operator -->
         <add-function signature="operator-(PyUnicode, Point)">
             <inject-code>
-                %PYARG_0 = arg;
-                Py_INCREF(arg);
+                <insert-template name="return_self" />
             </inject-code>
         </add-function>
     </value-type>
-- 
cgit v1.2.3