oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-22 17:18:39 +00:00
Code Wiki 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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);
}

2
src/metadata.h
View file

@ -65,7 +65,7 @@ public:
// Add support for variable names in values. Uses place like getString.
const std::string &resolveString(const std::string &str, std::string *place,
u16 recursion = 0) const;
u16 recursion = 0, bool deprecated = false) const;
protected:
// Returns nullptr to indicate absence of value. Uses place like getString.

1
src/util/string.h
View file

@ -459,6 +459,7 @@ inline void str_formspec_escape(std::string &str)
str_replace(str, "[", "\\[");
str_replace(str, ";", "\\;");
str_replace(str, ",", "\\,");
str_replace(str, "$", "\\$");
}
/**