flatten type fixes

Author: LukasMolzberger

include/fields/null_terminated_array.h

@@ -20,65 +20,4 @@ T* nullTerminatedArrayFromVector(const std::vector<T>& vec) {
     return arr;
 }
 
-template <typename T>
-class NullTerminatedIterator {
-public:
-    using ValueType = T;
-    using Pointer = T*;
-    using Reference = T&;
-
-    NullTerminatedIterator(Pointer ptr) : ptr_(ptr) {}
-
-    // Dereference operator
-    Reference operator*() const {
-        return *ptr_;
-    }
-
-    // Arrow operator
-    Pointer operator->() const {
-        return ptr_;
-    }
-
-    // Pre-increment operator
-    NullTerminatedIterator& operator++() {
-        ++ptr_;
-        return *this;
-    }
-
-    // Post-increment operator
-    NullTerminatedIterator operator++(int) {
-        NullTerminatedIterator temp = *this;
-        ++(*this);
-        return temp;
-    }
-
-    // Equality operator
-    bool operator!=(const NullTerminatedIterator& other) const {
-        return ptr_ != other.ptr_;
-    }
-
-private:
-    Pointer ptr_;
-};
-
-// NullTerminatedArray allows for easy iteration over null-terminated arrays
-template <typename T>
-class NullTerminatedArray {
-public:
-    using Iterator = NullTerminatedIterator<T>;
-
-    NullTerminatedArray(T* arr) : arr_(arr) {}
-
-    Iterator begin() const {
-        return Iterator(arr_);
-    }
-
-    Iterator end() const {
-        return nullptr;  // not implemented!
-    }
-
-private:
-    T* arr_;
-};
-
 #endif // NULL_TERMINATED_ARRAY_H

src/fields/flattened_type.cpp

@@ -87,16 +87,22 @@ FlattenedTypeRelation* FlattenedType::flattenPerType(Relation* relation, Type* r
     std::vector<FieldLinkDefinition*> fieldLinks;
 
     for (int i = 0; i < numberOfFields; i++) {
-        NullTerminatedArray fdArray(fieldsReverse[i]);
-        for (FieldDefinition* fd : fdArray) {
-            for(const auto& fl : direction->getFieldLinkDefinitions(fd)) {
+        FieldDefinition** fdArray = fieldsReverse[i];
+
+        int j = 0;
+        while (fdArray[j] != nullptr) {
+            FieldDefinition* fd = fdArray[j];
+            j++;
+
+            std::vector<FieldLinkDefinition*> fls = direction->getFieldLinkDefinitions(fd);
+            for(FieldLinkDefinition* fl : fls) {
                 if (fl->getRelation()->getRelationId() == relation->getRelationId() &&
                     relatedType->isInstanceOf(fl->getRelatedFD()->getObjectType()) &&
                     direction->invert()->getFlattenedType(relatedType)->fields[fl->getRelatedFD()->getId()] >= 0) {
                     fieldLinks.push_back(fl);
                 }
             }
-        }
+       }
     }
 
     return fieldLinks.empty() ?

src/fields/flattened_type_relation.cpp

@@ -23,18 +23,29 @@ FlattenedTypeRelation::FlattenedTypeRelation(FlattenedType* ft, const std::vecto
 
     // Fill fieldLinks with the grouped FieldLinkDefinitions
     for (int i = 0; i < flattenedType->getNumberOfFields(); ++i) {
-        NullTerminatedArray fdArray(flattenedType->getFieldsReverse()[i]);
+        FieldDefinition** fdArray = flattenedType->getFieldsReverse()[i];
 
-        for (FieldDefinition* fd : fdArray) {
-            fieldLinks[i] = nullTerminatedArrayFromVector<FieldLinkDefinition*>(*groupedByOriginFD[fd->getId()]);
+        int j = 0;
+        while (fdArray[j] != nullptr) {
+            FieldDefinition* fd = fdArray[j];
+            j++;
+
+            std::vector<FieldLinkDefinition*>* fls = groupedByOriginFD[fd->getId()];
+            if(fls != nullptr) {
+                fieldLinks[i] = nullTerminatedArrayFromVector<FieldLinkDefinition*>(*fls);
+            }
         }
     }
 }
 
 void FlattenedTypeRelation::followLinks(Direction* direction, Obj* relatedObj, Field* field) {
-    NullTerminatedArray flArray(fieldLinks[field->getId()]);
+    FieldLinkDefinition** flArray = fieldLinks[field->getId()];
+
+    int i = 0;
+    while (flArray[i] != nullptr) {
+        FieldLinkDefinition* fl = flArray[i];
+        i++;
 
-    for (FieldLinkDefinition* fl : flArray) {
         direction->transmit(field, fl, relatedObj);
     }
 }

src/fields/type.cpp

@@ -2,6 +2,7 @@
 #include "fields/obj.h"
 #include "fields/type_registry.h"
 #include "fields/field_definition.h"
+#include "fields/flattened_type.h"
 #include <iostream>
 #include <set>
 #include <algorithm>
@@ -31,8 +32,9 @@ std::vector<Relation*> Type::getRelations() const {
 
 void Type::initFlattenedType() {
     auto fieldDefs = getCollectFlattenedFieldDefinitions();
-//    flattenedTypeInputSide = createInputFlattenedType(std::shared_ptr<Type>(this), fieldDefs);
-//    flattenedTypeOutputSide = createOutputFlattenedType(std::shared_ptr<Type>(this), fieldDefs, flattenedTypeInputSide);
+
+    flattenedTypeInputSide = FlattenedType::createInputFlattenedType(this, fieldDefs);
+    flattenedTypeOutputSide = FlattenedType::createOutputFlattenedType(this, fieldDefs, flattenedTypeInputSide);
 }
 
 std::set<FieldDefinition*> Type::getCollectFlattenedFieldDefinitions() {