Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Allow weakref(null) in gdscript 

Tiny addition I personally found useful - this allows us to `var my_ref := weakref(null)` for nullable weak ref (with type hint!). When trying to test if `my_ref` is holding valid reference, we can just `if my_ref.get_ref():` instead of `if my_ref and my_ref.get_ref():` everywhere.
3.2
Windy Darian 2019-09-16 23:15:34 +07:00
parent 3e782c78ae
commit 628f467605
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
modules/gdscript/gdscript_functions.cpp
Unescape Escape View File

@ -572,37 +572,31 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
} break;
case OBJ_WEAKREF: {
VALIDATE_ARG_COUNT(1);
if (p_args[0]->get_type() != Variant::OBJECT) {
if (p_args[0]->get_type() == Variant::OBJECT) {
if (p_args[0]->is_ref()) {
Ref<WeakRef> wref = memnew(WeakRef);
REF r = *p_args[0];
if (r.is_valid()) {
wref->set_ref(r);
}
r_ret = wref;
} else {
Ref<WeakRef> wref = memnew(WeakRef);
Object *obj = *p_args[0];
if (obj) {
wref->set_obj(obj);
}
r_ret = wref;
}
} else if (p_args[0]->get_type() == Variant::NIL) {
r_ret = memnew(WeakRef);
} else {
r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.argument = 0;
r_error.expected = Variant::OBJECT;
r_ret = Variant();
return;
}
if (p_args[0]->is_ref()) {
REF r = *p_args[0];
if (!r.is_valid()) {
r_ret = Variant();
return;
}
Ref<WeakRef> wref = memnew(WeakRef);
wref->set_ref(r);
r_ret = wref;
} else {
Object *obj = *p_args[0];
if (!obj) {
r_ret = Variant();
return;
}
Ref<WeakRef> wref = memnew(WeakRef);
wref->set_obj(obj);
r_ret = wref;
}
} break;
case FUNC_FUNCREF: {
VALIDATE_ARG_COUNT(2);