godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Make max() and min() global functions only accept numbers 

The behavior for those are not well defined for non-numeric arguments.
To avoid confusion the other types are forbidden.
This commit is contained in:
George Marques 2023-02-24 13:43:55 -03:00
parent defa46bfd1
commit ed81b165eb
Signed by: vnen
GPG Key ID: 046BD46A3201E43D
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/variant/variant_utility.cpp
View File

@ -543,6 +543,13 @@ struct VariantUtilityFunctions {
Variant base = *p_args[0]; Variant base = *p_args[0];
Variant ret; Variant ret;
for (int i = 1; i < p_argcount; i++) { for (int i = 1; i < p_argcount; i++) {
Variant::Type arg_type = p_args[i]->get_type();
if (arg_type != Variant::INT && arg_type != Variant::FLOAT) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.expected = Variant::FLOAT;
r_error.argument = i;
return Variant();
}
bool valid; bool valid;
Variant::evaluate(Variant::OP_LESS, base, *p_args[i], ret, valid); Variant::evaluate(Variant::OP_LESS, base, *p_args[i], ret, valid);
if (!valid) { if (!valid) {
@ -576,6 +583,13 @@ struct VariantUtilityFunctions {
Variant base = *p_args[0]; Variant base = *p_args[0];
Variant ret; Variant ret;
for (int i = 1; i < p_argcount; i++) { for (int i = 1; i < p_argcount; i++) {
Variant::Type arg_type = p_args[i]->get_type();
if (arg_type != Variant::INT && arg_type != Variant::FLOAT) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_error.expected = Variant::FLOAT;
r_error.argument = i;
return Variant();
}
bool valid; bool valid;
Variant::evaluate(Variant::OP_GREATER, base, *p_args[i], ret, valid); Variant::evaluate(Variant::OP_GREATER, base, *p_args[i], ret, valid);
if (!valid) { if (!valid) {

4
doc/classes/@GlobalScope.xml
View File

@ -656,7 +656,7 @@
<method name="max" qualifiers="vararg"> <method name="max" qualifiers="vararg">
<return type="Variant" /> <return type="Variant" />
<description> <description>
Returns the maximum of the given values. This function can take any number of arguments. Returns the maximum of the given numeric values. This function can take any number of arguments.
[codeblock] [codeblock]
max(1, 7, 3, -6, 5) # Returns 7 max(1, 7, 3, -6, 5) # Returns 7
[/codeblock] [/codeblock]
@ -689,7 +689,7 @@
<method name="min" qualifiers="vararg"> <method name="min" qualifiers="vararg">
<return type="Variant" /> <return type="Variant" />
<description> <description>
Returns the minimum of the given values. This function can take any number of arguments. Returns the minimum of the given numeric values. This function can take any number of arguments.
[codeblock] [codeblock]
min(1, 7, 3, -6, 5) # Returns -6 min(1, 7, 3, -6, 5) # Returns -6
[/codeblock] [/codeblock]