Merge pull request #449 from OpenVicProject/prefer/span-2

Move even more const reference vectors to span

Author: Spartan322

src/openvic-simulation/GameManager.cpp

@@ -21,7 +21,7 @@ bool GameManager::load_mod_descriptors(std::span<const std::string> descriptors)
 	return true;
 }
 
-bool GameManager::set_roots(Dataloader::path_vector_t const& roots, Dataloader::path_vector_t const& replace_paths) {
+bool GameManager::set_roots(Dataloader::path_span_t roots, Dataloader::path_span_t replace_paths) {
 	if (!dataloader.set_roots(roots, replace_paths)) {
 		Logger::error("Failed to set dataloader roots!");
 		return false;

src/openvic-simulation/GameManager.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <optional>
+#include <span>
 
 #include "openvic-simulation/DefinitionManager.hpp"
 #include "openvic-simulation/InstanceManager.hpp"
@@ -35,7 +36,7 @@ namespace OpenVic {
 			return instance_manager ? &*instance_manager : nullptr;
 		}
 
-		bool set_roots(Dataloader::path_vector_t const& roots, Dataloader::path_vector_t const& replace_paths);
+		bool set_roots(Dataloader::path_span_t roots, Dataloader::path_span_t replace_paths);
 
 		bool load_mod_descriptors(std::span<const std::string> descriptors);
 

src/openvic-simulation/country/CountryDefinition.cpp

@@ -153,7 +153,7 @@ node_callback_t CountryDefinitionManager::load_country_party(
 		std::string_view party_name;
 		Date start_date, end_date;
 		Ideology const* ideology = nullptr;
-		CountryParty::policy_map_t policies { &politics_manager.get_issue_manager().get_issue_groups() };
+		CountryParty::policy_map_t policies { politics_manager.get_issue_manager().get_issue_groups() };
 
 		bool ret = expect_dictionary_keys_and_default(
 			[&politics_manager, &policies, &party_name](std::string_view key, ast::NodeCPtr value) -> bool {

src/openvic-simulation/country/CountryInstance.cpp

@@ -6,6 +6,7 @@
 #include "openvic-simulation/country/CountryDefinition.hpp"
 #include "openvic-simulation/defines/Define.hpp"
 #include "openvic-simulation/DefinitionManager.hpp"
+#include "openvic-simulation/economy/BuildingType.hpp"
 #include "openvic-simulation/economy/production/ProductionType.hpp"
 #include "openvic-simulation/history/CountryHistory.hpp"
 #include "openvic-simulation/InstanceManager.hpp"
@@ -32,18 +33,18 @@ static constexpr colour_t ERROR_COLOUR = colour_t::from_integer(0xFF0000);
 CountryInstance::CountryInstance(
 	CountryDefinition const* new_country_definition,
 	index_t new_index,
-	decltype(building_type_unlock_levels)::keys_type const& building_type_keys,
-	decltype(technology_unlock_levels)::keys_type const& technology_keys,
-	decltype(invention_unlock_levels)::keys_type const& invention_keys,
-	decltype(upper_house)::keys_type const& ideology_keys,
-	decltype(reforms)::keys_type const& reform_keys,
-	decltype(government_flag_overrides)::keys_type const& government_type_keys,
-	decltype(crime_unlock_levels)::keys_type const& crime_keys,
-	decltype(pop_type_distribution)::keys_type const& pop_type_keys,
-	decltype(goods_data)::keys_type const& good_instances_keys,
-	decltype(regiment_type_unlock_levels)::keys_type const& regiment_type_unlock_levels_keys,
-	decltype(ship_type_unlock_levels)::keys_type const& ship_type_unlock_levels_keys,
-	decltype(tax_rate_slider_value_by_strata)::keys_type const& strata_keys,
+	decltype(building_type_unlock_levels)::keys_span_type building_type_keys,
+	decltype(technology_unlock_levels)::keys_span_type technology_keys,
+	decltype(invention_unlock_levels)::keys_span_type invention_keys,
+	decltype(upper_house)::keys_span_type ideology_keys,
+	decltype(reforms)::keys_span_type reform_keys,
+	decltype(government_flag_overrides)::keys_span_type government_type_keys,
+	decltype(crime_unlock_levels)::keys_span_type crime_keys,
+	decltype(pop_type_distribution)::keys_span_type pop_type_keys,
+	decltype(goods_data)::keys_span_type good_instances_keys,
+	decltype(regiment_type_unlock_levels)::keys_span_type regiment_type_unlock_levels_keys,
+	decltype(ship_type_unlock_levels)::keys_span_type ship_type_unlock_levels_keys,
+	decltype(tax_rate_slider_value_by_strata)::keys_span_type strata_keys,
 	GameRulesManager const& new_game_rules_manager,
 	SharedCountryValues const& new_shared_country_values,
 	GoodInstanceManager& new_good_instance_manager,
@@ -59,44 +60,43 @@ CountryInstance::CountryInstance(
 	colour { ERROR_COLOUR },
 
 	/* Production */
-	building_type_unlock_levels { &building_type_keys },
+	building_type_unlock_levels { building_type_keys },
 
 	/* Budget */
 	taxable_income_mutex { std::make_unique<std::mutex>() },
-	taxable_income_by_pop_type { &pop_type_keys },
-	effective_tax_rate_by_strata { &strata_keys },
-	tax_rate_slider_value_by_strata { &strata_keys },
+	taxable_income_by_pop_type { pop_type_keys },
+	effective_tax_rate_by_strata { strata_keys },
+	tax_rate_slider_value_by_strata { strata_keys },
 	actual_net_tariffs_mutex { std::make_unique<std::mutex>() },
 
 	/* Technology */
-	technology_unlock_levels { &technology_keys },
-	invention_unlock_levels { &invention_keys },
+	technology_unlock_levels { technology_keys },
+	invention_unlock_levels { invention_keys },
 
 	/* Politics */
-	upper_house { &ideology_keys },
-	reforms { &reform_keys },
-	government_flag_overrides { &government_type_keys },
-	crime_unlock_levels { &crime_keys },
+	upper_house { ideology_keys },
+	reforms { reform_keys },
+	government_flag_overrides { government_type_keys },
+	crime_unlock_levels { crime_keys },
 
 	/* Population */
-	population_by_strata { &strata_keys },
-	militancy_by_strata { &strata_keys },
-	life_needs_fulfilled_by_strata { &strata_keys },
-	everyday_needs_fulfilled_by_strata { &strata_keys },
-	luxury_needs_fulfilled_by_strata { &strata_keys },
-	pop_type_distribution { &pop_type_keys },
-	pop_type_unemployed_count { &pop_type_keys },
-	ideology_distribution { &ideology_keys },
-	vote_distribution { nullptr },
+	population_by_strata { strata_keys },
+	militancy_by_strata { strata_keys },
+	life_needs_fulfilled_by_strata { strata_keys },
+	everyday_needs_fulfilled_by_strata { strata_keys },
+	luxury_needs_fulfilled_by_strata { strata_keys },
+	pop_type_distribution { pop_type_keys },
+	pop_type_unemployed_count { pop_type_keys },
+	ideology_distribution { ideology_keys },
 
 	/* Trade */
-	goods_data { &good_instances_keys },
+	goods_data { good_instances_keys },
 
 	/* Diplomacy */
 
 	/* Military */
-	regiment_type_unlock_levels { &regiment_type_unlock_levels_keys },
-	ship_type_unlock_levels { &ship_type_unlock_levels_keys } {
+	regiment_type_unlock_levels { regiment_type_unlock_levels_keys },
+	ship_type_unlock_levels { ship_type_unlock_levels_keys } {
 
 	// Exclude PROVINCE (local) modifier effects from the country's modifier sum
 	modifier_sum.set_this_excluded_targets(ModifierEffect::target_t::PROVINCE);
@@ -137,25 +137,25 @@ CountryInstance::CountryInstance(
 
 	update_country_definition_based_attributes();
 
-	for (BuildingType const& building_type : *building_type_unlock_levels.get_keys()) {
+	for (BuildingType const& building_type : building_type_unlock_levels.get_keys()) {
 		if (building_type.is_default_enabled()) {
 			unlock_building_type(building_type, new_good_instance_manager);
 		}
 	}
 
-	for (Crime const& crime : *crime_unlock_levels.get_keys()) {
+	for (Crime const& crime : crime_unlock_levels.get_keys()) {
 		if (crime.is_default_active()) {
 			unlock_crime(crime);
 		}
 	}
 
-	for (RegimentType const& regiment_type : *regiment_type_unlock_levels.get_keys()) {
+	for (RegimentType const& regiment_type : regiment_type_unlock_levels.get_keys()) {
 		if (regiment_type.is_active()) {
 			unlock_unit_type(regiment_type);
 		}
 	}
 
-	for (ShipType const& ship_type : *ship_type_unlock_levels.get_keys()) {
+	for (ShipType const& ship_type : ship_type_unlock_levels.get_keys()) {
 		if (ship_type.is_active()) {
 			unlock_unit_type(ship_type);
 		}
@@ -167,7 +167,7 @@ std::string_view CountryInstance::get_identifier() const {
 }
 
 void CountryInstance::update_country_definition_based_attributes() {
-	vote_distribution.set_keys(&country_definition->get_parties());
+	vote_distribution.set_keys(country_definition->get_parties());
 }
 
 bool CountryInstance::exists() const {
@@ -1464,13 +1464,13 @@ void CountryInstance::update_modifier_sum(Date today, StaticModifierCache const&
 		modifier_sum.add_modifier(*tech_school);
 	}
 
-	for (Technology const& technology : *technology_unlock_levels.get_keys()) {
+	for (Technology const& technology : technology_unlock_levels.get_keys()) {
 		if (is_technology_unlocked(technology)) {
 			modifier_sum.add_modifier(technology);
 		}
 	}
 
-	for (Invention const& invention : *invention_unlock_levels.get_keys()) {
+	for (Invention const& invention : invention_unlock_levels.get_keys()) {
 		if (is_invention_unlocked(invention)) {
 			modifier_sum.add_modifier(invention);
 		}
@@ -2097,10 +2097,10 @@ CountryInstanceManager::CountryInstanceManager(
 	ModifierEffectCache const& new_modifier_effect_cache,
 	CountryDefines const& new_country_defines,
 	PopsDefines const& new_pop_defines,
-	std::vector<PopType> const& pop_type_keys
+	std::span<const PopType> pop_type_keys
 )
   : country_definition_manager { new_country_definition_manager },
-	country_definition_to_instance_map { &new_country_definition_manager.get_country_definitions() },
+	country_definition_to_instance_map { new_country_definition_manager.get_country_definitions() },
 	shared_country_values {
 		new_modifier_effect_cache,
 		new_country_defines,
@@ -2121,18 +2121,18 @@ CountryInstance const& CountryInstanceManager::get_country_instance_from_definit
 }
 
 bool CountryInstanceManager::generate_country_instances(
-	decltype(CountryInstance::building_type_unlock_levels)::keys_type const& building_type_keys,
-	decltype(CountryInstance::technology_unlock_levels)::keys_type const& technology_keys,
-	decltype(CountryInstance::invention_unlock_levels)::keys_type const& invention_keys,
-	decltype(CountryInstance::upper_house)::keys_type const& ideology_keys,
-	decltype(CountryInstance::reforms)::keys_type const& reform_keys,
-	decltype(CountryInstance::government_flag_overrides)::keys_type const& government_type_keys,
-	decltype(CountryInstance::crime_unlock_levels)::keys_type const& crime_keys,
-	decltype(CountryInstance::pop_type_distribution)::keys_type const& pop_type_keys,
-	decltype(CountryInstance::goods_data)::keys_type const& good_instances_keys,
-	decltype(CountryInstance::regiment_type_unlock_levels)::keys_type const& regiment_type_unlock_levels_keys,
-	decltype(CountryInstance::ship_type_unlock_levels)::keys_type const& ship_type_unlock_levels_keys,
-	decltype(CountryInstance::tax_rate_slider_value_by_strata):: keys_type const& strata_keys,
+	decltype(CountryInstance::building_type_unlock_levels)::keys_span_type building_type_keys,
+	decltype(CountryInstance::technology_unlock_levels)::keys_span_type technology_keys,
+	decltype(CountryInstance::invention_unlock_levels)::keys_span_type invention_keys,
+	decltype(CountryInstance::upper_house)::keys_span_type ideology_keys,
+	decltype(CountryInstance::reforms)::keys_span_type reform_keys,
+	decltype(CountryInstance::government_flag_overrides)::keys_span_type government_type_keys,
+	decltype(CountryInstance::crime_unlock_levels)::keys_span_type crime_keys,
+	decltype(CountryInstance::pop_type_distribution)::keys_span_type pop_type_keys,
+	decltype(CountryInstance::goods_data)::keys_span_type good_instances_keys,
+	decltype(CountryInstance::regiment_type_unlock_levels)::keys_span_type regiment_type_unlock_levels_keys,
+	decltype(CountryInstance::ship_type_unlock_levels)::keys_span_type ship_type_unlock_levels_keys,
+	decltype(CountryInstance::tax_rate_slider_value_by_strata):: keys_span_type strata_keys,
 	GameRulesManager const& game_rules_manager,
 	GoodInstanceManager& good_instance_manager,
 	CountryDefines const& country_defines,

src/openvic-simulation/country/CountryInstance.hpp

@@ -340,18 +340,18 @@ namespace OpenVic {
 		CountryInstance(
 			CountryDefinition const* new_country_definition,
 			index_t new_index,
-			decltype(building_type_unlock_levels)::keys_type const& building_type_keys,
-			decltype(technology_unlock_levels)::keys_type const& technology_keys,
-			decltype(invention_unlock_levels)::keys_type const& invention_keys,
-			decltype(upper_house)::keys_type const& ideology_keys,
-			decltype(reforms)::keys_type const& reform_keys,
-			decltype(government_flag_overrides)::keys_type const& government_type_keys,
-			decltype(crime_unlock_levels)::keys_type const& crime_keys,
-			decltype(pop_type_distribution)::keys_type const& pop_type_keys,
-			decltype(goods_data)::keys_type const& good_instances_keys,
-			decltype(regiment_type_unlock_levels)::keys_type const& regiment_type_unlock_levels_keys,
-			decltype(ship_type_unlock_levels)::keys_type const& ship_type_unlock_levels_keys,
-			decltype(tax_rate_slider_value_by_strata)::keys_type const& strata_keys,
+			decltype(building_type_unlock_levels)::keys_span_type building_type_keys,
+			decltype(technology_unlock_levels)::keys_span_type technology_keys,
+			decltype(invention_unlock_levels)::keys_span_type invention_keys,
+			decltype(upper_house)::keys_span_type ideology_keys,
+			decltype(reforms)::keys_span_type reform_keys,
+			decltype(government_flag_overrides)::keys_span_type government_type_keys,
+			decltype(crime_unlock_levels)::keys_span_type crime_keys,
+			decltype(pop_type_distribution)::keys_span_type pop_type_keys,
+			decltype(goods_data)::keys_span_type good_instances_keys,
+			decltype(regiment_type_unlock_levels)::keys_span_type regiment_type_unlock_levels_keys,
+			decltype(ship_type_unlock_levels)::keys_span_type ship_type_unlock_levels_keys,
+			decltype(tax_rate_slider_value_by_strata)::keys_span_type strata_keys,
 			GameRulesManager const& new_game_rules_manager,
 			SharedCountryValues const& new_shared_country_values,
 			GoodInstanceManager& new_good_instance_manager,
@@ -673,7 +673,7 @@ namespace OpenVic {
 			ModifierEffectCache const& new_modifier_effect_cache,
 			CountryDefines const& new_country_defines,
 			PopsDefines const& new_pop_defines,
-			std::vector<PopType> const& pop_type_keys
+			std::span<const PopType> pop_type_keys
 		);
 
 		IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS(country_instance);
@@ -682,18 +682,18 @@ namespace OpenVic {
 		CountryInstance const& get_country_instance_from_definition(CountryDefinition const& country) const;
 
 		bool generate_country_instances(
-			decltype(CountryInstance::building_type_unlock_levels)::keys_type const& building_type_keys,
-			decltype(CountryInstance::technology_unlock_levels)::keys_type const& technology_keys,
-			decltype(CountryInstance::invention_unlock_levels)::keys_type const& invention_keys,
-			decltype(CountryInstance::upper_house)::keys_type const& ideology_keys,
-			decltype(CountryInstance::reforms)::keys_type const& reform_keys,
-			decltype(CountryInstance::government_flag_overrides)::keys_type const& government_type_keys,
-			decltype(CountryInstance::crime_unlock_levels)::keys_type const& crime_keys,
-			decltype(CountryInstance::pop_type_distribution)::keys_type const& pop_type_keys,
-			decltype(CountryInstance::goods_data)::keys_type const& good_instances_keys,
-			decltype(CountryInstance::regiment_type_unlock_levels)::keys_type const& regiment_type_unlock_levels_keys,
-			decltype(CountryInstance::ship_type_unlock_levels)::keys_type const& ship_type_unlock_levels_keys,
-			decltype(CountryInstance::tax_rate_slider_value_by_strata):: keys_type const& strata_keys,
+			decltype(CountryInstance::building_type_unlock_levels)::keys_span_type building_type_keys,
+			decltype(CountryInstance::technology_unlock_levels)::keys_span_type technology_keys,
+			decltype(CountryInstance::invention_unlock_levels)::keys_span_type invention_keys,
+			decltype(CountryInstance::upper_house)::keys_span_type ideology_keys,
+			decltype(CountryInstance::reforms)::keys_span_type reform_keys,
+			decltype(CountryInstance::government_flag_overrides)::keys_span_type government_type_keys,
+			decltype(CountryInstance::crime_unlock_levels)::keys_span_type crime_keys,
+			decltype(CountryInstance::pop_type_distribution)::keys_span_type pop_type_keys,
+			decltype(CountryInstance::goods_data)::keys_span_type good_instances_keys,
+			decltype(CountryInstance::regiment_type_unlock_levels)::keys_span_type regiment_type_unlock_levels_keys,
+			decltype(CountryInstance::ship_type_unlock_levels)::keys_span_type ship_type_unlock_levels_keys,
+			decltype(CountryInstance::tax_rate_slider_value_by_strata):: keys_span_type strata_keys,
 			GameRulesManager const& game_rules_manager,
 			GoodInstanceManager& good_instance_manager,
 			CountryDefines const& country_defines,

src/openvic-simulation/country/SharedCountryValues.cpp

@@ -12,11 +12,11 @@ SharedCountryValues::SharedCountryValues(
 	ModifierEffectCache const& new_modifier_effect_cache,
 	CountryDefines const& new_country_defines,
 	PopsDefines const& new_pop_defines,
-	decltype(shared_pop_type_values)::keys_type const& pop_type_keys
+	decltype(shared_pop_type_values)::keys_span_type pop_type_keys
 ) : modifier_effect_cache { new_modifier_effect_cache },
 	country_defines { new_country_defines },
 	pop_defines { new_pop_defines },
-	shared_pop_type_values { &pop_type_keys }
+	shared_pop_type_values { pop_type_keys }
 	{}
 
 void SharedCountryValues::update_costs(GoodInstanceManager const& good_instance_manager) {

src/openvic-simulation/country/SharedCountryValues.hpp

@@ -42,7 +42,7 @@ namespace OpenVic {
 			ModifierEffectCache const& new_modifier_effect_cache,
 			CountryDefines const& new_country_defines,
 			PopsDefines const& new_pop_defines,
-			decltype(shared_pop_type_values)::keys_type const& pop_type_keys
+			decltype(shared_pop_type_values)::keys_span_type pop_type_keys
 		);
 		SharedCountryValues(SharedCountryValues&&) = default;
 

src/openvic-simulation/dataloader/Dataloader.cpp

@@ -35,7 +35,7 @@ static fs::path ensure_forward_slash_path(std::string_view path) {
 #endif
 }
 
-bool Dataloader::set_roots(path_vector_t const& new_roots, path_vector_t const& new_replace_paths) {
+bool Dataloader::set_roots(path_span_t new_roots, path_span_t new_replace_paths) {
 	if (!roots.empty()) {
 		Logger::warning("Overriding existing dataloader roots!");
 		roots.clear();
@@ -46,7 +46,7 @@ bool Dataloader::set_roots(path_vector_t const& new_roots, path_vector_t const&
 		Logger::info("Adding replace path: ", replace_path);
 		replace_paths.push_back(replace_path);
 	}
-	for (std::reverse_iterator<path_vector_t::const_iterator> it = new_roots.crbegin(); it != new_roots.crend(); ++it) {
+	for (decltype(new_roots)::reverse_iterator it = new_roots.rbegin(); it != new_roots.rend(); ++it) {
 		if (std::find(roots.begin(), roots.end(), *it) == roots.end()) {
 			if (fs::is_directory(*it)) {
 				Logger::info("Adding dataloader root: ", *it);
@@ -130,7 +130,7 @@ fs::path Dataloader::lookup_image_file(std::string_view path) const {
 	return lookup_file(path);
 }
 
-bool Dataloader::should_ignore_path(fs::path const& path, path_vector_t const& replace_paths) const {
+bool Dataloader::should_ignore_path(fs::path const& path, path_span_t replace_paths) const {
 	bool ignore = false;
 	for (fs::path const& replace_path : replace_paths) {
 		if (path.string().starts_with(replace_path.string())) {
@@ -210,7 +210,7 @@ Dataloader::path_vector_t Dataloader::lookup_basic_identifier_prefixed_files_in_
 	return _lookup_files_in_dir<fs::recursive_directory_iterator>(path, extension, _extract_basic_identifier_prefix_from_path);
 }
 
-bool Dataloader::apply_to_files(path_vector_t const& files, apply_files_callback_t callback) const {
+bool Dataloader::apply_to_files(path_span_t files, apply_files_callback_t callback) const {
 	bool ret = true;
 	for (fs::path const& file : files) {
 		if (!callback(file)) {