summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/extension/gdextension.cpp74
-rw-r--r--core/extension/gdextension.h12
-rw-r--r--core/extension/gdextension_interface.cpp2
-rw-r--r--core/extension/gdextension_interface.h59
-rw-r--r--core/io/resource_loader.cpp3
-rw-r--r--core/object/class_db.cpp257
-rw-r--r--core/object/class_db.h31
-rw-r--r--core/object/method_bind.h42
-rw-r--r--core/object/object.compat.inc40
-rw-r--r--core/object/object.cpp52
-rw-r--r--core/object/object.h14
-rw-r--r--core/string/char_range.inc1314
-rw-r--r--core/string/char_utils.h43
-rw-r--r--core/string/translation.compat.inc46
-rw-r--r--core/string/translation.cpp15
-rw-r--r--core/string/translation.h8
-rw-r--r--core/string/ustring.cpp10
-rw-r--r--core/variant/callable.h2
-rw-r--r--core/variant/variant.h2
19 files changed, 1953 insertions, 73 deletions
diff --git a/core/extension/gdextension.cpp b/core/extension/gdextension.cpp
index 60487c5a52..c1298c8687 100644
--- a/core/extension/gdextension.cpp
+++ b/core/extension/gdextension.cpp
@@ -205,6 +205,7 @@ public:
virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
#ifdef TOOLS_ENABLED
ERR_FAIL_COND_V_MSG(!valid, Variant(), vformat("Cannot call invalid GDExtension method bind '%s'. It's probably cached - you may need to restart Godot.", name));
+ ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder(), Variant(), vformat("Cannot call GDExtension method bind '%s' on placeholder instance.", name));
#endif
Variant ret;
GDExtensionClassInstancePtr extension_instance = is_static() ? nullptr : p_object->_get_extension_instance();
@@ -218,6 +219,7 @@ public:
virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
#ifdef TOOLS_ENABLED
ERR_FAIL_COND_MSG(!valid, vformat("Cannot call invalid GDExtension method bind '%s'. It's probably cached - you may need to restart Godot.", name));
+ ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder(), vformat("Cannot call GDExtension method bind '%s' on placeholder instance.", name));
#endif
ERR_FAIL_COND_MSG(vararg, "Vararg methods don't have validated call support. This is most likely an engine bug.");
GDExtensionClassInstancePtr extension_instance = is_static() ? nullptr : p_object->_get_extension_instance();
@@ -249,6 +251,7 @@ public:
virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
#ifdef TOOLS_ENABLED
ERR_FAIL_COND_MSG(!valid, vformat("Cannot call invalid GDExtension method bind '%s'. It's probably cached - you may need to restart Godot.", name));
+ ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder(), vformat("Cannot call GDExtension method bind '%s' on placeholder instance.", name));
#endif
ERR_FAIL_COND_MSG(vararg, "Vararg methods don't have ptrcall support. This is most likely an engine bug.");
GDExtensionClassInstancePtr extension_instance = p_object->_get_extension_instance();
@@ -341,10 +344,11 @@ public:
#ifndef DISABLE_DEPRECATED
void GDExtension::_register_extension_class(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstStringNamePtr p_parent_class_name, const GDExtensionClassCreationInfo *p_extension_funcs) {
- const GDExtensionClassCreationInfo2 class_info2 = {
+ const GDExtensionClassCreationInfo3 class_info3 = {
p_extension_funcs->is_virtual, // GDExtensionBool is_virtual;
p_extension_funcs->is_abstract, // GDExtensionBool is_abstract;
true, // GDExtensionBool is_exposed;
+ false, // GDExtensionBool is_runtime;
p_extension_funcs->set_func, // GDExtensionClassSet set_func;
p_extension_funcs->get_func, // GDExtensionClassGet get_func;
p_extension_funcs->get_property_list_func, // GDExtensionClassGetPropertyList get_property_list_func;
@@ -369,15 +373,45 @@ void GDExtension::_register_extension_class(GDExtensionClassLibraryPtr p_library
const ClassCreationDeprecatedInfo legacy = {
p_extension_funcs->notification_func,
};
- _register_extension_class_internal(p_library, p_class_name, p_parent_class_name, &class_info2, &legacy);
+ _register_extension_class_internal(p_library, p_class_name, p_parent_class_name, &class_info3, &legacy);
}
-#endif // DISABLE_DEPRECATED
void GDExtension::_register_extension_class2(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstStringNamePtr p_parent_class_name, const GDExtensionClassCreationInfo2 *p_extension_funcs) {
+ const GDExtensionClassCreationInfo3 class_info3 = {
+ p_extension_funcs->is_virtual, // GDExtensionBool is_virtual;
+ p_extension_funcs->is_abstract, // GDExtensionBool is_abstract;
+ p_extension_funcs->is_exposed, // GDExtensionBool is_exposed;
+ false, // GDExtensionBool is_runtime;
+ p_extension_funcs->set_func, // GDExtensionClassSet set_func;
+ p_extension_funcs->get_func, // GDExtensionClassGet get_func;
+ p_extension_funcs->get_property_list_func, // GDExtensionClassGetPropertyList get_property_list_func;
+ p_extension_funcs->free_property_list_func, // GDExtensionClassFreePropertyList free_property_list_func;
+ p_extension_funcs->property_can_revert_func, // GDExtensionClassPropertyCanRevert property_can_revert_func;
+ p_extension_funcs->property_get_revert_func, // GDExtensionClassPropertyGetRevert property_get_revert_func;
+ p_extension_funcs->validate_property_func, // GDExtensionClassValidateProperty validate_property_func;
+ p_extension_funcs->notification_func, // GDExtensionClassNotification2 notification_func;
+ p_extension_funcs->to_string_func, // GDExtensionClassToString to_string_func;
+ p_extension_funcs->reference_func, // GDExtensionClassReference reference_func;
+ p_extension_funcs->unreference_func, // GDExtensionClassUnreference unreference_func;
+ p_extension_funcs->create_instance_func, // GDExtensionClassCreateInstance create_instance_func; /* this one is mandatory */
+ p_extension_funcs->free_instance_func, // GDExtensionClassFreeInstance free_instance_func; /* this one is mandatory */
+ p_extension_funcs->recreate_instance_func, // GDExtensionClassRecreateInstance recreate_instance_func;
+ p_extension_funcs->get_virtual_func, // GDExtensionClassGetVirtual get_virtual_func;
+ p_extension_funcs->get_virtual_call_data_func, // GDExtensionClassGetVirtualCallData get_virtual_call_data_func;
+ p_extension_funcs->call_virtual_with_data_func, // GDExtensionClassCallVirtualWithData call_virtual_func;
+ p_extension_funcs->get_rid_func, // GDExtensionClassGetRID get_rid;
+ p_extension_funcs->class_userdata, // void *class_userdata;
+ };
+
+ _register_extension_class_internal(p_library, p_class_name, p_parent_class_name, &class_info3);
+}
+#endif // DISABLE_DEPRECATED
+
+void GDExtension::_register_extension_class3(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstStringNamePtr p_parent_class_name, const GDExtensionClassCreationInfo3 *p_extension_funcs) {
_register_extension_class_internal(p_library, p_class_name, p_parent_class_name, p_extension_funcs);
}
-void GDExtension::_register_extension_class_internal(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstStringNamePtr p_parent_class_name, const GDExtensionClassCreationInfo2 *p_extension_funcs, const ClassCreationDeprecatedInfo *p_deprecated_funcs) {
+void GDExtension::_register_extension_class_internal(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstStringNamePtr p_parent_class_name, const GDExtensionClassCreationInfo3 *p_extension_funcs, const ClassCreationDeprecatedInfo *p_deprecated_funcs) {
GDExtension *self = reinterpret_cast<GDExtension *>(p_library);
StringName class_name = *reinterpret_cast<const StringName *>(p_class_name);
@@ -402,10 +436,15 @@ void GDExtension::_register_extension_class_internal(GDExtensionClassLibraryPtr
#ifdef TOOLS_ENABLED
Extension *extension = nullptr;
+ bool is_runtime = (bool)p_extension_funcs->is_runtime;
if (self->is_reloading && self->extension_classes.has(class_name)) {
extension = &self->extension_classes[class_name];
if (!parent_extension && parent_class_name != extension->gdextension.parent_class_name) {
- ERR_FAIL_MSG(vformat("GDExtension class '%s' attempt to change parent type from '%s' to '%s' on hot reload. Restart Godot for this change to take effect.", class_name, extension->gdextension.parent_class_name, parent_class_name));
+ ERR_FAIL_MSG(vformat("GDExtension class '%s' cannot change parent type from '%s' to '%s' on hot reload. Restart Godot for this change to take effect.", class_name, extension->gdextension.parent_class_name, parent_class_name));
+ }
+ if (extension->gdextension.is_runtime != is_runtime) {
+ ERR_PRINT(vformat("GDExtension class '%s' cannot change to/from runtime class on hot reload. Restart Godot for this change to take effect.", class_name));
+ is_runtime = extension->gdextension.is_runtime;
}
extension->is_reloading = false;
} else {
@@ -434,6 +473,9 @@ void GDExtension::_register_extension_class_internal(GDExtensionClassLibraryPtr
extension->gdextension.is_virtual = p_extension_funcs->is_virtual;
extension->gdextension.is_abstract = p_extension_funcs->is_abstract;
extension->gdextension.is_exposed = p_extension_funcs->is_exposed;
+#ifdef TOOLS_ENABLED
+ extension->gdextension.is_runtime = is_runtime;
+#endif
extension->gdextension.set = p_extension_funcs->set_func;
extension->gdextension.get = p_extension_funcs->get_func;
extension->gdextension.get_property_list = p_extension_funcs->get_property_list_func;
@@ -836,8 +878,9 @@ void GDExtension::initialize_gdextensions() {
#ifndef DISABLE_DEPRECATED
register_interface_function("classdb_register_extension_class", (GDExtensionInterfaceFunctionPtr)&GDExtension::_register_extension_class);
-#endif // DISABLE_DEPRECATED
register_interface_function("classdb_register_extension_class2", (GDExtensionInterfaceFunctionPtr)&GDExtension::_register_extension_class2);
+#endif // DISABLE_DEPRECATED
+ register_interface_function("classdb_register_extension_class3", (GDExtensionInterfaceFunctionPtr)&GDExtension::_register_extension_class3);
register_interface_function("classdb_register_extension_class_method", (GDExtensionInterfaceFunctionPtr)&GDExtension::_register_extension_class_method);
register_interface_function("classdb_register_extension_class_virtual_method", (GDExtensionInterfaceFunctionPtr)&GDExtension::_register_extension_class_virtual_method);
register_interface_function("classdb_register_extension_class_integer_constant", (GDExtensionInterfaceFunctionPtr)&GDExtension::_register_extension_class_integer_constant);
@@ -1089,7 +1132,10 @@ void GDExtension::prepare_reload() {
state.push_back(Pair<String, Variant>(P.name, value));
}
- E.value.instance_state[obj_id] = state;
+ E.value.instance_state[obj_id] = {
+ state, // List<Pair<String, Variant>> properties;
+ obj->is_extension_placeholder(), // bool is_placeholder;
+ };
}
}
}
@@ -1164,25 +1210,29 @@ void GDExtension::finish_reload() {
for (KeyValue<StringName, Extension> &E : extension_classes) {
// Loop over 'instance_state' rather than 'instance' because new instances
// may have been created when re-initializing the extension.
- for (const KeyValue<ObjectID, List<Pair<String, Variant>>> &S : E.value.instance_state) {
+ for (const KeyValue<ObjectID, Extension::InstanceState> &S : E.value.instance_state) {
Object *obj = ObjectDB::get_instance(S.key);
if (!obj) {
continue;
}
- obj->reset_internal_extension(&E.value.gdextension);
+ if (S.value.is_placeholder) {
+ obj->reset_internal_extension(ClassDB::get_placeholder_extension(E.value.gdextension.class_name));
+ } else {
+ obj->reset_internal_extension(&E.value.gdextension);
+ }
}
}
// Now that all the classes are back, restore the state.
for (KeyValue<StringName, Extension> &E : extension_classes) {
- for (const KeyValue<ObjectID, List<Pair<String, Variant>>> &S : E.value.instance_state) {
+ for (const KeyValue<ObjectID, Extension::InstanceState> &S : E.value.instance_state) {
Object *obj = ObjectDB::get_instance(S.key);
if (!obj) {
continue;
}
- for (const Pair<String, Variant> &state : S.value) {
+ for (const Pair<String, Variant> &state : S.value.properties) {
obj->set(state.first, state.second);
}
}
@@ -1190,7 +1240,7 @@ void GDExtension::finish_reload() {
// Finally, let the objects know that we are done reloading them.
for (KeyValue<StringName, Extension> &E : extension_classes) {
- for (const KeyValue<ObjectID, List<Pair<String, Variant>>> &S : E.value.instance_state) {
+ for (const KeyValue<ObjectID, Extension::InstanceState> &S : E.value.instance_state) {
Object *obj = ObjectDB::get_instance(S.key);
if (!obj) {
continue;
diff --git a/core/extension/gdextension.h b/core/extension/gdextension.h
index dbb39acb2e..a2b948a38a 100644
--- a/core/extension/gdextension.h
+++ b/core/extension/gdextension.h
@@ -59,7 +59,12 @@ class GDExtension : public Resource {
bool is_reloading = false;
HashMap<StringName, GDExtensionMethodBind *> methods;
HashSet<ObjectID> instances;
- HashMap<ObjectID, List<Pair<String, Variant>>> instance_state;
+
+ struct InstanceState {
+ List<Pair<String, Variant>> properties;
+ bool is_placeholder = false;
+ };
+ HashMap<ObjectID, InstanceState> instance_state;
#endif
};
@@ -73,9 +78,10 @@ class GDExtension : public Resource {
#ifndef DISABLE_DEPRECATED
static void _register_extension_class(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstStringNamePtr p_parent_class_name, const GDExtensionClassCreationInfo *p_extension_funcs);
-#endif // DISABLE_DEPRECATED
static void _register_extension_class2(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstStringNamePtr p_parent_class_name, const GDExtensionClassCreationInfo2 *p_extension_funcs);
- static void _register_extension_class_internal(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstStringNamePtr p_parent_class_name, const GDExtensionClassCreationInfo2 *p_extension_funcs, const ClassCreationDeprecatedInfo *p_deprecated_funcs = nullptr);
+#endif // DISABLE_DEPRECATED
+ static void _register_extension_class3(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstStringNamePtr p_parent_class_name, const GDExtensionClassCreationInfo3 *p_extension_funcs);
+ static void _register_extension_class_internal(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstStringNamePtr p_parent_class_name, const GDExtensionClassCreationInfo3 *p_extension_funcs, const ClassCreationDeprecatedInfo *p_deprecated_funcs = nullptr);
static void _register_extension_class_method(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, const GDExtensionClassMethodInfo *p_method_info);
static void _register_extension_class_virtual_method(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, const GDExtensionClassVirtualMethodInfo *p_method_info);
static void _register_extension_class_integer_constant(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstStringNamePtr p_enum_name, GDExtensionConstStringNamePtr p_constant_name, GDExtensionInt p_constant_value, GDExtensionBool p_is_bitfield);
diff --git a/core/extension/gdextension_interface.cpp b/core/extension/gdextension_interface.cpp
index c6d7779473..0c96c32187 100644
--- a/core/extension/gdextension_interface.cpp
+++ b/core/extension/gdextension_interface.cpp
@@ -1379,7 +1379,7 @@ static GDExtensionMethodBindPtr gdextension_classdb_get_method_bind(GDExtensionC
static GDExtensionObjectPtr gdextension_classdb_construct_object(GDExtensionConstStringNamePtr p_classname) {
const StringName classname = *reinterpret_cast<const StringName *>(p_classname);
- return (GDExtensionObjectPtr)ClassDB::instantiate(classname);
+ return (GDExtensionObjectPtr)ClassDB::instantiate_no_placeholders(classname);
}
static void *gdextension_classdb_get_class_tag(GDExtensionConstStringNamePtr p_classname) {
diff --git a/core/extension/gdextension_interface.h b/core/extension/gdextension_interface.h
index 48a66c9fae..65ee647a51 100644
--- a/core/extension/gdextension_interface.h
+++ b/core/extension/gdextension_interface.h
@@ -290,7 +290,7 @@ typedef struct {
GDExtensionClassGetVirtual get_virtual_func; // Queries a virtual function by name and returns a callback to invoke the requested virtual function.
GDExtensionClassGetRID get_rid_func;
void *class_userdata; // Per-class user data, later accessible in instance bindings.
-} GDExtensionClassCreationInfo; // Deprecated. Use GDExtensionClassCreationInfo2 instead.
+} GDExtensionClassCreationInfo; // Deprecated. Use GDExtensionClassCreationInfo3 instead.
typedef struct {
GDExtensionBool is_virtual;
@@ -323,7 +323,41 @@ typedef struct {
GDExtensionClassCallVirtualWithData call_virtual_with_data_func;
GDExtensionClassGetRID get_rid_func;
void *class_userdata; // Per-class user data, later accessible in instance bindings.
-} GDExtensionClassCreationInfo2;
+} GDExtensionClassCreationInfo2; // Deprecated. Use GDExtensionClassCreationInfo3 instead.
+
+typedef struct {
+ GDExtensionBool is_virtual;
+ GDExtensionBool is_abstract;
+ GDExtensionBool is_exposed;
+ GDExtensionBool is_runtime;
+ GDExtensionClassSet set_func;
+ GDExtensionClassGet get_func;
+ GDExtensionClassGetPropertyList get_property_list_func;
+ GDExtensionClassFreePropertyList free_property_list_func;
+ GDExtensionClassPropertyCanRevert property_can_revert_func;
+ GDExtensionClassPropertyGetRevert property_get_revert_func;
+ GDExtensionClassValidateProperty validate_property_func;
+ GDExtensionClassNotification2 notification_func;
+ GDExtensionClassToString to_string_func;
+ GDExtensionClassReference reference_func;
+ GDExtensionClassUnreference unreference_func;
+ GDExtensionClassCreateInstance create_instance_func; // (Default) constructor; mandatory. If the class is not instantiable, consider making it virtual or abstract.
+ GDExtensionClassFreeInstance free_instance_func; // Destructor; mandatory.
+ GDExtensionClassRecreateInstance recreate_instance_func;
+ // Queries a virtual function by name and returns a callback to invoke the requested virtual function.
+ GDExtensionClassGetVirtual get_virtual_func;
+ // Paired with `call_virtual_with_data_func`, this is an alternative to `get_virtual_func` for extensions that
+ // need or benefit from extra data when calling virtual functions.
+ // Returns user data that will be passed to `call_virtual_with_data_func`.
+ // Returning `NULL` from this function signals to Godot that the virtual function is not overridden.
+ // Data returned from this function should be managed by the extension and must be valid until the extension is deinitialized.
+ // You should supply either `get_virtual_func`, or `get_virtual_call_data_func` with `call_virtual_with_data_func`.
+ GDExtensionClassGetVirtualCallData get_virtual_call_data_func;
+ // Used to call virtual functions when `get_virtual_call_data_func` is not null.
+ GDExtensionClassCallVirtualWithData call_virtual_with_data_func;
+ GDExtensionClassGetRID get_rid_func;
+ void *class_userdata; // Per-class user data, later accessible in instance bindings.
+} GDExtensionClassCreationInfo3;
typedef void *GDExtensionClassLibraryPtr;
@@ -2240,6 +2274,9 @@ typedef void (*GDExtensionInterfaceObjectSetInstance)(GDExtensionObjectPtr p_o,
*
* Gets the class name of an Object.
*
+ * If the GDExtension wraps the Godot object in an abstraction specific to its class, this is the
+ * function that should be used to determine which wrapper to use.
+ *
* @param p_object A pointer to the Object.
* @param p_library A pointer the library received by the GDExtension's entry point function.
* @param r_class_name A pointer to a String to receive the class name.
@@ -2486,7 +2523,7 @@ typedef void *(*GDExtensionInterfaceClassdbGetClassTag)(GDExtensionConstStringNa
/**
* @name classdb_register_extension_class
* @since 4.1
- * @deprecated in Godot 4.2. Use `classdb_register_extension_class2` instead.
+ * @deprecated in Godot 4.2. Use `classdb_register_extension_class3` instead.
*
* Registers an extension class in the ClassDB.
*
@@ -2502,6 +2539,7 @@ typedef void (*GDExtensionInterfaceClassdbRegisterExtensionClass)(GDExtensionCla
/**
* @name classdb_register_extension_class2
* @since 4.2
+ * @deprecated in Godot 4.3. Use `classdb_register_extension_class3` instead.
*
* Registers an extension class in the ClassDB.
*
@@ -2515,6 +2553,21 @@ typedef void (*GDExtensionInterfaceClassdbRegisterExtensionClass)(GDExtensionCla
typedef void (*GDExtensionInterfaceClassdbRegisterExtensionClass2)(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstStringNamePtr p_parent_class_name, const GDExtensionClassCreationInfo2 *p_extension_funcs);
/**
+ * @name classdb_register_extension_class3
+ * @since 4.3
+ *
+ * Registers an extension class in the ClassDB.
+ *
+ * Provided struct can be safely freed once the function returns.
+ *
+ * @param p_library A pointer the library received by the GDExtension's entry point function.
+ * @param p_class_name A pointer to a StringName with the class name.
+ * @param p_parent_class_name A pointer to a StringName with the parent class name.
+ * @param p_extension_funcs A pointer to a GDExtensionClassCreationInfo2 struct.
+ */
+typedef void (*GDExtensionInterfaceClassdbRegisterExtensionClass3)(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstStringNamePtr p_parent_class_name, const GDExtensionClassCreationInfo3 *p_extension_funcs);
+
+/**
* @name classdb_register_extension_class_method
* @since 4.1
*
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index 5344266a9c..a3fc7bc370 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -658,9 +658,6 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro
// resource loading that means that the task to wait for can be restarted here to break the
// cycle, with as much recursion into this process as needed.
// When the stack is eventually unrolled, the original load will have been notified to go on.
-#ifdef DEV_ENABLED
- print_verbose("ResourceLoader: Potential for deadlock detected in task dependency. Attempting to avoid it by re-issuing the load now.");
-#endif
// CACHE_MODE_IGNORE is needed because, otherwise, the new request would just see there's
// an ongoing load for that resource and wait for it again. This value forces a new load.
Ref<ResourceLoader::LoadToken> token = _load_start(load_task.local_path, load_task.type_hint, LOAD_THREAD_DISTRIBUTE, ResourceFormatLoader::CACHE_MODE_IGNORE);
diff --git a/core/object/class_db.cpp b/core/object/class_db.cpp
index f2a9a68d08..63adc5b502 100644
--- a/core/object/class_db.cpp
+++ b/core/object/class_db.cpp
@@ -70,6 +70,139 @@ HashMap<StringName, ClassDB::ClassInfo> ClassDB::classes;
HashMap<StringName, StringName> ClassDB::resource_base_extensions;
HashMap<StringName, StringName> ClassDB::compat_classes;
+#ifdef TOOLS_ENABLED
+HashMap<StringName, ObjectGDExtension> ClassDB::placeholder_extensions;
+
+class PlaceholderExtensionInstance {
+ StringName class_name;
+ HashMap<StringName, Variant> properties;
+
+public:
+ PlaceholderExtensionInstance(const StringName &p_class_name) {
+ class_name = p_class_name;
+ }
+
+ ~PlaceholderExtensionInstance() {}
+
+ void set(const StringName &p_name, const Variant &p_value) {
+ bool is_default_valid = false;
+ Variant default_value = ClassDB::class_get_default_property_value(class_name, p_name, &is_default_valid);
+
+ // If there's a default value, then we know it's a valid property.
+ if (is_default_valid) {
+ properties[p_name] = p_value;
+ }
+ }
+
+ Variant get(const StringName &p_name) {
+ const Variant *value = properties.getptr(p_name);
+ Variant ret;
+
+ if (value) {
+ ret = *value;
+ } else {
+ bool is_default_valid = false;
+ Variant default_value = ClassDB::class_get_default_property_value(class_name, p_name, &is_default_valid);
+ if (is_default_valid) {
+ ret = default_value;
+ }
+ }
+
+ return ret;
+ }
+
+ static GDExtensionBool placeholder_instance_set(GDExtensionClassInstancePtr p_instance, GDExtensionConstStringNamePtr p_name, GDExtensionConstVariantPtr p_value) {
+ PlaceholderExtensionInstance *self = (PlaceholderExtensionInstance *)p_instance;
+ const StringName &name = *(StringName *)p_name;
+ const Variant &value = *(const Variant *)p_value;
+
+ self->set(name, value);
+
+ // We have to return true so Godot doesn't try to call the real setter function.
+ return true;
+ }
+
+ static GDExtensionBool placeholder_instance_get(GDExtensionClassInstancePtr p_instance, GDExtensionConstStringNamePtr p_name, GDExtensionVariantPtr r_ret) {
+ PlaceholderExtensionInstance *self = (PlaceholderExtensionInstance *)p_instance;
+ const StringName &name = *(StringName *)p_name;
+ Variant *value = (Variant *)r_ret;
+
+ *value = self->get(name);
+
+ // We have to return true so Godot doesn't try to call the real getter function.
+ return true;
+ }
+
+ static const GDExtensionPropertyInfo *placeholder_instance_get_property_list(GDExtensionClassInstancePtr p_instance, uint32_t *r_count) {
+ *r_count = 0;
+ return nullptr;
+ }
+
+ static void placeholder_instance_free_property_list(GDExtensionClassInstancePtr p_instance, const GDExtensionPropertyInfo *p_list) {
+ }
+
+ static GDExtensionBool placeholder_instance_property_can_revert(GDExtensionClassInstancePtr p_instance, GDExtensionConstStringNamePtr p_name) {
+ return false;
+ }
+
+ static GDExtensionBool placeholder_instance_property_get_revert(GDExtensionClassInstancePtr p_instance, GDExtensionConstStringNamePtr p_name, GDExtensionVariantPtr r_ret) {
+ return false;
+ }
+
+ static GDExtensionBool placeholder_instance_validate_property(GDExtensionClassInstancePtr p_instance, GDExtensionPropertyInfo *p_property) {
+ return false;
+ }
+
+ static void placeholder_instance_notification(GDExtensionClassInstancePtr p_instance, int32_t p_what, GDExtensionBool p_reversed) {
+ }
+
+ static void placeholder_instance_to_string(GDExtensionClassInstancePtr p_instance, GDExtensionBool *r_is_valid, GDExtensionStringPtr p_out) {
+ *r_is_valid = true;
+ }
+
+ static void placeholder_instance_reference(GDExtensionClassInstancePtr p_instance) {
+ }
+
+ static void placeholder_instance_unreference(GDExtensionClassInstancePtr p_instance) {
+ }
+
+ static uint64_t placeholder_instance_get_rid(GDExtensionClassInstancePtr p_instance) {
+ return 0;
+ }
+
+ static GDExtensionObjectPtr placeholder_class_create_instance(void *p_class_userdata) {
+ ClassDB::ClassInfo *ti = (ClassDB::ClassInfo *)p_class_userdata;
+
+ // Find the closest native parent.
+ ClassDB::ClassInfo *native_parent = ti->inherits_ptr;
+ while (native_parent->gdextension) {
+ native_parent = native_parent->inherits_ptr;
+ }
+ ERR_FAIL_NULL_V(native_parent->creation_func, nullptr);
+
+ // Construct a placeholder.
+ Object *obj = native_parent->creation_func();
+ obj->_extension = ClassDB::get_placeholder_extension(ti->name);
+ obj->_extension_instance = memnew(PlaceholderExtensionInstance(ti->name));
+ return obj;
+ }
+
+ static GDExtensionObjectPtr placeholder_class_recreate_instance(void *p_class_userdata, GDExtensionObjectPtr p_object) {
+ ClassDB::ClassInfo *ti = (ClassDB::ClassInfo *)p_class_userdata;
+ return memnew(PlaceholderExtensionInstance(ti->name));
+ }
+
+ static void placeholder_class_free_instance(void *p_class_userdata, GDExtensionClassInstancePtr p_instance) {
+ PlaceholderExtensionInstance *instance = (PlaceholderExtensionInstance *)p_instance;
+ memdelete(instance);
+ }
+
+ static GDExtensionClassCallVirtual placeholder_class_get_virtual(void *p_class_userdata, GDExtensionConstStringNamePtr p_name) {
+ return nullptr;
+ }
+};
+#endif
+
bool ClassDB::_is_parent_class(const StringName &p_class, const StringName &p_inherits) {
if (!classes.has(p_class)) {
return false;
@@ -346,7 +479,7 @@ StringName ClassDB::get_compatibility_class(const StringName &p_class) {
return StringName();
}
-Object *ClassDB::instantiate(const StringName &p_class) {
+Object *ClassDB::_instantiate_internal(const StringName &p_class, bool p_require_real_class) {
ClassInfo *ti;
{
OBJTYPE_RLOCK;
@@ -367,18 +500,124 @@ Object *ClassDB::instantiate(const StringName &p_class) {
}
#endif
if (ti->gdextension && ti->gdextension->create_instance) {
- Object *obj = (Object *)ti->gdextension->create_instance(ti->gdextension->class_userdata);
+ ObjectGDExtension *extension = ti->gdextension;
#ifdef TOOLS_ENABLED
- if (ti->gdextension->track_instance) {
- ti->gdextension->track_instance(ti->gdextension->tracking_userdata, obj);
+ if (!p_require_real_class && ti->is_runtime && Engine::get_singleton()->is_editor_hint()) {
+ extension = get_placeholder_extension(ti->name);
+ }
+#endif
+ Object *obj = (Object *)extension->create_instance(extension->class_userdata);
+
+#ifdef TOOLS_ENABLED
+ if (extension->track_instance) {
+ extension->track_instance(extension->tracking_userdata, obj);
}
#endif
return obj;
} else {
+#ifdef TOOLS_ENABLED
+ if (!p_require_real_class && ti->is_runtime && Engine::get_singleton()->is_editor_hint()) {
+ if (!ti->inherits_ptr || !ti->inherits_ptr->creation_func) {
+ ERR_PRINT_ONCE(vformat("Cannot make a placeholder instance of runtime class %s because its parent cannot be constructed.", ti->name));
+ } else {
+ ObjectGDExtension *extension = get_placeholder_extension(ti->name);
+ return (Object *)extension->create_instance(extension->class_userdata);
+ }
+ }
+#endif
+
return ti->creation_func();
}
}
+Object *ClassDB::instantiate(const StringName &p_class) {
+ return _instantiate_internal(p_class);
+}
+
+Object *ClassDB::instantiate_no_placeholders(const StringName &p_class) {
+ return _instantiate_internal(p_class, true);
+}
+
+#ifdef TOOLS_ENABLED
+ObjectGDExtension *ClassDB::get_placeholder_extension(const StringName &p_class) {
+ ObjectGDExtension *placeholder_extension = placeholder_extensions.getptr(p_class);
+ if (placeholder_extension) {
+ return placeholder_extension;
+ }
+
+ ClassInfo *ti;
+ {
+ OBJTYPE_RLOCK;
+ ti = classes.getptr(p_class);
+ if (!ti || ti->disabled || !ti->creation_func || (ti->gdextension && !ti->gdextension->create_instance)) {
+ if (compat_classes.has(p_class)) {
+ ti = classes.getptr(compat_classes[p_class]);
+ }
+ }
+ ERR_FAIL_NULL_V_MSG(ti, nullptr, "Cannot get class '" + String(p_class) + "'.");
+ ERR_FAIL_COND_V_MSG(ti->disabled, nullptr, "Class '" + String(p_class) + "' is disabled.");
+ }
+
+ // Make a "fake" extension to act as a placeholder.
+ placeholder_extensions[p_class] = ObjectGDExtension();
+ placeholder_extension = placeholder_extensions.getptr(p_class);
+
+ placeholder_extension->is_runtime = true;
+ placeholder_extension->is_placeholder = true;
+
+ if (ti->gdextension) {
+ placeholder_extension->library = ti->gdextension->library;
+ placeholder_extension->parent = ti->gdextension->parent;
+ placeholder_extension->children = ti->gdextension->children;
+ placeholder_extension->parent_class_name = ti->gdextension->parent_class_name;
+ placeholder_extension->class_name = ti->gdextension->class_name;
+ placeholder_extension->editor_class = ti->gdextension->editor_class;
+ placeholder_extension->reloadable = ti->gdextension->reloadable;
+ placeholder_extension->is_virtual = ti->gdextension->is_virtual;
+ placeholder_extension->is_abstract = ti->gdextension->is_abstract;
+ placeholder_extension->is_exposed = ti->gdextension->is_exposed;
+
+ placeholder_extension->tracking_userdata = ti->gdextension->tracking_userdata;
+ placeholder_extension->track_instance = ti->gdextension->track_instance;
+ placeholder_extension->untrack_instance = ti->gdextension->untrack_instance;
+ } else {
+ placeholder_extension->library = nullptr;
+ placeholder_extension->parent = nullptr;
+ placeholder_extension->parent_class_name = ti->inherits;
+ placeholder_extension->class_name = ti->name;
+ placeholder_extension->editor_class = ti->api == API_EDITOR;
+ placeholder_extension->reloadable = false;
+ placeholder_extension->is_virtual = ti->is_virtual;
+ placeholder_extension->is_abstract = false;
+ placeholder_extension->is_exposed = ti->exposed;
+ }
+
+ placeholder_extension->set = &PlaceholderExtensionInstance::placeholder_instance_set;
+ placeholder_extension->get = &PlaceholderExtensionInstance::placeholder_instance_get;
+ placeholder_extension->get_property_list = &PlaceholderExtensionInstance::placeholder_instance_get_property_list;
+ placeholder_extension->free_property_list = &PlaceholderExtensionInstance::placeholder_instance_free_property_list;
+ placeholder_extension->property_can_revert = &PlaceholderExtensionInstance::placeholder_instance_property_can_revert;
+ placeholder_extension->property_get_revert = &PlaceholderExtensionInstance::placeholder_instance_property_get_revert;
+ placeholder_extension->validate_property = &PlaceholderExtensionInstance::placeholder_instance_validate_property;
+ placeholder_extension->notification = nullptr;
+ placeholder_extension->notification2 = &PlaceholderExtensionInstance::placeholder_instance_notification;
+ placeholder_extension->to_string = &PlaceholderExtensionInstance::placeholder_instance_to_string;
+ placeholder_extension->reference = &PlaceholderExtensionInstance::placeholder_instance_reference;
+ placeholder_extension->unreference = &PlaceholderExtensionInstance::placeholder_instance_unreference;
+ placeholder_extension->get_rid = &PlaceholderExtensionInstance::placeholder_instance_get_rid;
+
+ placeholder_extension->class_userdata = ti;
+ placeholder_extension->create_instance = &PlaceholderExtensionInstance::placeholder_class_create_instance;
+ placeholder_extension->free_instance = &PlaceholderExtensionInstance::placeholder_class_free_instance;
+ placeholder_extension->get_virtual = &PlaceholderExtensionInstance::placeholder_class_get_virtual;
+ placeholder_extension->get_virtual_call_data = nullptr;
+ placeholder_extension->call_virtual_with_data = nullptr;
+ placeholder_extension->recreate_instance = &PlaceholderExtensionInstance::placeholder_class_recreate_instance;
+
+ return placeholder_extension;
+}
+#endif
+
void ClassDB::set_object_extension_instance(Object *p_object, const StringName &p_class, GDExtensionClassInstancePtr p_instance) {
ERR_FAIL_NULL(p_object);
ClassInfo *ti;
@@ -1716,7 +1955,7 @@ Variant ClassDB::class_get_default_property_value(const StringName &p_class, con
c = Engine::get_singleton()->get_singleton_object(p_class);
cleanup_c = false;
} else if (ClassDB::can_instantiate(p_class) && !ClassDB::is_virtual(p_class)) { // Keep this condition in sync with doc_tools.cpp get_documentation_default_value.
- c = ClassDB::instantiate(p_class);
+ c = ClassDB::instantiate_no_placeholders(p_class);
cleanup_c = true;
}
@@ -1813,6 +2052,9 @@ void ClassDB::register_extension_class(ObjectGDExtension *p_extension) {
}
}
c.reloadable = p_extension->reloadable;
+#ifdef TOOLS_ENABLED
+ c.is_runtime = p_extension->is_runtime;
+#endif
classes[p_extension->class_name] = c;
}
@@ -1826,6 +2068,11 @@ void ClassDB::unregister_extension_class(const StringName &p_class, bool p_free_
}
}
classes.erase(p_class);
+ default_values_cached.erase(p_class);
+ default_values.erase(p_class);
+#ifdef TOOLS_ENABLED
+ placeholder_extensions.erase(p_class);
+#endif
}
HashMap<StringName, ClassDB::NativeStruct> ClassDB::native_structs;
diff --git a/core/object/class_db.h b/core/object/class_db.h
index c910b30d11..7f117b4a9b 100644
--- a/core/object/class_db.h
+++ b/core/object/class_db.h
@@ -133,6 +133,7 @@ public:
bool exposed = false;
bool reloadable = false;
bool is_virtual = false;
+ bool is_runtime = false;
Object *(*creation_func)() = nullptr;
ClassInfo() {}
@@ -149,6 +150,10 @@ public:
static HashMap<StringName, StringName> resource_base_extensions;
static HashMap<StringName, StringName> compat_classes;
+#ifdef TOOLS_ENABLED
+ static HashMap<StringName, ObjectGDExtension> placeholder_extensions;
+#endif
+
#ifdef DEBUG_METHODS_ENABLED
static MethodBind *bind_methodfi(uint32_t p_flags, MethodBind *p_bind, bool p_compatibility, const MethodDefinition &method_name, const Variant **p_defs, int p_defcount);
#else
@@ -178,6 +183,8 @@ private:
static MethodBind *_bind_vararg_method(MethodBind *p_bind, const StringName &p_name, const Vector<Variant> &p_default_args, bool p_compatibility);
static void _bind_method_custom(const StringName &p_class, MethodBind *p_method, bool p_compatibility);
+ static Object *_instantiate_internal(const StringName &p_class, bool p_require_real_class = false);
+
public:
// DO NOT USE THIS!!!!!! NEEDS TO BE PUBLIC BUT DO NOT USE NO MATTER WHAT!!!
template <class T>
@@ -228,6 +235,23 @@ public:
T::register_custom_data_to_otdb();
}
+ template <class T>
+ static void register_runtime_class() {
+ GLOBAL_LOCK_FUNCTION;
+ static_assert(types_are_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
+ T::initialize_class();
+ ClassInfo *t = classes.getptr(T::get_class_static());
+ ERR_FAIL_NULL(t);
+ ERR_FAIL_COND_MSG(t->inherits_ptr && !t->inherits_ptr->creation_func, vformat("Cannot register runtime class '%s' that descends from an abstract parent class.", T::get_class_static()));
+ t->creation_func = &creator<T>;
+ t->exposed = true;
+ t->is_virtual = false;
+ t->is_runtime = true;
+ t->class_ptr = T::get_class_ptr_static();
+ t->api = current_api;
+ T::register_custom_data_to_otdb();
+ }
+
static void register_extension_class(ObjectGDExtension *p_extension);
static void unregister_extension_class(const StringName &p_class, bool p_free_method_binds = true);
@@ -253,6 +277,7 @@ public:
static void get_class_list(List<StringName> *p_classes);
#ifdef TOOLS_ENABLED
static void get_extensions_class_list(List<StringName> *p_classes);
+ static ObjectGDExtension *get_placeholder_extension(const StringName &p_class);
#endif
static void get_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes);
static void get_direct_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes);
@@ -264,6 +289,7 @@ public:
static bool can_instantiate(const StringName &p_class);
static bool is_virtual(const StringName &p_class);
static Object *instantiate(const StringName &p_class);
+ static Object *instantiate_no_placeholders(const StringName &p_class);
static void set_object_extension_instance(Object *p_object, const StringName &p_class, GDExtensionClassInstancePtr p_instance);
static APIType get_api_type(const StringName &p_class);
@@ -510,6 +536,11 @@ _FORCE_INLINE_ Vector<Error> errarray(P... p_args) {
::ClassDB::register_internal_class<m_class>(); \
}
+#define GDREGISTER_RUNTIME_CLASS(m_class) \
+ if (m_class::_class_is_enabled) { \
+ ::ClassDB::register_runtime_class<m_class>(); \
+ }
+
#define GDREGISTER_NATIVE_STRUCT(m_class, m_code) ClassDB::register_native_struct(#m_class, m_code, sizeof(m_class))
#include "core/disabled_classes.gen.h"
diff --git a/core/object/method_bind.h b/core/object/method_bind.h
index d67fd003c8..a1723adb9a 100644
--- a/core/object/method_bind.h
+++ b/core/object/method_bind.h
@@ -225,6 +225,9 @@ class MethodBindVarArgT : public MethodBindVarArgBase<MethodBindVarArgT<T>, T, v
public:
virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
+#ifdef TOOLS_ENABLED
+ ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder(), Variant(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
(static_cast<T *>(p_object)->*MethodBindVarArgBase<MethodBindVarArgT<T>, T, void, false>::method)(p_args, p_arg_count, r_error);
return {};
}
@@ -261,6 +264,9 @@ public:
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
+#ifdef TOOLS_ENABLED
+ ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder(), Variant(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
return (static_cast<T *>(p_object)->*MethodBindVarArgBase<MethodBindVarArgTR<T, R>, T, R, true>::method)(p_args, p_arg_count, r_error);
}
@@ -329,6 +335,9 @@ public:
#endif
virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
+#ifdef TOOLS_ENABLED
+ ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder(), Variant(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
#ifdef TYPED_METHOD_BIND
call_with_variant_args_dv(static_cast<T *>(p_object), method, p_args, p_arg_count, r_error, get_default_arguments());
#else
@@ -338,6 +347,9 @@ public:
}
virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
+#ifdef TOOLS_ENABLED
+ ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
#ifdef TYPED_METHOD_BIND
call_with_validated_object_instance_args(static_cast<T *>(p_object), method, p_args);
#else
@@ -346,6 +358,9 @@ public:
}
virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
+#ifdef TOOLS_ENABLED
+ ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
#ifdef TYPED_METHOD_BIND
call_with_ptr_args<T, P...>(static_cast<T *>(p_object), method, p_args);
#else
@@ -404,6 +419,9 @@ public:
#endif
virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
+#ifdef TOOLS_ENABLED
+ ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder(), Variant(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
#ifdef TYPED_METHOD_BIND
call_with_variant_argsc_dv(static_cast<T *>(p_object), method, p_args, p_arg_count, r_error, get_default_arguments());
#else
@@ -413,6 +431,9 @@ public:
}
virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
+#ifdef TOOLS_ENABLED
+ ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
#ifdef TYPED_METHOD_BIND
call_with_validated_object_instance_argsc(static_cast<T *>(p_object), method, p_args);
#else
@@ -421,6 +442,9 @@ public:
}
virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
+#ifdef TOOLS_ENABLED
+ ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
#ifdef TYPED_METHOD_BIND
call_with_ptr_argsc<T, P...>(static_cast<T *>(p_object), method, p_args);
#else
@@ -490,6 +514,9 @@ public:
virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
Variant ret;
+#ifdef TOOLS_ENABLED
+ ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder(), ret, vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
#ifdef TYPED_METHOD_BIND
call_with_variant_args_ret_dv(static_cast<T *>(p_object), method, p_args, p_arg_count, ret, r_error, get_default_arguments());
#else
@@ -499,6 +526,9 @@ public:
}
virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
+#ifdef TOOLS_ENABLED
+ ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
#ifdef TYPED_METHOD_BIND
call_with_validated_object_instance_args_ret(static_cast<T *>(p_object), method, p_args, r_ret);
#else
@@ -507,6 +537,9 @@ public:
}
virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
+#ifdef TOOLS_ENABLED
+ ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
#ifdef TYPED_METHOD_BIND
call_with_ptr_args_ret<T, R, P...>(static_cast<T *>(p_object), method, p_args, r_ret);
#else
@@ -577,6 +610,9 @@ public:
virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
Variant ret;
+#ifdef TOOLS_ENABLED
+ ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder(), ret, vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
#ifdef TYPED_METHOD_BIND
call_with_variant_args_retc_dv(static_cast<T *>(p_object), method, p_args, p_arg_count, ret, r_error, get_default_arguments());
#else
@@ -586,6 +622,9 @@ public:
}
virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
+#ifdef TOOLS_ENABLED
+ ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
#ifdef TYPED_METHOD_BIND
call_with_validated_object_instance_args_retc(static_cast<T *>(p_object), method, p_args, r_ret);
#else
@@ -594,6 +633,9 @@ public:
}
virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
+#ifdef TOOLS_ENABLED
+ ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
#ifdef TYPED_METHOD_BIND
call_with_ptr_args_retc<T, R, P...>(static_cast<T *>(p_object), method, p_args, r_ret);
#else
diff --git a/core/object/object.compat.inc b/core/object/object.compat.inc
new file mode 100644
index 0000000000..bf1e99fc9b
--- /dev/null
+++ b/core/object/object.compat.inc
@@ -0,0 +1,40 @@
+/**************************************************************************/
+/* object.compat.inc */
+/**************************************************************************/
+/* This file is part of: */
+/* GODOT ENGINE */
+/* https://godotengine.org */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
+/* */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the */
+/* "Software"), to deal in the Software without restriction, including */
+/* without limitation the rights to use, copy, modify, merge, publish, */
+/* distribute, sublicense, and/or sell copies of the Software, and to */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions: */
+/* */
+/* The above copyright notice and this permission notice shall be */
+/* included in all copies or substantial portions of the Software. */
+/* */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
+/**************************************************************************/
+
+#ifndef DISABLE_DEPRECATED
+
+#include "core/object/class_db.h"
+
+void Object::_bind_compatibility_methods() {
+ ClassDB::bind_compatibility_method(D_METHOD("tr", "message", "context"), &Object::tr, DEFVAL(""));
+ ClassDB::bind_compatibility_method(D_METHOD("tr_n", "message", "plural_message", "n", "context"), &Object::tr_n, DEFVAL(""));
+}
+
+#endif
diff --git a/core/object/object.cpp b/core/object/object.cpp
index cc33d0ab8a..5db1d2534f 100644
--- a/core/object/object.cpp
+++ b/core/object/object.cpp
@@ -29,6 +29,7 @@
/**************************************************************************/
#include "object.h"
+#include "object.compat.inc"
#include "core/core_string_names.h"
#include "core/extension/gdextension_manager.h"
@@ -492,14 +493,22 @@ void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) cons
ClassDB::get_property_list(current_extension->class_name, p_list, true, this);
if (current_extension->get_property_list) {
- uint32_t pcount;
- const GDExtensionPropertyInfo *pinfo = current_extension->get_property_list(_extension_instance, &pcount);
- for (uint32_t i = 0; i < pcount; i++) {
- p_list->push_back(PropertyInfo(pinfo[i]));
- }
- if (current_extension->free_property_list) {
- current_extension->free_property_list(_extension_instance, pinfo);
+#ifdef TOOLS_ENABLED
+ // If this is a placeholder, we can't call into the GDExtension on the parent class,
+ // because we don't have a real instance of the class to give it.
+ if (likely(!_extension->is_placeholder)) {
+#endif
+ uint32_t pcount;
+ const GDExtensionPropertyInfo *pinfo = current_extension->get_property_list(_extension_instance, &pcount);
+ for (uint32_t i = 0; i < pcount; i++) {
+ p_list->push_back(PropertyInfo(pinfo[i]));
+ }
+ if (current_extension->free_property_list) {
+ current_extension->free_property_list(_extension_instance, pinfo);
+ }
+#ifdef TOOLS_ENABLED
}
+#endif
}
current_extension = current_extension->parent;
@@ -1464,6 +1473,7 @@ void Object::initialize_class() {
}
ClassDB::_add_class<Object>();
_bind_methods();
+ _bind_compatibility_methods();
initialized = true;
}
@@ -1639,8 +1649,8 @@ void Object::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_message_translation", "enable"), &Object::set_message_translation);
ClassDB::bind_method(D_METHOD("can_translate_messages"), &Object::can_translate_messages);
- ClassDB::bind_method(D_METHOD("tr", "message", "context"), &Object::tr, DEFVAL(""));
- ClassDB::bind_method(D_METHOD("tr_n", "message", "plural_message", "n", "context"), &Object::tr_n, DEFVAL(""));
+ ClassDB::bind_method(D_METHOD("tr", "message", "context"), &Object::tr, DEFVAL(StringName()));
+ ClassDB::bind_method(D_METHOD("tr_n", "message", "plural_message", "n", "context"), &Object::tr_n, DEFVAL(StringName()));
ClassDB::bind_method(D_METHOD("is_queued_for_deletion"), &Object::is_queued_for_deletion);
ClassDB::bind_method(D_METHOD("cancel_free"), &Object::cancel_free);
@@ -1792,6 +1802,16 @@ uint32_t Object::get_edited_version() const {
#endif
StringName Object::get_class_name_for_extension(const GDExtension *p_library) const {
+#ifdef TOOLS_ENABLED
+ // If this is the library this extension comes from and it's a placeholder, we
+ // have to return the closest native parent's class name, so that it doesn't try to
+ // use this like the real object.
+ if (unlikely(_extension && _extension->library == p_library && _extension->is_placeholder)) {
+ const StringName *class_name = _get_class_namev();
+ return *class_name;
+ }
+#endif
+
// Only return the class name per the extension if it matches the given p_library.
if (_extension && _extension->library == p_library) {
return _extension->class_name;
@@ -1919,13 +1939,15 @@ void Object::clear_internal_extension() {
// Clear the instance bindings.
_instance_binding_mutex.lock();
- if (_instance_bindings[0].free_callback) {
- _instance_bindings[0].free_callback(_instance_bindings[0].token, this, _instance_bindings[0].binding);
+ if (_instance_bindings) {
+ if (_instance_bindings[0].free_callback) {
+ _instance_bindings[0].free_callback(_instance_bindings[0].token, this, _instance_bindings[0].binding);
+ }
+ _instance_bindings[0].binding = nullptr;
+ _instance_bindings[0].token = nullptr;
+ _instance_bindings[0].free_callback = nullptr;
+ _instance_bindings[0].reference_callback = nullptr;
}
- _instance_bindings[0].binding = nullptr;
- _instance_bindings[0].token = nullptr;
- _instance_bindings[0].free_callback = nullptr;
- _instance_bindings[0].reference_callback = nullptr;
_instance_binding_mutex.unlock();
// Clear the virtual methods.
diff --git a/core/object/object.h b/core/object/object.h
index 27f28b4aae..a062b8aa62 100644
--- a/core/object/object.h
+++ b/core/object/object.h
@@ -317,6 +317,10 @@ struct ObjectGDExtension {
bool is_virtual = false;
bool is_abstract = false;
bool is_exposed = true;
+#ifdef TOOLS_ENABLED
+ bool is_runtime = false;
+ bool is_placeholder = false;
+#endif
GDExtensionClassSet set;
GDExtensionClassGet get;
GDExtensionClassGetPropertyList get_property_list;
@@ -354,8 +358,8 @@ struct ObjectGDExtension {
#ifdef TOOLS_ENABLED
void *tracking_userdata = nullptr;
- void (*track_instance)(void *p_userdata, void *p_instance);
- void (*untrack_instance)(void *p_userdata, void *p_instance);
+ void (*track_instance)(void *p_userdata, void *p_instance) = nullptr;
+ void (*untrack_instance)(void *p_userdata, void *p_instance) = nullptr;
#endif
};
@@ -698,7 +702,11 @@ protected:
virtual void _notificationv(int p_notification, bool p_reversed) {}
static void _bind_methods();
+#ifndef DISABLE_DEPRECATED
+ static void _bind_compatibility_methods();
+#else
static void _bind_compatibility_methods() {}
+#endif
bool _set(const StringName &p_name, const Variant &p_property) { return false; };
bool _get(const StringName &p_name, Variant &r_property) const { return false; };
void _get_property_list(List<PropertyInfo> *p_list) const {};
@@ -755,6 +763,7 @@ protected:
void _clear_internal_resource_paths(const Variant &p_var);
friend class ClassDB;
+ friend class PlaceholderExtensionInstance;
bool _disconnect(const StringName &p_signal, const Callable &p_callable, bool p_force = false);
@@ -977,6 +986,7 @@ public:
#ifdef TOOLS_ENABLED
void clear_internal_extension();
void reset_internal_extension(ObjectGDExtension *p_extension);
+ bool is_extension_placeholder() const { return _extension && _extension->is_placeholder; }
#endif
void clear_internal_resource_paths();
diff --git a/core/string/char_range.inc b/core/string/char_range.inc
index 5dffe4f20d..b7d6bbdb61 100644
--- a/core/string/char_range.inc
+++ b/core/string/char_range.inc
@@ -1,5 +1,5 @@
/**************************************************************************/
-/* color_names.inc */
+/* char_range.inc */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -689,7 +689,6 @@ inline constexpr CharRange xid_start[] = {
{ 0x2ceb0, 0x2ebe0 },
{ 0x2f800, 0x2fa1d },
{ 0x30000, 0x3134a },
- { 0x0, 0x0 },
};
inline constexpr CharRange xid_continue[] = {
@@ -1450,7 +1449,1316 @@ inline constexpr CharRange xid_continue[] = {
{ 0x2f800, 0x2fa1d },
{ 0x30000, 0x3134a },
{ 0xe0100, 0xe01ef },
- { 0x0, 0x0 },
+};
+
+inline constexpr CharRange uppercase_letter[] = {
+ { 0x41, 0x5a },
+ { 0xc0, 0xd6 },
+ { 0xd8, 0xde },
+ { 0x100, 0x100 },
+ { 0x102, 0x102 },
+ { 0x104, 0x104 },
+ { 0x106, 0x106 },
+ { 0x108, 0x108 },
+ { 0x10a, 0x10a },
+ { 0x10c, 0x10c },
+ { 0x10e, 0x10e },
+ { 0x110, 0x110 },
+ { 0x112, 0x112 },
+ { 0x114, 0x114 },
+ { 0x116, 0x116 },
+ { 0x118, 0x118 },
+ { 0x11a, 0x11a },
+ { 0x11c, 0x11c },
+ { 0x11e, 0x11e },
+ { 0x120, 0x120 },
+ { 0x122, 0x122 },
+ { 0x124, 0x124 },
+ { 0x126, 0x126 },
+ { 0x128, 0x128 },
+ { 0x12a, 0x12a },
+ { 0x12c, 0x12c },
+ { 0x12e, 0x12e },
+ { 0x130, 0x130 },
+ { 0x132, 0x132 },
+ { 0x134, 0x134 },
+ { 0x136, 0x136 },
+ { 0x139, 0x139 },
+ { 0x13b, 0x13b },
+ { 0x13d, 0x13d },
+ { 0x13f, 0x13f },
+ { 0x141, 0x141 },
+ { 0x143, 0x143 },
+ { 0x145, 0x145 },
+ { 0x147, 0x147 },
+ { 0x14a, 0x14a },
+ { 0x14c, 0x14c },
+ { 0x14e, 0x14e },
+ { 0x150, 0x150 },
+ { 0x152, 0x152 },
+ { 0x154, 0x154 },
+ { 0x156, 0x156 },
+ { 0x158, 0x158 },
+ { 0x15a, 0x15a },
+ { 0x15c, 0x15c },
+ { 0x15e, 0x15e },
+ { 0x160, 0x160 },
+ { 0x162, 0x162 },
+ { 0x164, 0x164 },
+ { 0x166, 0x166 },
+ { 0x168, 0x168 },
+ { 0x16a, 0x16a },
+ { 0x16c, 0x16c },
+ { 0x16e, 0x16e },
+ { 0x170, 0x170 },
+ { 0x172, 0x172 },
+ { 0x174, 0x174 },
+ { 0x176, 0x176 },
+ { 0x178, 0x179 },
+ { 0x17b, 0x17b },
+ { 0x17d, 0x17d },
+ { 0x181, 0x182 },
+ { 0x184, 0x184 },
+ { 0x186, 0x187 },
+ { 0x189, 0x18b },
+ { 0x18e, 0x191 },
+ { 0x193, 0x194 },
+ { 0x196, 0x198 },
+ { 0x19c, 0x19d },
+ { 0x19f, 0x1a0 },
+ { 0x1a2, 0x1a2 },
+ { 0x1a4, 0x1a4 },
+ { 0x1a6, 0x1a7 },
+ { 0x1a9, 0x1a9 },
+ { 0x1ac, 0x1ac },
+ { 0x1ae, 0x1af },
+ { 0x1b1, 0x1b3 },
+ { 0x1b5, 0x1b5 },
+ { 0x1b7, 0x1b8 },
+ { 0x1bc, 0x1bc },
+ { 0x1c4, 0x1c4 },
+ { 0x1c7, 0x1c7 },
+ { 0x1ca, 0x1ca },
+ { 0x1cd, 0x1cd },
+ { 0x1cf, 0x1cf },
+ { 0x1d1, 0x1d1 },
+ { 0x1d3, 0x1d3 },
+ { 0x1d5, 0x1d5 },
+ { 0x1d7, 0x1d7 },
+ { 0x1d9, 0x1d9 },
+ { 0x1db, 0x1db },
+ { 0x1de, 0x1de },
+ { 0x1e0, 0x1e0 },
+ { 0x1e2, 0x1e2 },
+ { 0x1e4, 0x1e4 },
+ { 0x1e6, 0x1e6 },
+ { 0x1e8, 0x1e8 },
+ { 0x1ea, 0x1ea },
+ { 0x1ec, 0x1ec },
+ { 0x1ee, 0x1ee },
+ { 0x1f1, 0x1f1 },
+ { 0x1f4, 0x1f4 },
+ { 0x1f6, 0x1f8 },
+ { 0x1fa, 0x1fa },
+ { 0x1fc, 0x1fc },
+ { 0x1fe, 0x1fe },
+ { 0x200, 0x200 },
+ { 0x202, 0x202 },
+ { 0x204, 0x204 },
+ { 0x206, 0x206 },
+ { 0x208, 0x208 },
+ { 0x20a, 0x20a },
+ { 0x20c, 0x20c },
+ { 0x20e, 0x20e },
+ { 0x210, 0x210 },
+ { 0x212, 0x212 },
+ { 0x214, 0x214 },
+ { 0x216, 0x216 },
+ { 0x218, 0x218 },
+ { 0x21a, 0x21a },
+ { 0x21c, 0x21c },
+ { 0x21e, 0x21e },
+ { 0x220, 0x220 },
+ { 0x222, 0x222 },
+ { 0x224, 0x224 },
+ { 0x226, 0x226 },
+ { 0x228, 0x228 },
+ { 0x22a, 0x22a },
+ { 0x22c, 0x22c },
+ { 0x22e, 0x22e },
+ { 0x230, 0x230 },
+ { 0x232, 0x232 },
+ { 0x23a, 0x23b },
+ { 0x23d, 0x23e },
+ { 0x241, 0x241 },
+ { 0x243, 0x246 },
+ { 0x248, 0x248 },
+ { 0x24a, 0x24a },
+ { 0x24c, 0x24c },
+ { 0x24e, 0x24e },
+ { 0x370, 0x370 },
+ { 0x372, 0x372 },
+ { 0x376, 0x376 },
+ { 0x37f, 0x37f },
+ { 0x386, 0x386 },
+ { 0x388, 0x38a },
+ { 0x38c, 0x38c },
+ { 0x38e, 0x38f },
+ { 0x391, 0x3a1 },
+ { 0x3a3, 0x3ab },
+ { 0x3cf, 0x3cf },
+ { 0x3d2, 0x3d4 },
+ { 0x3d8, 0x3d8 },
+ { 0x3da, 0x3da },
+ { 0x3dc, 0x3dc },
+ { 0x3de, 0x3de },
+ { 0x3e0, 0x3e0 },
+ { 0x3e2, 0x3e2 },
+ { 0x3e4, 0x3e4 },
+ { 0x3e6, 0x3e6 },
+ { 0x3e8, 0x3e8 },
+ { 0x3ea, 0x3ea },
+ { 0x3ec, 0x3ec },
+ { 0x3ee, 0x3ee },
+ { 0x3f4, 0x3f4 },
+ { 0x3f7, 0x3f7 },
+ { 0x3f9, 0x3fa },
+ { 0x3fd, 0x42f },
+ { 0x460, 0x460 },
+ { 0x462, 0x462 },
+ { 0x464, 0x464 },
+ { 0x466, 0x466 },
+ { 0x468, 0x468 },
+ { 0x46a, 0x46a },
+ { 0x46c, 0x46c },
+ { 0x46e, 0x46e },
+ { 0x470, 0x470 },
+ { 0x472, 0x472 },
+ { 0x474, 0x474 },
+ { 0x476, 0x476 },
+ { 0x478, 0x478 },
+ { 0x47a, 0x47a },
+ { 0x47c, 0x47c },
+ { 0x47e, 0x47e },
+ { 0x480, 0x480 },
+ { 0x48a, 0x48a },
+ { 0x48c, 0x48c },
+ { 0x48e, 0x48e },
+ { 0x490, 0x490 },
+ { 0x492, 0x492 },
+ { 0x494, 0x494 },
+ { 0x496, 0x496 },
+ { 0x498, 0x498 },
+ { 0x49a, 0x49a },
+ { 0x49c, 0x49c },
+ { 0x49e, 0x49e },
+ { 0x4a0, 0x4a0 },
+ { 0x4a2, 0x4a2 },
+ { 0x4a4, 0x4a4 },
+ { 0x4a6, 0x4a6 },
+ { 0x4a8, 0x4a8 },
+ { 0x4aa, 0x4aa },
+ { 0x4ac, 0x4ac },
+ { 0x4ae, 0x4ae },
+ { 0x4b0, 0x4b0 },
+ { 0x4b2, 0x4b2 },
+ { 0x4b4, 0x4b4 },
+ { 0x4b6, 0x4b6 },
+ { 0x4b8, 0x4b8 },
+ { 0x4ba, 0x4ba },
+ { 0x4bc, 0x4bc },
+ { 0x4be, 0x4be },
+ { 0x4c0, 0x4c1 },
+ { 0x4c3, 0x4c3 },
+ { 0x4c5, 0x4c5 },
+ { 0x4c7, 0x4c7 },
+ { 0x4c9, 0x4c9 },
+ { 0x4cb, 0x4cb },
+ { 0x4cd, 0x4cd },
+ { 0x4d0, 0x4d0 },
+ { 0x4d2, 0x4d2 },
+ { 0x4d4, 0x4d4 },
+ { 0x4d6, 0x4d6 },
+ { 0x4d8, 0x4d8 },
+ { 0x4da, 0x4da },
+ { 0x4dc, 0x4dc },
+ { 0x4de, 0x4de },
+ { 0x4e0, 0x4e0 },
+ { 0x4e2, 0x4e2 },
+ { 0x4e4, 0x4e4 },
+ { 0x4e6, 0x4e6 },
+ { 0x4e8, 0x4e8 },
+ { 0x4ea, 0x4ea },
+ { 0x4ec, 0x4ec },
+ { 0x4ee, 0x4ee },
+ { 0x4f0, 0x4f0 },
+ { 0x4f2, 0x4f2 },
+ { 0x4f4, 0x4f4 },
+ { 0x4f6, 0x4f6 },
+ { 0x4f8, 0x4f8 },
+ { 0x4fa, 0x4fa },
+ { 0x4fc, 0x4fc },
+ { 0x4fe, 0x4fe },
+ { 0x500, 0x500 },
+ { 0x502, 0x502 },
+ { 0x504, 0x504 },
+ { 0x506, 0x506 },
+ { 0x508, 0x508 },
+ { 0x50a, 0x50a },
+ { 0x50c, 0x50c },
+ { 0x50e, 0x50e },
+ { 0x510, 0x510 },
+ { 0x512, 0x512 },
+ { 0x514, 0x514 },
+ { 0x516, 0x516 },
+ { 0x518, 0x518 },
+ { 0x51a, 0x51a },
+ { 0x51c, 0x51c },
+ { 0x51e, 0x51e },
+ { 0x520, 0x520 },
+ { 0x522, 0x522 },
+ { 0x524, 0x524 },
+ { 0x526, 0x526 },
+ { 0x528, 0x528 },
+ { 0x52a, 0x52a },
+ { 0x52c, 0x52c },
+ { 0x52e, 0x52e },
+ { 0x531, 0x556 },
+ { 0x10a0, 0x10c5 },
+ { 0x10c7, 0x10c7 },
+ { 0x10cd, 0x10cd },
+ { 0x13a0, 0x13f5 },
+ { 0x1c90, 0x1cba },
+ { 0x1cbd, 0x1cbf },
+ { 0x1e00, 0x1e00 },
+ { 0x1e02, 0x1e02 },
+ { 0x1e04, 0x1e04 },
+ { 0x1e06, 0x1e06 },
+ { 0x1e08, 0x1e08 },
+ { 0x1e0a, 0x1e0a },
+ { 0x1e0c, 0x1e0c },
+ { 0x1e0e, 0x1e0e },
+ { 0x1e10, 0x1e10 },
+ { 0x1e12, 0x1e12 },
+ { 0x1e14, 0x1e14 },
+ { 0x1e16, 0x1e16 },
+ { 0x1e18, 0x1e18 },
+ { 0x1e1a, 0x1e1a },
+ { 0x1e1c, 0x1e1c },
+ { 0x1e1e, 0x1e1e },
+ { 0x1e20, 0x1e20 },
+ { 0x1e22, 0x1e22 },
+ { 0x1e24, 0x1e24 },
+ { 0x1e26, 0x1e26 },
+ { 0x1e28, 0x1e28 },
+ { 0x1e2a, 0x1e2a },
+ { 0x1e2c, 0x1e2c },
+ { 0x1e2e, 0x1e2e },
+ { 0x1e30, 0x1e30 },
+ { 0x1e32, 0x1e32 },
+ { 0x1e34, 0x1e34 },
+ { 0x1e36, 0x1e36 },
+ { 0x1e38, 0x1e38 },
+ { 0x1e3a, 0x1e3a },
+ { 0x1e3c, 0x1e3c },
+ { 0x1e3e, 0x1e3e },
+ { 0x1e40, 0x1e40 },
+ { 0x1e42, 0x1e42 },
+ { 0x1e44, 0x1e44 },
+ { 0x1e46, 0x1e46 },
+ { 0x1e48, 0x1e48 },
+ { 0x1e4a, 0x1e4a },
+ { 0x1e4c, 0x1e4c },
+ { 0x1e4e, 0x1e4e },
+ { 0x1e50, 0x1e50 },
+ { 0x1e52, 0x1e52 },
+ { 0x1e54, 0x1e54 },
+ { 0x1e56, 0x1e56 },
+ { 0x1e58, 0x1e58 },
+ { 0x1e5a, 0x1e5a },
+ { 0x1e5c, 0x1e5c },
+ { 0x1e5e, 0x1e5e },
+ { 0x1e60, 0x1e60 },
+ { 0x1e62, 0x1e62 },
+ { 0x1e64, 0x1e64 },
+ { 0x1e66, 0x1e66 },
+ { 0x1e68, 0x1e68 },
+ { 0x1e6a, 0x1e6a },
+ { 0x1e6c, 0x1e6c },
+ { 0x1e6e, 0x1e6e },
+ { 0x1e70, 0x1e70 },
+ { 0x1e72, 0x1e72 },
+ { 0x1e74, 0x1e74 },
+ { 0x1e76, 0x1e76 },
+ { 0x1e78, 0x1e78 },
+ { 0x1e7a, 0x1e7a },
+ { 0x1e7c, 0x1e7c },
+ { 0x1e7e, 0x1e7e },
+ { 0x1e80, 0x1e80 },
+ { 0x1e82, 0x1e82 },
+ { 0x1e84, 0x1e84 },
+ { 0x1e86, 0x1e86 },
+ { 0x1e88, 0x1e88 },
+ { 0x1e8a, 0x1e8a },
+ { 0x1e8c, 0x1e8c },
+ { 0x1e8e, 0x1e8e },
+ { 0x1e90, 0x1e90 },
+ { 0x1e92, 0x1e92 },
+ { 0x1e94, 0x1e94 },
+ { 0x1e9e, 0x1e9e },
+ { 0x1ea0, 0x1ea0 },
+ { 0x1ea2, 0x1ea2 },
+ { 0x1ea4, 0x1ea4 },
+ { 0x1ea6, 0x1ea6 },
+ { 0x1ea8, 0x1ea8 },
+ { 0x1eaa, 0x1eaa },
+ { 0x1eac, 0x1eac },
+ { 0x1eae, 0x1eae },
+ { 0x1eb0, 0x1eb0 },
+ { 0x1eb2, 0x1eb2 },
+ { 0x1eb4, 0x1eb4 },
+ { 0x1eb6, 0x1eb6 },
+ { 0x1eb8, 0x1eb8 },
+ { 0x1eba, 0x1eba },
+ { 0x1ebc, 0x1ebc },
+ { 0x1ebe, 0x1ebe },
+ { 0x1ec0, 0x1ec0 },
+ { 0x1ec2, 0x1ec2 },
+ { 0x1ec4, 0x1ec4 },
+ { 0x1ec6, 0x1ec6 },
+ { 0x1ec8, 0x1ec8 },
+ { 0x1eca, 0x1eca },
+ { 0x1ecc, 0x1ecc },
+ { 0x1ece, 0x1ece },
+ { 0x1ed0, 0x1ed0 },
+ { 0x1ed2, 0x1ed2 },
+ { 0x1ed4, 0x1ed4 },
+ { 0x1ed6, 0x1ed6 },
+ { 0x1ed8, 0x1ed8 },
+ { 0x1eda, 0x1eda },
+ { 0x1edc, 0x1edc },
+ { 0x1ede, 0x1ede },
+ { 0x1ee0, 0x1ee0 },
+ { 0x1ee2, 0x1ee2 },
+ { 0x1ee4, 0x1ee4 },
+ { 0x1ee6, 0x1ee6 },
+ { 0x1ee8, 0x1ee8 },
+ { 0x1eea, 0x1eea },
+ { 0x1eec, 0x1eec },
+ { 0x1eee, 0x1eee },
+ { 0x1ef0, 0x1ef0 },
+ { 0x1ef2, 0x1ef2 },
+ { 0x1ef4, 0x1ef4 },
+ { 0x1ef6, 0x1ef6 },
+ { 0x1ef8, 0x1ef8 },
+ { 0x1efa, 0x1efa },
+ { 0x1efc, 0x1efc },
+ { 0x1efe, 0x1efe },
+ { 0x1f08, 0x1f0f },
+ { 0x1f18, 0x1f1d },
+ { 0x1f28, 0x1f2f },
+ { 0x1f38, 0x1f3f },
+ { 0x1f48, 0x1f4d },
+ { 0x1f59, 0x1f59 },
+ { 0x1f5b, 0x1f5b },
+ { 0x1f5d, 0x1f5d },
+ { 0x1f5f, 0x1f5f },
+ { 0x1f68, 0x1f6f },
+ { 0x1fb8, 0x1fbb },
+ { 0x1fc8, 0x1fcb },
+ { 0x1fd8, 0x1fdb },
+ { 0x1fe8, 0x1fec },
+ { 0x1ff8, 0x1ffb },
+ { 0x2102, 0x2102 },
+ { 0x2107, 0x2107 },
+ { 0x210b, 0x210d },
+ { 0x2110, 0x2112 },
+ { 0x2115, 0x2115 },
+ { 0x2119, 0x211d },
+ { 0x2124, 0x2124 },
+ { 0x2126, 0x2126 },
+ { 0x2128, 0x2128 },
+ { 0x212a, 0x212d },
+ { 0x2130, 0x2133 },
+ { 0x213e, 0x213f },
+ { 0x2145, 0x2145 },
+ { 0x2183, 0x2183 },
+ { 0x2c00, 0x2c2f },
+ { 0x2c60, 0x2c60 },
+ { 0x2c62, 0x2c64 },
+ { 0x2c67, 0x2c67 },
+ { 0x2c69, 0x2c69 },
+ { 0x2c6b, 0x2c6b },
+ { 0x2c6d, 0x2c70 },
+ { 0x2c72, 0x2c72 },
+ { 0x2c75, 0x2c75 },
+ { 0x2c7e, 0x2c80 },
+ { 0x2c82, 0x2c82 },
+ { 0x2c84, 0x2c84 },
+ { 0x2c86, 0x2c86 },
+ { 0x2c88, 0x2c88 },
+ { 0x2c8a, 0x2c8a },
+ { 0x2c8c, 0x2c8c },
+ { 0x2c8e, 0x2c8e },
+ { 0x2c90, 0x2c90 },
+ { 0x2c92, 0x2c92 },
+ { 0x2c94, 0x2c94 },
+ { 0x2c96, 0x2c96 },
+ { 0x2c98, 0x2c98 },
+ { 0x2c9a, 0x2c9a },
+ { 0x2c9c, 0x2c9c },
+ { 0x2c9e, 0x2c9e },
+ { 0x2ca0, 0x2ca0 },
+ { 0x2ca2, 0x2ca2 },
+ { 0x2ca4, 0x2ca4 },
+ { 0x2ca6, 0x2ca6 },
+ { 0x2ca8, 0x2ca8 },
+ { 0x2caa, 0x2caa },
+ { 0x2cac, 0x2cac },
+ { 0x2cae, 0x2cae },
+ { 0x2cb0, 0x2cb0 },
+ { 0x2cb2, 0x2cb2 },
+ { 0x2cb4, 0x2cb4 },
+ { 0x2cb6, 0x2cb6 },
+ { 0x2cb8, 0x2cb8 },
+ { 0x2cba, 0x2cba },
+ { 0x2cbc, 0x2cbc },
+ { 0x2cbe, 0x2cbe },
+ { 0x2cc0, 0x2cc0 },
+ { 0x2cc2, 0x2cc2 },
+ { 0x2cc4, 0x2cc4 },
+ { 0x2cc6, 0x2cc6 },
+ { 0x2cc8, 0x2cc8 },
+ { 0x2cca, 0x2cca },
+ { 0x2ccc, 0x2ccc },
+ { 0x2cce, 0x2cce },
+ { 0x2cd0, 0x2cd0 },
+ { 0x2cd2, 0x2cd2 },
+ { 0x2cd4, 0x2cd4 },
+ { 0x2cd6, 0x2cd6 },
+ { 0x2cd8, 0x2cd8 },
+ { 0x2cda, 0x2cda },
+ { 0x2cdc, 0x2cdc },
+ { 0x2cde, 0x2cde },
+ { 0x2ce0, 0x2ce0 },
+ { 0x2ce2, 0x2ce2 },
+ { 0x2ceb, 0x2ceb },
+ { 0x2ced, 0x2ced },
+ { 0x2cf2, 0x2cf2 },
+ { 0xa640, 0xa640 },
+ { 0xa642, 0xa642 },
+ { 0xa644, 0xa644 },
+ { 0xa646, 0xa646 },
+ { 0xa648, 0xa648 },
+ { 0xa64a, 0xa64a },
+ { 0xa64c, 0xa64c },
+ { 0xa64e, 0xa64e },
+ { 0xa650, 0xa650 },
+ { 0xa652, 0xa652 },
+ { 0xa654, 0xa654 },
+ { 0xa656, 0xa656 },
+ { 0xa658, 0xa658 },
+ { 0xa65a, 0xa65a },
+ { 0xa65c, 0xa65c },
+ { 0xa65e, 0xa65e },
+ { 0xa660, 0xa660 },
+ { 0xa662, 0xa662 },
+ { 0xa664, 0xa664 },
+ { 0xa666, 0xa666 },
+ { 0xa668, 0xa668 },
+ { 0xa66a, 0xa66a },
+ { 0xa66c, 0xa66c },
+ { 0xa680, 0xa680 },
+ { 0xa682, 0xa682 },
+ { 0xa684, 0xa684 },
+ { 0xa686, 0xa686 },
+ { 0xa688, 0xa688 },
+ { 0xa68a, 0xa68a },
+ { 0xa68c, 0xa68c },
+ { 0xa68e, 0xa68e },
+ { 0xa690, 0xa690 },
+ { 0xa692, 0xa692 },
+ { 0xa694, 0xa694 },
+ { 0xa696, 0xa696 },
+ { 0xa698, 0xa698 },
+ { 0xa69a, 0xa69a },
+ { 0xa722, 0xa722 },
+ { 0xa724, 0xa724 },
+ { 0xa726, 0xa726 },
+ { 0xa728, 0xa728 },
+ { 0xa72a, 0xa72a },
+ { 0xa72c, 0xa72c },
+ { 0xa72e, 0xa72e },
+ { 0xa732, 0xa732 },
+ { 0xa734, 0xa734 },
+ { 0xa736, 0xa736 },
+ { 0xa738, 0xa738 },
+ { 0xa73a, 0xa73a },
+ { 0xa73c, 0xa73c },
+ { 0xa73e, 0xa73e },
+ { 0xa740, 0xa740 },
+ { 0xa742, 0xa742 },
+ { 0xa744, 0xa744 },
+ { 0xa746, 0xa746 },
+ { 0xa748, 0xa748 },
+ { 0xa74a, 0xa74a },
+ { 0xa74c, 0xa74c },
+ { 0xa74e, 0xa74e },
+ { 0xa750, 0xa750 },
+ { 0xa752, 0xa752 },
+ { 0xa754, 0xa754 },
+ { 0xa756, 0xa756 },
+ { 0xa758, 0xa758 },
+ { 0xa75a, 0xa75a },
+ { 0xa75c, 0xa75c },
+ { 0xa75e, 0xa75e },
+ { 0xa760, 0xa760 },
+ { 0xa762, 0xa762 },
+ { 0xa764, 0xa764 },
+ { 0xa766, 0xa766 },
+ { 0xa768, 0xa768 },
+ { 0xa76a, 0xa76a },
+ { 0xa76c, 0xa76c },
+ { 0xa76e, 0xa76e },
+ { 0xa779, 0xa779 },
+ { 0xa77b, 0xa77b },
+ { 0xa77d, 0xa77e },
+ { 0xa780, 0xa780 },
+ { 0xa782, 0xa782 },
+ { 0xa784, 0xa784 },
+ { 0xa786, 0xa786 },
+ { 0xa78b, 0xa78b },
+ { 0xa78d, 0xa78d },
+ { 0xa790, 0xa790 },
+ { 0xa792, 0xa792 },
+ { 0xa796, 0xa796 },
+ { 0xa798, 0xa798 },
+ { 0xa79a, 0xa79a },
+ { 0xa79c, 0xa79c },
+ { 0xa79e, 0xa79e },
+ { 0xa7a0, 0xa7a0 },
+ { 0xa7a2, 0xa7a2 },
+ { 0xa7a4, 0xa7a4 },
+ { 0xa7a6, 0xa7a6 },
+ { 0xa7a8, 0xa7a8 },
+ { 0xa7aa, 0xa7ae },
+ { 0xa7b0, 0xa7b4 },
+ { 0xa7b6, 0xa7b6 },
+ { 0xa7b8, 0xa7b8 },
+ { 0xa7ba, 0xa7ba },
+ { 0xa7bc, 0xa7bc },
+ { 0xa7be, 0xa7be },
+ { 0xa7c0, 0xa7c0 },
+ { 0xa7c2, 0xa7c2 },
+ { 0xa7c4, 0xa7c7 },
+ { 0xa7c9, 0xa7c9 },
+ { 0xa7d0, 0xa7d0 },
+ { 0xa7d6, 0xa7d6 },
+ { 0xa7d8, 0xa7d8 },
+ { 0xa7f5, 0xa7f5 },
+ { 0xff21, 0xff3a },
+ { 0x10400, 0x10427 },
+ { 0x104b0, 0x104d3 },
+ { 0x10570, 0x1057a },
+ { 0x1057c, 0x1058a },
+ { 0x1058c, 0x10592 },
+ { 0x10594, 0x10595 },
+ { 0x10c80, 0x10cb2 },
+ { 0x118a0, 0x118bf },
+ { 0x16e40, 0x16e5f },
+ { 0x1d400, 0x1d419 },
+ { 0x1d434, 0x1d44d },
+ { 0x1d468, 0x1d481 },
+ { 0x1d49c, 0x1d49c },
+ { 0x1d49e, 0x1d49f },
+ { 0x1d4a2, 0x1d4a2 },
+ { 0x1d4a5, 0x1d4a6 },
+ { 0x1d4a9, 0x1d4ac },
+ { 0x1d4ae, 0x1d4b5 },
+ { 0x1d4d0, 0x1d4e9 },
+ { 0x1d504, 0x1d505 },
+ { 0x1d507, 0x1d50a },
+ { 0x1d50d, 0x1d514 },
+ { 0x1d516, 0x1d51c },
+ { 0x1d538, 0x1d539 },
+ { 0x1d53b, 0x1d53e },
+ { 0x1d540, 0x1d544 },
+ { 0x1d546, 0x1d546 },
+ { 0x1d54a, 0x1d550 },
+ { 0x1d56c, 0x1d585 },
+ { 0x1d5a0, 0x1d5b9 },
+ { 0x1d5d4, 0x1d5ed },
+ { 0x1d608, 0x1d621 },
+ { 0x1d63c, 0x1d655 },
+ { 0x1d670, 0x1d689 },
+ { 0x1d6a8, 0x1d6c0 },
+ { 0x1d6e2, 0x1d6fa },
+ { 0x1d71c, 0x1d734 },
+ { 0x1d756, 0x1d76e },
+ { 0x1d790, 0x1d7a8 },
+ { 0x1d7ca, 0x1d7ca },
+ { 0x1e900, 0x1e921 },
+};
+
+inline constexpr CharRange lowercase_letter[] = {
+ { 0x61, 0x7a },
+ { 0xb5, 0xb5 },
+ { 0xdf, 0xf6 },
+ { 0xf8, 0xff },
+ { 0x101, 0x101 },
+ { 0x103, 0x103 },
+ { 0x105, 0x105 },
+ { 0x107, 0x107 },
+ { 0x109, 0x109 },
+ { 0x10b, 0x10b },
+ { 0x10d, 0x10d },
+ { 0x10f, 0x10f },
+ { 0x111, 0x111 },
+ { 0x113, 0x113 },
+ { 0x115, 0x115 },
+ { 0x117, 0x117 },
+ { 0x119, 0x119 },
+ { 0x11b, 0x11b },
+ { 0x11d, 0x11d },
+ { 0x11f, 0x11f },
+ { 0x121, 0x121 },
+ { 0x123, 0x123 },
+ { 0x125, 0x125 },
+ { 0x127, 0x127 },
+ { 0x129, 0x129 },
+ { 0x12b, 0x12b },
+ { 0x12d, 0x12d },
+ { 0x12f, 0x12f },
+ { 0x131, 0x131 },
+ { 0x133, 0x133 },
+ { 0x135, 0x135 },
+ { 0x137, 0x138 },
+ { 0x13a, 0x13a },
+ { 0x13c, 0x13c },
+ { 0x13e, 0x13e },
+ { 0x140, 0x140 },
+ { 0x142, 0x142 },
+ { 0x144, 0x144 },
+ { 0x146, 0x146 },
+ { 0x148, 0x149 },
+ { 0x14b, 0x14b },
+ { 0x14d, 0x14d },
+ { 0x14f, 0x14f },
+ { 0x151, 0x151 },
+ { 0x153, 0x153 },
+ { 0x155, 0x155 },
+ { 0x157, 0x157 },
+ { 0x159, 0x159 },
+ { 0x15b, 0x15b },
+ { 0x15d, 0x15d },
+ { 0x15f, 0x15f },
+ { 0x161, 0x161 },
+ { 0x163, 0x163 },
+ { 0x165, 0x165 },
+ { 0x167, 0x167 },
+ { 0x169, 0x169 },
+ { 0x16b, 0x16b },
+ { 0x16d, 0x16d },
+ { 0x16f, 0x16f },
+ { 0x171, 0x171 },
+ { 0x173, 0x173 },
+ { 0x175, 0x175 },
+ { 0x177, 0x177 },
+ { 0x17a, 0x17a },
+ { 0x17c, 0x17c },
+ { 0x17e, 0x180 },
+ { 0x183, 0x183 },
+ { 0x185, 0x185 },
+ { 0x188, 0x188 },
+ { 0x18c, 0x18d },
+ { 0x192, 0x192 },
+ { 0x195, 0x195 },
+ { 0x199, 0x19b },
+ { 0x19e, 0x19e },
+ { 0x1a1, 0x1a1 },
+ { 0x1a3, 0x1a3 },
+ { 0x1a5, 0x1a5 },
+ { 0x1a8, 0x1a8 },
+ { 0x1aa, 0x1ab },
+ { 0x1ad, 0x1ad },
+ { 0x1b0, 0x1b0 },
+ { 0x1b4, 0x1b4 },
+ { 0x1b6, 0x1b6 },
+ { 0x1b9, 0x1ba },
+ { 0x1bd, 0x1bf },
+ { 0x1c6, 0x1c6 },
+ { 0x1c9, 0x1c9 },
+ { 0x1cc, 0x1cc },
+ { 0x1ce, 0x1ce },
+ { 0x1d0, 0x1d0 },
+ { 0x1d2, 0x1d2 },
+ { 0x1d4, 0x1d4 },
+ { 0x1d6, 0x1d6 },
+ { 0x1d8, 0x1d8 },
+ { 0x1da, 0x1da },
+ { 0x1dc, 0x1dd },
+ { 0x1df, 0x1df },
+ { 0x1e1, 0x1e1 },
+ { 0x1e3, 0x1e3 },
+ { 0x1e5, 0x1e5 },
+ { 0x1e7, 0x1e7 },
+ { 0x1e9, 0x1e9 },
+ { 0x1eb, 0x1eb },
+ { 0x1ed, 0x1ed },
+ { 0x1ef, 0x1f0 },
+ { 0x1f3, 0x1f3 },
+ { 0x1f5, 0x1f5 },
+ { 0x1f9, 0x1f9 },
+ { 0x1fb, 0x1fb },
+ { 0x1fd, 0x1fd },
+ { 0x1ff, 0x1ff },
+ { 0x201, 0x201 },
+ { 0x203, 0x203 },
+ { 0x205, 0x205 },
+ { 0x207, 0x207 },
+ { 0x209, 0x209 },
+ { 0x20b, 0x20b },
+ { 0x20d, 0x20d },
+ { 0x20f, 0x20f },
+ { 0x211, 0x211 },
+ { 0x213, 0x213 },
+ { 0x215, 0x215 },
+ { 0x217, 0x217 },
+ { 0x219, 0x219 },
+ { 0x21b, 0x21b },
+ { 0x21d, 0x21d },
+ { 0x21f, 0x21f },
+ { 0x221, 0x221 },
+ { 0x223, 0x223 },
+ { 0x225, 0x225 },
+ { 0x227, 0x227 },
+ { 0x229, 0x229 },
+ { 0x22b, 0x22b },
+ { 0x22d, 0x22d },
+ { 0x22f, 0x22f },
+ { 0x231, 0x231 },
+ { 0x233, 0x239 },
+ { 0x23c, 0x23c },
+ { 0x23f, 0x240 },
+ { 0x242, 0x242 },
+ { 0x247, 0x247 },
+ { 0x249, 0x249 },
+ { 0x24b, 0x24b },
+ { 0x24d, 0x24d },
+ { 0x24f, 0x293 },
+ { 0x295, 0x2af },
+ { 0x371, 0x371 },
+ { 0x373, 0x373 },
+ { 0x377, 0x377 },
+ { 0x37b, 0x37d },
+ { 0x390, 0x390 },
+ { 0x3ac, 0x3ce },
+ { 0x3d0, 0x3d1 },
+ { 0x3d5, 0x3d7 },
+ { 0x3d9, 0x3d9 },
+ { 0x3db, 0x3db },
+ { 0x3dd, 0x3dd },
+ { 0x3df, 0x3df },
+ { 0x3e1, 0x3e1 },
+ { 0x3e3, 0x3e3 },
+ { 0x3e5, 0x3e5 },
+ { 0x3e7, 0x3e7 },
+ { 0x3e9, 0x3e9 },
+ { 0x3eb, 0x3eb },
+ { 0x3ed, 0x3ed },
+ { 0x3ef, 0x3f3 },
+ { 0x3f5, 0x3f5 },
+ { 0x3f8, 0x3f8 },
+ { 0x3fb, 0x3fc },
+ { 0x430, 0x45f },
+ { 0x461, 0x461 },
+ { 0x463, 0x463 },
+ { 0x465, 0x465 },
+ { 0x467, 0x467 },
+ { 0x469, 0x469 },
+ { 0x46b, 0x46b },
+ { 0x46d, 0x46d },
+ { 0x46f, 0x46f },
+ { 0x471, 0x471 },
+ { 0x473, 0x473 },
+ { 0x475, 0x475 },
+ { 0x477, 0x477 },
+ { 0x479, 0x479 },
+ { 0x47b, 0x47b },
+ { 0x47d, 0x47d },
+ { 0x47f, 0x47f },
+ { 0x481, 0x481 },
+ { 0x48b, 0x48b },
+ { 0x48d, 0x48d },
+ { 0x48f, 0x48f },
+ { 0x491, 0x491 },
+ { 0x493, 0x493 },
+ { 0x495, 0x495 },
+ { 0x497, 0x497 },
+ { 0x499, 0x499 },
+ { 0x49b, 0x49b },
+ { 0x49d, 0x49d },
+ { 0x49f, 0x49f },
+ { 0x4a1, 0x4a1 },
+ { 0x4a3, 0x4a3 },
+ { 0x4a5, 0x4a5 },
+ { 0x4a7, 0x4a7 },
+ { 0x4a9, 0x4a9 },
+ { 0x4ab, 0x4ab },
+ { 0x4ad, 0x4ad },
+ { 0x4af, 0x4af },
+ { 0x4b1, 0x4b1 },
+ { 0x4b3, 0x4b3 },
+ { 0x4b5, 0x4b5 },
+ { 0x4b7, 0x4b7 },
+ { 0x4b9, 0x4b9 },
+ { 0x4bb, 0x4bb },
+ { 0x4bd, 0x4bd },
+ { 0x4bf, 0x4bf },
+ { 0x4c2, 0x4c2 },
+ { 0x4c4, 0x4c4 },
+ { 0x4c6, 0x4c6 },
+ { 0x4c8, 0x4c8 },
+ { 0x4ca, 0x4ca },
+ { 0x4cc, 0x4cc },
+ { 0x4ce, 0x4cf },
+ { 0x4d1, 0x4d1 },
+ { 0x4d3, 0x4d3 },
+ { 0x4d5, 0x4d5 },
+ { 0x4d7, 0x4d7 },
+ { 0x4d9, 0x4d9 },
+ { 0x4db, 0x4db },
+ { 0x4dd, 0x4dd },
+ { 0x4df, 0x4df },
+ { 0x4e1, 0x4e1 },
+ { 0x4e3, 0x4e3 },
+ { 0x4e5, 0x4e5 },
+ { 0x4e7, 0x4e7 },
+ { 0x4e9, 0x4e9 },
+ { 0x4eb, 0x4eb },
+ { 0x4ed, 0x4ed },
+ { 0x4ef, 0x4ef },
+ { 0x4f1, 0x4f1 },
+ { 0x4f3, 0x4f3 },
+ { 0x4f5, 0x4f5 },
+ { 0x4f7, 0x4f7 },
+ { 0x4f9, 0x4f9 },
+ { 0x4fb, 0x4fb },
+ { 0x4fd, 0x4fd },
+ { 0x4ff, 0x4ff },
+ { 0x501, 0x501 },
+ { 0x503, 0x503 },
+ { 0x505, 0x505 },
+ { 0x507, 0x507 },
+ { 0x509, 0x509 },
+ { 0x50b, 0x50b },
+ { 0x50d, 0x50d },
+ { 0x50f, 0x50f },
+ { 0x511, 0x511 },
+ { 0x513, 0x513 },
+ { 0x515, 0x515 },
+ { 0x517, 0x517 },
+ { 0x519, 0x519 },
+ { 0x51b, 0x51b },
+ { 0x51d, 0x51d },
+ { 0x51f, 0x51f },
+ { 0x521, 0x521 },
+ { 0x523, 0x523 },
+ { 0x525, 0x525 },
+ { 0x527, 0x527 },
+ { 0x529, 0x529 },
+ { 0x52b, 0x52b },
+ { 0x52d, 0x52d },
+ { 0x52f, 0x52f },
+ { 0x560, 0x588 },
+ { 0x10d0, 0x10fa },
+ { 0x10fd, 0x10ff },
+ { 0x13f8, 0x13fd },
+ { 0x1c80, 0x1c88 },
+ { 0x1d00, 0x1d2b },
+ { 0x1d6b, 0x1d77 },
+ { 0x1d79, 0x1d9a },
+ { 0x1e01, 0x1e01 },
+ { 0x1e03, 0x1e03 },
+ { 0x1e05, 0x1e05 },
+ { 0x1e07, 0x1e07 },
+ { 0x1e09, 0x1e09 },
+ { 0x1e0b, 0x1e0b },
+ { 0x1e0d, 0x1e0d },
+ { 0x1e0f, 0x1e0f },
+ { 0x1e11, 0x1e11 },
+ { 0x1e13, 0x1e13 },
+ { 0x1e15, 0x1e15 },
+ { 0x1e17, 0x1e17 },
+ { 0x1e19, 0x1e19 },
+ { 0x1e1b, 0x1e1b },
+ { 0x1e1d, 0x1e1d },
+ { 0x1e1f, 0x1e1f },
+ { 0x1e21, 0x1e21 },
+ { 0x1e23, 0x1e23 },
+ { 0x1e25, 0x1e25 },
+ { 0x1e27, 0x1e27 },
+ { 0x1e29, 0x1e29 },
+ { 0x1e2b, 0x1e2b },
+ { 0x1e2d, 0x1e2d },
+ { 0x1e2f, 0x1e2f },
+ { 0x1e31, 0x1e31 },
+ { 0x1e33, 0x1e33 },
+ { 0x1e35, 0x1e35 },
+ { 0x1e37, 0x1e37 },
+ { 0x1e39, 0x1e39 },
+ { 0x1e3b, 0x1e3b },
+ { 0x1e3d, 0x1e3d },
+ { 0x1e3f, 0x1e3f },
+ { 0x1e41, 0x1e41 },
+ { 0x1e43, 0x1e43 },
+ { 0x1e45, 0x1e45 },
+ { 0x1e47, 0x1e47 },
+ { 0x1e49, 0x1e49 },
+ { 0x1e4b, 0x1e4b },
+ { 0x1e4d, 0x1e4d },
+ { 0x1e4f, 0x1e4f },
+ { 0x1e51, 0x1e51 },
+ { 0x1e53, 0x1e53 },
+ { 0x1e55, 0x1e55 },
+ { 0x1e57, 0x1e57 },
+ { 0x1e59, 0x1e59 },
+ { 0x1e5b, 0x1e5b },
+ { 0x1e5d, 0x1e5d },
+ { 0x1e5f, 0x1e5f },
+ { 0x1e61, 0x1e61 },
+ { 0x1e63, 0x1e63 },
+ { 0x1e65, 0x1e65 },
+ { 0x1e67, 0x1e67 },
+ { 0x1e69, 0x1e69 },
+ { 0x1e6b, 0x1e6b },
+ { 0x1e6d, 0x1e6d },
+ { 0x1e6f, 0x1e6f },
+ { 0x1e71, 0x1e71 },
+ { 0x1e73, 0x1e73 },
+ { 0x1e75, 0x1e75 },
+ { 0x1e77, 0x1e77 },
+ { 0x1e79, 0x1e79 },
+ { 0x1e7b, 0x1e7b },
+ { 0x1e7d, 0x1e7d },
+ { 0x1e7f, 0x1e7f },
+ { 0x1e81, 0x1e81 },
+ { 0x1e83, 0x1e83 },
+ { 0x1e85, 0x1e85 },
+ { 0x1e87, 0x1e87 },
+ { 0x1e89, 0x1e89 },
+ { 0x1e8b, 0x1e8b },
+ { 0x1e8d, 0x1e8d },
+ { 0x1e8f, 0x1e8f },
+ { 0x1e91, 0x1e91 },
+ { 0x1e93, 0x1e93 },
+ { 0x1e95, 0x1e9d },
+ { 0x1e9f, 0x1e9f },
+ { 0x1ea1, 0x1ea1 },
+ { 0x1ea3, 0x1ea3 },
+ { 0x1ea5, 0x1ea5 },
+ { 0x1ea7, 0x1ea7 },
+ { 0x1ea9, 0x1ea9 },
+ { 0x1eab, 0x1eab },
+ { 0x1ead, 0x1ead },
+ { 0x1eaf, 0x1eaf },
+ { 0x1eb1, 0x1eb1 },
+ { 0x1eb3, 0x1eb3 },
+ { 0x1eb5, 0x1eb5 },
+ { 0x1eb7, 0x1eb7 },
+ { 0x1eb9, 0x1eb9 },
+ { 0x1ebb, 0x1ebb },
+ { 0x1ebd, 0x1ebd },
+ { 0x1ebf, 0x1ebf },
+ { 0x1ec1, 0x1ec1 },
+ { 0x1ec3, 0x1ec3 },
+ { 0x1ec5, 0x1ec5 },
+ { 0x1ec7, 0x1ec7 },
+ { 0x1ec9, 0x1ec9 },
+ { 0x1ecb, 0x1ecb },
+ { 0x1ecd, 0x1ecd },
+ { 0x1ecf, 0x1ecf },
+ { 0x1ed1, 0x1ed1 },
+ { 0x1ed3, 0x1ed3 },
+ { 0x1ed5, 0x1ed5 },
+ { 0x1ed7, 0x1ed7 },
+ { 0x1ed9, 0x1ed9 },
+ { 0x1edb, 0x1edb },
+ { 0x1edd, 0x1edd },
+ { 0x1edf, 0x1edf },
+ { 0x1ee1, 0x1ee1 },
+ { 0x1ee3, 0x1ee3 },
+ { 0x1ee5, 0x1ee5 },
+ { 0x1ee7, 0x1ee7 },
+ { 0x1ee9, 0x1ee9 },
+ { 0x1eeb, 0x1eeb },
+ { 0x1eed, 0x1eed },
+ { 0x1eef, 0x1eef },
+ { 0x1ef1, 0x1ef1 },
+ { 0x1ef3, 0x1ef3 },
+ { 0x1ef5, 0x1ef5 },
+ { 0x1ef7, 0x1ef7 },
+ { 0x1ef9, 0x1ef9 },
+ { 0x1efb, 0x1efb },
+ { 0x1efd, 0x1efd },
+ { 0x1eff, 0x1f07 },
+ { 0x1f10, 0x1f15 },
+ { 0x1f20, 0x1f27 },
+ { 0x1f30, 0x1f37 },
+ { 0x1f40, 0x1f45 },
+ { 0x1f50, 0x1f57 },
+ { 0x1f60, 0x1f67 },
+ { 0x1f70, 0x1f7d },
+ { 0x1f80, 0x1f87 },
+ { 0x1f90, 0x1f97 },
+ { 0x1fa0, 0x1fa7 },
+ { 0x1fb0, 0x1fb4 },
+ { 0x1fb6, 0x1fb7 },
+ { 0x1fbe, 0x1fbe },
+ { 0x1fc2, 0x1fc4 },
+ { 0x1fc6, 0x1fc7 },
+ { 0x1fd0, 0x1fd3 },
+ { 0x1fd6, 0x1fd7 },
+ { 0x1fe0, 0x1fe7 },
+ { 0x1ff2, 0x1ff4 },
+ { 0x1ff6, 0x1ff7 },
+ { 0x210a, 0x210a },
+ { 0x210e, 0x210f },
+ { 0x2113, 0x2113 },
+ { 0x212f, 0x212f },
+ { 0x2134, 0x2134 },
+ { 0x2139, 0x2139 },
+ { 0x213c, 0x213d },
+ { 0x2146, 0x2149 },
+ { 0x214e, 0x214e },
+ { 0x2184, 0x2184 },
+ { 0x2c30, 0x2c5f },
+ { 0x2c61, 0x2c61 },
+ { 0x2c65, 0x2c66 },
+ { 0x2c68, 0x2c68 },
+ { 0x2c6a, 0x2c6a },
+ { 0x2c6c, 0x2c6c },
+ { 0x2c71, 0x2c71 },
+ { 0x2c73, 0x2c74 },
+ { 0x2c76, 0x2c7b },
+ { 0x2c81, 0x2c81 },
+ { 0x2c83, 0x2c83 },
+ { 0x2c85, 0x2c85 },
+ { 0x2c87, 0x2c87 },
+ { 0x2c89, 0x2c89 },
+ { 0x2c8b, 0x2c8b },
+ { 0x2c8d, 0x2c8d },
+ { 0x2c8f, 0x2c8f },
+ { 0x2c91, 0x2c91 },
+ { 0x2c93, 0x2c93 },
+ { 0x2c95, 0x2c95 },
+ { 0x2c97, 0x2c97 },
+ { 0x2c99, 0x2c99 },
+ { 0x2c9b, 0x2c9b },
+ { 0x2c9d, 0x2c9d },
+ { 0x2c9f, 0x2c9f },
+ { 0x2ca1, 0x2ca1 },
+ { 0x2ca3, 0x2ca3 },
+ { 0x2ca5, 0x2ca5 },
+ { 0x2ca7, 0x2ca7 },
+ { 0x2ca9, 0x2ca9 },
+ { 0x2cab, 0x2cab },
+ { 0x2cad, 0x2cad },
+ { 0x2caf, 0x2caf },
+ { 0x2cb1, 0x2cb1 },
+ { 0x2cb3, 0x2cb3 },
+ { 0x2cb5, 0x2cb5 },
+ { 0x2cb7, 0x2cb7 },
+ { 0x2cb9, 0x2cb9 },
+ { 0x2cbb, 0x2cbb },
+ { 0x2cbd, 0x2cbd },
+ { 0x2cbf, 0x2cbf },
+ { 0x2cc1, 0x2cc1 },
+ { 0x2cc3, 0x2cc3 },
+ { 0x2cc5, 0x2cc5 },
+ { 0x2cc7, 0x2cc7 },
+ { 0x2cc9, 0x2cc9 },
+ { 0x2ccb, 0x2ccb },
+ { 0x2ccd, 0x2ccd },
+ { 0x2ccf, 0x2ccf },
+ { 0x2cd1, 0x2cd1 },
+ { 0x2cd3, 0x2cd3 },
+ { 0x2cd5, 0x2cd5 },
+ { 0x2cd7, 0x2cd7 },
+ { 0x2cd9, 0x2cd9 },
+ { 0x2cdb, 0x2cdb },
+ { 0x2cdd, 0x2cdd },
+ { 0x2cdf, 0x2cdf },
+ { 0x2ce1, 0x2ce1 },
+ { 0x2ce3, 0x2ce4 },
+ { 0x2cec, 0x2cec },
+ { 0x2cee, 0x2cee },
+ { 0x2cf3, 0x2cf3 },
+ { 0x2d00, 0x2d25 },
+ { 0x2d27, 0x2d27 },
+ { 0x2d2d, 0x2d2d },
+ { 0xa641, 0xa641 },
+ { 0xa643, 0xa643 },
+ { 0xa645, 0xa645 },
+ { 0xa647, 0xa647 },
+ { 0xa649, 0xa649 },
+ { 0xa64b, 0xa64b },
+ { 0xa64d, 0xa64d },
+ { 0xa64f, 0xa64f },
+ { 0xa651, 0xa651 },
+ { 0xa653, 0xa653 },
+ { 0xa655, 0xa655 },
+ { 0xa657, 0xa657 },
+ { 0xa659, 0xa659 },
+ { 0xa65b, 0xa65b },
+ { 0xa65d, 0xa65d },
+ { 0xa65f, 0xa65f },
+ { 0xa661, 0xa661 },
+ { 0xa663, 0xa663 },
+ { 0xa665, 0xa665 },
+ { 0xa667, 0xa667 },
+ { 0xa669, 0xa669 },
+ { 0xa66b, 0xa66b },
+ { 0xa66d, 0xa66d },
+ { 0xa681, 0xa681 },
+ { 0xa683, 0xa683 },
+ { 0xa685, 0xa685 },
+ { 0xa687, 0xa687 },
+ { 0xa689, 0xa689 },
+ { 0xa68b, 0xa68b },
+ { 0xa68d, 0xa68d },
+ { 0xa68f, 0xa68f },
+ { 0xa691, 0xa691 },
+ { 0xa693, 0xa693 },
+ { 0xa695, 0xa695 },
+ { 0xa697, 0xa697 },
+ { 0xa699, 0xa699 },
+ { 0xa69b, 0xa69b },
+ { 0xa723, 0xa723 },
+ { 0xa725, 0xa725 },
+ { 0xa727, 0xa727 },
+ { 0xa729, 0xa729 },
+ { 0xa72b, 0xa72b },
+ { 0xa72d, 0xa72d },
+ { 0xa72f, 0xa731 },
+ { 0xa733, 0xa733 },
+ { 0xa735, 0xa735 },
+ { 0xa737, 0xa737 },
+ { 0xa739, 0xa739 },
+ { 0xa73b, 0xa73b },
+ { 0xa73d, 0xa73d },
+ { 0xa73f, 0xa73f },
+ { 0xa741, 0xa741 },
+ { 0xa743, 0xa743 },
+ { 0xa745, 0xa745 },
+ { 0xa747, 0xa747 },
+ { 0xa749, 0xa749 },
+ { 0xa74b, 0xa74b },
+ { 0xa74d, 0xa74d },
+ { 0xa74f, 0xa74f },
+ { 0xa751, 0xa751 },
+ { 0xa753, 0xa753 },
+ { 0xa755, 0xa755 },
+ { 0xa757, 0xa757 },
+ { 0xa759, 0xa759 },
+ { 0xa75b, 0xa75b },
+ { 0xa75d, 0xa75d },
+ { 0xa75f, 0xa75f },
+ { 0xa761, 0xa761 },
+ { 0xa763, 0xa763 },
+ { 0xa765, 0xa765 },
+ { 0xa767, 0xa767 },
+ { 0xa769, 0xa769 },
+ { 0xa76b, 0xa76b },
+ { 0xa76d, 0xa76d },
+ { 0xa76f, 0xa76f },
+ { 0xa771, 0xa778 },
+ { 0xa77a, 0xa77a },
+ { 0xa77c, 0xa77c },
+ { 0xa77f, 0xa77f },
+ { 0xa781, 0xa781 },
+ { 0xa783, 0xa783 },
+ { 0xa785, 0xa785 },
+ { 0xa787, 0xa787 },
+ { 0xa78c, 0xa78c },
+ { 0xa78e, 0xa78e },
+ { 0xa791, 0xa791 },
+ { 0xa793, 0xa795 },
+ { 0xa797, 0xa797 },
+ { 0xa799, 0xa799 },
+ { 0xa79b, 0xa79b },
+ { 0xa79d, 0xa79d },
+ { 0xa79f, 0xa79f },
+ { 0xa7a1, 0xa7a1 },
+ { 0xa7a3, 0xa7a3 },
+ { 0xa7a5, 0xa7a5 },
+ { 0xa7a7, 0xa7a7 },
+ { 0xa7a9, 0xa7a9 },
+ { 0xa7af, 0xa7af },
+ { 0xa7b5, 0xa7b5 },
+ { 0xa7b7, 0xa7b7 },
+ { 0xa7b9, 0xa7b9 },
+ { 0xa7bb, 0xa7bb },
+ { 0xa7bd, 0xa7bd },
+ { 0xa7bf, 0xa7bf },
+ { 0xa7c1, 0xa7c1 },
+ { 0xa7c3, 0xa7c3 },
+ { 0xa7c8, 0xa7c8 },
+ { 0xa7ca, 0xa7ca },
+ { 0xa7d1, 0xa7d1 },
+ { 0xa7d3, 0xa7d3 },
+ { 0xa7d5, 0xa7d5 },
+ { 0xa7d7, 0xa7d7 },
+ { 0xa7d9, 0xa7d9 },
+ { 0xa7f6, 0xa7f6 },
+ { 0xa7fa, 0xa7fa },
+ { 0xab30, 0xab5a },
+ { 0xab60, 0xab68 },
+ { 0xab70, 0xabbf },
+ { 0xfb00, 0xfb06 },
+ { 0xfb13, 0xfb17 },
+ { 0xff41, 0xff5a },
+ { 0x10428, 0x1044f },
+ { 0x104d8, 0x104fb },
+ { 0x10597, 0x105a1 },
+ { 0x105a3, 0x105b1 },
+ { 0x105b3, 0x105b9 },
+ { 0x105bb, 0x105bc },
+ { 0x10cc0, 0x10cf2 },
+ { 0x118c0, 0x118df },
+ { 0x16e60, 0x16e7f },
+ { 0x1d41a, 0x1d433 },
+ { 0x1d44e, 0x1d454 },
+ { 0x1d456, 0x1d467 },
+ { 0x1d482, 0x1d49b },
+ { 0x1d4b6, 0x1d4b9 },
+ { 0x1d4bb, 0x1d4bb },
+ { 0x1d4bd, 0x1d4c3 },
+ { 0x1d4c5, 0x1d4cf },
+ { 0x1d4ea, 0x1d503 },
+ { 0x1d51e, 0x1d537 },
+ { 0x1d552, 0x1d56b },
+ { 0x1d586, 0x1d59f },
+ { 0x1d5ba, 0x1d5d3 },
+ { 0x1d5ee, 0x1d607 },
+ { 0x1d622, 0x1d63b },
+ { 0x1d656, 0x1d66f },
+ { 0x1d68a, 0x1d6a5 },
+ { 0x1d6c2, 0x1d6da },
+ { 0x1d6dc, 0x1d6e1 },
+ { 0x1d6fc, 0x1d714 },
+ { 0x1d716, 0x1d71b },
+ { 0x1d736, 0x1d74e },
+ { 0x1d750, 0x1d755 },
+ { 0x1d770, 0x1d788 },
+ { 0x1d78a, 0x1d78f },
+ { 0x1d7aa, 0x1d7c2 },
+ { 0x1d7c4, 0x1d7c9 },
+ { 0x1d7cb, 0x1d7cb },
+ { 0x1df00, 0x1df09 },
+ { 0x1df0b, 0x1df1e },
+ { 0x1df25, 0x1df2a },
+ { 0x1e922, 0x1e943 },
};
#endif // CHAR_RANGE_INC
diff --git a/core/string/char_utils.h b/core/string/char_utils.h
index 4ff8fb7320..aa9bc198ca 100644
--- a/core/string/char_utils.h
+++ b/core/string/char_utils.h
@@ -35,24 +35,43 @@
#include "char_range.inc"
+#define BSEARCH_CHAR_RANGE(m_array) \
+ int low = 0; \
+ int high = sizeof(m_array) / sizeof(m_array[0]) - 1; \
+ int middle; \
+ \
+ while (low <= high) { \
+ middle = (low + high) / 2; \
+ \
+ if (c < m_array[middle].start) { \
+ high = middle - 1; \
+ } else if (c > m_array[middle].end) { \
+ low = middle + 1; \
+ } else { \
+ return true; \
+ } \
+ } \
+ \
+ return false
+
static _FORCE_INLINE_ bool is_unicode_identifier_start(char32_t c) {
- for (int i = 0; xid_start[i].start != 0; i++) {
- if (c >= xid_start[i].start && c <= xid_start[i].end) {
- return true;
- }
- }
- return false;
+ BSEARCH_CHAR_RANGE(xid_start);
}
static _FORCE_INLINE_ bool is_unicode_identifier_continue(char32_t c) {
- for (int i = 0; xid_continue[i].start != 0; i++) {
- if (c >= xid_continue[i].start && c <= xid_continue[i].end) {
- return true;
- }
- }
- return false;
+ BSEARCH_CHAR_RANGE(xid_continue);
+}
+
+static _FORCE_INLINE_ bool is_unicode_upper_case(char32_t c) {
+ BSEARCH_CHAR_RANGE(uppercase_letter);
}
+static _FORCE_INLINE_ bool is_unicode_lower_case(char32_t c) {
+ BSEARCH_CHAR_RANGE(lowercase_letter);
+}
+
+#undef BSEARCH_CHAR_RANGE
+
static _FORCE_INLINE_ bool is_ascii_upper_case(char32_t c) {
return (c >= 'A' && c <= 'Z');
}
diff --git a/core/string/translation.compat.inc b/core/string/translation.compat.inc
new file mode 100644
index 0000000000..d792d4a6fc
--- /dev/null
+++ b/core/string/translation.compat.inc
@@ -0,0 +1,46 @@
+/**************************************************************************/
+/* translation.compat.inc */
+/**************************************************************************/
+/* This file is part of: */
+/* GODOT ENGINE */
+/* https://godotengine.org */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
+/* */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the */
+/* "Software"), to deal in the Software without restriction, including */
+/* without limitation the rights to use, copy, modify, merge, publish, */
+/* distribute, sublicense, and/or sell copies of the Software, and to */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions: */
+/* */
+/* The above copyright notice and this permission notice shall be */
+/* included in all copies or substantial portions of the Software. */
+/* */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
+/**************************************************************************/
+
+#ifndef DISABLE_DEPRECATED
+
+void Translation::_bind_compatibility_methods() {
+ ClassDB::bind_compatibility_method(D_METHOD("add_message", "src_message", "xlated_message", "context"), &Translation::add_message, DEFVAL(""));
+ ClassDB::bind_compatibility_method(D_METHOD("add_plural_message", "src_message", "xlated_messages", "context"), &Translation::add_plural_message, DEFVAL(""));
+ ClassDB::bind_compatibility_method(D_METHOD("get_message", "src_message", "context"), &Translation::get_message, DEFVAL(""));
+ ClassDB::bind_compatibility_method(D_METHOD("get_plural_message", "src_message", "src_plural_message", "n", "context"), &Translation::get_plural_message, DEFVAL(""));
+ ClassDB::bind_compatibility_method(D_METHOD("erase_message", "src_message", "context"), &Translation::erase_message, DEFVAL(""));
+}
+
+void TranslationServer::_bind_compatibility_methods() {
+ ClassDB::bind_compatibility_method(D_METHOD("translate", "message", "context"), &TranslationServer::translate, DEFVAL(""));
+ ClassDB::bind_compatibility_method(D_METHOD("translate_plural", "message", "plural_message", "n", "context"), &TranslationServer::translate_plural, DEFVAL(""));
+}
+
+#endif
diff --git a/core/string/translation.cpp b/core/string/translation.cpp
index 829c9bf777..db0c3f6006 100644
--- a/core/string/translation.cpp
+++ b/core/string/translation.cpp
@@ -29,6 +29,7 @@
/**************************************************************************/
#include "translation.h"
+#include "translation.compat.inc"
#include "core/config/project_settings.h"
#include "core/io/resource_loader.h"
@@ -155,11 +156,11 @@ int Translation::get_message_count() const {
void Translation::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_locale", "locale"), &Translation::set_locale);
ClassDB::bind_method(D_METHOD("get_locale"), &Translation::get_locale);
- ClassDB::bind_method(D_METHOD("add_message", "src_message", "xlated_message", "context"), &Translation::add_message, DEFVAL(""));
- ClassDB::bind_method(D_METHOD("add_plural_message", "src_message", "xlated_messages", "context"), &Translation::add_plural_message, DEFVAL(""));
- ClassDB::bind_method(D_METHOD("get_message", "src_message", "context"), &Translation::get_message, DEFVAL(""));
- ClassDB::bind_method(D_METHOD("get_plural_message", "src_message", "src_plural_message", "n", "context"), &Translation::get_plural_message, DEFVAL(""));
- ClassDB::bind_method(D_METHOD("erase_message", "src_message", "context"), &Translation::erase_message, DEFVAL(""));
+ ClassDB::bind_method(D_METHOD("add_message", "src_message", "xlated_message", "context"), &Translation::add_message, DEFVAL(StringName()));
+ ClassDB::bind_method(D_METHOD("add_plural_message", "src_message", "xlated_messages", "context"), &Translation::add_plural_message, DEFVAL(StringName()));
+ ClassDB::bind_method(D_METHOD("get_message", "src_message", "context"), &Translation::get_message, DEFVAL(StringName()));
+ ClassDB::bind_method(D_METHOD("get_plural_message", "src_message", "src_plural_message", "n", "context"), &Translation::get_plural_message, DEFVAL(StringName()));
+ ClassDB::bind_method(D_METHOD("erase_message", "src_message", "context"), &Translation::erase_message, DEFVAL(StringName()));
ClassDB::bind_method(D_METHOD("get_message_list"), &Translation::_get_message_list);
ClassDB::bind_method(D_METHOD("get_translated_message_list"), &Translation::get_translated_message_list);
ClassDB::bind_method(D_METHOD("get_message_count"), &Translation::get_message_count);
@@ -1002,8 +1003,8 @@ void TranslationServer::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_locale_name", "locale"), &TranslationServer::get_locale_name);
- ClassDB::bind_method(D_METHOD("translate", "message", "context"), &TranslationServer::translate, DEFVAL(""));
- ClassDB::bind_method(D_METHOD("translate_plural", "message", "plural_message", "n", "context"), &TranslationServer::translate_plural, DEFVAL(""));
+ ClassDB::bind_method(D_METHOD("translate", "message", "context"), &TranslationServer::translate, DEFVAL(StringName()));
+ ClassDB::bind_method(D_METHOD("translate_plural", "message", "plural_message", "n", "context"), &TranslationServer::translate_plural, DEFVAL(StringName()));
ClassDB::bind_method(D_METHOD("add_translation", "translation"), &TranslationServer::add_translation);
ClassDB::bind_method(D_METHOD("remove_translation", "translation"), &TranslationServer::remove_translation);
diff --git a/core/string/translation.h b/core/string/translation.h
index 3f9dbcc476..4eca37f6be 100644
--- a/core/string/translation.h
+++ b/core/string/translation.h
@@ -51,6 +51,10 @@ class Translation : public Resource {
protected:
static void _bind_methods();
+#ifndef DISABLE_DEPRECATED
+ static void _bind_compatibility_methods();
+#endif
+
GDVIRTUAL2RC(StringName, _get_message, StringName, StringName);
GDVIRTUAL4RC(StringName, _get_plural_message, StringName, StringName, int, StringName);
@@ -111,6 +115,10 @@ class TranslationServer : public Object {
static void _bind_methods();
+#ifndef DISABLE_DEPRECATED
+ static void _bind_compatibility_methods();
+#endif
+
struct LocaleScriptInfo {
String name;
String script;
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp
index 67b0fdee20..540891b3b0 100644
--- a/core/string/ustring.cpp
+++ b/core/string/ustring.cpp
@@ -1044,17 +1044,17 @@ String String::_camelcase_to_underscore() const {
int start_index = 0;
for (int i = 1; i < size(); i++) {
- bool is_prev_upper = is_ascii_upper_case(cstr[i - 1]);
- bool is_prev_lower = is_ascii_lower_case(cstr[i - 1]);
+ bool is_prev_upper = is_unicode_upper_case(cstr[i - 1]);
+ bool is_prev_lower = is_unicode_lower_case(cstr[i - 1]);
bool is_prev_digit = is_digit(cstr[i - 1]);
- bool is_curr_upper = is_ascii_upper_case(cstr[i]);
- bool is_curr_lower = is_ascii_lower_case(cstr[i]);
+ bool is_curr_upper = is_unicode_upper_case(cstr[i]);
+ bool is_curr_lower = is_unicode_lower_case(cstr[i]);
bool is_curr_digit = is_digit(cstr[i]);
bool is_next_lower = false;
if (i + 1 < size()) {
- is_next_lower = is_ascii_lower_case(cstr[i + 1]);
+ is_next_lower = is_unicode_lower_case(cstr[i + 1]);
}
const bool cond_a = is_prev_lower && is_curr_upper; // aA
diff --git a/core/variant/callable.h b/core/variant/callable.h
index 3ae424e9bf..38872b71ef 100644
--- a/core/variant/callable.h
+++ b/core/variant/callable.h
@@ -99,7 +99,7 @@ public:
bool is_valid() const;
template <typename... VarArgs>
- Callable bind(VarArgs... p_args);
+ Callable bind(VarArgs... p_args) const;
Callable bindv(const Array &p_arguments);
Callable bindp(const Variant **p_arguments, int p_argcount) const;
diff --git a/core/variant/variant.h b/core/variant/variant.h
index d685444c30..c358559c9b 100644
--- a/core/variant/variant.h
+++ b/core/variant/variant.h
@@ -865,7 +865,7 @@ Variant Callable::call(VarArgs... p_args) const {
}
template <typename... VarArgs>
-Callable Callable::bind(VarArgs... p_args) {
+Callable Callable::bind(VarArgs... p_args) const {
Variant args[sizeof...(p_args) + 1] = { p_args..., Variant() }; // +1 makes sure zero sized arrays are also supported.
const Variant *argptrs[sizeof...(p_args) + 1];
for (uint32_t i = 0; i < sizeof...(p_args); i++) {