Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-10 06:03:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

StringName Dictionary keys

Browse Source 
also added 'is_string()' method to Variant
and refactored many String type comparisons to use it instead
This commit is contained in:
rune-scape 2023-12-28 14:44:23 -08:00 committed by rune-scape
parent 40b378e9e2
commit 154049ce17
34 changed files with 65 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/object/object.cpp
View File

@ -605,7 +605,7 @@ Variant Object::_call_bind(const Variant **p_args, int p_argcount, Callable::Cal
return Variant(); return Variant();
} }
if (p_args[0]->get_type() != Variant::STRING_NAME && p_args[0]->get_type() != Variant::STRING) { if (!p_args[0]->is_string()) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 0; r_error.argument = 0;
r_error.expected = Variant::STRING_NAME; r_error.expected = Variant::STRING_NAME;
@ -624,7 +624,7 @@ Variant Object::_call_deferred_bind(const Variant **p_args, int p_argcount, Call
return Variant(); return Variant();
} }
if (p_args[0]->get_type() != Variant::STRING_NAME && p_args[0]->get_type() != Variant::STRING) { if (!p_args[0]->is_string()) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 0; r_error.argument = 0;
r_error.expected = Variant::STRING_NAME; r_error.expected = Variant::STRING_NAME;
@ -720,7 +720,7 @@ Variant Object::getvar(const Variant &p_key, bool *r_valid) const {
*r_valid = false; *r_valid = false;
} }
if (p_key.get_type() == Variant::STRING_NAME || p_key.get_type() == Variant::STRING) { if (p_key.is_string()) {
return get(p_key, r_valid); return get(p_key, r_valid);
} }
return Variant(); return Variant();
@ -730,7 +730,7 @@ void Object::setvar(const Variant &p_key, const Variant &p_value, bool *r_valid)
if (r_valid) { if (r_valid) {
*r_valid = false; *r_valid = false;
} }
if (p_key.get_type() == Variant::STRING_NAME || p_key.get_type() == Variant::STRING) { if (p_key.is_string()) {
return set(p_key, p_value, r_valid); return set(p_key, p_value, r_valid);
} }
} }
@ -1096,7 +1096,7 @@ Error Object::_emit_signal(const Variant **p_args, int p_argcount, Callable::Cal
ERR_FAIL_V(Error::ERR_INVALID_PARAMETER); ERR_FAIL_V(Error::ERR_INVALID_PARAMETER);
} }
if (unlikely(p_args[0]->get_type() != Variant::STRING_NAME && p_args[0]->get_type() != Variant::STRING)) { if (unlikely(!p_args[0]->is_string())) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 0; r_error.argument = 0;
r_error.expected = Variant::STRING_NAME; r_error.expected = Variant::STRING_NAME;

17
core/variant/dictionary.cpp
View File

@ -81,15 +81,7 @@ Variant Dictionary::get_value_at_index(int p_index) const {
Variant &Dictionary::operator[](const Variant &p_key) { Variant &Dictionary::operator[](const Variant &p_key) {
if (unlikely(_p->read_only)) { if (unlikely(_p->read_only)) {
if (p_key.get_type() == Variant::STRING_NAME) { if (likely(_p->variant_map.has(p_key))) {
const StringName *sn = VariantInternal::get_string_name(&p_key);
const String &key = sn->operator String();
if (likely(_p->variant_map.has(key))) {
*_p->read_only = _p->variant_map[key];
} else {
*_p->read_only = Variant();
}
} else if (likely(_p->variant_map.has(p_key))) {
*_p->read_only = _p->variant_map[p_key]; *_p->read_only = _p->variant_map[p_key];
} else { } else {
*_p->read_only = Variant(); *_p->read_only = Variant();
@ -97,12 +89,7 @@ Variant &Dictionary::operator[](const Variant &p_key) {
return *_p->read_only; return *_p->read_only;
} else { } else {
if (p_key.get_type() == Variant::STRING_NAME) { return _p->variant_map[p_key];
const StringName *sn = VariantInternal::get_string_name(&p_key);
return _p->variant_map[sn->operator String()];
} else {
return _p->variant_map[p_key];
}
} }
} }

9
core/variant/variant_construct.h
View File

@ -232,7 +232,7 @@ template <typename T>
class VariantConstructorFromString { class VariantConstructorFromString {
public: public:
static void construct(Variant &r_ret, const Variant **p_args, Callable::CallError &r_error) { static void construct(Variant &r_ret, const Variant **p_args, Callable::CallError &r_error) {
if (p_args[0]->get_type() != Variant::STRING) { if (!p_args[0]->is_string()) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 0; r_error.argument = 0;
r_error.expected = Variant::STRING; r_error.expected = Variant::STRING;
@ -240,7 +240,7 @@ public:
} }
VariantTypeChanger<T>::change(&r_ret); VariantTypeChanger<T>::change(&r_ret);
const String &src_str = *VariantGetInternalPtr<String>::get_ptr(p_args[0]); const String src_str = *p_args[0];
if (r_ret.get_type() == Variant::Type::INT) { if (r_ret.get_type() == Variant::Type::INT) {
r_ret = src_str.to_int(); r_ret = src_str.to_int();
@ -417,7 +417,7 @@ public:
return; return;
} }
if (p_args[2]->get_type() != Variant::STRING_NAME) { if (!p_args[2]->is_string()) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 2; r_error.argument = 2;
r_error.expected = Variant::STRING_NAME; r_error.expected = Variant::STRING_NAME;
@ -426,8 +426,7 @@ public:
const Array &base_arr = *VariantGetInternalPtr<Array>::get_ptr(p_args[0]); const Array &base_arr = *VariantGetInternalPtr<Array>::get_ptr(p_args[0]);
const uint32_t type = p_args[1]->operator uint32_t(); const uint32_t type = p_args[1]->operator uint32_t();
const StringName &class_name = *VariantGetInternalPtr<StringName>::get_ptr(p_args[2]); r_ret = Array(base_arr, type, *p_args[2], *p_args[3]);
r_ret = Array(base_arr, type, class_name, *p_args[3]);
} }
static inline void validated_construct(Variant *r_ret, const Variant **p_args) { static inline void validated_construct(Variant *r_ret, const Variant **p_args) {

4
core/variant/variant_setget.cpp
View File

@ -1288,8 +1288,8 @@ void Variant::get_property_list(List<PropertyInfo> *p_list) const {
List<Variant> keys; List<Variant> keys;
dic->get_key_list(&keys); dic->get_key_list(&keys);
for (const Variant &E : keys) { for (const Variant &E : keys) {
if (E.get_type() == Variant::STRING) { if (E.is_string()) {
p_list->push_back(PropertyInfo(Variant::STRING, E)); p_list->push_back(PropertyInfo(dic->get_valid(E).get_type(), E));
} }
} }
} else if (type == OBJECT) { } else if (type == OBJECT) {

2
editor/debugger/editor_debugger_inspector.cpp
View File

@ -151,7 +151,7 @@ ObjectID EditorDebuggerInspector::add_object(const Array &p_arr) {
Variant &var = property.second; Variant &var = property.second;
if (pinfo.type == Variant::OBJECT) { if (pinfo.type == Variant::OBJECT) {
if (var.get_type() == Variant::STRING) { if (var.is_string()) {
String path = var; String path = var;
if (path.contains("::")) { if (path.contains("::")) {
// built-in resource // built-in resource

8
editor/editor_build_profile.cpp
View File

@ -649,7 +649,7 @@ void EditorBuildProfileManager::_class_list_item_selected() {
} }
Variant md = item->get_metadata(0); Variant md = item->get_metadata(0);
if (md.get_type() == Variant::STRING || md.get_type() == Variant::STRING_NAME) { if (md.is_string()) {
description_bit->parse_symbol("class|" + md.operator String() + "|"); description_bit->parse_symbol("class|" + md.operator String() + "|");
} else if (md.get_type() == Variant::INT) { } else if (md.get_type() == Variant::INT) {
String build_option_description = EditorBuildProfile::get_build_option_description(EditorBuildProfile::BuildOption((int)md)); String build_option_description = EditorBuildProfile::get_build_option_description(EditorBuildProfile::BuildOption((int)md));
@ -670,7 +670,7 @@ void EditorBuildProfileManager::_class_list_item_edited() {
bool checked = item->is_checked(0); bool checked = item->is_checked(0);
Variant md = item->get_metadata(0); Variant md = item->get_metadata(0);
if (md.get_type() == Variant::STRING || md.get_type() == Variant::STRING_NAME) { if (md.is_string()) {
String class_selected = md; String class_selected = md;
edited->set_disable_class(class_selected, !checked); edited->set_disable_class(class_selected, !checked);
_update_edited_profile(); _update_edited_profile();
@ -691,7 +691,7 @@ void EditorBuildProfileManager::_class_list_item_collapsed(Object *p_item) {
} }
Variant md = item->get_metadata(0); Variant md = item->get_metadata(0);
if (md.get_type() != Variant::STRING && md.get_type() != Variant::STRING_NAME) { if (!md.is_string()) {
return; return;
} }
@ -706,7 +706,7 @@ void EditorBuildProfileManager::_update_edited_profile() {
if (class_list->get_selected()) { if (class_list->get_selected()) {
Variant md = class_list->get_selected()->get_metadata(0); Variant md = class_list->get_selected()->get_metadata(0);
if (md.get_type() == Variant::STRING || md.get_type() == Variant::STRING_NAME) { if (md.is_string()) {
class_selected = md; class_selected = md;
} else if (md.get_type() == Variant::INT) { } else if (md.get_type() == Variant::INT) {
build_option_selected = md; build_option_selected = md;

12
editor/editor_feature_profile.cpp
View File

@ -558,7 +558,7 @@ void EditorFeatureProfileManager::_class_list_item_selected() {
} }
Variant md = item->get_metadata(0); Variant md = item->get_metadata(0);
if (md.get_type() == Variant::STRING || md.get_type() == Variant::STRING_NAME) { if (md.is_string()) {
description_bit->parse_symbol("class|" + md.operator String() + "|"); description_bit->parse_symbol("class|" + md.operator String() + "|");
} else if (md.get_type() == Variant::INT) { } else if (md.get_type() == Variant::INT) {
String feature_description = EditorFeatureProfile::get_feature_description(EditorFeatureProfile::Feature((int)md)); String feature_description = EditorFeatureProfile::get_feature_description(EditorFeatureProfile::Feature((int)md));
@ -643,7 +643,7 @@ void EditorFeatureProfileManager::_class_list_item_edited() {
bool checked = item->is_checked(0); bool checked = item->is_checked(0);
Variant md = item->get_metadata(0); Variant md = item->get_metadata(0);
if (md.get_type() == Variant::STRING || md.get_type() == Variant::STRING_NAME) { if (md.is_string()) {
String class_selected = md; String class_selected = md;
edited->set_disable_class(class_selected, !checked); edited->set_disable_class(class_selected, !checked);
_save_and_update(); _save_and_update();
@ -666,7 +666,7 @@ void EditorFeatureProfileManager::_class_list_item_collapsed(Object *p_item) {
} }
Variant md = item->get_metadata(0); Variant md = item->get_metadata(0);
if (md.get_type() != Variant::STRING && md.get_type() != Variant::STRING_NAME) { if (!md.is_string()) {
return; return;
} }
@ -686,7 +686,7 @@ void EditorFeatureProfileManager::_property_item_edited() {
} }
Variant md = class_item->get_metadata(0); Variant md = class_item->get_metadata(0);
if (md.get_type() != Variant::STRING && md.get_type() != Variant::STRING_NAME) { if (!md.is_string()) {
return; return;
} }
@ -699,7 +699,7 @@ void EditorFeatureProfileManager::_property_item_edited() {
bool checked = item->is_checked(0); bool checked = item->is_checked(0);
md = item->get_metadata(0); md = item->get_metadata(0);
if (md.get_type() == Variant::STRING || md.get_type() == Variant::STRING_NAME) { if (md.is_string()) {
String property_selected = md; String property_selected = md;
edited->set_disable_class_property(class_name, property_selected, !checked); edited->set_disable_class_property(class_name, property_selected, !checked);
_save_and_update(); _save_and_update();
@ -732,7 +732,7 @@ void EditorFeatureProfileManager::_update_selected_profile() {
if (class_list->get_selected()) { if (class_list->get_selected()) {
Variant md = class_list->get_selected()->get_metadata(0); Variant md = class_list->get_selected()->get_metadata(0);
if (md.get_type() == Variant::STRING || md.get_type() == Variant::STRING_NAME) { if (md.is_string()) {
class_selected = md; class_selected = md;
} else if (md.get_type() == Variant::INT) { } else if (md.get_type() == Variant::INT) {
feature_selected = md; feature_selected = md;

4
editor/editor_undo_redo_manager.cpp
View File

@ -177,7 +177,7 @@ void EditorUndoRedoManager::_add_do_method(const Variant **p_args, int p_argcoun
return; return;
} }
if (p_args[1]->get_type() != Variant::STRING_NAME && p_args[1]->get_type() != Variant::STRING) { if (!p_args[1]->is_string()) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 1; r_error.argument = 1;
r_error.expected = Variant::STRING_NAME; r_error.expected = Variant::STRING_NAME;
@ -206,7 +206,7 @@ void EditorUndoRedoManager::_add_undo_method(const Variant **p_args, int p_argco
return; return;
} }
if (p_args[1]->get_type() != Variant::STRING_NAME && p_args[1]->get_type() != Variant::STRING) { if (!p_args[1]->is_string()) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 1; r_error.argument = 1;
r_error.expected = Variant::STRING_NAME; r_error.expected = Variant::STRING_NAME;

4
editor/plugins/visual_shader_editor_plugin.cpp
View File

@ -2201,7 +2201,7 @@ void VisualShaderEditor::_update_options_menu() {
if (input.is_valid()) { if (input.is_valid()) {
input->set_shader_mode(visual_shader->get_mode()); input->set_shader_mode(visual_shader->get_mode());
input->set_shader_type(visual_shader->get_shader_type()); input->set_shader_type(visual_shader->get_shader_type());
if (!add_options[i].ops.is_empty() && add_options[i].ops[0].get_type() == Variant::STRING) { if (!add_options[i].ops.is_empty() && add_options[i].ops[0].is_string()) {
input->set_input_name((String)add_options[i].ops[0]); input->set_input_name((String)add_options[i].ops[0]);
} }
} }
@ -3281,7 +3281,7 @@ void VisualShaderEditor::_setup_node(VisualShaderNode *p_node, const Vector<Vari
VisualShaderNodeInput *input = Object::cast_to<VisualShaderNodeInput>(p_node); VisualShaderNodeInput *input = Object::cast_to<VisualShaderNodeInput>(p_node);
if (input) { if (input) {
ERR_FAIL_COND(p_ops[0].get_type() != Variant::STRING); ERR_FAIL_COND(!p_ops[0].is_string());
input->set_input_name((String)p_ops[0]); input->set_input_name((String)p_ops[0]);
return; return;
} }

2
modules/gdscript/editor/gdscript_translation_parser_plugin.cpp
View File

@ -71,7 +71,7 @@ Error GDScriptEditorTranslationParserPlugin::parse_file(const String &p_path, Ve
bool GDScriptEditorTranslationParserPlugin::_is_constant_string(const GDScriptParser::ExpressionNode *p_expression) { bool GDScriptEditorTranslationParserPlugin::_is_constant_string(const GDScriptParser::ExpressionNode *p_expression) {
ERR_FAIL_NULL_V(p_expression, false); ERR_FAIL_NULL_V(p_expression, false);
return p_expression->is_constant && (p_expression->reduced_value.get_type() == Variant::STRING || p_expression->reduced_value.get_type() == Variant::STRING_NAME); return p_expression->is_constant && p_expression->reduced_value.is_string();
} }
void GDScriptEditorTranslationParserPlugin::_traverse_class(const GDScriptParser::ClassNode *p_class) { void GDScriptEditorTranslationParserPlugin::_traverse_class(const GDScriptParser::ClassNode *p_class) {

2
modules/gdscript/gdscript_editor.cpp
View File

@ -1997,7 +1997,7 @@ static bool _guess_expression_type(GDScriptParser::CompletionContext &p_context,
} }
// Look for valid indexing in other types // Look for valid indexing in other types
if (!found && (index.value.get_type() == Variant::STRING || index.value.get_type() == Variant::NODE_PATH)) { if (!found && (index.value.is_string() || index.value.get_type() == Variant::NODE_PATH)) {
StringName id = index.value; StringName id = index.value;
found = _guess_identifier_type_from_base(c, base, id, r_type); found = _guess_identifier_type_from_base(c, base, id, r_type);
} else if (!found && index.type.kind == GDScriptParser::DataType::BUILTIN) { } else if (!found && index.type.kind == GDScriptParser::DataType::BUILTIN) {

2
modules/gdscript/gdscript_utility_functions.cpp
View File

@ -232,7 +232,7 @@ struct GDScriptUtilityFunctionsDefinitions {
static inline void load(Variant *r_ret, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) { static inline void load(Variant *r_ret, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
VALIDATE_ARG_COUNT(1); VALIDATE_ARG_COUNT(1);
if (p_args[0]->get_type() != Variant::STRING) { if (!p_args[0]->is_string()) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 0; r_error.argument = 0;
r_error.expected = Variant::STRING; r_error.expected = Variant::STRING;

2
modules/gdscript/language_server/gdscript_text_document.cpp
View File

@ -309,7 +309,7 @@ Dictionary GDScriptTextDocument::resolve(const Dictionary &p_params) {
params.load(p_params["data"]); params.load(p_params["data"]);
symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(params, item.label, item.kind == lsp::CompletionItemKind::Method || item.kind == lsp::CompletionItemKind::Function); symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(params, item.label, item.kind == lsp::CompletionItemKind::Method || item.kind == lsp::CompletionItemKind::Function);
} else if (data.get_type() == Variant::STRING) { } else if (data.is_string()) {
String query = data; String query = data;
Vector<String> param_symbols = query.split(SYMBOL_SEPERATOR, false); Vector<String> param_symbols = query.split(SYMBOL_SEPERATOR, false);

2
modules/gdscript/language_server/godot_lsp.h
View File

@ -1064,7 +1064,7 @@ struct CompletionItem {
} }
if (p_dict.has("documentation")) { if (p_dict.has("documentation")) {
Variant doc = p_dict["documentation"]; Variant doc = p_dict["documentation"];
if (doc.get_type() == Variant::STRING) { if (doc.is_string()) {
documentation.value = doc; documentation.value = doc;
} else if (doc.get_type() == Variant::DICTIONARY) { } else if (doc.get_type() == Variant::DICTIONARY) {
Dictionary v = doc; Dictionary v = doc;

4
modules/gdscript/tests/scripts/analyzer/warnings/confusable_capture_reassignment.out
View File

@ -15,5 +15,5 @@ GDTEST_OK
>> Line: 16 >> Line: 16
>> CONFUSABLE_CAPTURE_REASSIGNMENT >> CONFUSABLE_CAPTURE_REASSIGNMENT
>> Reassigning lambda capture does not modify the outer local variable "array_assign". >> Reassigning lambda capture does not modify the outer local variable "array_assign".
lambda 2 2 12 (2, 0) [2] [2] { "x": 2 } lambda 2 2 12 (2, 0) [2] [2] { &"x": 2 }
outer 2 1 1 (1, 0) [1] [2] { "x": 2 } outer 2 1 1 (1, 0) [1] [2] { &"x": 2 }

2
modules/gdscript/tests/scripts/parser/features/dictionary_lua_style.out
View File

@ -1,2 +1,2 @@
GDTEST_OK GDTEST_OK
{ "a": 1, "b": 2, "with spaces": 3, "2": 4 } { &"a": 1, &"b": 2, &"with spaces": 3, &"2": 4 }

2
modules/gdscript/tests/scripts/parser/features/dictionary_mixed_syntax.out
View File

@ -1,2 +1,2 @@
GDTEST_OK GDTEST_OK
{ "hello": { "world": { "is": "beautiful" } } } { "hello": { &"world": { "is": "beautiful" } } }

4
modules/gdscript/tests/scripts/runtime/features/dictionary_string_stringname_equivalent.gd
View File

@ -7,11 +7,11 @@ func test():
stringname_dict[&"abc"] = 24 stringname_dict[&"abc"] = 24
print("String key is TYPE_STRING: ", typeof(string_dict.keys()[0]) == TYPE_STRING) print("String key is TYPE_STRING: ", typeof(string_dict.keys()[0]) == TYPE_STRING)
print("StringName key is TYPE_STRING: ", typeof(stringname_dict.keys()[0]) == TYPE_STRING) print("StringName key is TYPE_STRING_NAME: ", typeof(stringname_dict.keys()[0]) == TYPE_STRING_NAME)
print("StringName gets String: ", string_dict.get(&"abc")) print("StringName gets String: ", string_dict.get(&"abc"))
print("String gets StringName: ", stringname_dict.get("abc")) print("String gets StringName: ", stringname_dict.get("abc"))
stringname_dict[&"abc"] = 42 stringname_dict[&"abc"] = 42
# They compare equal because StringName keys are converted to String. # They compare equal because StringName keys are considered equivalent to String keys.
print("String Dictionary == StringName Dictionary: ", string_dict == stringname_dict) print("String Dictionary == StringName Dictionary: ", string_dict == stringname_dict)

2
modules/gdscript/tests/scripts/runtime/features/dictionary_string_stringname_equivalent.out
View File

@ -1,6 +1,6 @@
GDTEST_OK GDTEST_OK
String key is TYPE_STRING: true String key is TYPE_STRING: true
StringName key is TYPE_STRING: true StringName key is TYPE_STRING_NAME: true
StringName gets String: 42 StringName gets String: 42
String gets StringName: 24 String gets StringName: 24
String Dictionary == StringName Dictionary: true String Dictionary == StringName Dictionary: true

2
modules/multiplayer/scene_rpc_interface.cpp
View File

@ -82,7 +82,7 @@ void SceneRPCInterface::_parse_rpc_config(const Variant &p_config, bool p_for_no
Array names = config.keys(); Array names = config.keys();
names.sort(); // Ensure ID order names.sort(); // Ensure ID order
for (int i = 0; i < names.size(); i++) { for (int i = 0; i < names.size(); i++) {
ERR_CONTINUE(names[i].get_type() != Variant::STRING && names[i].get_type() != Variant::STRING_NAME); ERR_CONTINUE(!names[i].is_string());
String name = names[i].operator String(); String name = names[i].operator String();
ERR_CONTINUE(config[name].get_type() != Variant::DICTIONARY); ERR_CONTINUE(config[name].get_type() != Variant::DICTIONARY);
ERR_CONTINUE(!config[name].operator Dictionary().has("rpc_mode")); ERR_CONTINUE(!config[name].operator Dictionary().has("rpc_mode"));

4
modules/regex/regex.cpp
View File

@ -54,8 +54,8 @@ int RegExMatch::_find(const Variant &p_name) const {
return -1; return -1;
} }
return i; return i;
} else if (p_name.get_type() == Variant::STRING || p_name.get_type() == Variant::STRING_NAME) { } else if (p_name.is_string()) {
HashMap<String, int>::ConstIterator found = names.find((String)p_name); HashMap<String, int>::ConstIterator found = names.find(p_name);
if (found) { if (found) {
return found->value; return found->value;
} }

2
modules/text_server_adv/text_server_adv.cpp
View File

@ -5902,7 +5902,7 @@ _FORCE_INLINE_ void TextServerAdvanced::_add_featuers(const Dictionary &p_source
int32_t value = values[i]; int32_t value = values[i];
if (value >= 0) { if (value >= 0) {
hb_feature_t feature; hb_feature_t feature;
if (keys[i].get_type() == Variant::STRING) { if (keys[i].is_string()) {
feature.tag = _name_to_tag(keys[i]); feature.tag = _name_to_tag(keys[i]);
} else { } else {
feature.tag = keys[i]; feature.tag = keys[i];

2
platform/android/java_class_wrapper.cpp
View File

@ -97,7 +97,7 @@ bool JavaClass::_call_method(JavaObject *p_instance, const StringName &p_method,
} }
} break; } break;
case ARG_TYPE_STRING: { case ARG_TYPE_STRING: {
if (p_args[i]->get_type() != Variant::STRING) { if (!p_args[i]->is_string()) {
arg_expected = Variant::STRING; arg_expected = Variant::STRING;
} }
} break; } break;

2
platform/web/api/api.cpp
View File

@ -99,7 +99,7 @@ Variant JavaScriptBridge::_create_object_bind(const Variant **p_args, int p_argc
r_error.expected = 1; r_error.expected = 1;
return Ref<JavaScriptObject>(); return Ref<JavaScriptObject>();
} }
if (p_args[0]->get_type() != Variant::STRING) { if (!p_args[0]->is_string()) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 0; r_error.argument = 0;
r_error.expected = Variant::STRING; r_error.expected = Variant::STRING;

2
platform/web/javascript_bridge_singleton.cpp
View File

@ -304,7 +304,7 @@ Variant JavaScriptBridge::_create_object_bind(const Variant **p_args, int p_argc
r_error.expected = 1; r_error.expected = 1;
return Ref<JavaScriptObject>(); return Ref<JavaScriptObject>();
} }
if (p_args[0]->get_type() != Variant::STRING) { if (!p_args[0]->is_string()) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 0; r_error.argument = 0;
r_error.expected = Variant::STRING; r_error.expected = Variant::STRING;

4
scene/gui/line_edit.cpp
View File

@ -698,13 +698,13 @@ bool LineEdit::can_drop_data(const Point2 &p_point, const Variant &p_data) const
return drop_override; return drop_override;
} }
return is_editable() && p_data.get_type() == Variant::STRING; return is_editable() && p_data.is_string();
} }
void LineEdit::drop_data(const Point2 &p_point, const Variant &p_data) { void LineEdit::drop_data(const Point2 &p_point, const Variant &p_data) {
Control::drop_data(p_point, p_data); Control::drop_data(p_point, p_data);
if (p_data.get_type() == Variant::STRING && is_editable()) { if (p_data.is_string() && is_editable()) {
set_caret_at_pixel_pos(p_point.x); set_caret_at_pixel_pos(p_point.x);
int caret_column_tmp = caret_column; int caret_column_tmp = caret_column;
bool is_inside_sel = selection.enabled && caret_column >= selection.begin && caret_column <= selection.end; bool is_inside_sel = selection.enabled && caret_column >= selection.begin && caret_column <= selection.end;

4
scene/gui/text_edit.cpp
View File

@ -2963,13 +2963,13 @@ bool TextEdit::can_drop_data(const Point2 &p_point, const Variant &p_data) const
return drop_override; return drop_override;
} }
return is_editable() && p_data.get_type() == Variant::STRING; return is_editable() && p_data.is_string();
} }
void TextEdit::drop_data(const Point2 &p_point, const Variant &p_data) { void TextEdit::drop_data(const Point2 &p_point, const Variant &p_data) {
Control::drop_data(p_point, p_data); Control::drop_data(p_point, p_data);
if (p_data.get_type() == Variant::STRING && is_editable()) { if (p_data.is_string() && is_editable()) {
Point2i pos = get_line_column_at_pos(get_local_mouse_pos()); Point2i pos = get_line_column_at_pos(get_local_mouse_pos());
int drop_at_line = pos.y; int drop_at_line = pos.y;
int drop_at_column = pos.x; int drop_at_column = pos.x;

2
scene/gui/tree.cpp
View File

@ -1564,7 +1564,7 @@ void TreeItem::_call_recursive_bind(const Variant **p_args, int p_argcount, Call
return; return;
} }
if (p_args[0]->get_type() != Variant::STRING && p_args[0]->get_type() != Variant::STRING_NAME) { if (!p_args[0]->is_string()) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 0; r_error.argument = 0;
r_error.expected = Variant::STRING_NAME; r_error.expected = Variant::STRING_NAME;

10
scene/main/node.cpp
View File

@ -770,8 +770,7 @@ Error Node::_rpc_bind(const Variant **p_args, int p_argcount, Callable::CallErro
return ERR_INVALID_PARAMETER; return ERR_INVALID_PARAMETER;
} }
Variant::Type type = p_args[0]->get_type(); if (!p_args[0]->is_string()) {
if (type != Variant::STRING_NAME && type != Variant::STRING) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 0; r_error.argument = 0;
r_error.expected = Variant::STRING_NAME; r_error.expected = Variant::STRING_NAME;
@ -799,8 +798,7 @@ Error Node::_rpc_id_bind(const Variant **p_args, int p_argcount, Callable::CallE
return ERR_INVALID_PARAMETER; return ERR_INVALID_PARAMETER;
} }
Variant::Type type = p_args[1]->get_type(); if (!p_args[1]->is_string()) {
if (type != Variant::STRING_NAME && type != Variant::STRING) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 1; r_error.argument = 1;
r_error.expected = Variant::STRING_NAME; r_error.expected = Variant::STRING_NAME;
@ -3436,7 +3434,7 @@ Variant Node::_call_deferred_thread_group_bind(const Variant **p_args, int p_arg
return Variant(); return Variant();
} }
if (p_args[0]->get_type() != Variant::STRING_NAME && p_args[0]->get_type() != Variant::STRING) { if (!p_args[0]->is_string()) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 0; r_error.argument = 0;
r_error.expected = Variant::STRING_NAME; r_error.expected = Variant::STRING_NAME;
@ -3459,7 +3457,7 @@ Variant Node::_call_thread_safe_bind(const Variant **p_args, int p_argcount, Cal
return Variant(); return Variant();
} }
if (p_args[0]->get_type() != Variant::STRING_NAME && p_args[0]->get_type() != Variant::STRING) { if (!p_args[0]->is_string()) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 0; r_error.argument = 0;
r_error.expected = Variant::STRING_NAME; r_error.expected = Variant::STRING_NAME;

8
scene/main/scene_tree.cpp
View File

@ -1315,8 +1315,8 @@ void SceneTree::_call_group_flags(const Variant **p_args, int p_argcount, Callab
ERR_FAIL_COND(p_argcount < 3); ERR_FAIL_COND(p_argcount < 3);
ERR_FAIL_COND(!p_args[0]->is_num()); ERR_FAIL_COND(!p_args[0]->is_num());
ERR_FAIL_COND(p_args[1]->get_type() != Variant::STRING_NAME && p_args[1]->get_type() != Variant::STRING); ERR_FAIL_COND(!p_args[1]->is_string());
ERR_FAIL_COND(p_args[2]->get_type() != Variant::STRING_NAME && p_args[2]->get_type() != Variant::STRING); ERR_FAIL_COND(!p_args[2]->is_string());
int flags = *p_args[0]; int flags = *p_args[0];
StringName group = *p_args[1]; StringName group = *p_args[1];
@ -1329,8 +1329,8 @@ void SceneTree::_call_group(const Variant **p_args, int p_argcount, Callable::Ca
r_error.error = Callable::CallError::CALL_OK; r_error.error = Callable::CallError::CALL_OK;
ERR_FAIL_COND(p_argcount < 2); ERR_FAIL_COND(p_argcount < 2);
ERR_FAIL_COND(p_args[0]->get_type() != Variant::STRING_NAME && p_args[0]->get_type() != Variant::STRING); ERR_FAIL_COND(!p_args[0]->is_string());
ERR_FAIL_COND(p_args[1]->get_type() != Variant::STRING_NAME && p_args[1]->get_type() != Variant::STRING); ERR_FAIL_COND(!p_args[1]->is_string());
StringName group = *p_args[0]; StringName group = *p_args[0];
StringName method = *p_args[1]; StringName method = *p_args[1];

4
scene/resources/2d/tile_set.cpp
View File

@ -3920,7 +3920,7 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) {
int terrain_index = components[1].trim_prefix("terrain_").to_int(); int terrain_index = components[1].trim_prefix("terrain_").to_int();
ERR_FAIL_COND_V(terrain_index < 0, false); ERR_FAIL_COND_V(terrain_index < 0, false);
if (components[2] == "name") { if (components[2] == "name") {
ERR_FAIL_COND_V(p_value.get_type() != Variant::STRING, false); ERR_FAIL_COND_V(!p_value.is_string(), false);
while (terrain_set_index >= terrain_sets.size()) { while (terrain_set_index >= terrain_sets.size()) {
add_terrain_set(); add_terrain_set();
} }
@ -3958,7 +3958,7 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) {
int index = components[0].trim_prefix("custom_data_layer_").to_int(); int index = components[0].trim_prefix("custom_data_layer_").to_int();
ERR_FAIL_COND_V(index < 0, false); ERR_FAIL_COND_V(index < 0, false);
if (components[1] == "name") { if (components[1] == "name") {
ERR_FAIL_COND_V(p_value.get_type() != Variant::STRING, false); ERR_FAIL_COND_V(!p_value.is_string(), false);
while (index >= custom_data_layers.size()) { while (index >= custom_data_layers.size()) {
add_custom_data_layer(); add_custom_data_layer();
} }

2
scene/resources/animation.cpp
View File

@ -1717,7 +1717,7 @@ int Animation::track_insert_key(int p_track, double p_time, const Variant &p_key
ERR_FAIL_COND_V(p_key.get_type() != Variant::DICTIONARY, -1); ERR_FAIL_COND_V(p_key.get_type() != Variant::DICTIONARY, -1);
Dictionary d = p_key; Dictionary d = p_key;
ERR_FAIL_COND_V(!d.has("method") || (d["method"].get_type() != Variant::STRING_NAME && d["method"].get_type() != Variant::STRING), -1); ERR_FAIL_COND_V(!d.has("method") || !d["method"].is_string(), -1);
ERR_FAIL_COND_V(!d.has("args") || !d["args"].is_array(), -1); ERR_FAIL_COND_V(!d.has("args") || !d["args"].is_array(), -1);
MethodKey k; MethodKey k;

2
servers/text_server.cpp
View File

@ -1988,7 +1988,7 @@ TypedArray<Vector3i> TextServer::parse_structured_text(StructuredTextParser p_pa
} }
} break; } break;
case STRUCTURED_TEXT_LIST: { case STRUCTURED_TEXT_LIST: {
if (p_args.size() == 1 && p_args[0].get_type() == Variant::STRING) { if (p_args.size() == 1 && p_args[0].is_string()) {
Vector<String> tags = p_text.split(String(p_args[0])); Vector<String> tags = p_text.split(String(p_args[0]));
int prev = 0; int prev = 0;
for (int i = 0; i < tags.size(); i++) { for (int i = 0; i < tags.size(); i++) {

3
tests/core/variant/test_dictionary.h
View File

@ -66,8 +66,7 @@ TEST_CASE("[Dictionary] Assignment using bracket notation ([])") {
map[StringName("HelloName")] = 6; map[StringName("HelloName")] = 6;
CHECK(int(map[StringName("HelloName")]) == 6); CHECK(int(map[StringName("HelloName")]) == 6);
// Check that StringName key is converted to String. CHECK(int(map.find_key(6).get_type()) == Variant::STRING_NAME);
CHECK(int(map.find_key(6).get_type()) == Variant::STRING);
map[StringName("HelloName")] = 7; map[StringName("HelloName")] = 7;
CHECK(int(map[StringName("HelloName")]) == 7); CHECK(int(map[StringName("HelloName")]) == 7);