Fix add-function tag when adding a global function.

Reviewed by Marcelo Lira <marcelo.lira@openbossa.org>

5 files changed, 48 insertions, 18 deletions

diff --git a/abstractmetabuilder.cpp b/abstractmetabuilder.cpp
index 87826eb37..c98a7bf2d 100644
--- a/abstractmetabuilder.cpp
+++ b/abstractmetabuilder.cpp
@@ -499,7 +499,7 @@ bool AbstractMetaBuilder::build(QIODevice* input)
     }
 
     // Functions added to the module on the type system.
-    foreach (AddedFunction addedFunc, types->addedFunctions()) {
+    foreach (AddedFunction addedFunc, types->globalUserFunctions()) {
         AbstractMetaFunction* metaFunc = traverseFunction(addedFunc);
         metaFunc->setFunctionType(AbstractMetaFunction::NormalFunction);
         m_globalFunctions << metaFunc;
diff --git a/tests/testaddfunction.cpp b/tests/testaddfunction.cpp
index b1c0aca8d..91380b073 100644
--- a/tests/testaddfunction.cpp
+++ b/tests/testaddfunction.cpp
@@ -247,7 +247,7 @@ void TestAddFunction::testAddFunctionAtModuleLevel()
 
     TypeDatabase* typeDb = TypeDatabase::instance();
 
-    AddedFunctionList addedFuncs = typeDb->findAddedFunctions("func");
+    AddedFunctionList addedFuncs = typeDb->findGlobalUserFunctions("func");
 
     QCOMPARE(addedFuncs.size(), 1);
 
@@ -310,6 +310,30 @@ void TestAddFunction::testAddStaticFunction()
     QVERIFY(addedFunc->isStatic());
 }
 
+void TestAddFunction::testAddGlobalFunction()
+{
+    const char cppCode[] = "struct A { };struct B {};";
+    const char xmlCode[] = "\
+    <typesystem package=\"Foo\">\
+        <primitive-type name='int'/> \
+        <value-type name='A' />\
+        <add-function signature='globalFunc(int, int)' static='yes'>\
+            <inject-code class='target' position='beginning'>custom_code();</inject-code>\
+        </add-function>\
+        <add-function signature='globalFunc2(int, int)' static='yes'>\
+            <inject-code class='target' position='beginning'>custom_code();</inject-code>\
+        </add-function>\
+        <value-type name='B' />\
+    </typesystem>";
+    TestUtil t(cppCode, xmlCode);
+    AbstractMetaFunctionList globalFuncs = t.builder()->globalFunctions();
+    QCOMPARE(globalFuncs.count(), 2);
+    QVERIFY(!t.builder()->classes().findClass("B")->findFunction("globalFunc"));
+    QVERIFY(!t.builder()->classes().findClass("B")->findFunction("globalFunc2"));
+    QVERIFY(!globalFuncs[0]->injectedCodeSnips().isEmpty());
+    QVERIFY(!globalFuncs[1]->injectedCodeSnips().isEmpty());
+}
+
 QTEST_APPLESS_MAIN(TestAddFunction)
 
 #include "testaddfunction.moc"
diff --git a/tests/testaddfunction.h b/tests/testaddfunction.h
index 4d5764309..2d529f02a 100644
--- a/tests/testaddfunction.h
+++ b/tests/testaddfunction.h
@@ -39,6 +39,7 @@ private slots:
     void testAddFunctionAtModuleLevel();
     void testAddFunctionWithVarargs();
     void testAddStaticFunction();
+    void testAddGlobalFunction();
 };
 
 #endif
diff --git a/typesystem.cpp b/typesystem.cpp
index 69bc8455a..098a095e9 100644
--- a/typesystem.cpp
+++ b/typesystem.cpp
@@ -255,11 +255,16 @@ bool Handler::endElement(const QString &, const QString &localName, const QStrin
         return true;
 
     switch (m_current->type) {
-    case StackElement::Root: {
-        TypeDatabase::instance()->setAddedFunctions(m_addedFunctions);
-        TypeDatabase::instance()->setFunctionModifications(m_functionMods);
-    }
-    break;
+    case StackElement::AddFunction:
+        if (m_generate == TypeEntry::GenerateAll
+            && m_current->parent
+            && m_current->parent->type == StackElement::Root) { // Global function
+            TypeDatabase::instance()->addGlobalUserFunctions(m_addedFunctions);
+            TypeDatabase::instance()->addGlobalUserFunctionModifications(m_functionMods);
+            m_addedFunctions.clear();
+            m_functionMods.clear();
+        }
+        break;
     case StackElement::ObjectTypeEntry:
     case StackElement::ValueTypeEntry:
     case StackElement::InterfaceTypeEntry:
@@ -1987,10 +1992,10 @@ FlagsTypeEntry *TypeDatabase::findFlagsType(const QString &name) const
     return fte ? fte : (FlagsTypeEntry *) m_flagsEntries.value(name);
 }
 
-AddedFunctionList TypeDatabase::findAddedFunctions(const QString& name) const
+AddedFunctionList TypeDatabase::findGlobalUserFunctions(const QString& name) const
 {
     AddedFunctionList addedFunctions;
-    foreach (AddedFunction func, m_addedFunctions) {
+    foreach (AddedFunction func, m_globalUserFunctions) {
         if (func.name() == name)
             addedFunctions.append(func);
     }
diff --git a/typesystem.h b/typesystem.h
index 635ae43d8..b63db9b7b 100644
--- a/typesystem.h
+++ b/typesystem.h
@@ -1901,21 +1901,21 @@ public:
         m_templates[t->name()] = t;
     }
 
-    AddedFunctionList addedFunctions() const
+    AddedFunctionList globalUserFunctions() const
     {
-        return m_addedFunctions;
+        return m_globalUserFunctions;
     }
-    void setAddedFunctions(const AddedFunctionList& addedFunctions)
+    void addGlobalUserFunctions(const AddedFunctionList& functions)
     {
-        m_addedFunctions = addedFunctions;
+        m_globalUserFunctions << functions;
     }
-    AddedFunctionList findAddedFunctions(const QString& name) const;
+    AddedFunctionList findGlobalUserFunctions(const QString& name) const;
 
-    void setFunctionModifications(const FunctionModificationList& functionModifications)
+    void addGlobalUserFunctionModifications(const FunctionModificationList& functionModifications)
     {
-        m_functionMods = functionModifications;
+        m_functionMods << functionModifications;
     }
-    void addFunctionModification(const FunctionModification& functionModification)
+    void addGlobalUserFunctionModification(const FunctionModification& functionModification)
     {
         m_functionMods << functionModification;
     }
@@ -1977,7 +1977,7 @@ private:
     TemplateEntryHash m_templates;
     QStringList m_suppressedWarnings;
 
-    AddedFunctionList m_addedFunctions;
+    AddedFunctionList m_globalUserFunctions;
     FunctionModificationList m_functionMods;
 
     QStringList m_requiredTargetImports;