diff --git a/Fronter b/Fronter
index afa303df7..7b7efd242 160000
--- a/Fronter
+++ b/Fronter
@@ -1 +1 @@
-Subproject commit afa303df7270cb322ff5e115c90be5ff462d42ab
+Subproject commit 7b7efd242f1d50c69ea4176de5052ced72556450
diff --git a/ImperatorToCK3/ImperatorToCK3.vcxproj b/ImperatorToCK3/ImperatorToCK3.vcxproj
index c1e38a972..fb8113b4e 100644
--- a/ImperatorToCK3/ImperatorToCK3.vcxproj
+++ b/ImperatorToCK3/ImperatorToCK3.vcxproj
@@ -77,6 +77,7 @@
ImperatorToCK3Converter
true
NativeMinimumRules.ruleset
+ false
$(ProjectDir)\..\$(Configuration)\ImperatorToCK3\
@@ -89,7 +90,7 @@
$(LibraryPath)
$(UniversalCRT_IncludePath);$(IncludePath)
$(ReferencePath)
- false
+ true
true
NativeRecommendedRules.ruleset
@@ -132,10 +133,11 @@
true
true
stdcpplatest
- Source;..\imageMagick\include-windows;..\commonItems;..\commonItems\compile-time-regular-expressions\single-header;..\cpp-base64;..\ZipLib;$(WindowsSDK_IncludePath)
+ Source;..\imageMagick\include-windows;..\commonItems;..\cpp-base64;..\ZipLib;$(WindowsSDK_IncludePath)
_UNICODE;UNICODE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SILENCE_CXX20_U8PATH_DEPRECATION_WARNING;%(PreprocessorDefinitions)
stdc17
true
+ ProgramDatabase
Console
@@ -185,12 +187,13 @@
true
false
stdcpplatest
- Source;..\imageMagick\include-windows;..\commonItems;..\commonItems\compile-time-regular-expressions\single-header;..\cpp-base64;..\ZipLib;$(WindowsSDK_IncludePath)
+ Source;..\imageMagick\include-windows;..\commonItems;..\cpp-base64;..\ZipLib;$(WindowsSDK_IncludePath)
true
_UNICODE;UNICODE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SILENCE_CXX20_U8PATH_DEPRECATION_WARNING;%(PreprocessorDefinitions)
true
true
stdc17
+ None
Console
@@ -307,7 +310,6 @@
-
diff --git a/ImperatorToCK3/ImperatorToCK3.vcxproj.filters b/ImperatorToCK3/ImperatorToCK3.vcxproj.filters
index 375c7473a..582df01e2 100644
--- a/ImperatorToCK3/ImperatorToCK3.vcxproj.filters
+++ b/ImperatorToCK3/ImperatorToCK3.vcxproj.filters
@@ -358,9 +358,6 @@
commonItems
-
- commonItems
-
commonItems
diff --git a/ImperatorToCK3/Source/CK3/Province/CK3ProvinceMappings.cpp b/ImperatorToCK3/Source/CK3/Province/CK3ProvinceMappings.cpp
index 2f8d72f43..d2d279d10 100644
--- a/ImperatorToCK3/Source/CK3/Province/CK3ProvinceMappings.cpp
+++ b/ImperatorToCK3/Source/CK3/Province/CK3ProvinceMappings.cpp
@@ -12,11 +12,11 @@ CK3::ProvinceMappings::ProvinceMappings(const std::string& theFile) {
void CK3::ProvinceMappings::registerKeys() {
- registerMatcher(commonItems::integerMatch, [this](const std::string& provIDStr, std::istream& theStream) {
+ registerRegex(commonItems::integerRegex, [this](const std::string& provIDStr, std::istream& theStream) {
auto targetProvID = commonItems::stringToInteger(provIDStr);
auto baseProvID = commonItems::getULlong(theStream);
if (targetProvID != baseProvID) // if left and right IDs are equal, no point in mapping
mappings.emplace(targetProvID, baseProvID);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
\ No newline at end of file
diff --git a/ImperatorToCK3/Source/CK3/Province/CK3Provinces.cpp b/ImperatorToCK3/Source/CK3/Province/CK3Provinces.cpp
index 0b9682873..dd19e25d4 100644
--- a/ImperatorToCK3/Source/CK3/Province/CK3Provinces.cpp
+++ b/ImperatorToCK3/Source/CK3/Province/CK3Provinces.cpp
@@ -12,10 +12,10 @@ CK3::Provinces::Provinces(const std::string& filePath) {
void CK3::Provinces::registerKeys() {
- registerMatcher(commonItems::integerMatch, [this](const std::string& provIdStr, std::istream& theStream) {
+ registerRegex(commonItems::integerRegex, [this](const std::string& provIdStr, std::istream& theStream) {
auto provID = commonItems::stringToInteger(provIdStr);
auto newProvince = std::make_shared(provID, theStream);
provinces.emplace(provID, newProvince);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
\ No newline at end of file
diff --git a/ImperatorToCK3/Source/CK3/Titles/LandedTitles.cpp b/ImperatorToCK3/Source/CK3/Titles/LandedTitles.cpp
index 17d4cdc56..8247d0da8 100644
--- a/ImperatorToCK3/Source/CK3/Titles/LandedTitles.cpp
+++ b/ImperatorToCK3/Source/CK3/Titles/LandedTitles.cpp
@@ -35,7 +35,7 @@ void CK3::LandedTitles::registerKeys() {
Title::addFoundTitle(newTitle, foundTitles);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/CK3/Titles/Title.cpp b/ImperatorToCK3/Source/CK3/Titles/Title.cpp
index 6cbae7b69..0eeafbfa6 100644
--- a/ImperatorToCK3/Source/CK3/Titles/Title.cpp
+++ b/ImperatorToCK3/Source/CK3/Titles/Title.cpp
@@ -69,7 +69,7 @@ void CK3::Title::registerKeys() {
registerKeyword("province", [this](std::istream& theStream) {
province = commonItems::getULlong(theStream);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/CK3/Titles/TitlesHistory.cpp b/ImperatorToCK3/Source/CK3/Titles/TitlesHistory.cpp
index 4e70a005e..436e759b9 100644
--- a/ImperatorToCK3/Source/CK3/Titles/TitlesHistory.cpp
+++ b/ImperatorToCK3/Source/CK3/Titles/TitlesHistory.cpp
@@ -40,7 +40,7 @@ void CK3::TitlesHistory::TitlesHistory::registerKeys() {
currentGovernmentMap[titleName] = titleHistory.currentGovernmentWithDate.second;
}
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
@@ -74,7 +74,7 @@ void CK3::TitleHistory::TitleHistory::registerKeys() {
currentGovernmentWithDate = std::pair(date(dateStr), *historyEntry.government);
}
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
@@ -96,5 +96,5 @@ void CK3::DatedHistoryEntry::DatedHistoryEntry::registerKeys() {
registerKeyword("government", [this](std::istream& theStream) {
government = commonItems::getString(theStream);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
\ No newline at end of file
diff --git a/ImperatorToCK3/Source/Configuration/Configuration.cpp b/ImperatorToCK3/Source/Configuration/Configuration.cpp
index d13b43484..956974095 100644
--- a/ImperatorToCK3/Source/Configuration/Configuration.cpp
+++ b/ImperatorToCK3/Source/Configuration/Configuration.cpp
@@ -69,7 +69,7 @@ void Configuration::registerKeys() {
convertBirthAndDeathDates = false;
Log(LogLevel::Info) << "Conversion of characters' birth and death dates set to: " << convertBirthAndDeathDates;
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Imperator/Characters/CharacterAttributes.cpp b/ImperatorToCK3/Source/Imperator/Characters/CharacterAttributes.cpp
index 8f059e561..2cc151053 100644
--- a/ImperatorToCK3/Source/Imperator/Characters/CharacterAttributes.cpp
+++ b/ImperatorToCK3/Source/Imperator/Characters/CharacterAttributes.cpp
@@ -24,5 +24,5 @@ void Imperator::CharacterAttributes::registerKeys() {
registerKeyword("zeal", [this](std::istream& theStream) {
zeal = commonItems::getInt(theStream);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
\ No newline at end of file
diff --git a/ImperatorToCK3/Source/Imperator/Characters/CharacterFactory.cpp b/ImperatorToCK3/Source/Imperator/Characters/CharacterFactory.cpp
index 92ec59fd9..e2ff268b7 100644
--- a/ImperatorToCK3/Source/Imperator/Characters/CharacterFactory.cpp
+++ b/ImperatorToCK3/Source/Imperator/Characters/CharacterFactory.cpp
@@ -71,7 +71,7 @@ Imperator::Character::Factory::Factory() {
character->attributes.charisma = attributesFromBloc.getCharisma();
character->attributes.zeal = attributesFromBloc.getZeal();
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Imperator/Characters/CharacterName.cpp b/ImperatorToCK3/Source/Imperator/Characters/CharacterName.cpp
index d17c61854..45e151689 100644
--- a/ImperatorToCK3/Source/Imperator/Characters/CharacterName.cpp
+++ b/ImperatorToCK3/Source/Imperator/Characters/CharacterName.cpp
@@ -16,5 +16,5 @@ void Imperator::CharacterName::registerKeys() {
registerKeyword("name", [this](std::istream& theStream) {
name = commonItems::getString(theStream);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
\ No newline at end of file
diff --git a/ImperatorToCK3/Source/Imperator/Characters/Characters.cpp b/ImperatorToCK3/Source/Imperator/Characters/Characters.cpp
index c2726775e..008728ace 100644
--- a/ImperatorToCK3/Source/Imperator/Characters/Characters.cpp
+++ b/ImperatorToCK3/Source/Imperator/Characters/Characters.cpp
@@ -18,11 +18,11 @@ Imperator::Characters::Characters(std::istream& theStream, const std::shared_ptr
void Imperator::Characters::registerKeys() {
- registerMatcher(commonItems::integerMatch, [this](const std::string& charID, std::istream& theStream) {
+ registerRegex(commonItems::integerRegex, [this](const std::string& charID, std::istream& theStream) {
std::shared_ptr newCharacter = characterFactory.getCharacter(theStream, charID, genes);
characters.emplace(newCharacter->getID(), newCharacter);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
@@ -125,5 +125,5 @@ void Imperator::CharactersBloc::registerKeys() {
registerKeyword("character_database", [this](std::istream& theStream) {
characters = Characters(theStream, genes);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
\ No newline at end of file
diff --git a/ImperatorToCK3/Source/Imperator/Countries/Countries.cpp b/ImperatorToCK3/Source/Imperator/Countries/Countries.cpp
index 45e0cc3cb..8a0120934 100644
--- a/ImperatorToCK3/Source/Imperator/Countries/Countries.cpp
+++ b/ImperatorToCK3/Source/Imperator/Countries/Countries.cpp
@@ -14,11 +14,11 @@ Imperator::Countries::Countries(std::istream& theStream) {
}
void Imperator::Countries::registerKeys() {
- registerMatcher(commonItems::integerMatch, [this](const std::string& countryID, std::istream& theStream) {
+ registerRegex(commonItems::integerRegex, [this](const std::string& countryID, std::istream& theStream) {
std::shared_ptr newCountry = countryFactory.getCountry(theStream, commonItems::stringToInteger(countryID));
countries.emplace(newCountry->getID(), newCountry);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
@@ -32,7 +32,7 @@ void Imperator::CountriesBloc::registerKeys() {
registerKeyword("country_database", [this](std::istream& theStream) {
countries = Countries(theStream);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Imperator/Countries/CountryCurrencies.cpp b/ImperatorToCK3/Source/Imperator/Countries/CountryCurrencies.cpp
index dec302b63..5b30a0859 100644
--- a/ImperatorToCK3/Source/Imperator/Countries/CountryCurrencies.cpp
+++ b/ImperatorToCK3/Source/Imperator/Countries/CountryCurrencies.cpp
@@ -20,5 +20,5 @@ void Imperator::CountryCurrencies::registerKeys() {
registerSetter("aggressive_expansion", aggressive_expansion);
registerSetter("political_influence", political_influence);
registerSetter("military_experience", military_experience);
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
\ No newline at end of file
diff --git a/ImperatorToCK3/Source/Imperator/Countries/CountryFactory.cpp b/ImperatorToCK3/Source/Imperator/Countries/CountryFactory.cpp
index 227e3ec59..f0539d6b0 100644
--- a/ImperatorToCK3/Source/Imperator/Countries/CountryFactory.cpp
+++ b/ImperatorToCK3/Source/Imperator/Countries/CountryFactory.cpp
@@ -102,7 +102,7 @@ Imperator::Country::Factory::Factory() {
registerRegex(tribalLawRegexStr, [this](const std::string& unused, std::istream& theStream) {
country->tribalLaws.emplace(commonItems::getString(theStream));
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Imperator/Countries/CountryName.cpp b/ImperatorToCK3/Source/Imperator/Countries/CountryName.cpp
index b6bd6b8cb..d13e2e685 100644
--- a/ImperatorToCK3/Source/Imperator/Countries/CountryName.cpp
+++ b/ImperatorToCK3/Source/Imperator/Countries/CountryName.cpp
@@ -16,5 +16,5 @@ void Imperator::CountryName::registerKeys() {
registerKeyword("name", [this](std::istream& theStream) {
name = commonItems::getString(theStream);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Imperator/Families/Families.cpp b/ImperatorToCK3/Source/Imperator/Families/Families.cpp
index 7539bba58..25f8cf08c 100644
--- a/ImperatorToCK3/Source/Imperator/Families/Families.cpp
+++ b/ImperatorToCK3/Source/Imperator/Families/Families.cpp
@@ -20,7 +20,7 @@ void Imperator::Families::loadFamilies(std::istream& theStream) {
void Imperator::Families::registerKeys() {
- registerMatcher(commonItems::integerMatch, [this](const std::string& theFamilyID, std::istream& theStream) {
+ registerRegex(commonItems::integerRegex, [this](const std::string& theFamilyID, std::istream& theStream) {
const auto familyStr = commonItems::stringOfItem(theStream).getString();
if (familyStr.find('{') != std::string::npos) {
std::stringstream tempStream(familyStr);
@@ -33,7 +33,7 @@ void Imperator::Families::registerKeys() {
}
}
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
@@ -49,5 +49,5 @@ void Imperator::FamiliesBloc::registerKeys() {
registerKeyword("families", [this](std::istream& theStream) {
families.loadFamilies(theStream);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
\ No newline at end of file
diff --git a/ImperatorToCK3/Source/Imperator/Families/FamilyFactory.cpp b/ImperatorToCK3/Source/Imperator/Families/FamilyFactory.cpp
index 7963c0104..446772115 100644
--- a/ImperatorToCK3/Source/Imperator/Families/FamilyFactory.cpp
+++ b/ImperatorToCK3/Source/Imperator/Families/FamilyFactory.cpp
@@ -26,7 +26,7 @@ Imperator::Family::Factory::Factory() {
family->members.emplace_back(memberID, nullptr);
}
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Imperator/Genes/AccessoryGene.cpp b/ImperatorToCK3/Source/Imperator/Genes/AccessoryGene.cpp
index 6a348c9e9..a87aa6989 100644
--- a/ImperatorToCK3/Source/Imperator/Genes/AccessoryGene.cpp
+++ b/ImperatorToCK3/Source/Imperator/Genes/AccessoryGene.cpp
@@ -21,10 +21,10 @@ void Imperator::AccessoryGene::registerKeys() {
if (commonItems::getString(theStream) == "yes")
inheritable = true;
});
- registerMatcher(commonItems::stringMatch, [this](const std::string& geneTemplateName, std::istream& theStream) {
+ registerRegex(commonItems::stringRegex, [this](const std::string& geneTemplateName, std::istream& theStream) {
geneTemplates.insert({ geneTemplateName, AccessoryGeneTemplate(theStream) });
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Imperator/Genes/AccessoryGeneTemplate.cpp b/ImperatorToCK3/Source/Imperator/Genes/AccessoryGeneTemplate.cpp
index b2befe1ff..b9411bc9b 100644
--- a/ImperatorToCK3/Source/Imperator/Genes/AccessoryGeneTemplate.cpp
+++ b/ImperatorToCK3/Source/Imperator/Genes/AccessoryGeneTemplate.cpp
@@ -30,5 +30,5 @@ void Imperator::AccessoryGeneTemplate::registerKeys() {
ageSexWeightBlocks.insert(std::pair(ageSexStr, ageSexWeightBlocks.find(sexAge)->second));
}
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Imperator/Genes/AccessoryGenes.cpp b/ImperatorToCK3/Source/Imperator/Genes/AccessoryGenes.cpp
index 987adfd5b..9312467ca 100644
--- a/ImperatorToCK3/Source/Imperator/Genes/AccessoryGenes.cpp
+++ b/ImperatorToCK3/Source/Imperator/Genes/AccessoryGenes.cpp
@@ -16,8 +16,8 @@ void Imperator::AccessoryGenes::registerKeys() {
registerKeyword("index", [this](std::istream& theStream) {
index = commonItems::getInt(theStream);
});
- registerMatcher(commonItems::stringMatch, [this](const std::string& geneName, std::istream& theStream) {
+ registerRegex(commonItems::stringRegex, [this](const std::string& geneName, std::istream& theStream) {
genes.emplace(geneName, AccessoryGene(theStream));
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Imperator/Genes/GenesDB.cpp b/ImperatorToCK3/Source/Imperator/Genes/GenesDB.cpp
index ed5df2341..392d09665 100644
--- a/ImperatorToCK3/Source/Imperator/Genes/GenesDB.cpp
+++ b/ImperatorToCK3/Source/Imperator/Genes/GenesDB.cpp
@@ -23,5 +23,5 @@ void Imperator::GenesDB::registerKeys() {
registerKeyword("accessory_genes", [this](std::istream& theStream) {
accessoryGenes = AccessoryGenes(theStream);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Imperator/Genes/WeightBlock.cpp b/ImperatorToCK3/Source/Imperator/Genes/WeightBlock.cpp
index 9129b86e6..f000d5454 100644
--- a/ImperatorToCK3/Source/Imperator/Genes/WeightBlock.cpp
+++ b/ImperatorToCK3/Source/Imperator/Genes/WeightBlock.cpp
@@ -13,7 +13,7 @@ Imperator::WeightBlock::WeightBlock(std::istream& theStream) {
void Imperator::WeightBlock::registerKeys() {
- registerMatcher(commonItems::integerMatch, [this](const std::string& absoluteWeightStr, std::istream& theStream) {
+ registerRegex(commonItems::integerRegex, [this](const std::string& absoluteWeightStr, std::istream& theStream) {
const auto newObjectName = commonItems::getString(theStream);
try {
addObject(newObjectName, stoi(absoluteWeightStr));
@@ -22,7 +22,7 @@ void Imperator::WeightBlock::registerKeys() {
Log(LogLevel::Error) << "Undefined error, absolute weight value was: " << absoluteWeightStr << "; Error message: " << e.what();
}
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Imperator/ImperatorWorld.cpp b/ImperatorToCK3/Source/Imperator/ImperatorWorld.cpp
index ae5464706..0cd4f4b52 100644
--- a/ImperatorToCK3/Source/Imperator/ImperatorWorld.cpp
+++ b/ImperatorToCK3/Source/Imperator/ImperatorWorld.cpp
@@ -75,7 +75,7 @@ Imperator::World::World(const Configuration& theConfiguration) {
LOG(LogLevel::Info) << ">> Loaded " << pops.getPops().size() << " pops.";
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
LOG(LogLevel::Info) << "-> Verifying Imperator save.";
verifySave(theConfiguration.getSaveGamePath());
diff --git a/ImperatorToCK3/Source/Imperator/Provinces/PopFactory.cpp b/ImperatorToCK3/Source/Imperator/Provinces/PopFactory.cpp
index d0a3c4b6a..f61a2151c 100644
--- a/ImperatorToCK3/Source/Imperator/Provinces/PopFactory.cpp
+++ b/ImperatorToCK3/Source/Imperator/Provinces/PopFactory.cpp
@@ -15,7 +15,7 @@ Imperator::Pop::Factory::Factory() {
registerKeyword("religion", [this](std::istream& theStream) {
pop->religion = commonItems::getString(theStream);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Imperator/Provinces/Pops.cpp b/ImperatorToCK3/Source/Imperator/Provinces/Pops.cpp
index d9d55d8e0..fa70248e2 100644
--- a/ImperatorToCK3/Source/Imperator/Provinces/Pops.cpp
+++ b/ImperatorToCK3/Source/Imperator/Provinces/Pops.cpp
@@ -15,7 +15,7 @@ void Imperator::Pops::loadPops(std::istream& theStream) {
void Imperator::Pops::registerKeys() {
- registerMatcher(commonItems::integerMatch, [this](const std::string& thePopID, std::istream& theStream) {
+ registerRegex(commonItems::integerRegex, [this](const std::string& thePopID, std::istream& theStream) {
const auto popStr = commonItems::stringOfItem(theStream).getString();
if (popStr.find('{') != std::string::npos) {
std::stringstream tempStream(popStr);
@@ -23,7 +23,7 @@ void Imperator::Pops::registerKeys() {
pops.emplace(pop->getID(), std::move(pop));
}
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
@@ -39,5 +39,5 @@ void Imperator::PopsBloc::registerKeys() {
registerKeyword("population", [this](std::istream& theStream) {
pops.loadPops(theStream);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Imperator/Provinces/ProvinceFactory.cpp b/ImperatorToCK3/Source/Imperator/Provinces/ProvinceFactory.cpp
index b62893820..82744e493 100644
--- a/ImperatorToCK3/Source/Imperator/Provinces/ProvinceFactory.cpp
+++ b/ImperatorToCK3/Source/Imperator/Provinces/ProvinceFactory.cpp
@@ -46,7 +46,7 @@ Imperator::Province::Factory::Factory() {
const auto buildingsVector = commonItems::getInts(theStream);
province->buildingsCount = std::accumulate(buildingsVector.begin(), buildingsVector.end(), 0);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Imperator/Provinces/ProvinceName.cpp b/ImperatorToCK3/Source/Imperator/Provinces/ProvinceName.cpp
index 84c35c038..2060f9750 100644
--- a/ImperatorToCK3/Source/Imperator/Provinces/ProvinceName.cpp
+++ b/ImperatorToCK3/Source/Imperator/Provinces/ProvinceName.cpp
@@ -16,5 +16,5 @@ void Imperator::ProvinceName::registerKeys() {
registerKeyword("name", [this](std::istream& theStream) {
name = commonItems::getString(theStream);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
\ No newline at end of file
diff --git a/ImperatorToCK3/Source/Imperator/Provinces/Provinces.cpp b/ImperatorToCK3/Source/Imperator/Provinces/Provinces.cpp
index 5be53c15e..73618caea 100644
--- a/ImperatorToCK3/Source/Imperator/Provinces/Provinces.cpp
+++ b/ImperatorToCK3/Source/Imperator/Provinces/Provinces.cpp
@@ -17,11 +17,11 @@ Imperator::Provinces::Provinces(std::istream& theStream) {
void Imperator::Provinces::registerKeys() {
- registerMatcher(commonItems::integerMatch, [this](const std::string& provID, std::istream& theStream) {
+ registerRegex(commonItems::integerRegex, [this](const std::string& provID, std::istream& theStream) {
std::shared_ptr newProvince = provinceFactory.getProvince(theStream, commonItems::stringToInteger(provID));
provinces.emplace(newProvince->getID(), newProvince);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/CoaMapper/CoaMapper.cpp b/ImperatorToCK3/Source/Mappers/CoaMapper/CoaMapper.cpp
index 7834e44d2..e3746ab94 100644
--- a/ImperatorToCK3/Source/Mappers/CoaMapper/CoaMapper.cpp
+++ b/ImperatorToCK3/Source/Mappers/CoaMapper/CoaMapper.cpp
@@ -30,7 +30,7 @@ mappers::CoaMapper::CoaMapper(const std::string& coaFilePath) {
void mappers::CoaMapper::registerKeys()
{
registerKeyword("template", commonItems::ignoreItem); // we don't need templates, we need CoAs!
- registerMatcher(commonItems::catchallRegexMatch, [this](const std::string& flagName, std::istream& theStream) { // the rest should be CoAs
+ registerRegex(commonItems::catchallRegex, [this](const std::string& flagName, std::istream& theStream) { // the rest should be CoAs
coasMap.emplace(flagName, commonItems::stringOfItem{ theStream }.getString());
});
}
diff --git a/ImperatorToCK3/Source/Mappers/CultureMapper/CultureMapper.cpp b/ImperatorToCK3/Source/Mappers/CultureMapper/CultureMapper.cpp
index ab895173f..9f3c44de3 100644
--- a/ImperatorToCK3/Source/Mappers/CultureMapper/CultureMapper.cpp
+++ b/ImperatorToCK3/Source/Mappers/CultureMapper/CultureMapper.cpp
@@ -25,7 +25,7 @@ void mappers::CultureMapper::registerKeys() {
registerKeyword("link", [this](std::istream& theStream) {
cultureMapRules.emplace_back(CultureMappingRule{ theStream });
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/CultureMapper/CultureMappingRule.cpp b/ImperatorToCK3/Source/Mappers/CultureMapper/CultureMappingRule.cpp
index 3477cd97d..ea811dbbc 100644
--- a/ImperatorToCK3/Source/Mappers/CultureMapper/CultureMappingRule.cpp
+++ b/ImperatorToCK3/Source/Mappers/CultureMapper/CultureMappingRule.cpp
@@ -32,7 +32,7 @@ mappers::CultureMappingRule::CultureMappingRule(std::istream& theStream) {
registerKeyword("impProvince", [this](std::istream& theStream) {
imperatorProvinces.insert(commonItems::getULlong(theStream));
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
parseStream(theStream);
clearRegisteredKeywords();
diff --git a/ImperatorToCK3/Source/Mappers/GovernmentMapper/GovernmentMapper.cpp b/ImperatorToCK3/Source/Mappers/GovernmentMapper/GovernmentMapper.cpp
index ca9f3d8aa..7c98f03cd 100644
--- a/ImperatorToCK3/Source/Mappers/GovernmentMapper/GovernmentMapper.cpp
+++ b/ImperatorToCK3/Source/Mappers/GovernmentMapper/GovernmentMapper.cpp
@@ -32,7 +32,7 @@ void mappers::GovernmentMapper::registerKeys() {
impToCK3GovernmentMap.emplace(imperatorGovernment, theMapping.ck3Government);
}
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/GovernmentMapper/GovernmentMapping.cpp b/ImperatorToCK3/Source/Mappers/GovernmentMapper/GovernmentMapping.cpp
index 3bfa8c7da..2bf719cf2 100644
--- a/ImperatorToCK3/Source/Mappers/GovernmentMapper/GovernmentMapping.cpp
+++ b/ImperatorToCK3/Source/Mappers/GovernmentMapper/GovernmentMapping.cpp
@@ -11,7 +11,7 @@ mappers::GovernmentMapping::GovernmentMapping(std::istream& theStream) {
registerKeyword("imp", [this](std::istream& theStream) {
impGovernments.emplace(commonItems::getString(theStream));
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
parseStream(theStream);
clearRegisteredKeywords();
diff --git a/ImperatorToCK3/Source/Mappers/NicknameMapper/NicknameMapper.cpp b/ImperatorToCK3/Source/Mappers/NicknameMapper/NicknameMapper.cpp
index 80810233b..7e1eac563 100644
--- a/ImperatorToCK3/Source/Mappers/NicknameMapper/NicknameMapper.cpp
+++ b/ImperatorToCK3/Source/Mappers/NicknameMapper/NicknameMapper.cpp
@@ -30,7 +30,7 @@ void mappers::NicknameMapper::registerKeys() {
impToCK3NicknameMap.emplace(imperatorNickname, *theMapping.ck3Nickname);
}
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/NicknameMapper/NicknameMapping.cpp b/ImperatorToCK3/Source/Mappers/NicknameMapper/NicknameMapping.cpp
index 461f5df95..6b6d42fed 100644
--- a/ImperatorToCK3/Source/Mappers/NicknameMapper/NicknameMapping.cpp
+++ b/ImperatorToCK3/Source/Mappers/NicknameMapper/NicknameMapping.cpp
@@ -18,5 +18,5 @@ void mappers::NicknameMapping::registerKeys() {
registerKeyword("imp", [this](std::istream& theStream) {
impNicknames.insert(commonItems::getString(theStream));
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/ProvinceMapper/ProvinceMapper.cpp b/ImperatorToCK3/Source/Mappers/ProvinceMapper/ProvinceMapper.cpp
index 29a2bab4c..3dcc42e54 100644
--- a/ImperatorToCK3/Source/Mappers/ProvinceMapper/ProvinceMapper.cpp
+++ b/ImperatorToCK3/Source/Mappers/ProvinceMapper/ProvinceMapper.cpp
@@ -39,7 +39,7 @@ void mappers::ProvinceMapper::registerKeys() {
// have been cut. There should only be a single, 0.0.0.0={} block inside province_mappings.txt
theMappings = ProvinceMappingsVersion(theStream);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/ProvinceMapper/ProvinceMapping.cpp b/ImperatorToCK3/Source/Mappers/ProvinceMapper/ProvinceMapping.cpp
index ea41b2635..dc3a064b4 100644
--- a/ImperatorToCK3/Source/Mappers/ProvinceMapper/ProvinceMapping.cpp
+++ b/ImperatorToCK3/Source/Mappers/ProvinceMapper/ProvinceMapping.cpp
@@ -18,5 +18,5 @@ void mappers::ProvinceMapping::registerKeys() {
registerKeyword("imp", [this](std::istream& theStream) {
impProvinces.emplace_back(commonItems::getULlong(theStream));
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/ProvinceMapper/ProvinceMappingsVersion.cpp b/ImperatorToCK3/Source/Mappers/ProvinceMapper/ProvinceMappingsVersion.cpp
index 6123b9429..2e92b8587 100644
--- a/ImperatorToCK3/Source/Mappers/ProvinceMapper/ProvinceMappingsVersion.cpp
+++ b/ImperatorToCK3/Source/Mappers/ProvinceMapper/ProvinceMappingsVersion.cpp
@@ -18,5 +18,5 @@ void mappers::ProvinceMappingsVersion::registerKeys() {
return;
mappings.push_back(newMapping);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/RegionMapper/CK3Region.cpp b/ImperatorToCK3/Source/Mappers/RegionMapper/CK3Region.cpp
index a7b5f4f34..c532c8c59 100644
--- a/ImperatorToCK3/Source/Mappers/RegionMapper/CK3Region.cpp
+++ b/ImperatorToCK3/Source/Mappers/RegionMapper/CK3Region.cpp
@@ -30,7 +30,7 @@ void mappers::CK3Region::registerKeys() {
for (const auto& id : commonItems::getULlongs(theStream))
provinces.insert(id);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/RegionMapper/CK3RegionMapper.cpp b/ImperatorToCK3/Source/Mappers/RegionMapper/CK3RegionMapper.cpp
index 54fb47b38..a2711db19 100644
--- a/ImperatorToCK3/Source/Mappers/RegionMapper/CK3RegionMapper.cpp
+++ b/ImperatorToCK3/Source/Mappers/RegionMapper/CK3RegionMapper.cpp
@@ -59,7 +59,7 @@ void mappers::CK3RegionMapper::registerRegionKeys() {
const auto newRegion = std::make_shared(theStream);
regions[regionName] = newRegion;
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/RegionMapper/ImperatorArea.cpp b/ImperatorToCK3/Source/Mappers/RegionMapper/ImperatorArea.cpp
index 5ad497bc4..0d4c4a523 100644
--- a/ImperatorToCK3/Source/Mappers/RegionMapper/ImperatorArea.cpp
+++ b/ImperatorToCK3/Source/Mappers/RegionMapper/ImperatorArea.cpp
@@ -17,7 +17,7 @@ void mappers::ImperatorArea::registerKeys() {
for (const auto& id : commonItems::getULlongs(theStream))
provinces.emplace(id);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/RegionMapper/ImperatorRegion.cpp b/ImperatorToCK3/Source/Mappers/RegionMapper/ImperatorRegion.cpp
index dad3ae156..de1898024 100644
--- a/ImperatorToCK3/Source/Mappers/RegionMapper/ImperatorRegion.cpp
+++ b/ImperatorToCK3/Source/Mappers/RegionMapper/ImperatorRegion.cpp
@@ -17,7 +17,7 @@ void mappers::ImperatorRegion::registerKeys() {
for (const auto& name : commonItems::getStrings(theStream))
areas.emplace(name, nullptr);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
bool mappers::ImperatorRegion::regionContainsProvince(const unsigned long long province) const {
diff --git a/ImperatorToCK3/Source/Mappers/RegionMapper/ImperatorRegionMapper.cpp b/ImperatorToCK3/Source/Mappers/RegionMapper/ImperatorRegionMapper.cpp
index 94bb12dea..f0a8eb11b 100644
--- a/ImperatorToCK3/Source/Mappers/RegionMapper/ImperatorRegionMapper.cpp
+++ b/ImperatorToCK3/Source/Mappers/RegionMapper/ImperatorRegionMapper.cpp
@@ -54,7 +54,7 @@ void mappers::ImperatorRegionMapper::registerRegionKeys() {
const auto newRegion = std::make_shared(theStream);
regions[regionName] = newRegion;
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
@@ -63,7 +63,7 @@ void mappers::ImperatorRegionMapper::registerAreaKeys() {
const auto newArea = std::make_shared(theStream);
areas[areaName] = newArea;
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/ReligionMapper/ReligionMapper.cpp b/ImperatorToCK3/Source/Mappers/ReligionMapper/ReligionMapper.cpp
index cecf7dacd..9a7bca2ed 100644
--- a/ImperatorToCK3/Source/Mappers/ReligionMapper/ReligionMapper.cpp
+++ b/ImperatorToCK3/Source/Mappers/ReligionMapper/ReligionMapper.cpp
@@ -25,7 +25,7 @@ void mappers::ReligionMapper::registerKeys() {
registerKeyword("link", [this](std::istream& theStream) {
religionMappings.emplace_back(theStream);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/ReligionMapper/ReligionMapping.cpp b/ImperatorToCK3/Source/Mappers/ReligionMapper/ReligionMapping.cpp
index d55b0341d..14cb451d0 100644
--- a/ImperatorToCK3/Source/Mappers/ReligionMapper/ReligionMapping.cpp
+++ b/ImperatorToCK3/Source/Mappers/ReligionMapper/ReligionMapping.cpp
@@ -26,7 +26,7 @@ mappers::ReligionMapping::ReligionMapping(std::istream& theStream) {
registerKeyword("impProvince", [this](std::istream& theStream) {
imperatorProvinces.insert(commonItems::getULlong(theStream));
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
parseStream(theStream);
clearRegisteredKeywords();
diff --git a/ImperatorToCK3/Source/Mappers/SuccessionLawMapper/SuccessionLawMapper.cpp b/ImperatorToCK3/Source/Mappers/SuccessionLawMapper/SuccessionLawMapper.cpp
index 226442ef3..c873ad889 100644
--- a/ImperatorToCK3/Source/Mappers/SuccessionLawMapper/SuccessionLawMapper.cpp
+++ b/ImperatorToCK3/Source/Mappers/SuccessionLawMapper/SuccessionLawMapper.cpp
@@ -33,7 +33,7 @@ void mappers::SuccessionLawMapper::registerKeys() {
iterator->second.insert(mapping.ck3SuccessionLaws.begin(), mapping.ck3SuccessionLaws.end());
}
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/SuccessionLawMapper/SuccessionLawMapping.cpp b/ImperatorToCK3/Source/Mappers/SuccessionLawMapper/SuccessionLawMapping.cpp
index 1389855f5..9971f7645 100644
--- a/ImperatorToCK3/Source/Mappers/SuccessionLawMapper/SuccessionLawMapping.cpp
+++ b/ImperatorToCK3/Source/Mappers/SuccessionLawMapper/SuccessionLawMapping.cpp
@@ -11,7 +11,7 @@ mappers::SuccessionLawMapping::SuccessionLawMapping(std::istream& theStream) {
registerKeyword("ck3", [this](std::istream& theStream) {
ck3SuccessionLaws.emplace(commonItems::getString(theStream));
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
parseStream(theStream);
clearRegisteredKeywords();
diff --git a/ImperatorToCK3/Source/Mappers/TagTitleMapper/TagTitleMapper.cpp b/ImperatorToCK3/Source/Mappers/TagTitleMapper/TagTitleMapper.cpp
index fbeb500b0..37afd732e 100644
--- a/ImperatorToCK3/Source/Mappers/TagTitleMapper/TagTitleMapper.cpp
+++ b/ImperatorToCK3/Source/Mappers/TagTitleMapper/TagTitleMapper.cpp
@@ -19,7 +19,7 @@ void mappers::TagTitleMapper::registerKeys() {
registerKeyword("link", [this](std::istream& theStream) {
theMappings.emplace_back(TagTitleMapping(theStream));
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/TagTitleMapper/TagTitleMapping.cpp b/ImperatorToCK3/Source/Mappers/TagTitleMapper/TagTitleMapping.cpp
index c103c0b27..95ecd5a9b 100644
--- a/ImperatorToCK3/Source/Mappers/TagTitleMapper/TagTitleMapping.cpp
+++ b/ImperatorToCK3/Source/Mappers/TagTitleMapper/TagTitleMapping.cpp
@@ -29,5 +29,5 @@ void mappers::TagTitleMapping::registerKeys() {
registerKeyword("rank", [this](std::istream& theStream) {
ranks.emplace(commonItems::getString(theStream));
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/TraitMapper/TraitMapper.cpp b/ImperatorToCK3/Source/Mappers/TraitMapper/TraitMapper.cpp
index 3174e781e..9f9e4ad98 100644
--- a/ImperatorToCK3/Source/Mappers/TraitMapper/TraitMapper.cpp
+++ b/ImperatorToCK3/Source/Mappers/TraitMapper/TraitMapper.cpp
@@ -30,7 +30,7 @@ void mappers::TraitMapper::registerKeys() {
impToCK3TraitMap.emplace(imperatorTrait, *theMapping.ck3Trait);
}
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ImperatorToCK3/Source/Mappers/TraitMapper/TraitMapping.cpp b/ImperatorToCK3/Source/Mappers/TraitMapper/TraitMapping.cpp
index 43e8efa77..a29bef147 100644
--- a/ImperatorToCK3/Source/Mappers/TraitMapper/TraitMapping.cpp
+++ b/ImperatorToCK3/Source/Mappers/TraitMapper/TraitMapping.cpp
@@ -11,7 +11,7 @@ mappers::TraitMapping::TraitMapping(std::istream& theStream) {
registerKeyword("imp", [this](std::istream& theStream) {
impTraits.insert(commonItems::getString(theStream));
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
parseStream(theStream);
clearRegisteredKeywords();
diff --git a/ImperatorToCK3/Source/Mappers/VersionParser/VersionParser.cpp b/ImperatorToCK3/Source/Mappers/VersionParser/VersionParser.cpp
index 956295e6d..ba91a5024 100644
--- a/ImperatorToCK3/Source/Mappers/VersionParser/VersionParser.cpp
+++ b/ImperatorToCK3/Source/Mappers/VersionParser/VersionParser.cpp
@@ -28,5 +28,5 @@ void mappers::VersionParser::registerKeys() {
registerKeyword("descriptionLine", [this](std::istream& theStream) {
descriptionLine = commonItems::getString(theStream);
});
- registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
+ registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
}
diff --git a/ZipLib b/ZipLib
index c4686d5d3..1a0fbd703 160000
--- a/ZipLib
+++ b/ZipLib
@@ -1 +1 @@
-Subproject commit c4686d5d375a8081430fbd0dcf7f7f85a34a98e1
+Subproject commit 1a0fbd703b11b92cc1723cc0ab44005428438d69
diff --git a/commonItems b/commonItems
index 97eafd1df..8b08a4888 160000
--- a/commonItems
+++ b/commonItems
@@ -1 +1 @@
-Subproject commit 97eafd1df22adf4c0dc619a0fe739c7aa315cd1a
+Subproject commit 8b08a488858423cf6982dce12cf179e9f419d8ab