Fixed #101. Added children operator. Added unit tests for node payloads.

libs/cpp/lang/include/lang/builders/allocator.hpp

@@ -11,6 +11,7 @@ class allocator {
  AcquireT acquire;
  ReleaseT release;
 
+ [[nodiscard]] builder none() const;
  builder source_root(const char* filename) const;
  builder scope(const char* identifier) const;
  builder heap_type(const char* identifier) const;

libs/cpp/lang/src/builders/allocator.cpp

@@ -1,8 +1,16 @@
 #include "lang/builders/allocator.hpp"
+#include "lang/builders/builder.hpp"
+#include "core/nodes/node_type.h"
 
 using namespace cl::lang::builders;
 
 bool
 allocator::equal(const allocator &left, const allocator &right) {
  return left.acquire == right.acquire && left.release == right.release;
+}
+
+builder
+allocator::none() const {
+
+ return builder::from_payload(*this, nullptr, ::none);
 }

libs/cpp/lang/src/builders/builder.cpp

@@ -1,7 +1,5 @@
 #include "lang/builders/builder.hpp"
-#include "lang/builders/builders.hpp"
 #include "lang/builders/allocator.hpp"
-#include "lang/language.hpp"
 #include "core/node.h"
 
 namespace b = cl::lang::builders;

libs/cpp/lang/src/builders/builders.cpp

@@ -1,4 +0,0 @@
-#include "lang/builders/builders.hpp"
-#include "lang/builders/builder.hpp"
-
-namespace b = cl::lang::builders;

libs/cpp/lang/src/builders/heap_type.cpp

@@ -2,7 +2,6 @@
 #include "lang/builders/allocator.hpp"
 #include "lang/builders/builder.hpp"
 #include "lang/utils.hpp"
-#include "core/node.h"
 #include "core/nodes/node_type.h"
 
 namespace b = cl::lang::builders;

libs/cpp/lang/src/builders/scope.cpp

@@ -2,7 +2,6 @@
 #include "lang/builders/allocator.hpp"
 #include "lang/builders/builder.hpp"
 #include "lang/utils.hpp"
-#include "core/node.h"
 #include "core/nodes/node_type.h"
 
 namespace b = cl::lang::builders;

libs/cpp/lang/src/builders/source_root.cpp

@@ -2,7 +2,6 @@
 #include "lang/builders/allocator.hpp"
 #include "lang/builders/builder.hpp"
 #include "lang/utils.hpp"
-#include "core/node.h"
 #include "core/nodes/node_type.h"
 
 namespace b = cl::lang::builders;

tests/CMakeLists.txt

@@ -11,6 +11,9 @@ set(PUBLIC_SOURCES_FILES
  "${LIBRARY_BASE_PATH}/src/core/config.cpp"
  "${LIBRARY_BASE_PATH}/src/lang/builders/builder_child.cpp"
  "${LIBRARY_BASE_PATH}/src/lang/builders/builder_children.cpp"
+ "${LIBRARY_BASE_PATH}/src/lang/builders/source_root.cpp"
+ "${LIBRARY_BASE_PATH}/src/lang/builders/scope.cpp"
+ "${LIBRARY_BASE_PATH}/src/lang/builders/heap_type.cpp"
 )
 
 set(DOCTEST_NO_INSTALL ON)

tests/src/core/config.cpp

@@ -3,7 +3,7 @@
 
 TEST_SUITE_BEGIN("core/config");
 
-TEST_CASE("Lifetime") {
+TEST_CASE("config lifetime") {
  struct cl_config* config = cl_config_init();
  REQUIRE_NE((struct cl_config*)nullptr, config);
 
@@ -14,7 +14,7 @@ TEST_CASE("Lifetime") {
  REQUIRE_EQ(1, term);
 }
 
-TEST_CASE("String") {
+TEST_CASE("config string") {
  struct cl_config* config = cl_config_init();
  REQUIRE_NE((struct cl_config*)nullptr, config);
 

tests/src/lang/builders/builder_child.cpp

@@ -10,7 +10,7 @@ namespace b = cl::lang::builders;
 
 TEST_SUITE_BEGIN("lang/builders/builder_child");
 
-TEST_CASE("Child single") {
+TEST_CASE("builder_child single") {
  auto m = b::allocator{ malloc, free };
  auto factory = m.source_root("hello.ts");
 
@@ -25,7 +25,7 @@ TEST_CASE("Child single") {
  REQUIRE_UNARY_FALSE(strcmp("hello.ts", ((const cl_node_source_root*)root->payload)->file_name));
 }
 
-TEST_CASE("Child hierarchy temporary") {
+TEST_CASE("builder_child hierarchy temporary") {
  auto m = b::allocator{ malloc, free };
  auto factory = m.source_root("hello.ts") << m.source_root("world.ts");
 
@@ -49,7 +49,7 @@ TEST_CASE("Child hierarchy temporary") {
  REQUIRE_UNARY_FALSE(strcmp("world.ts", ((const cl_node_source_root*)child->payload)->file_name));
 }
 
-TEST_CASE("Child hierarchy variable") {
+TEST_CASE("builder_child hierarchy variable") {
  auto m = b::allocator{ malloc, free };
  auto a = m.source_root("hello.ts");
  auto factory = a << m.source_root("world.ts");
@@ -74,7 +74,7 @@ TEST_CASE("Child hierarchy variable") {
  REQUIRE_UNARY_FALSE(strcmp("world.ts", ((const cl_node_source_root*)child->payload)->file_name));
 }
 
-TEST_CASE("Child hierarchy variable rewrite") {
+TEST_CASE("builder_child hierarchy variable rewrite") {
  auto m = b::allocator{ malloc, free };
  auto factory = m.source_root("hello.ts");
  factory = factory << m.source_root("world.ts");
@@ -99,7 +99,7 @@ TEST_CASE("Child hierarchy variable rewrite") {
  REQUIRE_UNARY_FALSE(strcmp("world.ts", ((const cl_node_source_root*)child->payload)->file_name));
 }
 
-TEST_CASE("Child hierarchy variable rewrite reverse") {
+TEST_CASE("builder_child hierarchy variable rewrite reverse") {
  auto m = b::allocator{ malloc, free };
  auto factory = m.source_root("world.ts");
  factory = m.source_root("hello.ts") << factory;
@@ -124,7 +124,7 @@ TEST_CASE("Child hierarchy variable rewrite reverse") {
  REQUIRE_UNARY_FALSE(strcmp("world.ts", ((const cl_node_source_root*)child->payload)->file_name));
 }
 
-TEST_CASE("Child hierarchy both variables rewrite") {
+TEST_CASE("builder_child hierarchy both variables rewrite") {
  auto m = b::allocator{ malloc, free };
  auto factory = m.source_root("world.ts");
  auto a = m.source_root("hello.ts");
@@ -150,7 +150,7 @@ TEST_CASE("Child hierarchy both variables rewrite") {
  REQUIRE_UNARY_FALSE(strcmp("world.ts", ((const cl_node_source_root*)child->payload)->file_name));
 }
 
-TEST_CASE("Child hierarchy temporary nested temporary") {
+TEST_CASE("builder_child hierarchy temporary nested temporary") {
  auto m = b::allocator{ malloc, free };
  auto factory = m.source_root("hello.ts") << m.source_root("world.ts") << m.source_root("!.ts");
 
@@ -183,7 +183,7 @@ TEST_CASE("Child hierarchy temporary nested temporary") {
  REQUIRE_UNARY_FALSE(strcmp("!.ts", ((const cl_node_source_root*)child->payload)->file_name));
 }
 
-TEST_CASE("Child hierarchy variable nested temporary") {
+TEST_CASE("builder_child hierarchy variable nested temporary") {
  auto m = b::allocator{ malloc, free };
  auto factory = m.source_root("hello.ts");
  factory = factory << m.source_root("world.ts") << m.source_root("!.ts");
@@ -217,7 +217,7 @@ TEST_CASE("Child hierarchy variable nested temporary") {
  REQUIRE_UNARY_FALSE(strcmp("!.ts", ((const cl_node_source_root*)child->payload)->file_name));
 }
 
-TEST_CASE("Child hierarchy variable nested variable") {
+TEST_CASE("builder_child hierarchy variable nested variable") {
  auto m = b::allocator{ malloc, free };
  auto factory = m.source_root("hello.ts");
  factory = factory << m.source_root("world.ts");

tests/src/lang/builders/builder_children.cpp

@@ -11,7 +11,7 @@ namespace b = cl::lang::builders;
 
 TEST_SUITE_BEGIN("lang/builders/builder_children");
 
-TEST_CASE("Children hierarchy temporary") {
+TEST_CASE("builder_children hierarchy temporary") {
  auto m = b::allocator{ malloc, free };
  auto factory = m.source_root("hello.ts")
  << b::children(m.source_root("world.ts"), m.source_root("!.ts"));
@@ -46,7 +46,7 @@ TEST_CASE("Children hierarchy temporary") {
  REQUIRE_UNARY_FALSE(strcmp("!.ts", ((const cl_node_source_root*)child->payload)->file_name));
 }
 
-TEST_CASE("Children hierarchy variable") {
+TEST_CASE("builder_children hierarchy variable") {
  auto m = b::allocator{ malloc, free };
  auto a = m.source_root("hello.ts");
  auto factory = a << b::children(m.source_root("world.ts"), m.source_root("!.ts"));
@@ -81,7 +81,7 @@ TEST_CASE("Children hierarchy variable") {
  REQUIRE_UNARY_FALSE(strcmp("!.ts", ((const cl_node_source_root*)child->payload)->file_name));
 }
 
-TEST_CASE("Children hierarchy variable rewrite") {
+TEST_CASE("builder_children hierarchy variable rewrite") {
  auto m = b::allocator{ malloc, free };
  auto factory = m.source_root("hello.ts");
  factory = factory << b::children(m.source_root("world.ts"), m.source_root("!.ts"));
@@ -116,7 +116,7 @@ TEST_CASE("Children hierarchy variable rewrite") {
  REQUIRE_UNARY_FALSE(strcmp("!.ts", ((const cl_node_source_root*)child->payload)->file_name));
 }
 
-TEST_CASE("Children hierarchy variable rewrite reverse") {
+TEST_CASE("builder_children hierarchy variable rewrite reverse") {
  auto m = b::allocator{ malloc, free };
  auto a = b::children(m.source_root("world.ts"), m.source_root("!.ts"));
  auto factory = m.source_root("hello.ts") << a;
@@ -151,7 +151,7 @@ TEST_CASE("Children hierarchy variable rewrite reverse") {
  REQUIRE_UNARY_FALSE(strcmp("!.ts", ((const cl_node_source_root*)child->payload)->file_name));
 }
 
-TEST_CASE("Children hierarchy mixed children temporary") {
+TEST_CASE("builder_children hierarchy mixed children temporary") {
  auto m = b::allocator{ malloc, free };
  auto a = m.source_root("world.ts");
  auto factory = m.source_root("hello.ts") << b::children(a, m.source_root("!.ts"));
@@ -186,4 +186,41 @@ TEST_CASE("Children hierarchy mixed children temporary") {
  REQUIRE_UNARY_FALSE(strcmp("!.ts", ((const cl_node_source_root*)child->payload)->file_name));
 }
 
+TEST_CASE("builder_children hierarchy mixed children variable") {
+ auto m = b::allocator{ malloc, free };
+ auto a = m.source_root("world.ts");
+ auto b = b::children(a, m.source_root("!.ts"));
+ auto c = m.source_root("hello.ts");
+ auto factory = c << b;
+
+ auto root = factory.root_get();
+ REQUIRE_UNARY(root);
+ REQUIRE_NE(root, factory.parent_get());
+ REQUIRE_EQ(2, root->child_count);
+ REQUIRE_UNARY(root->payload);
+ REQUIRE_EQ(::source_root, root->payload_type);
+ REQUIRE_UNARY_FALSE(root->parent);
+ REQUIRE_UNARY_FALSE(strcmp("hello.ts", ((const cl_node_source_root*)root->payload)->file_name));
+
+ auto child = root->children;
+ REQUIRE_UNARY(child);
+ REQUIRE_EQ((child + 1), factory.parent_get());
+ REQUIRE_EQ(0, child->child_count);
+ REQUIRE_UNARY_FALSE(child->children);
+ REQUIRE_UNARY(child->payload);
+ REQUIRE_EQ(::source_root, child->payload_type);
+ REQUIRE_EQ(root, child->parent);
+ REQUIRE_UNARY_FALSE(strcmp("world.ts", ((const cl_node_source_root*)child->payload)->file_name));
+
+ ++child;
+ REQUIRE_UNARY(child);
+ REQUIRE_EQ(child, factory.parent_get());
+ REQUIRE_EQ(0, child->child_count);
+ REQUIRE_UNARY_FALSE(child->children);
+ REQUIRE_UNARY(child->payload);
+ REQUIRE_EQ(::source_root, child->payload_type);
+ REQUIRE_EQ(root, child->parent);
+ REQUIRE_UNARY_FALSE(strcmp("!.ts", ((const cl_node_source_root*)child->payload)->file_name));
+}
+
 TEST_SUITE_END();

tests/src/lang/builders/heap_type.cpp

@@ -0,0 +1,74 @@
+#include <cstring>
+#include "lang/builders/allocator.hpp"
+#include "lang/builders/builder.hpp"
+#include "core/node.h"
+#include "core/nodes/node_type.h"
+#include "core/nodes/heap_type.h"
+#include "doctest/doctest.h"
+
+namespace b = cl::lang::builders;
+
+TEST_SUITE_BEGIN("lang/builders/heap_type");
+
+TEST_CASE("heap_type lifetime") {
+ auto m = b::allocator{ malloc, free };
+ auto factory = m.heap_type("hello");
+
+ auto root = factory.root_get();
+ REQUIRE_UNARY(root);
+ REQUIRE_EQ(root, factory.parent_get());
+ REQUIRE_EQ(0, root->child_count);
+ REQUIRE_EQ(nullptr, root->children);
+ REQUIRE_UNARY(root->payload);
+ REQUIRE_EQ(::heap_type, root->payload_type);
+ REQUIRE_UNARY_FALSE(root->parent);
+ REQUIRE_UNARY_FALSE(strcmp("hello", ((const cl_node_heap_type*)root->payload)->identifier));
+}
+
+TEST_CASE("heap_type value") {
+ auto m = b::allocator{ malloc, free };
+
+ SUBCASE("empty") {
+ auto factory = m.heap_type("");
+
+ auto root = factory.root_get();
+ REQUIRE_UNARY(root);
+ REQUIRE_EQ(root, factory.parent_get());
+ REQUIRE_EQ(0, root->child_count);
+ REQUIRE_EQ(nullptr, root->children);
+ REQUIRE_UNARY(root->payload);
+ REQUIRE_EQ(::heap_type, root->payload_type);
+ REQUIRE_UNARY_FALSE(root->parent);
+ REQUIRE_UNARY_FALSE(strcmp("", ((const cl_node_heap_type*)root->payload)->identifier));
+ }
+
+ SUBCASE("null") {
+ auto factory = m.heap_type(nullptr);
+
+ auto root = factory.root_get();
+ REQUIRE_UNARY(root);
+ REQUIRE_EQ(root, factory.parent_get());
+ REQUIRE_EQ(0, root->child_count);
+ REQUIRE_EQ(nullptr, root->children);
+ REQUIRE_UNARY(root->payload);
+ REQUIRE_EQ(::heap_type, root->payload_type);
+ REQUIRE_UNARY_FALSE(root->parent);
+ REQUIRE_EQ(nullptr, ((const cl_node_heap_type*)root->payload)->identifier);
+ }
+
+ SUBCASE("filled") {
+ auto factory = m.heap_type("hello");
+
+ auto root = factory.root_get();
+ REQUIRE_UNARY(root);
+ REQUIRE_EQ(root, factory.parent_get());
+ REQUIRE_EQ(0, root->child_count);
+ REQUIRE_EQ(nullptr, root->children);
+ REQUIRE_UNARY(root->payload);
+ REQUIRE_EQ(::heap_type, root->payload_type);
+ REQUIRE_UNARY_FALSE(root->parent);
+ REQUIRE_UNARY_FALSE(strcmp("hello", ((const cl_node_heap_type*)root->payload)->identifier));
+ }
+}
+
+TEST_SUITE_END();