Implemented some helper functions to facilitate implementing doValidate methods. This includes the "validateName" function (which makes sure the Node has a valid identifier), the "continueValidation" function (which descends into the given list of child nodes) and the "continueValidationCheckDuplicates" which descends into the given child list and makes sure the names of the child nodes are unique.

1 files changed, 24 insertions, 0 deletions

diff --git a/src/core/model/Node.cpp b/src/core/model/Node.cpp
index 7565ba9..e432aff 100644
--- a/src/core/model/Node.cpp
+++ b/src/core/model/Node.cpp
@@ -23,6 +23,7 @@
 #include <core/common/Logger.hpp>
 #include <core/common/Rtti.hpp>
 #include <core/common/TypedRttiBuilder.hpp>
+#include <core/common/Utils.hpp>
 
 #include "Node.hpp"
 
@@ -353,8 +354,31 @@ std::vector<ResolutionResult> Node::resolve(const std::string &name,
 	return resolve(std::vector<std::string>{name}, type);
 }
 
+bool Node::checkDuplicate(Handle<Node> elem,
+                          std::unordered_set<std::string> &names,
+                          Logger &logger) const
+{
+	const std::string &name = elem->getName();
+	if (!names.emplace(name).second) {
+		logger.error(std::string("Element with name \"") + name +
+		             std::string("\" defined multiple times."));
+		return false;
+	}
+	return true;
+}
+
 bool Node::doValidate(Logger &logger) const { return true; }
 
+bool Node::validateName(Logger &logger) const
+{
+	if (!Utils::isIdentifier(name)) {
+		logger.error(type().name + std::string(" name \"") + name +
+		             std::string("\" is not a valid identifier"));
+		return false;
+	}
+	return true;
+}
+
 void Node::invalidate()
 {
 	// Only perform the invalidation if necessary