Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 23:31:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit godotengine/godot@7a0ab9d561

Browse Source
This commit is contained in:
Spartan322
2025-05-22 14:01:21 -04:00
parent 9b9da6e3f9 7a0ab9d561
commit 38fb5272ad
441 changed files with 14189 additions and 7714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
modules/mono/csharp_script.cpp
View File

@@ -41,9 +41,9 @@
#include "utils/path_utils.h"
#include "utils/string_utils.h"
#ifdef DEBUG_METHODS_ENABLED
#ifdef DEBUG_ENABLED
#include "class_db_api_json.h"
#endif
#endif // DEBUG_ENABLED
#ifdef TOOLS_ENABLED
#include "editor/editor_internal_calls.h"
@@ -106,14 +106,14 @@ void CSharpLanguage::init() {
return;
}
#endif
#ifdef DEBUG_METHODS_ENABLED
#ifdef DEBUG_ENABLED
if (OS::get_singleton()->get_cmdline_args().find("--class-db-json")) {
class_db_api_to_json("user://class_db_api.json", ClassDB::API_CORE);
#ifdef TOOLS_ENABLED
class_db_api_to_json("user://class_db_api_editor.json", ClassDB::API_EDITOR);
#endif
}
#endif
#endif // DEBUG_ENABLED
GLOBAL_DEF("dotnet/project/assembly_name", "");
#ifdef TOOLS_ENABLED
@@ -181,7 +181,7 @@ void CSharpLanguage::finalize() {
ERR_PRINT("Leaked unsafe reference to deleted object: " + itos(id));
}
}
#endif
#endif // DEBUG_ENABLED
memdelete(managed_callable_middleman);
@@ -189,8 +189,8 @@ void CSharpLanguage::finalize() {
finalized = true;
}
void CSharpLanguage::get_reserved_words(List<String> *p_words) const {
static const char *_reserved_words[] = {
Vector<String> CSharpLanguage::get_reserved_words() const {
static const Vector<String> ret = {
// Reserved keywords
"abstract",
"as",
@@ -300,15 +300,9 @@ void CSharpLanguage::get_reserved_words(List<String> *p_words) const {
"when",
"where",
"yield",
nullptr
};
const char **w = _reserved_words;
while (*w) {
p_words->push_back(*w);
w++;
}
return ret;
}
bool CSharpLanguage::is_control_flow_keyword(const String &p_keyword) const {
@@ -331,21 +325,30 @@ bool CSharpLanguage::is_control_flow_keyword(const String &p_keyword) const {
p_keyword == "while";
}
void CSharpLanguage::get_comment_delimiters(List<String> *p_delimiters) const {
p_delimiters->push_back("//"); // single-line comment
p_delimiters->push_back("/* */"); // delimited comment
Vector<String> CSharpLanguage::get_comment_delimiters() const {
static const Vector<String> delimiters = {
"//", // single-line comment
"/* */" // delimited comment
};
return delimiters;
}
void CSharpLanguage::get_doc_comment_delimiters(List<String> *p_delimiters) const {
p_delimiters->push_back("///"); // single-line doc comment
p_delimiters->push_back("/** */"); // delimited doc comment
Vector<String> CSharpLanguage::get_doc_comment_delimiters() const {
static const Vector<String> delimiters = {
"///", // single-line doc comment
"/** */" // delimited doc comment
};
return delimiters;
}
void CSharpLanguage::get_string_delimiters(List<String> *p_delimiters) const {
p_delimiters->push_back("' '"); // character literal
p_delimiters->push_back("\" \""); // regular string literal
p_delimiters->push_back("@\" \""); // verbatim string literal
Vector<String> CSharpLanguage::get_string_delimiters() const {
static const Vector<String> delimiters = {
"' '", // character literal
"\" \"", // regular string literal
"@\" \"" // verbatim string literal
};
// Generic string highlighting suffices as a workaround for now.
return delimiters;
}
static String get_base_class_name(const String &p_base_class_name, const String p_class_name) {
@@ -389,9 +392,7 @@ Vector<ScriptLanguage::ScriptTemplate> CSharpLanguage::get_built_in_templates(co
String CSharpLanguage::validate_path(const String &p_path) const {
String class_name = p_path.get_file().get_basename();
List<String> keywords;
get_reserved_words(&keywords);
if (keywords.find(class_name)) {
if (get_reserved_words().has(class_name)) {
return RTR("Class name can't be a reserved keyword");
}
if (!TS->is_valid_identifier(class_name)) {
@@ -520,7 +521,7 @@ void CSharpLanguage::post_unsafe_reference(Object *p_obj) {
MutexLock lock(unsafe_object_references_lock);
ObjectID id = p_obj->get_instance_id();
unsafe_object_references[id]++;
#endif
#endif // DEBUG_ENABLED
}
void CSharpLanguage::pre_unsafe_unreference(Object *p_obj) {
@@ -532,7 +533,7 @@ void CSharpLanguage::pre_unsafe_unreference(Object *p_obj) {
if (--elem->value == 0) {
unsafe_object_references.remove(elem);
}
#endif
#endif // DEBUG_ENABLED
}
void CSharpLanguage::frame() {
@@ -934,7 +935,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
#ifdef DEBUG_ENABLED
// If we reached here, the instantiated script must be a placeholder.
CRASH_COND(!obj->get_script_instance()->is_placeholder());
#endif
#endif // DEBUG_ENABLED
}
}
@@ -1119,7 +1120,7 @@ bool CSharpLanguage::setup_csharp_script_binding(CSharpScriptBinding &r_script_b
CSharpInstance *csharp_instance = CAST_CSHARP_INSTANCE(p_object->get_script_instance());
CRASH_COND(csharp_instance != nullptr && !csharp_instance->is_destructing_script_instance());
}
#endif
#endif // DEBUG_ENABLED
StringName type_name = p_object->get_class_name();
@@ -1142,7 +1143,7 @@ bool CSharpLanguage::setup_csharp_script_binding(CSharpScriptBinding &r_script_b
#ifdef DEBUG_ENABLED
CRASH_COND(!r_script_binding.gchandle.is_released());
#endif
#endif // DEBUG_ENABLED
GCHandleIntPtr strong_gchandle =
GDMonoCache::managed_callbacks.ScriptManagerBridge_CreateManagedForGodotObjectBinding(
@@ -1196,8 +1197,8 @@ void CSharpLanguage::_instance_binding_free_callback(void *, void *, void *p_bin
if (GDMono::get_singleton() == nullptr) {
#ifdef DEBUG_ENABLED
CRASH_COND(csharp_lang && !csharp_lang->script_bindings.is_empty());
#endif
// Mono runtime finalized, all the gchandle bindings were already released
#endif // DEBUG_ENABLED
// Mono runtime finalized, all the gchandle bindings were already released
return;
}
@@ -1240,7 +1241,7 @@ GDExtensionBool CSharpLanguage::_instance_binding_reference_callback(void *p_tok
#ifdef DEBUG_ENABLED
CRASH_COND(!rc_owner);
#endif
#endif // DEBUG_ENABLED
MonoGCHandleData &gchandle = script_binding.gchandle;
@@ -1333,7 +1334,7 @@ void *CSharpLanguage::get_instance_binding_with_setup(Object *p_object) {
void *CSharpLanguage::get_existing_instance_binding(Object *p_object) {
#ifdef DEBUG_ENABLED
CRASH_COND(p_object->has_instance_binding(p_object));
#endif
#endif // DEBUG_ENABLED
return get_instance_binding(p_object);
}
@@ -1688,7 +1689,7 @@ bool CSharpInstance::_reference_owner_unsafe() {
CRASH_COND(!base_ref_counted);
CRASH_COND(owner == nullptr);
CRASH_COND(unsafe_referenced); // already referenced
#endif
#endif // DEBUG_ENABLED
// Unsafe refcount increment. The managed instance also counts as a reference.
// This way if the unmanaged world has no references to our owner
@@ -1708,7 +1709,7 @@ bool CSharpInstance::_unreference_owner_unsafe() {
#ifdef DEBUG_ENABLED
CRASH_COND(!base_ref_counted);
CRASH_COND(owner == nullptr);
#endif
#endif // DEBUG_ENABLED
if (!unsafe_referenced) {
return false; // Already unreferenced
@@ -1756,7 +1757,7 @@ void CSharpInstance::mono_object_disposed(GCHandleIntPtr p_gchandle_to_free) {
#ifdef DEBUG_ENABLED
CRASH_COND(base_ref_counted);
CRASH_COND(gchandle.is_released());
#endif
#endif // DEBUG_ENABLED
CSharpLanguage::get_singleton()->release_script_gchandle_thread_safe(p_gchandle_to_free, gchandle);
}
@@ -1764,7 +1765,7 @@ void CSharpInstance::mono_object_disposed_baseref(GCHandleIntPtr p_gchandle_to_f
#ifdef DEBUG_ENABLED
CRASH_COND(!base_ref_counted);
CRASH_COND(gchandle.is_released());
#endif
#endif // DEBUG_ENABLED
// Must make sure event signals are not left dangling
disconnect_event_signals();
@@ -1826,7 +1827,7 @@ void CSharpInstance::refcount_incremented() {
#ifdef DEBUG_ENABLED
CRASH_COND(!base_ref_counted);
CRASH_COND(owner == nullptr);
#endif
#endif // DEBUG_ENABLED
RefCounted *rc_owner = Object::cast_to<RefCounted>(owner);
@@ -1857,7 +1858,7 @@ bool CSharpInstance::refcount_decremented() {
#ifdef DEBUG_ENABLED
CRASH_COND(!base_ref_counted);
CRASH_COND(owner == nullptr);
#endif
#endif // DEBUG_ENABLED
RefCounted *rc_owner = Object::cast_to<RefCounted>(owner);
@@ -2013,7 +2014,7 @@ CSharpInstance::~CSharpInstance() {
#ifdef DEBUG_ENABLED
// The "instance binding" holds a reference so the refcount should be at least 2 before `scope_keep_owner_alive` goes out of scope
CRASH_COND(rc_owner->get_reference_count() <= 1);
#endif
#endif // DEBUG_ENABLED
}
if (script.is_valid() && owner) {
@@ -2026,7 +2027,7 @@ CSharpInstance::~CSharpInstance() {
script->instances.remove(match);
#else
script->instances.erase(owner);
#endif
#endif // DEBUG_ENABLED
}
}
@@ -2078,7 +2079,7 @@ void GD_CLR_STDCALL CSharpScript::_add_property_info_list_callback(CSharpScript
#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
p_script->exported_members_names.insert(name);
#endif
#endif // DEBUG_ENABLED
}
}
}
@@ -2435,7 +2436,7 @@ Variant CSharpScript::_new(const Variant **p_args, int p_argcount, Callable::Cal
ScriptInstance *CSharpScript::instance_create(Object *p_this) {
#ifdef DEBUG_ENABLED
CRASH_COND(!valid);
#endif
#endif // DEBUG_ENABLED
StringName native_name;
GDMonoCache::managed_callbacks.ScriptManagerBridge_GetScriptNativeName(this, &native_name);
@@ -2590,7 +2591,7 @@ Error CSharpScript::reload(bool p_keep_state) {
if (valid) {
#ifdef DEBUG_ENABLED
print_verbose("Found class for script " + get_path());
#endif
#endif // DEBUG_ENABLED
update_script_class_info(this);
@@ -2772,7 +2773,7 @@ CSharpScript::CSharpScript() {
MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex);
CSharpLanguage::get_singleton()->script_list.add(&script_list);
}
#endif
#endif // DEBUG_ENABLED
}
CSharpScript::~CSharpScript() {
@@ -2781,7 +2782,7 @@ CSharpScript::~CSharpScript() {
MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex);
CSharpLanguage::get_singleton()->script_list.remove(&script_list);
}
#endif
#endif // DEBUG_ENABLED
if (GDMonoCache::godot_api_cache_updated) {
GDMonoCache::managed_callbacks.ScriptManagerBridge_RemoveScriptBridge(this);
@@ -2789,13 +2790,13 @@ CSharpScript::~CSharpScript() {
}
void CSharpScript::get_members(HashSet<StringName> *p_members) {
#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
#ifdef DEBUG_ENABLED
if (p_members) {
for (const StringName &member_name : exported_members_names) {
p_members->insert(member_name);
}
}
#endif
#endif // DEBUG_ENABLED
}
/*************** RESOURCE ***************/
@@ -2823,10 +2824,10 @@ Ref<Resource> ResourceFormatLoaderCSharpScript::load(const String &p_path, const
scr.instantiate();
}
#if defined(DEBUG_ENABLED) || defined(TOOLS_ENABLED)
#ifdef DEBUG_ENABLED
Error err = scr->load_source_code(real_path);
ERR_FAIL_COND_V_MSG(err != OK, Ref<Resource>(), "Cannot load C# script file '" + real_path + "'.");
#endif
#endif // DEBUG_ENABLED
// Only one instance of a C# script is allowed to exist.
ERR_FAIL_COND_V_MSG(!scr->get_path().is_empty() && scr->get_path() != p_original_path, Ref<Resource>(),