normalize members of iterator

include/ifaces/ILinkMixin.h

@@ -11,10 +11,10 @@ public:
 	using ElemPtr = std::shared_ptr<TElem>;
 
 	virtual ~ILinkMixin() = default;
-	virtual operator std::shared_ptr<TElem>() = 0;
 	virtual void linkChild(const ElemPtr& child) = 0;
 	virtual void unlinkParent() = 0;
 	virtual const std::vector<ElemPtr>& children() = 0;
 	virtual ElemPtr parent() = 0;
 	virtual LinkPtr getLink() = 0;
+	//virtual operator ElemPtr() const = 0;
 };

include/iterators/BFSIterator.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <queue>
+#include <stack>
 
 #include "iterators/BaseIterator.h"
 

include/iterators/BaseIterator.h

@@ -1,4 +1,5 @@
 #pragma once
+#include <tuple>
 
 #include "ifaces/IIterator.h"
 

include/iterators/Traversal.h

@@ -1,27 +1,22 @@
 #pragma once
+#include <queue>
 
 #include "ifaces/INode.h"
 
 #include "iterators/DFSIterator.h"
 #include "iterators/BFSIterator.h"
 
-namespace traversal {
-	/// \brief Фабрика итераторов узлов дерева.
-	/// \tparam T Тип алгоритма для обхода дерева.
-	/// Конструирует итерируемый объект с заданным алгоритмом обхода. Например, в ширину
-	/// или глубину.
-	template<typename Policy>
-	class Traversal {
-		INode* start;
+template<typename Policy>
+class Traversal {
+	INode* start;
 
-	public:
-		explicit Traversal(INode* start) : start(start) {}
-		explicit Traversal(NodePtr start) : start(start.get()) {}
+public:
+	explicit Traversal(INode* start) : start(start) {}
+	explicit Traversal(NodePtr start) : start(start.get()) {}
 
-		Policy begin() const { return Policy(start); }
-		Policy end() const { return Policy(nullptr); }
-	};
+	Policy begin() const { return Policy(start); }
+	Policy end() const { return Policy(nullptr); }
+};
 
-	using DFS = Traversal<DFSIterator<INode>>;
-	using BFS = Traversal<BFSIterator<INode>>;
-}
+using TraversalDFS = Traversal<DFSIterator<INode>>;
+using TraversalBFS = Traversal<BFSIterator<INode>>;

include/links/BaseLink.h

@@ -34,7 +34,7 @@ public:
 	}
 
 	~BaseLink() override {
-		Logger::get("ConDes").dbg("--- Destructor called for: BaseLink");
+		Logger::get("Link").dbg("--- Destructor called for: BaseLink");
 	}
 protected:
 	std::vector<ElemPtr> children_;

include/links/NotImplementedLink.h

@@ -20,7 +20,7 @@ public:
 	void removeChild(const ElemPtr& child) override { }
 
 	~NotImplementedLink() override {
-		Logger::get("ConDes").dbg("--- Destructor called for: NotImplementedLink");
+		Logger::get("Link").dbg("--- Destructor called for: NotImplementedLink");
 	}
 private:
 	std::vector<ElemPtr> empty_;

include/mixins/BaseLinkMixin.h

@@ -14,11 +14,7 @@ class BaseLinkMixin : public virtual ILinkMixin<INode>,
 
 public:
 	~BaseLinkMixin() override {
-		Logger::get("ConDes").dbg("--- Destructor called for: BaseLinkMixin");
-	}
-
-	operator std::shared_ptr<INode>() override {
-		return this->getNode();
+		Logger::get("Mixin").dbg("--- Destructor called for: BaseLinkMixin");
 	}
 
 	void linkChild(const ElemPtr& child) override {
@@ -37,15 +33,7 @@ public:
 
 		auto parentLink = parent->getLink();
 
-		/* NOTE:
-		 *
-		 * Keep a reference to the node we gonna to unlink.
-		 * Otherwise, we'll disappear between `removeChild` and
-		 * `setParent`. Do not rearrange these calls, because
-		 * we want to modify the tree top down.
-		 */
-		auto node = getNode();
-		parentLink->removeChild(node);
+		parentLink->removeChild(getNode());
 		getLink()->setParent(nullptr);
 	}
 

