Merge pull request #129 from OpenVicProject/registry-template-fun

Reworked `UniqueKeyRegistry` template params

Author: Hop311

src/openvic-simulation/dataloader/Dataloader.cpp

@@ -836,8 +836,10 @@ bool Dataloader::load_defines(GameManager& game_manager) {
 		ret = false;
 	}
 	if (!_load_technologies(game_manager)) {
+		Logger::error("Failed to load technologies!");
 		ret = false;
 	}
+	game_manager.get_modifier_manager().lock_modifier_effects();
 	if (!game_manager.get_politics_manager().get_rule_manager().setup_rules(
 		game_manager.get_economy_manager().get_building_type_manager()
 	)) {

src/openvic-simulation/interface/LoadBase.hpp

@@ -5,27 +5,27 @@
 
 namespace OpenVic {
 
-	template<typename... _Context>
+	template<typename... Context>
 	class LoadBase {
 	protected:
 		LoadBase() = default;
 
-		virtual bool _fill_key_map(NodeTools::key_map_t&, _Context...) = 0;
+		virtual bool _fill_key_map(NodeTools::key_map_t&, Context...) = 0;
 
 	public:
 		LoadBase(LoadBase&&) = default;
 		virtual ~LoadBase() = default;
 
-		bool load(ast::NodeCPtr node, _Context... context) {
+		bool load(ast::NodeCPtr node, Context... context) {
 			NodeTools::key_map_t key_map;
 			bool ret = _fill_key_map(key_map, context...);
 			ret &= NodeTools::expect_dictionary_key_map(std::move(key_map))(node);
 			return ret;
 		}
 
-		template<std::derived_from<LoadBase<_Context...>> T, std::derived_from<T> U>
+		template<std::derived_from<LoadBase<Context...>> T, std::derived_from<T> U>
 		static NodeTools::node_callback_t _expect_instance(
-			NodeTools::callback_t<std::unique_ptr<T>&&> callback, _Context... context
+			NodeTools::callback_t<std::unique_ptr<T>&&> callback, Context... context
 		) {
 			return [callback, &context...](ast::NodeCPtr node) -> bool {
 				std::unique_ptr<T> instance { std::make_unique<U>() };
@@ -38,14 +38,14 @@ namespace OpenVic {
 		OV_DETAIL_GET_TYPE_BASE_CLASS(LoadBase)
 	};
 
-	template<typename... _Context>
-	class Named : public LoadBase<_Context...> {
+	template<typename... Context>
+	class Named : public LoadBase<Context...> {
 		std::string PROPERTY(name);
 
 	protected:
 		Named() = default;
 
-		virtual bool _fill_key_map(NodeTools::key_map_t& key_map, _Context...) override {
+		virtual bool _fill_key_map(NodeTools::key_map_t& key_map, Context...) override {
 			using namespace OpenVic::NodeTools;
 			return add_key_map_entries(key_map, "name", ONE_EXACTLY, expect_string(assign_variable_callback_string(name)));
 		}
@@ -64,19 +64,21 @@ namespace OpenVic {
 		OV_DETAIL_GET_TYPE
 	};
 
-	template<typename T, typename... _Context>
-	requires std::derived_from<T, Named<_Context...>>
-	struct _get_name {
-		constexpr std::string_view operator()(T const* item) const {
-			return item->get_name();
+	template<typename Value, typename... Context>
+	requires std::derived_from<Value, Named<Context...>>
+	struct RegistryValueInfoNamed {
+		using value_type = Value;
+
+		static constexpr std::string_view get_identifier(value_type const& item) {
+			return item.get_name();
 		}
 	};
 
-	template<typename T, typename... _Context>
-	requires std::derived_from<T, Named<_Context...>>
-	using NamedRegistry = ValueRegistry<T, _get_name<T, _Context...>>;
+	template<typename Value, typename... Context>
+	requires std::derived_from<Value, Named<Context...>>
+	using NamedRegistry = ValueRegistry<RegistryValueInfoNamed<Value, Context...>>;
 
-	template<typename T, typename... _Context>
-	requires std::derived_from<T, Named<_Context...>>
-	using NamedInstanceRegistry = InstanceRegistry<T, _get_name<T, _Context...>>;
+	template<typename Value, typename... Context>
+	requires std::derived_from<Value, Named<Context...>>
+	using NamedInstanceRegistry = InstanceRegistry<RegistryValueInfoNamed<Value, Context...>>;
 }

src/openvic-simulation/misc/Modifier.cpp

@@ -98,9 +98,7 @@ bool ModifierManager::add_modifier_effect(std::string_view identifier, bool posi
 		Logger::error("Invalid modifier effect identifier - empty!");
 		return false;
 	}
-	return modifier_effects.add_item(
-		std::make_unique<ModifierEffect>(std::move(identifier), std::move(positive_good), std::move(format))
-	);
+	return modifier_effects.add_item({ std::move(identifier), positive_good, format });
 }
 
 bool ModifierManager::setup_modifier_effects() {

src/openvic-simulation/misc/Modifier.hpp

@@ -3,22 +3,19 @@
 #include "openvic-simulation/scripts/ConditionScript.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 
-#include "dataloader/NodeTools.hpp"
-
-
 namespace OpenVic {
 	struct ModifierManager;
 
 	struct ModifierEffect : HasIdentifier {
+		friend struct ModifierManager;
+
 		enum class format_t {
 			PROPORTION_DECIMAL,	/* An unscaled fraction/ratio, with 1 being "full"/"whole" */
 			PERCENTAGE_DECIMAL,	/* A fraction/ratio scaled so that 100 is "full"/"whole" */
 			RAW_DECIMAL,		/* A continuous quantity, e.g. attack strength */
 			INT					/* A discrete quantity, e.g. building count limit */
 		};
 
-		friend std::unique_ptr<ModifierEffect> std::make_unique<ModifierEffect>(std::string_view&&, bool&&, format_t&&);
-
 	private:
 		/* If true, positive values will be green and negative values will be red.
 		 * If false, the colours will be switced.
@@ -115,10 +112,10 @@ namespace OpenVic {
 	struct ModifierManager {
 		/* Some ModifierEffects are generated mid-load, such as max/min count modifiers for each building, so
 		 * we can't lock it until loading is over. This means we can't rely on locking for pointer stability,
-		 * so instead we use an IdentifierInstanceRegistry (using std::unique_ptr's under the hood).
+		 * so instead we store the effects in a deque which doesn't invalidate pointers on insert.
 		 */
 	private:
-		CaseInsensitiveIdentifierInstanceRegistry<ModifierEffect> IDENTIFIER_REGISTRY(modifier_effect);
+		CaseInsensitiveIdentifierRegistry<ModifierEffect, RegistryStorageInfoDeque> IDENTIFIER_REGISTRY(modifier_effect);
 		case_insensitive_string_set_t complex_modifiers;
 
 		IdentifierRegistry<Modifier> IDENTIFIER_REGISTRY(event_modifier);