Merge pull request #37537 from ThakeeNathees/const-parsing-datatype-bug-fix

GDScript: Fix type inference for const reference to global class

modules/gdscript/gdscript_parser.cpp

@@ -827,6 +827,7 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s
 					//check from singletons
 					ConstantNode *constant = alloc_node<ConstantNode>();
 					constant->value = GDScriptLanguage::get_singleton()->get_named_globals_map()[identifier];
+					constant->datatype = _type_from_variant(constant->value);
 					expr = constant;
 					bfn = true;
 				}
@@ -837,6 +838,7 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s
 						if (scr.is_valid() && scr->is_valid()) {
 							ConstantNode *constant = alloc_node<ConstantNode>();
 							constant->value = scr;
+							constant->datatype = _type_from_variant(constant->value);
 							expr = constant;
 							bfn = true;
 						}
@@ -852,6 +854,7 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s
 							if (parent_constants.has(identifier)) {
 								ConstantNode *constant = alloc_node<ConstantNode>();
 								constant->value = parent_constants[identifier];
+								constant->datatype = _type_from_variant(constant->value);
 								expr = constant;
 								bfn = true;
 							}
@@ -2386,6 +2389,7 @@ void GDScriptParser::_generate_pattern(PatternNode *p_pattern, Node *p_node_to_m
 			// a bind always matches
 			ConstantNode *true_value = alloc_node<ConstantNode>();
 			true_value->value = Variant(true);
+			true_value->datatype = _type_from_variant(true_value->value);
 			p_resulting_node = true_value;
 		} break;
 		case PatternNode::PT_ARRAY: {
@@ -2432,6 +2436,7 @@ void GDScriptParser::_generate_pattern(PatternNode *p_pattern, Node *p_node_to_m
 				// size
 				ConstantNode *length = alloc_node<ConstantNode>();
 				length->value = Variant(open_ended ? p_pattern->array.size() - 1 : p_pattern->array.size());
+				length->datatype = _type_from_variant(length->value);
 
 				OperatorNode *call = alloc_node<OperatorNode>();
 				call->op = OperatorNode::OP_CALL;
@@ -2465,6 +2470,7 @@ void GDScriptParser::_generate_pattern(PatternNode *p_pattern, Node *p_node_to_m
 
 				ConstantNode *index = alloc_node<ConstantNode>();
 				index->value = Variant(i);
+				index->datatype = _type_from_variant(index->value);
 
 				OperatorNode *indexed_value = alloc_node<OperatorNode>();
 				indexed_value->op = OperatorNode::OP_INDEX;
@@ -2525,6 +2531,7 @@ void GDScriptParser::_generate_pattern(PatternNode *p_pattern, Node *p_node_to_m
 				// size
 				ConstantNode *length = alloc_node<ConstantNode>();
 				length->value = Variant(open_ended ? p_pattern->dictionary.size() - 1 : p_pattern->dictionary.size());
+				length->datatype = _type_from_variant(length->value);
 
 				OperatorNode *call = alloc_node<OperatorNode>();
 				call->op = OperatorNode::OP_CALL;
@@ -2601,6 +2608,7 @@ void GDScriptParser::_generate_pattern(PatternNode *p_pattern, Node *p_node_to_m
 			// simply generate a `true`
 			ConstantNode *true_value = alloc_node<ConstantNode>();
 			true_value->value = Variant(true);
+			true_value->datatype = _type_from_variant(true_value->value);
 			p_resulting_node = true_value;
 		} break;
 		default: {
@@ -3320,6 +3328,7 @@ void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) {
 				} else {
 					ConstantNode *message_node = alloc_node<ConstantNode>();
 					message_node->value = String();
+					message_node->datatype = _type_from_variant(message_node->value);
 					an->message = message_node;
 				}
 
@@ -6236,11 +6245,13 @@ GDScriptParser::Node *GDScriptParser::_get_default_value_for_type(const DataType
 			ConstantNode *c = alloc_node<ConstantNode>();
 			Callable::CallError err;
 			c->value = Variant::construct(p_type.builtin_type, nullptr, 0, err);
+			c->datatype = _type_from_variant(c->value);
 			result = c;
 		}
 	} else {
 		ConstantNode *c = alloc_node<ConstantNode>();
 		c->value = Variant();
+		c->datatype = _type_from_variant(c->value);
 		result = c;
 	}
 
@@ -8118,6 +8129,7 @@ void GDScriptParser::_check_block_types(BlockNode *p_block) {
 							ConstantNode *tgt_type = alloc_node<ConstantNode>();
 							tgt_type->line = lv->line;
 							tgt_type->value = (int)lv->datatype.builtin_type;
+							tgt_type->datatype = _type_from_variant(tgt_type->value);
 
 							OperatorNode *convert_call = alloc_node<OperatorNode>();
 							convert_call->line = lv->line;
@@ -8253,6 +8265,7 @@ void GDScriptParser::_check_block_types(BlockNode *p_block) {
 									ConstantNode *tgt_type = alloc_node<ConstantNode>();
 									tgt_type->line = op->line;
 									tgt_type->value = (int)lh_type.builtin_type;
+									tgt_type->datatype = _type_from_variant(tgt_type->value);
 
 									OperatorNode *convert_call = alloc_node<OperatorNode>();
 									convert_call->line = op->line;