dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: replace for loops with endof with range-based for loops

Browse Source
This commit is contained in:
Rubidium
2024-04-07 22:18:39 +02:00
committed by rubidium42
parent 095bdf32fe
commit 4e6d4fcf32
6 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/strgen/strgen.cpp
View File

@@ -337,25 +337,25 @@ int CDECL main(int argc, char *argv[])
switch (i) {
case 'C':
fmt::print("args\tflags\tcommand\treplacement\n");
for (const CmdStruct *cs = _cmd_structs; cs < endof(_cmd_structs); cs++) {
for (const auto &cs : _cmd_structs) {
char flags;
if (cs->proc == EmitGender) {
if (cs.proc == EmitGender) {
flags = 'g'; // Command needs number of parameters defined by number of genders
} else if (cs->proc == EmitPlural) {
} else if (cs.proc == EmitPlural) {
flags = 'p'; // Command needs number of parameters defined by plural value
} else if (cs->flags & C_DONTCOUNT) {
} else if (cs.flags & C_DONTCOUNT) {
flags = 'i'; // Command may be in the translation when it is not in base
} else {
flags = '0'; // Command needs no parameters
}
fmt::print("{}\t{:c}\t\"{}\"\t\"{}\"\n", cs->consumes, flags, cs->cmd, strstr(cs->cmd, "STRING") ? "STRING" : cs->cmd);
fmt::print("{}\t{:c}\t\"{}\"\t\"{}\"\n", cs.consumes, flags, cs.cmd, strstr(cs.cmd, "STRING") ? "STRING" : cs.cmd);
}
return 0;
case 'L':
fmt::print("count\tdescription\tnames\n");
for (const PluralForm *pf = _plural_forms; pf < endof(_plural_forms); pf++) {
fmt::print("{}\t\"{}\"\t{}\n", pf->plural_count, pf->description, pf->names);
for (const auto &pf : _plural_forms) {
fmt::print("{}\t\"{}\"\t{}\n", pf.plural_count, pf.description, pf.names);
}
return 0;

4
src/strgen/strgen_base.cpp
View File

@@ -420,8 +420,8 @@ void EmitGender(Buffer *buffer, char *buf, int)
static const CmdStruct *FindCmd(const char *s, int len)
{
for (const CmdStruct *cs = _cmd_structs; cs != endof(_cmd_structs); cs++) {
if (strncmp(cs->cmd, s, len) == 0 && cs->cmd[len] == '\0') return cs;
for (const auto &cs : _cmd_structs) {
if (strncmp(cs.cmd, s, len) == 0 && cs.cmd[len] == '\0') return &cs;
}
return nullptr;
}