From 239001e6f2d71dcc5113c77fa01ffe3f478ec84c Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 24 Mar 2024 20:49:15 +0100 Subject: [PATCH] refactor: use std ranges functions where applicable --- src/Common/Game/IW3/GameIW3.cpp | 2 +- src/Common/Game/IW4/GameIW4.cpp | 2 +- src/Common/Game/IW5/GameIW5.cpp | 2 +- src/Common/Game/T5/GameT5.cpp | 2 +- src/Common/Game/T6/GameT6.cpp | 2 +- src/Common/StateMap/StateMapLayout.cpp | 11 +++-- src/Linker/Linker.cpp | 23 +++++----- .../CommonStructuredDataEnum.cpp | 22 +++++----- .../CommonStructuredDataStruct.cpp | 22 +++++----- .../IW4/AssetLoaders/AssetLoaderMaterial.cpp | 13 +++--- .../AssetLoaders/AssetLoaderTechniqueSet.cpp | 42 +++++++++---------- .../AssetLoaders/AssetLoaderVertexDecl.cpp | 6 +-- .../T6/AssetLoaders/AssetLoaderFontIcon.cpp | 11 +++-- .../T6/AssetLoaders/AssetLoaderSoundBank.cpp | 2 +- src/ObjLoading/ObjContainer/IPak/IPak.cpp | 11 +++-- .../ObjContainer/IPak/IPakStreamManager.cpp | 24 +++++------ src/ObjLoading/ObjContainer/IWD/IWD.cpp | 2 +- .../SoundBank/SoundBankWriter.cpp | 11 +++-- .../StateMap/Parsing/StateMapParser.cpp | 11 +++-- src/ObjLoading/StateMap/StateMapHandler.cpp | 34 +++++++-------- .../AssetDumpers/AssetDumperTechniqueSet.cpp | 13 +++--- .../T6/AssetDumpers/AssetDumperSndBank.cpp | 2 +- src/ObjWriting/Menu/AbstractMenuDumper.cpp | 22 +++++----- .../ObjContainer/IPak/IPakWriter.cpp | 13 +++--- .../Parsing/Impl/DefinesStreamProxy.cpp | 2 +- .../Expression/SimpleExpressionMatchers.cpp | 22 +++++----- .../SimpleMatcherAnyCharacterBesides.cpp | 2 +- .../SimpleMatcherKeywordIgnoreCase.cpp | 14 +++---- .../Computations/MemberComputations.cpp | 35 +++++++--------- .../MemberDeclarationModifierComputations.cpp | 35 +++++++--------- .../Parsing/Commands/CommandsFileReader.cpp | 11 +++-- .../Commands/Sequence/SequenceAssetRef.cpp | 11 +++-- .../Commands/Sequence/SequenceString.cpp | 11 +++-- .../Parsing/Header/HeaderFileReader.cpp | 11 +++-- .../CreateMemberInformationPostProcessor.cpp | 11 +++-- .../PostProcessing/UnionsPostProcessor.cpp | 15 ++++--- .../PostProcessing/UsagesPostProcessor.cpp | 13 +++--- .../Printing/PrettyPrinter.cpp | 22 +++++----- src/ZoneLoading/Loading/AssetMarker.cpp | 2 +- src/ZoneLoading/Loading/ZoneLoader.cpp | 11 +++-- .../Parsing/Mock/MockParserLineStream.cpp | 11 +++-- .../Parsing/Matcher/MatcherTests.cpp | 2 +- 42 files changed, 251 insertions(+), 295 deletions(-) diff --git a/src/Common/Game/IW3/GameIW3.cpp b/src/Common/Game/IW3/GameIW3.cpp index 295aada2..e3eb4549 100644 --- a/src/Common/Game/IW3/GameIW3.cpp +++ b/src/Common/Game/IW3/GameIW3.cpp @@ -25,7 +25,7 @@ void GameIW3::AddZone(Zone* zone) void GameIW3::RemoveZone(Zone* zone) { - const auto foundEntry = std::find(m_zones.begin(), m_zones.end(), zone); + const auto foundEntry = std::ranges::find(m_zones, zone); if (foundEntry != m_zones.end()) m_zones.erase(foundEntry); diff --git a/src/Common/Game/IW4/GameIW4.cpp b/src/Common/Game/IW4/GameIW4.cpp index 4ff26b6d..bc391d45 100644 --- a/src/Common/Game/IW4/GameIW4.cpp +++ b/src/Common/Game/IW4/GameIW4.cpp @@ -25,7 +25,7 @@ void GameIW4::AddZone(Zone* zone) void GameIW4::RemoveZone(Zone* zone) { - const auto foundEntry = std::find(m_zones.begin(), m_zones.end(), zone); + const auto foundEntry = std::ranges::find(m_zones, zone); if (foundEntry != m_zones.end()) m_zones.erase(foundEntry); diff --git a/src/Common/Game/IW5/GameIW5.cpp b/src/Common/Game/IW5/GameIW5.cpp index a73a1b8c..d11f93e9 100644 --- a/src/Common/Game/IW5/GameIW5.cpp +++ b/src/Common/Game/IW5/GameIW5.cpp @@ -25,7 +25,7 @@ void GameIW5::AddZone(Zone* zone) void GameIW5::RemoveZone(Zone* zone) { - const auto foundEntry = std::find(m_zones.begin(), m_zones.end(), zone); + const auto foundEntry = std::ranges::find(m_zones, zone); if (foundEntry != m_zones.end()) m_zones.erase(foundEntry); diff --git a/src/Common/Game/T5/GameT5.cpp b/src/Common/Game/T5/GameT5.cpp index cf363927..5f4f790b 100644 --- a/src/Common/Game/T5/GameT5.cpp +++ b/src/Common/Game/T5/GameT5.cpp @@ -25,7 +25,7 @@ void GameT5::AddZone(Zone* zone) void GameT5::RemoveZone(Zone* zone) { - const auto foundEntry = std::find(m_zones.begin(), m_zones.end(), zone); + const auto foundEntry = std::ranges::find(m_zones, zone); if (foundEntry != m_zones.end()) m_zones.erase(foundEntry); diff --git a/src/Common/Game/T6/GameT6.cpp b/src/Common/Game/T6/GameT6.cpp index 42c66b9a..61149e03 100644 --- a/src/Common/Game/T6/GameT6.cpp +++ b/src/Common/Game/T6/GameT6.cpp @@ -25,7 +25,7 @@ void GameT6::AddZone(Zone* zone) void GameT6::RemoveZone(Zone* zone) { - const auto foundEntry = std::find(m_zones.begin(), m_zones.end(), zone); + const auto foundEntry = std::ranges::find(m_zones, zone); if (foundEntry != m_zones.end()) m_zones.erase(foundEntry); diff --git a/src/Common/StateMap/StateMapLayout.cpp b/src/Common/StateMap/StateMapLayout.cpp index 058d3ea4..b847c719 100644 --- a/src/Common/StateMap/StateMapLayout.cpp +++ b/src/Common/StateMap/StateMapLayout.cpp @@ -37,12 +37,11 @@ namespace state_map for (auto& resultVar : entry.m_result_vars) { - const auto correspondingVar = std::find_if(layout.m_var_layout.m_vars.begin(), - layout.m_var_layout.m_vars.end(), - [&resultVar](const StateMapLayoutVar& var) - { - return var.m_name == resultVar; - }); + const auto correspondingVar = std::ranges::find_if(layout.m_var_layout.m_vars, + [&resultVar](const StateMapLayoutVar& var) + { + return var.m_name == resultVar; + }); // Has to have a corresponding var assert(correspondingVar != layout.m_var_layout.m_vars.end()); diff --git a/src/Linker/Linker.cpp b/src/Linker/Linker.cpp index 4ec04ca9..343b9168 100644 --- a/src/Linker/Linker.cpp +++ b/src/Linker/Linker.cpp @@ -467,19 +467,18 @@ class LinkerImpl final : public Linker bool BuildReferencedTargets(const std::string& projectName, const std::string& targetName, const ZoneDefinition& zoneDefinition) { - return std::all_of(zoneDefinition.m_targets_to_build.begin(), - zoneDefinition.m_targets_to_build.end(), - [this, &projectName, &targetName](const std::string& buildTargetName) - { - if (buildTargetName == targetName) - { - std::cerr << "Cannot build target with same name: \"" << targetName << "\"\n"; - return false; - } + return std::ranges::all_of(zoneDefinition.m_targets_to_build, + [this, &projectName, &targetName](const std::string& buildTargetName) + { + if (buildTargetName == targetName) + { + std::cerr << "Cannot build target with same name: \"" << targetName << "\"\n"; + return false; + } - std::cout << "Building referenced target \"" << buildTargetName << "\"\n"; - return BuildProject(projectName, buildTargetName); - }); + std::cout << "Building referenced target \"" << buildTargetName << "\"\n"; + return BuildProject(projectName, buildTargetName); + }); } bool BuildProject(const std::string& projectName, const std::string& targetName) diff --git a/src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.cpp b/src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.cpp index 4a7a7ead..6a62a01f 100644 --- a/src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.cpp +++ b/src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.cpp @@ -60,20 +60,18 @@ uint32_t CommonStructuredDataEnum::CalculateChecksum(const uint32_t initialValue void CommonStructuredDataEnum::SortEntriesByOffset() { - std::sort(m_entries.begin(), - m_entries.end(), - [](const CommonStructuredDataEnumEntry& e1, const CommonStructuredDataEnumEntry& e2) - { - return e1.m_value < e2.m_value; - }); + std::ranges::sort(m_entries, + [](const CommonStructuredDataEnumEntry& e1, const CommonStructuredDataEnumEntry& e2) + { + return e1.m_value < e2.m_value; + }); } void CommonStructuredDataEnum::SortEntriesByName() { - std::sort(m_entries.begin(), - m_entries.end(), - [](const CommonStructuredDataEnumEntry& e1, const CommonStructuredDataEnumEntry& e2) - { - return e1.m_name < e2.m_name; - }); + std::ranges::sort(m_entries, + [](const CommonStructuredDataEnumEntry& e1, const CommonStructuredDataEnumEntry& e2) + { + return e1.m_name < e2.m_name; + }); } diff --git a/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.cpp b/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.cpp index 5f98b010..31b61ac1 100644 --- a/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.cpp +++ b/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.cpp @@ -118,20 +118,18 @@ uint32_t CommonStructuredDataStruct::CalculateChecksum(const CommonStructuredDat void CommonStructuredDataStruct::SortPropertiesByOffset() { - std::sort(m_properties.begin(), - m_properties.end(), - [](const CommonStructuredDataStructProperty& e1, const CommonStructuredDataStructProperty& e2) - { - return e1.m_offset_in_bits < e2.m_offset_in_bits; - }); + std::ranges::sort(m_properties, + [](const CommonStructuredDataStructProperty& e1, const CommonStructuredDataStructProperty& e2) + { + return e1.m_offset_in_bits < e2.m_offset_in_bits; + }); } void CommonStructuredDataStruct::SortPropertiesByName() { - std::sort(m_properties.begin(), - m_properties.end(), - [](const CommonStructuredDataStructProperty& e1, const CommonStructuredDataStructProperty& e2) - { - return e1.m_name < e2.m_name; - }); + std::ranges::sort(m_properties, + [](const CommonStructuredDataStructProperty& e1, const CommonStructuredDataStructProperty& e2) + { + return e1.m_name < e2.m_name; + }); } diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMaterial.cpp b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMaterial.cpp index 2d75deaf..8f9ba950 100644 --- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMaterial.cpp +++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMaterial.cpp @@ -844,13 +844,12 @@ namespace IW4 if (techsetDefinition->GetTechniqueByIndex(i, techniqueName)) { const auto stateBitsForTechnique = GetStateBitsForTechnique(techniqueName); - const auto foundStateBits = - std::find_if(m_state_bits.begin(), - m_state_bits.end(), - [stateBitsForTechnique](const GfxStateBits& s1) - { - return s1.loadBits[0] == stateBitsForTechnique.loadBits[0] && s1.loadBits[1] == stateBitsForTechnique.loadBits[1]; - }); + const auto foundStateBits = std::ranges::find_if(m_state_bits, + [stateBitsForTechnique](const GfxStateBits& s1) + { + return s1.loadBits[0] == stateBitsForTechnique.loadBits[0] + && s1.loadBits[1] == stateBitsForTechnique.loadBits[1]; + }); if (foundStateBits != m_state_bits.end()) { diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTechniqueSet.cpp b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTechniqueSet.cpp index abbd5b46..cc11f48d 100644 --- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTechniqueSet.cpp +++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTechniqueSet.cpp @@ -403,22 +403,21 @@ namespace IW4 return false; // Sort args by their update frequency - std::sort(pass.m_arguments.begin(), - pass.m_arguments.end(), - [](const PassShaderArgument& arg1, const PassShaderArgument& arg2) - { - if (arg1.m_update_frequency != arg2.m_update_frequency) - return arg1.m_update_frequency < arg2.m_update_frequency; + std::ranges::sort(pass.m_arguments, + [](const PassShaderArgument& arg1, const PassShaderArgument& arg2) + { + if (arg1.m_update_frequency != arg2.m_update_frequency) + return arg1.m_update_frequency < arg2.m_update_frequency; - if (arg1.m_arg.type != arg2.m_arg.type) - return arg1.m_arg.type < arg2.m_arg.type; + if (arg1.m_arg.type != arg2.m_arg.type) + return arg1.m_arg.type < arg2.m_arg.type; - if (arg1.m_arg.type == MTL_ARG_MATERIAL_VERTEX_CONST || arg1.m_arg.type == MTL_ARG_MATERIAL_PIXEL_CONST - || arg1.m_arg.type == MTL_ARG_MATERIAL_PIXEL_SAMPLER) - return arg1.m_arg.u.codeSampler < arg2.m_arg.u.codeSampler; + if (arg1.m_arg.type == MTL_ARG_MATERIAL_VERTEX_CONST || arg1.m_arg.type == MTL_ARG_MATERIAL_PIXEL_CONST + || arg1.m_arg.type == MTL_ARG_MATERIAL_PIXEL_SAMPLER) + return arg1.m_arg.u.codeSampler < arg2.m_arg.u.codeSampler; - return arg1.m_arg.dest < arg2.m_arg.dest; - }); + return arg1.m_arg.dest < arg2.m_arg.dest; + }); AllocateVertexDecl(); @@ -600,12 +599,11 @@ namespace IW4 size_t& registerOffset, std::string& errorMessage) const { - const auto matchingShaderConstant = std::find_if(shaderInfo.m_constants.begin(), - shaderInfo.m_constants.end(), - [argument](const d3d9::ShaderConstant& constant) - { - return constant.m_name == argument.m_argument_name; - }); + const auto matchingShaderConstant = std::ranges::find_if(shaderInfo.m_constants, + [argument](const d3d9::ShaderConstant& constant) + { + return constant.m_name == argument.m_argument_name; + }); if (matchingShaderConstant == shaderInfo.m_constants.end()) { @@ -1013,14 +1011,14 @@ namespace IW4 return false; } - const auto foundDestination = std::find(std::begin(materialStreamDestinationNames), std::end(materialStreamDestinationNames), destination); + const auto foundDestination = std::ranges::find(materialStreamDestinationNames, destination); if (foundDestination == std::end(materialStreamDestinationNames)) { errorMessage = "Unknown stream destination"; return false; } - const auto foundSource = std::find(std::begin(materialStreamSourceNames), std::end(materialStreamSourceNames), source); + const auto foundSource = std::ranges::find(materialStreamSourceNames, source); if (foundSource == std::end(materialStreamSourceNames)) { errorMessage = "Unknown stream source"; @@ -1187,7 +1185,7 @@ namespace IW4 assert(arg.m_arg.type == MTL_ARG_CODE_PIXEL_SAMPLER); if (arg.m_arg.type == MTL_ARG_CODE_PIXEL_SAMPLER) { - const auto customSampler = std::find(std::begin(g_customSamplerSrc), std::end(g_customSamplerSrc), arg.m_arg.u.codeSampler); + const auto customSampler = std::ranges::find(g_customSamplerSrc, arg.m_arg.u.codeSampler); assert(customSampler != std::end(g_customSamplerSrc)); if (customSampler != std::end(g_customSamplerSrc)) { diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexDecl.cpp b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexDecl.cpp index bf446f45..d86d02c6 100644 --- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexDecl.cpp +++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexDecl.cpp @@ -64,16 +64,14 @@ bool AssetLoaderVertexDecl::LoadFromRaw( return false; } - const auto foundSourceAbbreviation = - std::find(std::begin(materialStreamSourceAbbreviation), std::end(materialStreamSourceAbbreviation), sourceAbbreviation); + const auto foundSourceAbbreviation = std::ranges::find(materialStreamSourceAbbreviation, sourceAbbreviation); if (foundSourceAbbreviation == std::end(materialStreamSourceAbbreviation)) { std::cout << "Unknown vertex decl source abbreviation: " << sourceAbbreviation << "\n"; return false; } - const auto foundDestinationAbbreviation = - std::find(std::begin(materialStreamDestinationAbbreviation), std::end(materialStreamDestinationAbbreviation), destinationAbbreviation); + const auto foundDestinationAbbreviation = std::ranges::find(materialStreamDestinationAbbreviation, destinationAbbreviation); if (foundDestinationAbbreviation == std::end(materialStreamDestinationAbbreviation)) { std::cout << "Unknown vertex decl destination abbreviation: " << destinationAbbreviation << "\n"; diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFontIcon.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFontIcon.cpp index 96300e59..8d917d3f 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFontIcon.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFontIcon.cpp @@ -48,12 +48,11 @@ void AssetLoaderFontIcon::PreprocessRow(std::vector& row) bool AssetLoaderFontIcon::RowIsEmpty(const std::vector& row) { - return std::all_of(row.begin(), - row.end(), - [](const std::string& cell) - { - return cell.empty(); - }); + return std::ranges::all_of(row, + [](const std::string& cell) + { + return cell.empty(); + }); } bool AssetLoaderFontIcon::ParseInt(int& value, const std::string& str) diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp index 5e2b46a7..e6b0f82d 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp @@ -27,7 +27,7 @@ namespace { std::string soundFilePath(sndAlias->assetFileName); - std::replace(soundFilePath.begin(), soundFilePath.end(), '\\', '/'); + std::ranges::replace(soundFilePath, '\\', '/'); for (const auto& droppedPrefix : PREFIXES_TO_DROP) { if (soundFilePath.rfind(droppedPrefix, 0) != std::string::npos) diff --git a/src/ObjLoading/ObjContainer/IPak/IPak.cpp b/src/ObjLoading/ObjContainer/IPak/IPak.cpp index fd8dc343..5f88c264 100644 --- a/src/ObjLoading/ObjContainer/IPak/IPak.cpp +++ b/src/ObjLoading/ObjContainer/IPak/IPak.cpp @@ -56,12 +56,11 @@ class IPak::Impl : public ObjContainerReferenceable m_index_entries.push_back(indexEntry); } - std::sort(m_index_entries.begin(), - m_index_entries.end(), - [](const IPakIndexEntry& entry1, const IPakIndexEntry& entry2) - { - return entry1.key.combinedKey < entry2.key.combinedKey; - }); + std::ranges::sort(m_index_entries, + [](const IPakIndexEntry& entry1, const IPakIndexEntry& entry2) + { + return entry1.key.combinedKey < entry2.key.combinedKey; + }); return true; } diff --git a/src/ObjLoading/ObjContainer/IPak/IPakStreamManager.cpp b/src/ObjLoading/ObjContainer/IPak/IPakStreamManager.cpp index 546b621a..3243ebf6 100644 --- a/src/ObjLoading/ObjContainer/IPak/IPakStreamManager.cpp +++ b/src/ObjLoading/ObjContainer/IPak/IPakStreamManager.cpp @@ -71,12 +71,11 @@ public: m_stream_mutex.lock(); ChunkBuffer* reservedChunkBuffer; - const auto freeChunkBuffer = std::find_if(m_chunk_buffers.begin(), - m_chunk_buffers.end(), - [](ChunkBuffer* chunkBuffer) - { - return chunkBuffer->m_using_stream == nullptr; - }); + const auto freeChunkBuffer = std::ranges::find_if(m_chunk_buffers, + [](ChunkBuffer* chunkBuffer) + { + return chunkBuffer->m_using_stream == nullptr; + }); if (freeChunkBuffer == m_chunk_buffers.end()) { @@ -111,12 +110,11 @@ public: { m_stream_mutex.lock(); - const auto openStreamEntry = std::find_if(m_open_streams.begin(), - m_open_streams.end(), - [stream](const ManagedStream& managedStream) - { - return managedStream.m_stream == stream; - }); + const auto openStreamEntry = std::ranges::find_if(m_open_streams, + [stream](const ManagedStream& managedStream) + { + return managedStream.m_stream == stream; + }); if (openStreamEntry != m_open_streams.end()) { @@ -127,7 +125,7 @@ public: // Only keep previously allocated chunk buffer if we did not get over the limit of idle chunk buffers if (m_chunk_buffers.size() > CHUNK_BUFFER_COUNT_IDLE_LIMIT) { - const auto chunkBufferEntry = std::find(m_chunk_buffers.begin(), m_chunk_buffers.end(), chunkBuffer); + const auto chunkBufferEntry = std::ranges::find(m_chunk_buffers, chunkBuffer); if (chunkBufferEntry != m_chunk_buffers.end()) { diff --git a/src/ObjLoading/ObjContainer/IWD/IWD.cpp b/src/ObjLoading/ObjContainer/IWD/IWD.cpp index 7c046cfc..8a5e1c6f 100644 --- a/src/ObjLoading/ObjContainer/IWD/IWD.cpp +++ b/src/ObjLoading/ObjContainer/IWD/IWD.cpp @@ -248,7 +248,7 @@ public: } auto iwdFilename = fileName; - std::replace(iwdFilename.begin(), iwdFilename.end(), '\\', '/'); + std::ranges::replace(iwdFilename, '\\', '/'); const auto iwdEntry = m_entry_map.find(iwdFilename); diff --git a/src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.cpp b/src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.cpp index c6a285fe..7294ff81 100644 --- a/src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.cpp +++ b/src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.cpp @@ -46,12 +46,11 @@ public: void AddSound(const std::string& soundFilePath, unsigned int soundId, bool looping, bool streamed) override { - auto itr = std::find_if(this->m_sounds.begin(), - this->m_sounds.end(), - [soundId](SoundBankEntryInfo& entry) - { - return entry.m_sound_id == soundId; - }); + auto itr = std::ranges::find_if(this->m_sounds, + [soundId](SoundBankEntryInfo& entry) + { + return entry.m_sound_id == soundId; + }); if (itr == this->m_sounds.end()) { diff --git a/src/ObjLoading/StateMap/Parsing/StateMapParser.cpp b/src/ObjLoading/StateMap/Parsing/StateMapParser.cpp index 12a29f29..1e0bbebb 100644 --- a/src/ObjLoading/StateMap/Parsing/StateMapParser.cpp +++ b/src/ObjLoading/StateMap/Parsing/StateMapParser.cpp @@ -179,12 +179,11 @@ namespace state_map const auto tokenValue = valueToken.m_type == SimpleParserValueType::IDENTIFIER ? valueToken.IdentifierValue() : std::to_string(valueToken.IntegerValue()); - const auto referencedValue = std::find_if(var.m_values.begin(), - var.m_values.end(), - [&tokenValue](const StateMapLayoutVarValue& value) - { - return value.m_name == tokenValue; - }); + const auto referencedValue = std::ranges::find_if(var.m_values, + [&tokenValue](const StateMapLayoutVarValue& value) + { + return value.m_name == tokenValue; + }); if (referencedValue == var.m_values.end()) throw ParsingException(valueToken.GetPos(), "Not part of the valid values for this var"); diff --git a/src/ObjLoading/StateMap/StateMapHandler.cpp b/src/ObjLoading/StateMap/StateMapHandler.cpp index a34f1ee4..07f2a364 100644 --- a/src/ObjLoading/StateMap/StateMapHandler.cpp +++ b/src/ObjLoading/StateMap/StateMapHandler.cpp @@ -40,19 +40,18 @@ void StateMapHandler::ApplyStateMap(const uint32_t* baseStateBits, uint32_t* out for (auto entryIndex = 0u; entryIndex < m_state_map.m_state_map_entries.size(); entryIndex++) { const auto& entry = m_state_map.m_state_map_entries[entryIndex]; - const auto matchingRule = std::find_if(entry.m_rules.begin(), - entry.m_rules.end(), - [&vars](const std::unique_ptr& rule) - { - const auto matchingCondition = std::find_if(rule->m_conditions.begin(), - rule->m_conditions.end(), - [&vars](std::unique_ptr& condition) - { - return condition->EvaluateNonStatic(&vars).IsTruthy(); - }); + const auto matchingRule = std::ranges::find_if(entry.m_rules, + [&vars](const std::unique_ptr& rule) + { + const auto matchingCondition = + std::ranges::find_if(rule->m_conditions, + [&vars](std::unique_ptr& condition) + { + return condition->EvaluateNonStatic(&vars).IsTruthy(); + }); - return matchingCondition != rule->m_conditions.end(); - }); + return matchingCondition != rule->m_conditions.end(); + }); if (matchingRule != entry.m_rules.end()) ApplyRule(m_state_map_layout.m_entry_layout.m_entries[entryIndex], **matchingRule, outStateBits); @@ -68,12 +67,11 @@ StateMapVars StateMapHandler::BuildVars(const uint32_t* baseStateBits) const for (const auto& var : m_state_map_layout.m_var_layout.m_vars) { const auto baseStateBitField = baseStateBits[var.m_state_bits_index]; - const auto matchingValue = std::find_if(var.m_values.begin(), - var.m_values.end(), - [&baseStateBitField](const StateMapLayoutVarValue& value) - { - return (baseStateBitField & value.m_state_bits_mask) == value.m_state_bits_mask; - }); + const auto matchingValue = std::ranges::find_if(var.m_values, + [&baseStateBitField](const StateMapLayoutVarValue& value) + { + return (baseStateBitField & value.m_state_bits_mask) == value.m_state_bits_mask; + }); if (matchingValue != var.m_values.end()) result.AddValue(var.m_name, matchingValue->m_name); diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTechniqueSet.cpp b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTechniqueSet.cpp index abe35157..610b18cb 100644 --- a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTechniqueSet.cpp +++ b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperTechniqueSet.cpp @@ -126,13 +126,12 @@ namespace IW4 { const auto expectedRegisterSet = arg.type == MTL_ARG_CODE_PIXEL_SAMPLER || arg.type == MTL_ARG_MATERIAL_PIXEL_SAMPLER ? d3d9::RegisterSet::SAMPLER : d3d9::RegisterSet::FLOAT_4; - const auto targetShaderArg = std::find_if(shaderInfo.m_constants.begin(), - shaderInfo.m_constants.end(), - [arg, expectedRegisterSet](const d3d9::ShaderConstant& constant) - { - return constant.m_register_set == expectedRegisterSet && constant.m_register_index <= arg.dest - && constant.m_register_index + constant.m_register_count > arg.dest; - }); + const auto targetShaderArg = std::ranges::find_if(shaderInfo.m_constants, + [arg, expectedRegisterSet](const d3d9::ShaderConstant& constant) + { + return constant.m_register_set == expectedRegisterSet && constant.m_register_index <= arg.dest + && constant.m_register_index + constant.m_register_count > arg.dest; + }); assert(targetShaderArg != shaderInfo.m_constants.end()); if (targetShaderArg == shaderInfo.m_constants.end()) diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp index 9272cddd..532cb3fa 100644 --- a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp +++ b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp @@ -139,7 +139,7 @@ class AssetDumperSndBank::Internal { fs::path assetPath(m_context.m_base_path); - std::replace(outputFileName.begin(), outputFileName.end(), '\\', '/'); + std::ranges::replace(outputFileName, '\\', '/'); for (const auto& droppedPrefix : PREFIXES_TO_DROP) { if (outputFileName.rfind(droppedPrefix, 0) != std::string::npos) diff --git a/src/ObjWriting/Menu/AbstractMenuDumper.cpp b/src/ObjWriting/Menu/AbstractMenuDumper.cpp index bf41830e..5b00b40b 100644 --- a/src/ObjWriting/Menu/AbstractMenuDumper.cpp +++ b/src/ObjWriting/Menu/AbstractMenuDumper.cpp @@ -115,22 +115,20 @@ bool AbstractMenuDumper::DoesTokenNeedQuotationMarks(const std::string& token) if (token.empty()) return true; - const auto hasAlNumCharacter = std::any_of(token.begin(), - token.end(), - [](const char& c) - { - return isalnum(c); - }); + const auto hasAlNumCharacter = std::ranges::any_of(token, + [](const char& c) + { + return isalnum(c); + }); if (!hasAlNumCharacter) return false; - const auto hasNonIdentifierCharacter = std::any_of(token.begin(), - token.end(), - [](const char& c) - { - return !isalnum(c) && c != '_'; - }); + const auto hasNonIdentifierCharacter = std::ranges::any_of(token, + [](const char& c) + { + return !isalnum(c) && c != '_'; + }); return hasNonIdentifierCharacter; } diff --git a/src/ObjWriting/ObjContainer/IPak/IPakWriter.cpp b/src/ObjWriting/ObjContainer/IPak/IPakWriter.cpp index f97318b0..819cdf14 100644 --- a/src/ObjWriting/ObjContainer/IPak/IPakWriter.cpp +++ b/src/ObjWriting/ObjContainer/IPak/IPakWriter.cpp @@ -291,12 +291,11 @@ public: m_index_entries.reserve(m_images.size()); - const auto result = std::all_of(m_images.begin(), - m_images.end(), - [this](const std::string& imageName) - { - return WriteImageData(imageName); - }); + const auto result = std::ranges::all_of(m_images, + [this](const std::string& imageName) + { + return WriteImageData(imageName); + }); FlushBlock(); m_data_section_size = static_cast(m_current_offset - m_data_section_offset); @@ -311,7 +310,7 @@ public: void SortIndexSectionEntries() { - std::sort(m_index_entries.begin(), m_index_entries.end(), CompareIndices); + std::ranges::sort(m_index_entries, CompareIndices); } void WriteIndexSection() diff --git a/src/Parser/Parsing/Impl/DefinesStreamProxy.cpp b/src/Parser/Parsing/Impl/DefinesStreamProxy.cpp index 72e69af7..dd683eb7 100644 --- a/src/Parser/Parsing/Impl/DefinesStreamProxy.cpp +++ b/src/Parser/Parsing/Impl/DefinesStreamProxy.cpp @@ -981,7 +981,7 @@ void DefinesStreamProxy::ProcessNestedMacros(ParserLine& line, unsigned& linePos const Define* nestedMacro = nullptr; while (FindNextMacro(input, pos, defineStart, nestedMacro)) { - if (std::find(callstack.cbegin(), callstack.cend(), nestedMacro) != callstack.cend()) + if (std::ranges::find(std::as_const(callstack), nestedMacro) != callstack.cend()) { // Do not expand recursively continue; diff --git a/src/Parser/Parsing/Simple/Expression/SimpleExpressionMatchers.cpp b/src/Parser/Parsing/Simple/Expression/SimpleExpressionMatchers.cpp index 7a3e3b98..a5f21c30 100644 --- a/src/Parser/Parsing/Simple/Expression/SimpleExpressionMatchers.cpp +++ b/src/Parser/Parsing/Simple/Expression/SimpleExpressionMatchers.cpp @@ -283,18 +283,16 @@ std::unique_ptr SimpleExpressionMatchers::P } } - const auto hasAddOperation = std::any_of(enabledBinaryOperations.begin(), - enabledBinaryOperations.end(), - [](const SimpleExpressionBinaryOperationType* type) - { - return type == &SimpleExpressionBinaryOperationType::OPERATION_ADD; - }); - const auto hasSubtractOperation = std::any_of(enabledBinaryOperations.begin(), - enabledBinaryOperations.end(), - [](const SimpleExpressionBinaryOperationType* type) - { - return type == &SimpleExpressionBinaryOperationType::OPERATION_SUBTRACT; - }); + const auto hasAddOperation = std::ranges::any_of(enabledBinaryOperations, + [](const SimpleExpressionBinaryOperationType* type) + { + return type == &SimpleExpressionBinaryOperationType::OPERATION_ADD; + }); + const auto hasSubtractOperation = std::ranges::any_of(enabledBinaryOperations, + [](const SimpleExpressionBinaryOperationType* type) + { + return type == &SimpleExpressionBinaryOperationType::OPERATION_SUBTRACT; + }); if (hasAddOperation && hasSubtractOperation) { diff --git a/src/Parser/Parsing/Simple/Matcher/SimpleMatcherAnyCharacterBesides.cpp b/src/Parser/Parsing/Simple/Matcher/SimpleMatcherAnyCharacterBesides.cpp index 0208ffcf..c89d86d3 100644 --- a/src/Parser/Parsing/Simple/Matcher/SimpleMatcherAnyCharacterBesides.cpp +++ b/src/Parser/Parsing/Simple/Matcher/SimpleMatcherAnyCharacterBesides.cpp @@ -8,7 +8,7 @@ SimpleMatcherAnyCharacterBesides::SimpleMatcherAnyCharacterBesides(std::vector SimpleMatcherAnyCharacterBesides::CanMatch(ILexer* lexer, const unsigned tokenOffset) { const auto& token = lexer->GetToken(tokenOffset); - return token.m_type == SimpleParserValueType::CHARACTER && std::find(m_chars.begin(), m_chars.end(), token.CharacterValue()) == m_chars.end() + return token.m_type == SimpleParserValueType::CHARACTER && std::ranges::find(m_chars, token.CharacterValue()) == m_chars.end() ? MatcherResult::Match(1) : MatcherResult::NoMatch(); } diff --git a/src/Parser/Parsing/Simple/Matcher/SimpleMatcherKeywordIgnoreCase.cpp b/src/Parser/Parsing/Simple/Matcher/SimpleMatcherKeywordIgnoreCase.cpp index b7fad05f..699033a2 100644 --- a/src/Parser/Parsing/Simple/Matcher/SimpleMatcherKeywordIgnoreCase.cpp +++ b/src/Parser/Parsing/Simple/Matcher/SimpleMatcherKeywordIgnoreCase.cpp @@ -17,14 +17,12 @@ MatcherResult SimpleMatcherKeywordIgnoreCase::CanMatch(ILexer return MatcherResult::NoMatch(); const auto& identifierValue = token.IdentifierValue(); - const auto isEqual = std::equal(identifierValue.begin(), - identifierValue.end(), - m_value.begin(), - m_value.end(), - [](const char a, const char b) - { - return tolower(a) == b; - }); + const auto isEqual = std::ranges::equal(identifierValue, + m_value, + [](const char a, const char b) + { + return tolower(a) == b; + }); if (isEqual) return MatcherResult::Match(1); diff --git a/src/ZoneCodeGeneratorLib/Domain/Computations/MemberComputations.cpp b/src/ZoneCodeGeneratorLib/Domain/Computations/MemberComputations.cpp index 501218f0..516494b6 100644 --- a/src/ZoneCodeGeneratorLib/Domain/Computations/MemberComputations.cpp +++ b/src/ZoneCodeGeneratorLib/Domain/Computations/MemberComputations.cpp @@ -21,12 +21,11 @@ bool MemberComputations::ShouldIgnore() const bool MemberComputations::ContainsNonEmbeddedReference() const { const auto& declarationModifiers = m_info->m_member->m_type_declaration->m_declaration_modifiers; - return std::any_of(declarationModifiers.begin(), - declarationModifiers.end(), - [](const std::unique_ptr& modifier) - { - return modifier->GetType() == DeclarationModifierType::POINTER; - }); + return std::ranges::any_of(declarationModifiers, + [](const std::unique_ptr& modifier) + { + return modifier->GetType() == DeclarationModifierType::POINTER; + }); } bool MemberComputations::ContainsSinglePointerReference() const @@ -136,12 +135,11 @@ bool MemberComputations::IsPointerToArray() const if (lastModifier->GetType() != DeclarationModifierType::ARRAY) return false; - return std::any_of(declarationModifiers.begin(), - declarationModifiers.end(), - [](const std::unique_ptr& modifier) - { - return modifier->GetType() == DeclarationModifierType::POINTER; - }); + return std::ranges::any_of(declarationModifiers, + [](const std::unique_ptr& modifier) + { + return modifier->GetType() == DeclarationModifierType::POINTER; + }); } std::vector MemberComputations::GetPointerToArraySizes() const @@ -207,13 +205,12 @@ bool MemberComputations::HasDynamicArraySize() const { const auto& declarationModifiers = m_info->m_member->m_type_declaration->m_declaration_modifiers; - return std::any_of(declarationModifiers.begin(), - declarationModifiers.end(), - [](const std::unique_ptr& declarationModifier) - { - return declarationModifier->GetType() == DeclarationModifierType::ARRAY - && dynamic_cast(declarationModifier.get())->m_dynamic_size_evaluation; - }); + return std::ranges::any_of(declarationModifiers, + [](const std::unique_ptr& declarationModifier) + { + return declarationModifier->GetType() == DeclarationModifierType::ARRAY + && dynamic_cast(declarationModifier.get())->m_dynamic_size_evaluation; + }); } bool MemberComputations::IsDynamicMember() const diff --git a/src/ZoneCodeGeneratorLib/Domain/Computations/MemberDeclarationModifierComputations.cpp b/src/ZoneCodeGeneratorLib/Domain/Computations/MemberDeclarationModifierComputations.cpp index 9f6954e9..2b9e99ba 100644 --- a/src/ZoneCodeGeneratorLib/Domain/Computations/MemberDeclarationModifierComputations.cpp +++ b/src/ZoneCodeGeneratorLib/Domain/Computations/MemberDeclarationModifierComputations.cpp @@ -123,7 +123,7 @@ std::vector DeclarationModifierComputations::Ge for (auto i = 0; i < arraySize; i++) { std::vector childModifierIndices(m_modifier_indices.size() + 1); - std::copy(m_modifier_indices.begin(), m_modifier_indices.end(), childModifierIndices.begin()); + std::ranges::copy(m_modifier_indices, childModifierIndices.begin()); childModifierIndices[childModifierIndices.size() - 1] = i; arrayEntries.push_back(DeclarationModifierComputations(m_information, std::move(childModifierIndices))); } @@ -140,12 +140,11 @@ bool DeclarationModifierComputations::IsSinglePointer() const { const auto following = GetFollowingDeclarationModifiers(); - return !std::any_of(following.begin(), - following.end(), - [](const DeclarationModifier* modifier) - { - return modifier->GetType() == DeclarationModifierType::POINTER; - }); + return !std::ranges::any_of(following, + [](const DeclarationModifier* modifier) + { + return modifier->GetType() == DeclarationModifierType::POINTER; + }); } return false; @@ -160,12 +159,11 @@ bool DeclarationModifierComputations::IsArrayPointer() const { const auto following = GetFollowingDeclarationModifiers(); - return !std::any_of(following.begin(), - following.end(), - [](const DeclarationModifier* modifier) - { - return modifier->GetType() == DeclarationModifierType::POINTER; - }); + return !std::ranges::any_of(following, + [](const DeclarationModifier* modifier) + { + return modifier->GetType() == DeclarationModifierType::POINTER; + }); } return false; @@ -247,12 +245,11 @@ unsigned DeclarationModifierComputations::GetAlignment() const { const auto following = GetFollowingDeclarationModifiers(); - return std::any_of(following.begin(), - following.end(), - [](const DeclarationModifier* modifier) - { - return modifier->GetType() == DeclarationModifierType::POINTER; - }) + return std::ranges::any_of(following, + [](const DeclarationModifier* modifier) + { + return modifier->GetType() == DeclarationModifierType::POINTER; + }) ? m_information->m_member->GetAlignment() : m_information->m_member->m_type_declaration->m_type->GetAlignment(); } diff --git a/src/ZoneCodeGeneratorLib/Parsing/Commands/CommandsFileReader.cpp b/src/ZoneCodeGeneratorLib/Parsing/Commands/CommandsFileReader.cpp index 7629261a..a596c6c5 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/Commands/CommandsFileReader.cpp +++ b/src/ZoneCodeGeneratorLib/Parsing/Commands/CommandsFileReader.cpp @@ -91,10 +91,9 @@ bool CommandsFileReader::ReadCommandsFile(IDataRepository* repository) if (!result) return false; - return std::all_of(m_post_processors.begin(), - m_post_processors.end(), - [repository](const std::unique_ptr& postProcessor) - { - return postProcessor->PostProcess(repository); - }); + return std::ranges::all_of(m_post_processors, + [repository](const std::unique_ptr& postProcessor) + { + return postProcessor->PostProcess(repository); + }); } diff --git a/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceAssetRef.cpp b/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceAssetRef.cpp index e15512e2..12ba3291 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceAssetRef.cpp +++ b/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceAssetRef.cpp @@ -45,12 +45,11 @@ void SequenceAssetRef::ProcessMatch(CommandsParserState* state, SequenceResultm_declaration_modifiers; - hasPointerRef = std::any_of(modifiers.begin(), - modifiers.end(), - [](const std::unique_ptr& modifier) - { - return modifier->GetType() == DeclarationModifierType::POINTER; - }); + hasPointerRef = std::ranges::any_of(modifiers, + [](const std::unique_ptr& modifier) + { + return modifier->GetType() == DeclarationModifierType::POINTER; + }); } if (typeDecl->m_type->GetType() == DataDefinitionType::TYPEDEF) diff --git a/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceString.cpp b/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceString.cpp index 79405a32..e0aedd8a 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceString.cpp +++ b/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceString.cpp @@ -39,12 +39,11 @@ void SequenceString::ProcessMatch(CommandsParserState* state, SequenceResultm_declaration_modifiers; - hasPointerRef = std::any_of(modifiers.begin(), - modifiers.end(), - [](const std::unique_ptr& modifier) - { - return modifier->GetType() == DeclarationModifierType::POINTER; - }); + hasPointerRef = std::ranges::any_of(modifiers, + [](const std::unique_ptr& modifier) + { + return modifier->GetType() == DeclarationModifierType::POINTER; + }); } if (typeDecl->m_type->GetType() == DataDefinitionType::TYPEDEF) diff --git a/src/ZoneCodeGeneratorLib/Parsing/Header/HeaderFileReader.cpp b/src/ZoneCodeGeneratorLib/Parsing/Header/HeaderFileReader.cpp index a3e73d53..a38e00b0 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/Header/HeaderFileReader.cpp +++ b/src/ZoneCodeGeneratorLib/Parsing/Header/HeaderFileReader.cpp @@ -91,10 +91,9 @@ bool HeaderFileReader::ReadHeaderFile(IDataRepository* repository) if (!result) return false; - return std::all_of(m_post_processors.begin(), - m_post_processors.end(), - [repository](const std::unique_ptr& postProcessor) - { - return postProcessor->PostProcess(repository); - }); + return std::ranges::all_of(m_post_processors, + [repository](const std::unique_ptr& postProcessor) + { + return postProcessor->PostProcess(repository); + }); } diff --git a/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/CreateMemberInformationPostProcessor.cpp b/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/CreateMemberInformationPostProcessor.cpp index 84c42dab..dd645778 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/CreateMemberInformationPostProcessor.cpp +++ b/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/CreateMemberInformationPostProcessor.cpp @@ -29,10 +29,9 @@ bool CreateMemberInformationPostProcessor::PostProcess(IDataRepository* reposito { const auto& allStructureInformation = repository->GetAllStructureInformation(); - return std::all_of(allStructureInformation.begin(), - allStructureInformation.end(), - [this, repository](StructureInformation* structure) - { - return CreateMemberInformationForStructure(repository, structure); - }); + return std::ranges::all_of(allStructureInformation, + [this, repository](StructureInformation* structure) + { + return CreateMemberInformationForStructure(repository, structure); + }); } diff --git a/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/UnionsPostProcessor.cpp b/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/UnionsPostProcessor.cpp index 311b580d..ec209f35 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/UnionsPostProcessor.cpp +++ b/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/UnionsPostProcessor.cpp @@ -40,13 +40,12 @@ bool UnionsPostProcessor::PostProcess(IDataRepository* repository) { const auto& allInfos = repository->GetAllStructureInformation(); - return std::all_of(allInfos.begin(), - allInfos.end(), - [](StructureInformation* info) - { - if (info->m_definition->GetType() != DataDefinitionType::UNION) - return true; + return std::ranges::all_of(allInfos, + [](StructureInformation* info) + { + if (info->m_definition->GetType() != DataDefinitionType::UNION) + return true; - return ProcessUnion(info); - }); + return ProcessUnion(info); + }); } diff --git a/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/UsagesPostProcessor.cpp b/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/UsagesPostProcessor.cpp index e8214f31..031bd695 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/UsagesPostProcessor.cpp +++ b/src/ZoneCodeGeneratorLib/Parsing/PostProcessing/UsagesPostProcessor.cpp @@ -63,11 +63,10 @@ bool UsagesPostProcessor::PostProcess(IDataRepository* repository) { const auto& allInfos = repository->GetAllStructureInformation(); - return std::all_of(allInfos.begin(), - allInfos.end(), - [](StructureInformation* info) - { - const StructureComputations computations(info); - return !computations.IsAsset() || ProcessAsset(info); - }); + return std::ranges::all_of(allInfos, + [](StructureInformation* info) + { + const StructureComputations computations(info); + return !computations.IsAsset() || ProcessAsset(info); + }); } diff --git a/src/ZoneCodeGeneratorLib/Printing/PrettyPrinter.cpp b/src/ZoneCodeGeneratorLib/Printing/PrettyPrinter.cpp index b7dde0ea..c8012ba5 100644 --- a/src/ZoneCodeGeneratorLib/Printing/PrettyPrinter.cpp +++ b/src/ZoneCodeGeneratorLib/Printing/PrettyPrinter.cpp @@ -97,12 +97,11 @@ void PrettyPrinter::PrintVariable(Variable* variable) const else { if (declarationModifiers[0]->GetType() == DeclarationModifierType::POINTER - && std::any_of(declarationModifiers.begin(), - declarationModifiers.end(), - [](const std::unique_ptr& modifier) - { - return modifier->GetType() == DeclarationModifierType::ARRAY; - })) + && std::ranges::any_of(declarationModifiers, + [](const std::unique_ptr& modifier) + { + return modifier->GetType() == DeclarationModifierType::ARRAY; + })) { PrintVariablePointerToArray(variable); } @@ -262,12 +261,11 @@ void PrettyPrinter::PrintTypedefs() const else { if (declarationModifiers[0]->GetType() == DeclarationModifierType::POINTER - && std::any_of(declarationModifiers.begin(), - declarationModifiers.end(), - [](const std::unique_ptr& modifier) - { - return modifier->GetType() == DeclarationModifierType::ARRAY; - })) + && std::ranges::any_of(declarationModifiers, + [](const std::unique_ptr& modifier) + { + return modifier->GetType() == DeclarationModifierType::ARRAY; + })) { PrintTypedefPointerToArray(typedefDefinition); } diff --git a/src/ZoneLoading/Loading/AssetMarker.cpp b/src/ZoneLoading/Loading/AssetMarker.cpp index c6ce0d17..5ea12738 100644 --- a/src/ZoneLoading/Loading/AssetMarker.cpp +++ b/src/ZoneLoading/Loading/AssetMarker.cpp @@ -82,7 +82,7 @@ std::vector AssetMarker::GetUsedScriptStrings() const for (auto scrString : m_used_script_strings) usedScriptStrings.push_back(scrString); - std::sort(usedScriptStrings.begin(), usedScriptStrings.end()); + std::ranges::sort(usedScriptStrings); } return usedScriptStrings; diff --git a/src/ZoneLoading/Loading/ZoneLoader.cpp b/src/ZoneLoading/Loading/ZoneLoader.cpp index 14557334..e3569b24 100644 --- a/src/ZoneLoading/Loading/ZoneLoader.cpp +++ b/src/ZoneLoading/Loading/ZoneLoader.cpp @@ -30,12 +30,11 @@ void ZoneLoader::AddXBlock(std::unique_ptr block) { m_blocks.push_back(block.get()); - std::sort(m_blocks.begin(), - m_blocks.end(), - [](XBlock* b1, XBlock* b2) -> bool - { - return b1->m_index < b2->m_index; - }); + std::ranges::sort(m_blocks, + [](XBlock* b1, XBlock* b2) -> bool + { + return b1->m_index < b2->m_index; + }); m_zone->GetMemory()->AddBlock(std::move(block)); } diff --git a/test/ParserTestUtils/Parsing/Mock/MockParserLineStream.cpp b/test/ParserTestUtils/Parsing/Mock/MockParserLineStream.cpp index 865e774a..2e0db56c 100644 --- a/test/ParserTestUtils/Parsing/Mock/MockParserLineStream.cpp +++ b/test/ParserTestUtils/Parsing/Mock/MockParserLineStream.cpp @@ -61,10 +61,9 @@ bool MockParserLineStream::IsOpen() const bool MockParserLineStream::Eof() const { - return !std::any_of(m_include_positions.begin(), - m_include_positions.end(), - [](const IncludePos& pos) - { - return pos.m_pos < pos.m_lines.size(); - }); + return !std::ranges::any_of(m_include_positions, + [](const IncludePos& pos) + { + return pos.m_pos < pos.m_lines.size(); + }); } diff --git a/test/ZoneCodeGeneratorLibTests/Parsing/Matcher/MatcherTests.cpp b/test/ZoneCodeGeneratorLibTests/Parsing/Matcher/MatcherTests.cpp index 912f2b40..be3b0046 100644 --- a/test/ZoneCodeGeneratorLibTests/Parsing/Matcher/MatcherTests.cpp +++ b/test/ZoneCodeGeneratorLibTests/Parsing/Matcher/MatcherTests.cpp @@ -973,7 +973,7 @@ namespace test::parsing::matcher [](HeaderMatcherFactory::token_list_t& tokens) { auto str = tokens[0].get().IdentifierValue(); - std::transform(str.begin(), str.end(), str.begin(), toupper); + std::ranges::transform(str, str.begin(), toupper); return HeaderParserValue::Identifier(tokens[0].get().GetPos(), new std::string(std::move(str))); }), create.Char('{'),