Fixed type system variable replacement for arguments removed with conversion rule.

Also added an array argument modification test, and moved
AutoArrayPointer from libpyside to libshiboken.

Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>

3 files changed, 24 insertions, 18 deletions

diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
index 827ec28e3..efbf6ef96 100644
--- a/generator/cppgenerator.cpp
+++ b/generator/cppgenerator.cpp
@@ -726,7 +726,7 @@ void CppGenerator::writeVirtualMethodNative(QTextStream&s, const AbstractMetaFun
             ac << INDENT;
             if (!func->conversionRule(TypeSystem::TargetLangCode, arg->argumentIndex() + 1).isEmpty()) {
                 // Has conversion rule.
-                ac << arg->name() << "_out";
+                ac << QString("%1"CONV_RULE_OUT_VAR_SUFFIX).arg(arg->name());
             } else {
                 QString argName = arg->name();
                 if (avoidProtectedHack()) {
@@ -2021,17 +2021,16 @@ void CppGenerator::writeMethodCall(QTextStream& s, const AbstractMetaFunction* f
             int removedArgs = 0;
             for (int i = 0; i < maxArgs + removedArgs; i++) {
                 const AbstractMetaArgument* arg = func->arguments().at(i);
+                bool hasConversionRule = !func->conversionRule(TypeSystem::NativeCode, arg->argumentIndex() + 1).isEmpty();
                 if (func->argumentRemoved(i + 1)) {
-
                     // If some argument with default value is removed from a
                     // method signature, the said value must be explicitly
                     // added to the method call.
                     removedArgs++;
 
                     // If have conversion rules I will use this for removed args
-                    bool hasConversionRule = !func->conversionRule(TypeSystem::NativeCode, arg->argumentIndex() + 1).isEmpty();
                     if (hasConversionRule) {
-                        userArgs << arg->name() + "_out";
+                        userArgs << QString("%1"CONV_RULE_OUT_VAR_SUFFIX).arg(arg->name());
                     } else {
                        if (arg->defaultValueExpression().isEmpty())
                            badModifications = true;
@@ -2040,14 +2039,9 @@ void CppGenerator::writeMethodCall(QTextStream& s, const AbstractMetaFunction* f
                     }
                 } else {
                     int idx = arg->argumentIndex() - removedArgs;
-                    QString argName;
-
-                    bool hasConversionRule = !func->conversionRule(TypeSystem::NativeCode, arg->argumentIndex() + 1).isEmpty();
-                    if (hasConversionRule) {
-                        argName = arg->name() + "_out";
-                    } else {
-                        argName = QString(CPP_ARG"%1").arg(idx);
-                    }
+                    QString argName = hasConversionRule
+                                      ? QString("%1"CONV_RULE_OUT_VAR_SUFFIX).arg(arg->name())
+                                      : QString(CPP_ARG"%1").arg(idx);
                     userArgs << argName;
                 }
             }
@@ -2073,7 +2067,7 @@ void CppGenerator::writeMethodCall(QTextStream& s, const AbstractMetaFunction* f
                 if (!arg->defaultValueExpression().isEmpty())
                     otherArgs.prepend(guessScopeForDefaultValue(func, arg));
                 else if (hasConversionRule)
-                    otherArgs.prepend(arg->name() + "_out");
+                    otherArgs.prepend(QString("%1"CONV_RULE_OUT_VAR_SUFFIX).arg(arg->name()));
                 else
                     badModifications = true;
             }
diff --git a/generator/shibokengenerator.cpp b/generator/shibokengenerator.cpp
index 05d374ea4..eacc5e54d 100644
--- a/generator/shibokengenerator.cpp
+++ b/generator/shibokengenerator.cpp
@@ -1081,7 +1081,7 @@ void ShibokenGenerator::writeArgumentNames(QTextStream &s,
             && (!func->conversionRule(TypeSystem::NativeCode, arguments.at(j)->argumentIndex() + 1).isEmpty()
                 || !func->conversionRule(TypeSystem::TargetLangCode, arguments.at(j)->argumentIndex() + 1).isEmpty())
             && !func->isConstructor()) {
-           s << "_out";
+           s << CONV_RULE_OUT_VAR_SUFFIX;
         }
 
         argCount++;
@@ -1206,20 +1206,31 @@ QMap<int, QString> ShibokenGenerator::getArgumentReplacement(const AbstractMetaF
                                                              const AbstractMetaArgument* lastArg)
 {
     QMap<int, QString> argReplacement;
+    TypeSystem::Language convLang = (language == TypeSystem::TargetLangCode)
+                                    ? TypeSystem::NativeCode : TypeSystem::TargetLangCode;
     int removed = 0;
     for (int i = 0; i < func->arguments().size(); ++i) {
         const AbstractMetaArgument* arg = func->arguments().at(i);
         QString argValue;
         if (language == TypeSystem::TargetLangCode) {
+            bool hasConversionRule = !func->conversionRule(convLang, i+1).isEmpty();
             bool argRemoved = func->argumentRemoved(i+1);
             removed = removed + (int) argRemoved;
             if (argRemoved || (lastArg && arg->argumentIndex() > lastArg->argumentIndex()))
                 argValue = arg->defaultValueExpression();
+
+            if (argRemoved && hasConversionRule && argValue.isEmpty())
+                argValue = QString("%1"CONV_RULE_OUT_VAR_SUFFIX).arg(arg->name());
+
             if (!argRemoved && argValue.isEmpty()) {
-                if (arg->type()->typeEntry()->isCustom())
-                    argValue = usePyArgs ? QString(PYTHON_ARGS"[%1]").arg(i - removed) : PYTHON_ARG;
-                else
-                    argValue = QString(CPP_ARG"%1").arg(i - removed);
+                int argPos = i - removed;
+                if (arg->type()->typeEntry()->isCustom()) {
+                    argValue = usePyArgs ? QString(PYTHON_ARGS"[%1]").arg(argPos) : PYTHON_ARG;
+                } else {
+                    argValue = hasConversionRule
+                               ? QString("%1"CONV_RULE_OUT_VAR_SUFFIX).arg(arg->name())
+                               : QString(CPP_ARG"%1").arg(argPos);
+                }
             }
         } else {
             argValue = arg->name();
diff --git a/generator/shibokengenerator.h b/generator/shibokengenerator.h
index 605b205e6..2c4dc888a 100644
--- a/generator/shibokengenerator.h
+++ b/generator/shibokengenerator.h
@@ -24,6 +24,7 @@
 #ifndef SHIBOKENGENERATOR_H
 #define SHIBOKENGENERATOR_H
 
+#define CONV_RULE_OUT_VAR_SUFFIX  "_out"
 #define CPP_ARG                   "cppArg"
 #define CPP_ARG0                  CPP_ARG"0"
 #define CPP_RETURN_VAR            "cppResult"