Make definition index types strongly typed

Author: wvpm

src/openvic-simulation/country/CountryDefinition.cpp

@@ -64,9 +64,9 @@ bool CountryDefinitionManager::add_country(
 	static constexpr colour_t default_colour = colour_t::fill_as(colour_t::max_value);
 
 	return country_definitions.emplace_item(
-		identifier,
-		identifier, colour, get_country_definition_count(), *graphical_culture, std::move(parties), std::move(unit_names),
-		dynamic_tag, std::move(alternative_colours),
+		identifier, //
+		identifier, colour, CountryDefinition::index_t { get_country_definition_count() }, *graphical_culture,
+		std::move(parties), std::move(unit_names), dynamic_tag, std::move(alternative_colours),
 		/* Default to country colour for the chest and grey for the others. Update later if necessary. */
 		colour, default_colour, default_colour
 	);

src/openvic-simulation/country/CountryDefinition.hpp

@@ -9,6 +9,7 @@
 #include "openvic-simulation/types/HasIndex.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
+#include "openvic-simulation/types/TypedIndices.hpp"
 
 namespace OpenVic {
 	struct CountryDefinitionManager;
@@ -20,7 +21,7 @@ namespace OpenVic {
 	struct UnitType;
 
 	/* Generic information about a TAG */
-	struct CountryDefinition : HasIdentifierAndColour, HasIndex<CountryDefinition> {
+	struct CountryDefinition : HasIdentifierAndColour, HasIndex<CountryDefinition, country_index_t> {
 		friend struct CountryDefinitionManager;
 
 		using unit_names_map_t = ordered_map<UnitType const*, name_list_t>;

src/openvic-simulation/country/CountryInstance.cpp

@@ -1,6 +1,7 @@
 #include "CountryInstance.hpp"
 #include "CountryInstanceDeps.hpp"
 #include "CountryInstanceManager.hpp"
+#include <type_safe/strong_typedef.hpp>
 
 #include <algorithm>
 #include <cstddef>
@@ -2065,7 +2066,7 @@ void CountryInstance::manage_national_stockpile(
 	fixed_point_t weights_sum = 0;
 
 	for (auto [good_instance, good_data] : goods_data) {
-		const size_t index = good_instance.index;
+		const size_t index = type_safe::get(good_instance.index);
 		if (good_data.is_automated || !good_data.is_selling) {
 			const fixed_point_t quantity_to_allocate_for = good_data.is_automated 
 				? good_data.government_needs - good_data.stockpile_amount

src/openvic-simulation/country/CountryInstance.hpp

@@ -18,6 +18,7 @@
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
 #include "openvic-simulation/types/TechnologyUnlockLevel.hpp"
+#include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/types/UnitBranchType.hpp"
 #include "openvic-simulation/types/UnitVariant.hpp"
 #include "openvic-simulation/types/ValueHistory.hpp"
@@ -78,7 +79,7 @@ namespace OpenVic {
 
 	/* Representation of a country's mutable attributes, with a CountryDefinition that is unique at any single time
 	 * but can be swapped with other CountryInstance's CountryDefinition when switching tags. */
-	struct CountryInstance : FlagStrings, HasIndex<CountryInstance>, PopsAggregate {
+	struct CountryInstance : FlagStrings, HasIndex<CountryInstance, country_index_t>, PopsAggregate {
 		friend struct CountryInstanceManager;
 
 		/*

src/openvic-simulation/dataloader/Dataloader.cpp

@@ -784,7 +784,7 @@ bool Dataloader::_load_map_dir(DefinitionManager& definition_manager) const {
 
 	bool ret = expect_dictionary_keys(
 		"max_provinces", ONE_EXACTLY,
-			expect_uint<ProvinceDefinition::index_t>(std::bind_front(&MapDefinition::set_max_provinces, &map_definition)),
+			expect_index<ProvinceDefinition::index_t>(std::bind_front(&MapDefinition::set_max_provinces, &map_definition)),
 		"sea_starts", ONE_EXACTLY,
 			expect_list_reserve_length(
 				water_province_identifiers, expect_identifier(vector_callback(water_province_identifiers))

src/openvic-simulation/dataloader/NodeTools.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <concepts>
 #include <cstdint>
 #include <functional>
 #include <optional>
@@ -26,6 +27,7 @@
 #include "openvic-simulation/utility/Concepts.hpp"
 
 #include <function2/function2.hpp>
+#include <type_safe/strong_typedef.hpp>
 
 #define MOV(...) static_cast<std::remove_reference_t<decltype(__VA_ARGS__)>&&>(__VA_ARGS__)
 #define FWD(...) static_cast<decltype(__VA_ARGS__)>(__VA_ARGS__)
@@ -195,6 +197,28 @@ using namespace std::string_view_literals;
 			return expect_uint(callback, base);
 		}
 
+		template<derived_from_specialization_of<type_safe::strong_typedef> T>
+		requires std::unsigned_integral<type_safe::underlying_type<T>>
+		NodeCallback auto expect_index(callback_t<T>& callback, int base = 10) {
+			using underlying_type = type_safe::underlying_type<T>;
+
+			return expect_uint64([callback](uint64_t val) mutable -> bool {
+				if (val <= static_cast<uint64_t>(std::numeric_limits<underlying_type>::max())) {
+					return callback(T(val));
+				}
+				spdlog::error_s(
+					"Invalid uint: {} (valid range: [0, {}])",
+					val, static_cast<uint64_t>(std::numeric_limits<underlying_type>::max()) 
+				);
+				return false;
+			}, base);
+		}
+		template<derived_from_specialization_of<type_safe::strong_typedef> T>
+		requires std::unsigned_integral<type_safe::underlying_type<T>>
+		NodeCallback auto expect_index(callback_t<T>&& callback, int base = 10) {
+			return expect_index(callback, base);
+		}
+
 		callback_t<std::string_view> expect_fixed_point_str(callback_t<fixed_point_t> callback);
 		node_callback_t expect_fixed_point(callback_t<fixed_point_t> callback);
 		/* Expect a list of 3 base 10 values, each either in the range [0, 1] or (1, 255], representing RGB components. */

src/openvic-simulation/economy/BuildingType.cpp

@@ -12,7 +12,7 @@ BuildingType::BuildingType(
 	index_t new_index,
 	std::string_view identifier,
 	building_type_args_t& building_type_args
-) : HasIndex<BuildingType> { new_index },
+) : HasIndex { new_index },
 	Modifier { identifier, std::move(building_type_args.modifier), modifier_type_t::BUILDING },
 	type { building_type_args.type },
 	on_completion { building_type_args.on_completion },
@@ -52,7 +52,7 @@ bool BuildingTypeManager::add_building_type(
 
 	const bool ret = building_types.emplace_item(
 		identifier,
-		get_building_type_count(), identifier, building_type_args
+		BuildingType::index_t { get_building_type_count() }, identifier, building_type_args
 	);
 
 	if (ret) {

src/openvic-simulation/economy/BuildingType.hpp

@@ -6,6 +6,7 @@
 #include "openvic-simulation/types/HasIndex.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
 
 namespace OpenVic {
@@ -19,7 +20,7 @@ namespace OpenVic {
 	 * MAP-12, MAP-75, MAP-76
 	 * MAP-13, MAP-78, MAP-79
 	 */
-	struct BuildingType : HasIndex<BuildingType>, Modifier {
+	struct BuildingType : HasIndex<BuildingType, building_type_index_t>, Modifier {
 		using naval_capacity_t = uint64_t;
 
 		struct building_type_args_t {

src/openvic-simulation/economy/GoodDefinition.cpp

@@ -63,7 +63,7 @@ bool GoodDefinitionManager::add_good_definition(
 
 	if (good_definitions.emplace_item(
 		identifier,
-		identifier, colour, get_good_definition_count(), category, base_price, is_available_from_start,
+		identifier, colour, GoodDefinition::index_t { get_good_definition_count() }, category, base_price, is_available_from_start,
 		is_tradeable, is_money, has_overseas_penalty
 	)) {
 		category.good_definitions.push_back(&get_back_good_definition());

src/openvic-simulation/economy/GoodDefinition.hpp

@@ -3,6 +3,7 @@
 #include "openvic-simulation/types/HasIdentifier.hpp"
 #include "openvic-simulation/types/HasIndex.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
+#include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
 
 namespace OpenVic {
@@ -31,7 +32,7 @@ namespace OpenVic {
 	 * ECON-238, ECON-239, ECON-240, ECON-241, ECON-242, ECON-243, ECON-244, ECON-245, ECON-246, ECON-247, ECON-248, ECON-249,
 	 * ECON-250, ECON-251, ECON-252, ECON-253, ECON-254, ECON-255, ECON-256, ECON-257, ECON-258, ECON-259, ECON-260, ECON-261
 	 */
-	struct GoodDefinition : HasIdentifierAndColour, HasIndex<GoodDefinition> {
+	struct GoodDefinition : HasIdentifierAndColour, HasIndex<GoodDefinition, good_index_t> {
 
 	public:
 		GoodCategory const& category;