mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-31 08:04:36 +01:00
Code Issues Releases Wiki Activity

Codechange: Use std-find instead of for-loops in strgen. (#14754)

Browse Source
This commit is contained in:
Peter Nelson
2025-11-04 15:26:15 +00:00
committed by GitHub
parent 3befbdd52f
commit 06d8e039c6
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/strgen/strgen.h
View File

@@ -137,6 +137,8 @@ struct CmdStruct;
struct CmdPair {
const CmdStruct *cmd;
std::string param;
auto operator<=>(const CmdPair &other) const = default;
};
struct ParsedCommandStruct {

21
src/strgen/strgen_base.cpp
View File

@@ -313,9 +313,8 @@ void EmitGender(StringBuilder &builder, std::string_view param, char32_t)
static const CmdStruct *FindCmd(std::string_view s)
{
for (const auto &cs : _cmd_structs) {
if (cs.cmd == s) return &cs;
}
auto it = std::ranges::find(_cmd_structs, s, &CmdStruct::cmd);
if (it != std::end(_cmd_structs)) return &*it;
return nullptr;
}
@@ -449,17 +448,11 @@ static bool CheckCommandsMatch(std::string_view a, std::string_view b, std::stri
for (auto &templ_nc : templ.non_consuming_commands) {
/* see if we find it in lang, and zero it out */
bool found = false;
for (auto &lang_nc : lang.non_consuming_commands) {
if (templ_nc.cmd == lang_nc.cmd && templ_nc.param == lang_nc.param) {
/* it was found in both. zero it out from lang so we don't find it again */
lang_nc.cmd = nullptr;
found = true;
break;
}
}
if (!found) {
auto it = std::ranges::find(lang.non_consuming_commands, templ_nc);
if (it != std::end(lang.non_consuming_commands)) {
/* it was found in both. zero it out from lang so we don't find it again */
it->cmd = nullptr;
} else {
StrgenWarning("{}: command '{}' exists in template file but not in language file", name, templ_nc.cmd->cmd);
result = false;
}