Merge pull request #92570 from rune-scape/rune-stringname-bits

StringName: `operator==` compares in-place

core/string/string_name.cpp

@@ -39,6 +39,30 @@ StaticCString StaticCString::create(const char *p_ptr) {
 	return scs;
 }
 
+bool StringName::_Data::operator==(const String &p_name) const {
+	if (cname) {
+		return p_name == cname;
+	} else {
+		return name == p_name;
+	}
+}
+
+bool StringName::_Data::operator!=(const String &p_name) const {
+	return !operator==(p_name);
+}
+
+bool StringName::_Data::operator==(const char *p_name) const {
+	if (cname) {
+		return strcmp(cname, p_name) == 0;
+	} else {
+		return name == p_name;
+	}
+}
+
+bool StringName::_Data::operator!=(const char *p_name) const {
+	return !operator==(p_name);
+}
+
 StringName _scs_create(const char *p_chr, bool p_static) {
 	return (p_chr[0] ? StringName(StaticCString::create(p_chr), p_static) : StringName());
 }
@@ -139,19 +163,19 @@ void StringName::unref() {
 }
 
 bool StringName::operator==(const String &p_name) const {
-	if (!_data) {
+	if (_data) {
-		return (p_name.length() == 0);
+		return _data->operator==(p_name);
 	}
 
-	return (_data->get_name() == p_name);
+	return p_name.is_empty();
 }
 
 bool StringName::operator==(const char *p_name) const {
-	if (!_data) {
+	if (_data) {
-		return (p_name[0] == 0);
+		return _data->operator==(p_name);
 	}
 
-	return (_data->get_name() == p_name);
+	return p_name[0] == 0;
 }
 
 bool StringName::operator!=(const String &p_name) const {
@@ -168,9 +192,47 @@ bool StringName::operator!=(const StringName &p_name) const {
 	return _data != p_name._data;
 }
 
-void StringName::operator=(const StringName &p_name) {
+char32_t StringName::operator[](int p_index) const {
+	if (_data) {
+		if (_data->cname) {
+			CRASH_BAD_INDEX(p_index, static_cast<long>(strlen(_data->cname)));
+			return _data->cname[p_index];
+		} else {
+			return _data->name[p_index];
+		}
+	}
+
+	CRASH_BAD_INDEX(p_index, 0);
+	return 0;
+}
+
+int StringName::length() const {
+	if (_data) {
+		if (_data->cname) {
+			return strlen(_data->cname);
+		} else {
+			return _data->name.length();
+		}
+	}
+
+	return 0;
+}
+
+bool StringName::is_empty() const {
+	if (_data) {
+		if (_data->cname) {
+			return _data->cname[0] == 0;
+		} else {
+			return _data->name.is_empty();
+		}
+	}
+
+	return true;
+}
+
+StringName &StringName::operator=(const StringName &p_name) {
 	if (this == &p_name) {
-		return;
+		return *this;
 	}
 
 	unref();
@@ -178,6 +240,8 @@ void StringName::operator=(const StringName &p_name) {
 	if (p_name._data && p_name._data->refcount.ref()) {
 		_data = p_name._data;
 	}
+
+	return *this;
 }
 
 StringName::StringName(const StringName &p_name) {
@@ -216,7 +280,7 @@ StringName::StringName(const char *p_name, bool p_static) {
 
 	while (_data) {
 		// compare hash first
-		if (_data->hash == hash && _data->get_name() == p_name) {
+		if (_data->hash == hash && _data->operator==(p_name)) {
 			break;
 		}
 		_data = _data->next;
@@ -275,7 +339,7 @@ StringName::StringName(const StaticCString &p_static_string, bool p_static) {
 
 	while (_data) {
 		// compare hash first
-		if (_data->hash == hash && _data->get_name() == p_static_string.ptr) {
+		if (_data->hash == hash && _data->operator==(p_static_string.ptr)) {
 			break;
 		}
 		_data = _data->next;
@@ -333,7 +397,7 @@ StringName::StringName(const String &p_name, bool p_static) {
 	_data = _table[idx];
 
 	while (_data) {
-		if (_data->hash == hash && _data->get_name() == p_name) {
+		if (_data->hash == hash && _data->operator==(p_name)) {
 			break;
 		}
 		_data = _data->next;
@@ -392,7 +456,7 @@ StringName StringName::search(const char *p_name) {
 
 	while (_data) {
 		// compare hash first
-		if (_data->hash == hash && _data->get_name() == p_name) {
+		if (_data->hash == hash && _data->operator==(p_name)) {
 			break;
 		}
 		_data = _data->next;
@@ -429,7 +493,7 @@ StringName StringName::search(const char32_t *p_name) {
 
 	while (_data) {
 		// compare hash first
-		if (_data->hash == hash && _data->get_name() == p_name) {
+		if (_data->hash == hash && _data->operator==(p_name)) {
 			break;
 		}
 		_data = _data->next;
@@ -455,7 +519,7 @@ StringName StringName::search(const String &p_name) {
 
 	while (_data) {
 		// compare hash first
-		if (_data->hash == hash && p_name == _data->get_name()) {
+		if (_data->hash == hash && _data->operator==(p_name)) {
 			break;
 		}
 		_data = _data->next;
@@ -474,15 +538,15 @@ StringName StringName::search(const String &p_name) {
 }
 
 bool operator==(const String &p_name, const StringName &p_string_name) {
-	return p_name == p_string_name.operator String();
+	return p_string_name.operator==(p_name);
 }
 bool operator!=(const String &p_name, const StringName &p_string_name) {
-	return p_name != p_string_name.operator String();
+	return p_string_name.operator!=(p_name);
 }
 
 bool operator==(const char *p_name, const StringName &p_string_name) {
-	return p_name == p_string_name.operator String();
+	return p_string_name.operator==(p_name);
 }
 bool operator!=(const char *p_name, const StringName &p_string_name) {
-	return p_name != p_string_name.operator String();
+	return p_string_name.operator!=(p_name);
 }

core/string/string_name.h

@@ -60,6 +60,11 @@ class StringName {
 		uint32_t debug_references = 0;
 #endif
 		String get_name() const { return cname ? String(cname) : name; }
+		bool operator==(const String &p_name) const;
+		bool operator!=(const String &p_name) const;
+		bool operator==(const char *p_name) const;
+		bool operator!=(const char *p_name) const;
+
 		int idx = 0;
 		uint32_t hash = 0;
 		_Data *prev = nullptr;
@@ -99,6 +104,10 @@ public:
 	bool operator!=(const String &p_name) const;
 	bool operator!=(const char *p_name) const;
 
+	char32_t operator[](int p_index) const;
+	int length() const;
+	bool is_empty() const;
+
 	_FORCE_INLINE_ bool is_node_unique_name() const {
 		if (!_data) {
 			return false;
@@ -175,7 +184,7 @@ public:
 		}
 	};
 
-	void operator=(const StringName &p_name);
+	StringName &operator=(const StringName &p_name);
 	StringName(const char *p_name, bool p_static = false);
 	StringName(const StringName &p_name);
 	StringName(const String &p_name, bool p_static = false);