include/mixins/FabricMixin.h

@@ -1,11 +0,0 @@
-#pragma once
-#include <memory>
-
-template <typename T>
-class FabricMixin {
-public:
-	template <typename... Args>
-	static std::shared_ptr<T> create(Args&&... args) {
-		return std::shared_ptr<T>(new T(std::forward<Args>(args)...));
-	}
-};

include/mixins/HierarchicalLinkMixin.h

@@ -16,7 +16,7 @@ class HierarchicalLinkMixin : public LazyLinkMixin<OneToOneLink<TElem>> {
 
 public:
 	~HierarchicalLinkMixin() override {
-		Logger::get("ConDes").dbg("--- Destructor called for: HierarchicalLinkMixin");
+		Logger::get("Mixin").dbg("--- Destructor called for: HierarchicalLinkMixin");
 	}
 
 	void linkChild(const ElemPtr& child) override {
@@ -34,10 +34,10 @@ protected:
 
 		if (typeid(*child) == typeid(*this)) {
 			Logger::get("Mixin").dbg("---  Mutate to OneToMany");
-			newLink = std::make_shared<OneToManyLink<TElem>>(*this);
+			newLink = std::make_shared<OneToManyLink<TElem>>(this->getNode());
 		} else {
 			Logger::get("Mixin").dbg("---  Mutate to OneToOne");
-			newLink = std::make_shared<OneToOneLink<TElem>>(*this);
+			newLink = std::make_shared<OneToOneLink<TElem>>(this->getNode());
 		}
 
 		if (newLink && this->link_)

include/mixins/LazyLinkMixin.h

@@ -25,13 +25,14 @@ public:
 	LazyLinkMixin() {}
 
 	~LazyLinkMixin() override {
-		Logger::get("ConDes").info("--- Destructor called for: LazyLinkMixin");
+		Logger::get("Mixin").dbg("--- Destructor called for: LazyLinkMixin");
 	}
 
 protected:
 	void lazyInit() {
 		if (!link_) {
-			link_ = std::make_shared<TLink>(*this);
+			link_ = std::make_shared<TLink>(
+					BaseLinkMixin::getNode());
 		}
 	}
 	LinkPtr link_;

include/nodes/BaseNode.h

@@ -1,4 +1,5 @@
 #pragma once
+#include <iostream>
 
 #include "ifaces/INode.h"
 #include "Logger.h"
@@ -8,12 +9,12 @@
 class BaseNode : public virtual INode {
 public:
 	BaseNode(std::string name) : name_(std::move(name)) {
-		Logger::get("ConDes").dbg(std::string("--- Base constructor called for: ") + name_);
+		Logger::get("Node").dbg(std::string("--- Base constructor called for: ") + name_);
 	}
 	const std::string& name() const override { return name_; }
 	const std::string& kind() const override { return kind_; }
 	~BaseNode() {
-		Logger::get("ConDes").info(std::string("--- Base destructor called for: ") + name_);
+		Logger::get("Node").dbg(std::string("--- Base destructor called for: ") + name_);
 	}
 protected:
 	std::string name_;

include/nodes/ComplexNode.h

@@ -1,22 +1,19 @@
 #pragma once
+#include <iostream>
 
 #include "nodes/BaseNode.h"
 #include "mixins/HierarchicalLinkMixin.h"
-#include "mixins/FabricMixin.h"
 #include "Logger.h"
 
 /// \brief Класс сложного (составного) узла дерева.
-/// Может содержать несколько дочерних ComplexNode или один SimpleNode.
+/// Может содержать несколько дочерних ComplexNode и один SimpleNode.
 class ComplexNode : public BaseNode,
-		    virtual public HierarchicalLinkMixin<INode>,
-		    public FabricMixin<ComplexNode> {
+		    virtual public HierarchicalLinkMixin<INode> {
 public:
 	~ComplexNode() {
-		Logger::get("ConDes").dbg(std::string("--- Complex destructor called for: ") + name_);
+		Logger::get("Node").dbg(std::string("--- Complex destructor called for: ") + name_);
 	}
-private:
-	friend class FabricMixin<ComplexNode>;
 	ComplexNode(std::string name) : BaseNode(std::move(name)) {
-		Logger::get("ConDes").dbg(std::string("--- Complex constructor called for: ") + name_);
+		Logger::get("Node").dbg(std::string("--- Complex constructor called for: ") + name_);
 	}
 };

include/nodes/SimpleNode.h

@@ -1,23 +1,20 @@
 #pragma once
+#include <iostream>
 
 #include "nodes/BaseNode.h"
 #include "mixins/LazyLinkMixin.h"
-#include "mixins/FabricMixin.h"
 #include "links/OneToOneLink.h"
 #include "Logger.h"
 
 /// \brief Класс простого (листового) узла дерева.
 /// Может содержать только одного дочернего ComplexNode.
 class SimpleNode : public BaseNode,
-		   virtual public LazyLinkMixin<OneToOneLink<INode>>,
-		   public FabricMixin<SimpleNode> {
+		   virtual public LazyLinkMixin<OneToOneLink<INode>> {
 public:
 	~SimpleNode() {
-		Logger::get("ConDes").dbg(std::string("--- Simple destructor called for: ") + name_);
+		Logger::get("Node").dbg(std::string("--- Simple destructor called for: ") + name_);
 	}
-private:
-	friend class FabricMixin<SimpleNode>;
 	SimpleNode(std::string name) : BaseNode(std::move(name)) {
-		Logger::get("ConDes").dbg(std::string("--- Simple constructor called for: ") + name_);
+		Logger::get("Node").dbg(std::string("--- Simple constructor called for: ") + name_);
 	}
 };

src/main.cpp

@@ -14,15 +14,15 @@ void printNode(INode& node, size_t level) {
 }
 
 void printTreeBFS(INode& node) {
-	for (auto& child : traversal::BFS(&node))
+	for (auto& child : TraversalBFS(&node))
 		printNode(*child, 0);
 }
 void printTreeList(INode& node) {
-	for (auto& child : traversal::DFS(&node))
+	for (auto& child : TraversalDFS(&node))
 		printNode(*child, 0);
 }
 void printTreeLadder(INode& node) {
-	for (auto& [child, level] : traversal::DFS(&node))
+	for (auto& [child, level] : TraversalDFS(&node))
 		printNode(*child, level);
 }
 
@@ -31,16 +31,12 @@ int main() {
 	Logger::suppressCategory("Node");
 	Logger::suppressCategory("Link");
 	Logger::suppressCategory("Mixin");
-
-	Logger::suppressCategory("ConDes");
-	Logger::setMinSeverity("ConDes", Logger::Severity::Info);
-
 	auto& logger = Logger::get("MAIN");
 	logger.info("Entering main scope...");
 
 	{
-		auto root = ComplexNode::create("ComplexRoot");
-		auto child1 = ComplexNode::create("ComplexChild1");
+		auto root = std::make_shared<ComplexNode>("ComplexRoot");
+		auto child1 = std::make_shared<ComplexNode>("ComplexChild1");
 
 		root->linkChild(child1);
 
@@ -49,21 +45,23 @@ int main() {
 		std::cout << "\n";
 
 		{
-			auto child2 = ComplexNode::create("ComplexChild2");
+			auto child2 = std::make_shared<ComplexNode>("ComplexChild2");
 			root->linkChild(child2);
 
-			auto subchild2 = SimpleNode::create("SimpleSubChild2");
+			auto subchild2 = std::make_shared<SimpleNode>("SimpleSubChild2");
 			child2->linkChild(subchild2);
 
-			auto child3 = ComplexNode::create("ComplexChild3");
+			auto child3 = std::make_shared<ComplexNode>("ComplexChild3");
 			root->linkChild(child3);
 
-			child3->linkChild(SimpleNode::create("SimpleSubChild3"));
+			auto subchild3 = std::make_shared<SimpleNode>("SimpleSubChild3");
+			child3->linkChild(subchild3);
 
 			{
 				// Негативный сценарий 1: попытка добавить второй SimpleNode к ComplexNode
 				try {
-					child2->linkChild(SimpleNode::create("ShouldFail"));
+					auto anotherSimple = std::make_shared<SimpleNode>("ShouldFail");
+					child2->linkChild(anotherSimple);
 					logger.err("[ERROR] Не должно было получиться добавить второй SimpleNode к ComplexNode!");
 				} catch (const std::logic_error& e) {
 					logger.warn(std::string("[Ожидаемое исключение] ") + e.what());
@@ -71,12 +69,14 @@ int main() {
 
 				// Негативный сценарий 2: попытка добавить ComplexNode к SimpleNode
 				// Это допустимо: SimpleNode может иметь ComplexNode в качестве единственного ребёнка
-				subchild2->linkChild(ComplexNode::create("GoodComplex"));
+				auto goodComplex = std::make_shared<ComplexNode>("GoodComplex");
+				subchild2->linkChild(goodComplex);
 				logger.info("[OK] ComplexNode успешно добавлен к SimpleNode как единственный ребёнок.");
 
 				// Негативный сценарий: попытка добавить второго ребёнка к SimpleNode
 				try {
-					subchild2->linkChild(SimpleNode::create("ShouldFail2"));
+					auto anotherSimple = std::make_shared<SimpleNode>("ShouldFail2");
+					subchild2->linkChild(anotherSimple);
 					logger.err("[ERROR] Не должно было получиться добавить второго ребёнка к SimpleNode!");
 				} catch (const std::logic_error& e) {
 					logger.warn(std::string("[Ожидаемое исключение] ") + e.what());
@@ -84,7 +84,8 @@ int main() {
 
 				// Негативный сценарий: попытка добавить SimpleNode в ComplexNode, который уже содержит несколько ComplexNode-дочерних
 				try {
-					root->linkChild(SimpleNode::create("BadSimple"));
+					auto badSimple = std::make_shared<SimpleNode>("BadSimple");
+					root->linkChild(badSimple);
 					logger.err("[ERROR] Не должно было получиться добавить SimpleNode в ComplexNode с несколькими ComplexNode-дочерними!");
 				} catch (const std::logic_error& e) {
 					logger.warn(std::string("[Ожидаемое исключение] ") + e.what());
@@ -119,36 +120,16 @@ int main() {
 
 		logger.info("Unlinking ComplexChild1 and ComplexChild3...\n");
 		child1->unlinkParent();
-		for (auto child : traversal::BFS(root)) {
-			if (child->name() == "ComplexChild3") {
-				/* Avoid of disconnecting a node of the tree
-				 * we're traversing. Method holds reference
-				 * to it's object itself. But iterator ignores
-				 * smart pointers, feeling free to dereference
-				 * the destroyed object.
-				 */
-#if 1
-				/* Keep in mind to keep your reference until
-				 * the cycle ends, if you want more than just
-				 * remove subtree.
-				 */
-				NodePtr node = *child;
-				node->unlinkParent();
-				std::cout << "Unlinked: "
-					  << node->name() << std::endl;
+		for (auto child : root->getLink()->getChildren()) {
+			NodePtr childNode = std::dynamic_pointer_cast<INode>(child);
+			if (childNode->name() == "ComplexChild3") {
+				childNode->unlinkParent();
 				break;
-#else
-				/* Otherwise, just break immediately you
-				 * unlinked a node. The current pointer is not
-				 * a valid pointer anymore.
-				 */
-				child->unlinkParent();
-				break;
-#endif
 			}
 		}
 
-		root->linkChild(SimpleNode::create("SimpleChild4"));
+		auto child4 = std::make_shared<SimpleNode>("SimpleChild4");
+		root->linkChild(child4);
 
 		std::cout << "\nTree flush and link SimpleChild4:\n";
 		printTreeLadder(*root);
@@ -156,7 +137,6 @@ int main() {
 	}
 
 	logger.info("Exited main scope. All smart pointers destroyed.");
-	logger.info("(It don't? Check ConDes logger)");
 
 	return 0;
 }