luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-15 01:25:20 +02:00
Code Activity

Deprecate special handling of ${key} syntax in metadata values (#12970)

Browse Source
This commit is contained in:
Jude Melton-Houghton
2022-11-24 17:56:43 -05:00
committed by GitHub
parent 3c7f26d937
commit 8817af07fb
6 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/metadata.cpp
View File

@@ -51,7 +51,7 @@ const std::string &IMetadata::getString(const std::string &name, std::string *pl
return empty_string;
}
return resolveString(*raw, place, recursion);
return resolveString(*raw, place, recursion, true);
}
bool IMetadata::getStringToRef(const std::string &name,
@@ -61,16 +61,21 @@ bool IMetadata::getStringToRef(const std::string &name,
if (!raw)
return false;
const std::string &resolved = resolveString(*raw, &str, recursion);
const std::string &resolved = resolveString(*raw, &str, recursion, true);
if (&resolved != &str)
str = resolved;
return true;
}
const std::string &IMetadata::resolveString(const std::string &str, std::string *place,
u16 recursion) const
u16 recursion, bool deprecated) const
{
if (recursion <= 1 && str.substr(0, 2) == "${" && str[str.length() - 1] == '}') {
if (deprecated) {
warningstream << "Deprecated use of recursive resolution syntax in metadata: ";
safe_print_string(warningstream, str);
warningstream << std::endl;
}
// It may be the case that &str == place, but that's fine.
return getString(str.substr(2, str.length() - 3), place, recursion + 1);
}