More work on complex object support

Author: Genbox

Src/FastData.Generator.CPlusPlus.Tests/FastData.Generator.CPlusPlus.Tests.csproj

@@ -9,4 +9,8 @@
     <ProjectReference Include="..\FastData.InternalShared\FastData.InternalShared.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Features\" />
+  </ItemGroup>
+
 </Project>

Src/FastData.Generator.CPlusPlus.Tests/FeatureTests.cs

@@ -2,27 +2,31 @@
 using Genbox.FastData.Generator.CPlusPlus.Internal.Framework;
 using Genbox.FastData.Generator.Extensions;
 using Genbox.FastData.Generator.Framework;
+using Genbox.FastData.InternalShared;
+using Genbox.FastData.InternalShared.TestClasses;
+using Genbox.FastData.InternalShared.TestClasses.TheoryData;
 using static Genbox.FastData.Generator.Helpers.FormatHelper;
 using static Genbox.FastData.InternalShared.Helpers.TestHelper;
 
 namespace Genbox.FastData.Generator.CPlusPlus.Tests;
 
 public class FeatureTests(CPlusPlusContext context) : IClassFixture<CPlusPlusContext>
 {
-    [Fact]
-    public async Task StructSupportTest()
+    [Theory]
+    [ClassData(typeof(SimpleTestVectorTheoryData))]
+    public async Task ObjectSupportTest<T>(TestVector<T> vector)
     {
-        int[] values = [1, 2, 3];
-        const string id = nameof(StructSupportTest);
-
-        string genSource = FastDataGenerator.GenerateKeyed(values, [
+        Person[] values =
+        [
             new Person { Age = 1, Name = "Bob", Other = new Person { Name = "Anna", Age = 4 } },
             new Person { Age = 2, Name = "Billy" },
             new Person { Age = 3, Name = "Bibi" },
-        ], new FastDataConfig { StructureType = StructureType.Array }, CPlusPlusCodeGenerator.Create(new CPlusPlusCodeGeneratorConfig(id)));
+        ];
+
+        GeneratorSpec spec = Generate(id => CPlusPlusCodeGenerator.Create(new CPlusPlusCodeGeneratorConfig(id)), vector, values);
 
-        await Verify(genSource)
-              .UseFileName(id)
+        await Verify(spec.Source)
+              .UseFileName(spec.Identifier)
               .UseDirectory("Features")
               .DisableDiff();
 
@@ -33,20 +37,21 @@ await Verify(genSource)
                               #include <string>
                               #include <iostream>
 
-                              {{genSource}}
+                              {{spec.Source}}
 
-                              int main(int argc, char* argv[])
+                              int main()
                               {
-                              {{FormatList(values, x => $"""
-                                                         if (!{id}::contains({map.ToValueLabel(x)}))
-                                                             return false;
-                                                         """, "\n")}}
+                                  const Person* res;
+                              {{FormatList(vector.Keys, x => $"""
+                                                                  if (!{spec.Identifier}::try_lookup({map.ToValueLabel(x)}, res))
+                                                                      return 0;
+                                                              """, "\n")}}
 
                                   return 1;
                               }
                               """;
 
-        string executable = context.Compiler.Compile(id, testSource);
+        string executable = context.Compiler.Compile(spec.Identifier, testSource);
         Assert.Equal(1, RunProcess(executable));
     }
 

…/Features/StructSupportTest.verified.txt …ures/ArrayStructure_Int32_3.verified.txtSrc/FastData.Generator.CPlusPlus.Tests/Features/StructSupportTest.verified.txt renamed to Src/FastData.Generator.CPlusPlus.Tests/Features/ArrayStructure_Int32_3.verified.txt Src/FastData.Generator.CPlusPlus.Tests/Features/StructSupportTest.verified.txt renamed to Src/FastData.Generator.CPlusPlus.Tests/Features/ArrayStructure_Int32_3.verified.txt

@@ -1,12 +1,21 @@
-// This file is auto-generated. Do not edit manually.
+
+struct Person {
+    const int32_t Age;
+    const std::u32string_view Name;
+    const Person* Other;
+
+    Person(const int32_t age, const std::u32string_view name, const Person* other) : Age(age), Name(name), Other(other) { }
+};
+
+// This file is auto-generated. Do not edit manually.
 // Structure: Array
 #pragma once
 #include <array>
 #include <cstdint>
 #include <limits>
 #include <string_view>
 
-class StructSupportTest final
+class ArrayStructure_Int32_3 final
 {
 static constexpr std::array<int32_t, 3> keys = {
         1, 2, 3
@@ -26,18 +35,10 @@ public:
         }
         return false;
     }
-struct Person {
-    const int32_t Age;
-    const std::u32string_view Name;
-    const Person* Other;
-
-    Person(const int32_t age, const std::u32string_view name, const Person* other) : Age(age), Name(name), Other(other) { }
-};
-
-    static std::array<StructSupportTest::Person*, 3> values;
+    static std::array<Person*, 3> values;
 
     [[nodiscard]]
-    static bool try_lookup(const int32_t key, Person*& value) noexcept
+    static bool try_lookup(const int32_t key, const Person*& value) noexcept
     {
         if (key < 1 || key > 3)
             return false;
@@ -50,6 +51,8 @@ struct Person {
                 return true;
             }
         }
+
+        value = nullptr;
         return false;
     }
 
@@ -58,13 +61,13 @@ struct Person {
     static constexpr int32_t max_key = 3;
 
 public:
-    StructSupportTest() = delete;
-    StructSupportTest(const StructSupportTest&) = delete;
-    StructSupportTest& operator=(const StructSupportTest&) = delete;
-    StructSupportTest(StructSupportTest&&) = delete;
-    StructSupportTest& operator=(StructSupportTest&&) = delete;
+    ArrayStructure_Int32_3() = delete;
+    ArrayStructure_Int32_3(const ArrayStructure_Int32_3&) = delete;
+    ArrayStructure_Int32_3& operator=(const ArrayStructure_Int32_3&) = delete;
+    ArrayStructure_Int32_3(ArrayStructure_Int32_3&&) = delete;
+    ArrayStructure_Int32_3& operator=(ArrayStructure_Int32_3&&) = delete;
 };
-std::array<StructSupportTest::Person*, 3> StructSupportTest::values = {
+std::array<Person*, 3> ArrayStructure_Int32_3::values = {
     new Person(1, U"Bob", new Person(4, U"Anna", nullptr)),
     new Person(2, U"Billy", nullptr),
     new Person(3, U"Bibi", nullptr),

Src/FastData.Generator.CPlusPlus.Tests/Features/BinarySearchStructure_Int32_3.verified.txt

@@ -0,0 +1,94 @@
+
+struct Person {
+    const int32_t Age;
+    const std::u32string_view Name;
+    const Person* Other;
+
+    Person(const int32_t age, const std::u32string_view name, const Person* other) : Age(age), Name(name), Other(other) { }
+};
+
+// This file is auto-generated. Do not edit manually.
+// Structure: BinarySearch
+#pragma once
+#include <array>
+#include <cstdint>
+#include <limits>
+#include <string_view>
+
+class BinarySearchStructure_Int32_3 final
+{
+    static constexpr std::array<int32_t, 3> keys = {
+        1, 2, 3
+    };
+
+public:
+    [[nodiscard]]
+    static bool contains(const int32_t key) noexcept
+    {
+        if (key < 1 || key > 3)
+            return false;
+
+        size_t lo = 0;
+        size_t hi = 2;
+        while (lo <= hi)
+        {
+            const size_t mid = lo + ((hi - lo) >> 1);
+
+            if (keys[mid] == key)
+                return true;
+
+            if (keys[mid] < key)
+                lo = mid + 1;
+            else
+                hi = mid - 1;
+        }
+
+        return false;
+    }
+    static std::array<Person*, 3> values;
+
+    [[nodiscard]]
+    static bool try_lookup(const int32_t key, const Person*& value) noexcept
+    {
+        if (key < 1 || key > 3)
+            return false;
+
+        size_t lo = 0;
+        size_t hi = 2;
+        while (lo <= hi)
+        {
+            const size_t mid = lo + ((hi - lo) >> 1);
+
+            if (keys[mid] == key)
+            {
+                value = values[mid];
+                return true;
+            }
+
+            if (keys[mid] < key)
+                lo = mid + 1;
+            else
+                hi = mid - 1;
+        }
+
+        value = nullptr;
+        return false;
+    }
+
+    static constexpr size_t item_count = 3;
+    static constexpr int32_t min_key = 1;
+    static constexpr int32_t max_key = 3;
+
+public:
+    BinarySearchStructure_Int32_3() = delete;
+    BinarySearchStructure_Int32_3(const BinarySearchStructure_Int32_3&) = delete;
+    BinarySearchStructure_Int32_3& operator=(const BinarySearchStructure_Int32_3&) = delete;
+    BinarySearchStructure_Int32_3(BinarySearchStructure_Int32_3&&) = delete;
+    BinarySearchStructure_Int32_3& operator=(BinarySearchStructure_Int32_3&&) = delete;
+};
+std::array<Person*, 3> BinarySearchStructure_Int32_3::values = {
+    new Person(1, U"Bob", new Person(4, U"Anna", nullptr)),
+    new Person(2, U"Billy", nullptr),
+    new Person(3, U"Bibi", nullptr),
+
+};

Src/FastData.Generator.CPlusPlus.Tests/Features/ConditionalStructure_Int32_3.verified.txt

@@ -0,0 +1,75 @@
+
+struct Person {
+    const int32_t Age;
+    const std::u32string_view Name;
+    const Person* Other;
+
+    Person(const int32_t age, const std::u32string_view name, const Person* other) : Age(age), Name(name), Other(other) { }
+};
+
+// This file is auto-generated. Do not edit manually.
+// Structure: Conditional
+#pragma once
+#include <array>
+#include <cstdint>
+#include <limits>
+#include <string_view>
+
+class ConditionalStructure_Int32_3 final
+{
+public:
+    [[nodiscard]]
+    static bool contains(const int32_t key) noexcept
+    {
+
+
+        if (key == 1 || key == 2 || key == 3)
+            return true;
+
+        return false;
+    }
+    static std::array<Person*, 3> values;
+
+    [[nodiscard]]
+    static bool try_lookup(const int32_t key, const Person*& value) noexcept
+    {
+
+
+        if (key == 1)
+        {
+            value = values[0];
+            return true;
+        }
+        if (key == 2)
+        {
+            value = values[1];
+            return true;
+        }
+        if (key == 3)
+        {
+            value = values[2];
+            return true;
+        }
+
+
+        value = nullptr;
+        return false;
+    }
+
+    static constexpr size_t item_count = 3;
+    static constexpr int32_t min_key = 1;
+    static constexpr int32_t max_key = 3;
+
+public:
+    ConditionalStructure_Int32_3() = delete;
+    ConditionalStructure_Int32_3(const ConditionalStructure_Int32_3&) = delete;
+    ConditionalStructure_Int32_3& operator=(const ConditionalStructure_Int32_3&) = delete;
+    ConditionalStructure_Int32_3(ConditionalStructure_Int32_3&&) = delete;
+    ConditionalStructure_Int32_3& operator=(ConditionalStructure_Int32_3&&) = delete;
+};
+std::array<Person*, 3> ConditionalStructure_Int32_3::values = {
+    new Person(1, U"Bob", new Person(4, U"Anna", nullptr)),
+    new Person(2, U"Billy", nullptr),
+    new Person(3, U"Bibi", nullptr),
+
+};