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

Merge pull request #97374 from rune-scape/get-native-static-callable

Browse Source 
GDScriptNativeClass: Allow getting static function as callable
This commit is contained in:
Thaddeus Crews 2024-10-24 13:23:01 -05:00
commit 7444da766a
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/gdscript/gdscript.cpp
View File

@ -76,9 +76,16 @@ bool GDScriptNativeClass::_get(const StringName &p_name, Variant &r_ret) const {
if (ok) { if (ok) {
r_ret = v; r_ret = v;
return true; return true;
} else {
return false;
} }
MethodBind *method = ClassDB::get_method(name, p_name);
if (method && method->is_static()) {
// Native static method.
r_ret = Callable(this, p_name);
return true;
}
return false;
} }
void GDScriptNativeClass::_bind_methods() { void GDScriptNativeClass::_bind_methods() {

8
modules/gdscript/tests/scripts/runtime/features/native_static_method_as_callable.gd Normal file
View File

@ -0,0 +1,8 @@
func get_parse_string(t: Variant):
return t.parse_string
func test():
var a: Callable = JSON.parse_string
var b: Callable = get_parse_string(JSON)
prints(a.call("{\"test\": \"a\"}"), a.is_valid())
prints(b.call("{\"test\": \"b\"}"), b.is_valid())

3
modules/gdscript/tests/scripts/runtime/features/native_static_method_as_callable.out Normal file
View File

@ -0,0 +1,3 @@
GDTEST_OK
{ "test": "a" } false
{ "test": "b" } false