Merge branch 'master' of somweyr.de:ousia

1 files changed, 28 insertions, 2 deletions

diff --git a/src/core/model/Node.cpp b/src/core/model/Node.cpp
index a935715..bd023e1 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"
 
@@ -272,14 +273,14 @@ bool Node::resolve(ResolutionState &state)
 			}
 		} else {
 			size_t resCount = state.resultCount();
-			continueResolve(state);
+			doResolve(state);
 			return state.resultCount() > resCount;
 		}
 	}
 	return false;
 }
 
-void Node::continueResolve(ResolutionState &state)
+void Node::doResolve(ResolutionState &state)
 {
 	// Do nothing in the default implementation
 }
@@ -353,8 +354,33 @@ 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 in parent ") +
+		             type().name + std::string(" \"") +
+		             Utils::join(path(), ".") + std::string("\""));
+		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