Refactor building_level_t to be type-safe

Author: Spartan322

src/openvic-simulation/economy/BuildingInstance.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "openvic-simulation/types/BuildingLevel.hpp"
+#include "openvic-simulation/economy/BuildingLevel.hpp"
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/HasIdentifier.hpp"
@@ -23,7 +23,7 @@ namespace OpenVic {
 	public:
 		BuildingType const& building_type;
 
-		BuildingInstance(BuildingType const& new_building_type, building_level_t new_level = 0);
+		BuildingInstance(BuildingType const& new_building_type, building_level_t new_level = building_level_t { 0 });
 		BuildingInstance(BuildingInstance&&) = default;
 
 		bool expand();

src/openvic-simulation/economy/BuildingLevel.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <cstdint>
+
+#include <fmt/base.h>
+#include <fmt/format.h>
+
+#include <type_safe/strong_typedef.hpp>
+
+namespace OpenVic {
+	struct building_level_t : type_safe::strong_typedef<building_level_t, std::int16_t>,
+							  type_safe::strong_typedef_op::equality_comparison<building_level_t>,
+							  type_safe::strong_typedef_op::relational_comparison<building_level_t>,
+							  type_safe::strong_typedef_op::integer_arithmetic<building_level_t>,
+							  type_safe::strong_typedef_op::mixed_addition<building_level_t, std::uint16_t>,
+							  type_safe::strong_typedef_op::mixed_subtraction<building_level_t, std::uint16_t> {
+		using strong_typedef::strong_typedef;
+	};
+}
+
+template<>
+struct fmt::formatter<OpenVic::building_level_t> : fmt::formatter<std::int16_t> {
+	fmt::format_context::iterator format(OpenVic::building_level_t const& value, fmt::format_context& ctx) const {
+		return fmt::formatter<std::int16_t>::format(type_safe::get(value), ctx);
+	}
+};

src/openvic-simulation/economy/BuildingType.cpp

@@ -78,7 +78,7 @@ bool BuildingTypeManager::load_buildings_file(
 				"on_completion", ZERO_OR_ONE, expect_identifier(assign_variable_callback(building_type_args.on_completion)),
 				"completion_size", ZERO_OR_ONE,
 					expect_fixed_point(assign_variable_callback(building_type_args.completion_size)),
-				"max_level", ONE_EXACTLY, expect_uint(assign_variable_callback(building_type_args.max_level)),
+				"max_level", ONE_EXACTLY, expect_strong_typedef<building_level_t>(assign_variable_callback(building_type_args.max_level)),
 				"goods_cost", ONE_EXACTLY, good_definition_manager.expect_good_definition_decimal_map(
 					move_variable_callback(building_type_args.goods_cost)
 				),
@@ -101,7 +101,7 @@ bool BuildingTypeManager::load_buildings_file(
 				"pop_build_factory", ZERO_OR_ONE, expect_bool(assign_variable_callback(building_type_args.pop_build_factory)),
 				"strategic_factory", ZERO_OR_ONE, expect_bool(assign_variable_callback(building_type_args.strategic_factory)),
 				"advanced_factory", ZERO_OR_ONE, expect_bool(assign_variable_callback(building_type_args.advanced_factory)),
-				"fort_level", ZERO_OR_ONE, expect_uint(assign_variable_callback(building_type_args.fort_level)),
+				"fort_level", ZERO_OR_ONE, expect_strong_typedef<building_level_t>(assign_variable_callback(building_type_args.fort_level)),
 				"naval_capacity", ZERO_OR_ONE, expect_uint(assign_variable_callback(building_type_args.naval_capacity)),
 				"colonial_points", ZERO_OR_ONE,
 					expect_list(expect_fixed_point(vector_callback(building_type_args.colonial_points))),

src/openvic-simulation/economy/BuildingType.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "openvic-simulation/modifier/Modifier.hpp"
-#include "openvic-simulation/types/BuildingLevel.hpp"
+#include "openvic-simulation/economy/BuildingLevel.hpp"
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/HasIndex.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
@@ -27,7 +27,7 @@ namespace OpenVic {
 			std::string_view type, on_completion;
 			ModifierValue modifier;
 			fixed_point_t completion_size = 0, cost = 0, colonial_range = 0, infrastructure = 0;
-			building_level_t max_level = 0, fort_level = 0;
+			building_level_t max_level = building_level_t { 0 }, fort_level = building_level_t { 0 };
 			fixed_point_map_t<GoodDefinition const*> goods_cost;
 			Timespan build_time;
 			bool on_map = false, default_enabled = false, pop_build_factory = false, strategic_factory = false,

src/openvic-simulation/history/ProvinceHistory.cpp

@@ -82,7 +82,7 @@ bool ProvinceHistoryMap::_load_history_entry(
 			BuildingType const* building_type = building_type_manager.get_building_type_by_identifier(key);
 			if (building_type != nullptr) {
 				if (building_type->is_in_province()) {
-					return expect_uint<building_level_t>(
+					return expect_strong_typedef<building_level_t>(
 						/* This is set to warn to prevent vanilla from always having errors because
 						 * of a duplicate railroad entry in the 1861.1.1 history of Manchester (278). */
 						map_callback(entry.province_buildings, building_type, true)
@@ -156,10 +156,10 @@ bool ProvinceHistoryMap::_load_history_entry(
 		},
 		"state_building", ZERO_OR_MORE, [&building_type_manager, &entry](ast::NodeCPtr node) -> bool {
 			BuildingType const* building_type = nullptr;
-			uint8_t level = 0;
+			building_level_t level = building_level_t { 0 };
 
 			bool ret = expect_dictionary_keys(
-				"level", ONE_EXACTLY, expect_uint(assign_variable_callback(level)),
+				"level", ONE_EXACTLY, expect_strong_typedef<building_level_t>(assign_variable_callback(level)),
 				"building", ONE_EXACTLY, building_type_manager.expect_building_type_identifier(
 					assign_variable_callback_pointer(building_type)
 				),

src/openvic-simulation/history/ProvinceHistory.hpp

@@ -5,7 +5,7 @@
 #include "openvic-simulation/economy/BuildingType.hpp"
 #include "openvic-simulation/history/HistoryMap.hpp"
 #include "openvic-simulation/population/Pop.hpp"
-#include "openvic-simulation/types/BuildingLevel.hpp"
+#include "openvic-simulation/economy/BuildingLevel.hpp"
 #include "openvic-simulation/types/ColonyStatus.hpp"
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"

src/openvic-simulation/map/Mapmode.cpp

@@ -234,7 +234,7 @@ bool MapmodeManager::setup_mapmodes(MapDefinition const& map_definition) {
 			BuildingInstance const* railroad = province.get_building_by_identifier("railroad");
 			if (railroad != nullptr) {
 				const colour_argb_t::value_type val = colour_argb_t::colour_traits::component_from_fraction(
-					railroad->get_level(), railroad->building_type.get_max_level() + 1, 0.5f, 1.0f
+					type_safe::get(railroad->get_level()), type_safe::get(railroad->building_type.get_max_level()) + 1, 0.5f, 1.0f
 				);
 				switch (railroad->get_expansion_state()) {
 				case BuildingInstance::ExpansionState::CannotExpand: