Allows to doc vararg method return type as void #34745
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timothyqiu
force-pushed
the
vararg-return-nil-34743
branch
from
8262e30 to
cdeb8eb
Compare
akien-mga
reviewed
Jan 2, 2020
core/object.cpp
Outdated
| @@ -1686,7 +1686,7 @@ void Object::_bind_methods() { | |||
| mi.name = "emit_signal"; | |||
| mi.arguments.push_back(PropertyInfo(Variant::STRING, "signal")); | |||
|
|
|||
| ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "emit_signal", &Object::_emit_signal, mi); | |||
| ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "emit_signal", &Object::_emit_signal, mi, Vector<Variant>(), false); | |||
There was a problem hiding this comment.
Other similar methods seem to use varray() (see variant.h) as a shorthand for Vector<Variant>().
|
For the reference, this also impacts the GDNative API in a compatibility breaking way, but I think this is OK to do before the 3.2 release (compat breakage between 3.1.x and 3.2 is expected). CC @godotengine/gdnative to confirm. --- api.json 2020-01-02 13:51:41.400082712 +0100
+++ api2.json 2020-01-02 13:55:51.671606934 +0100
@@ -95424,7 +95424,7 @@
},
{
"name": "call_deferred",
- "return_type": "Variant",
+ "return_type": "void",
"is_editor": false,
"is_noscript": false,
"is_const": false,
@@ -95555,7 +95555,7 @@
},
{
"name": "emit_signal",
- "return_type": "Variant",
+ "return_type": "void",
"is_editor": false,
"is_noscript": false,
"is_const": false,
@@ -157300,7 +157300,7 @@
"methods": [
{
"name": "add_do_method",
- "return_type": "Variant",
+ "return_type": "void",
"is_editor": false,
"is_noscript": false,
"is_const": false,
@@ -157375,7 +157375,7 @@
},
{
"name": "add_undo_method",
- "return_type": "Variant",
+ "return_type": "void",
"is_editor": false,
"is_noscript": false,
"is_const": false, |
timothyqiu
force-pushed
the
vararg-return-nil-34743
branch
from
cdeb8eb to
4d727f1
Compare
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #34743
Parameter
p_return_nil_is_variantis added tobind_vararg_methodto opt-out thePROPERTY_USAGE_NIL_IS_VARIANTflag.Before this fix,
MethodBindVarArgalways setPROPERTY_USAGE_NIL_IS_VARIANTfor the return type.godot/core/method_bind.h
Lines 365 to 367 in 1788b22
Update: renamed
p_return_nil_as_varianttop_return_nil_is_variant, to be consistent with the flag name.