godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

StringLikeVariantOrder: Compare in-place

Browse Source
This commit is contained in:
rune-scape
2024-10-21 20:32:03 -07:00
parent fc827bbe25
commit 0c7d78f455
5 changed files with 60 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/variant/variant.cpp
View File

@@ -3406,6 +3406,26 @@ bool StringLikeVariantComparator::compare(const Variant &p_lhs, const Variant &p
return false;
}
bool StringLikeVariantOrder::compare(const Variant &p_lhs, const Variant &p_rhs) {
if (p_lhs.get_type() == Variant::STRING) {
const String &lhs = *VariantInternal::get_string(&p_lhs);
if (p_rhs.get_type() == Variant::STRING) {
return StringName::AlphCompare::compare(lhs, *VariantInternal::get_string(&p_rhs));
} else if (p_rhs.get_type() == Variant::STRING_NAME) {
return StringName::AlphCompare::compare(lhs, *VariantInternal::get_string_name(&p_rhs));
}
} else if (p_lhs.get_type() == Variant::STRING_NAME) {
const StringName &lhs = *VariantInternal::get_string_name(&p_lhs);
if (p_rhs.get_type() == Variant::STRING) {
return StringName::AlphCompare::compare(lhs, *VariantInternal::get_string(&p_rhs));
} else if (p_rhs.get_type() == Variant::STRING_NAME) {
return StringName::AlphCompare::compare(lhs, *VariantInternal::get_string_name(&p_rhs));
}
}
return p_lhs < p_rhs;
}
bool Variant::is_ref_counted() const {
return type == OBJECT && _get_obj().id.is_ref_counted();
}