asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Revert "GdScript: Use reduced constant expression result when doing binary operations. Fixes #50293"

Browse source 
This reverts commit 6207708607.

It broke a GDScript test (which didn't exist back when the PR was made,
so was missed prior to the merge).

It choked on:
```
prints("a", test_instance.a, test_instance.a == Named.VALUE_A)
```
With:
```
Invalid operands "VALUE_A (enum value)" and "int" for "==" operator.
```
This commit is contained in:
Rémi Verschelde 2021-09-30 18:56:33 +02:00
parent 767bde8c28
commit d2b8560d7a
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/gdscript/gdscript_analyzer.cpp
View file

@ -1867,19 +1867,11 @@ void GDScriptAnalyzer::reduce_binary_op(GDScriptParser::BinaryOpNode *p_binary_o
GDScriptParser::DataType left_type;
if (p_binary_op->left_operand) {
if (p_binary_op->left_operand->is_constant) {
left_type = type_from_variant(p_binary_op->left_operand->reduced_value, p_binary_op->left_operand);
} else {
left_type = p_binary_op->left_operand->get_datatype();
}
left_type = p_binary_op->left_operand->get_datatype();
}
GDScriptParser::DataType right_type;
if (p_binary_op->right_operand) {
if (p_binary_op->right_operand->is_constant) {
right_type = type_from_variant(p_binary_op->right_operand->reduced_value, p_binary_op->right_operand);
} else {
right_type = p_binary_op->right_operand->get_datatype();
}
right_type = p_binary_op->right_operand->get_datatype();
}
if (!left_type.is_set() || !right_type.is_set()) {