godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-21 14:57:09 +00:00
Code Releases Wiki Activity

Don't check type when assigning Array

Browse Source 
The array should just assimilate the type of the other one since
assignment in this case means a change in the reference.

This also adds a `typed_assign` function for the cases where type
validation is wanted.
This commit is contained in:
George Marques
2021-03-15 10:07:34 -03:00
parent a851b72354
commit 497dab94be
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/variant/array.cpp
View File

@@ -139,7 +139,7 @@ uint32_t Array::hash() const {
return h; return h;
} }
void Array::_assign(const Array &p_array) { bool Array::_assign(const Array &p_array) {
if (_p->typed.type != Variant::OBJECT && _p->typed.type == p_array._p->typed.type) { if (_p->typed.type != Variant::OBJECT && _p->typed.type == p_array._p->typed.type) {
//same type or untyped, just reference, should be fine //same type or untyped, just reference, should be fine
_ref(p_array); _ref(p_array);
@@ -150,7 +150,7 @@ void Array::_assign(const Array &p_array) {
//for objects, it needs full validation, either can be converted or fail //for objects, it needs full validation, either can be converted or fail
for (int i = 0; i < p_array._p->array.size(); i++) { for (int i = 0; i < p_array._p->array.size(); i++) {
if (!_p->typed.validate(p_array._p->array[i], "assign")) { if (!_p->typed.validate(p_array._p->array[i], "assign")) {
return; return false;
} }
} }
_p->array = p_array._p->array; //then just copy, which is cheap anyway _p->array = p_array._p->array; //then just copy, which is cheap anyway
@@ -168,10 +168,10 @@ void Array::_assign(const Array &p_array) {
Callable::CallError ce; Callable::CallError ce;
Variant::construct(_p->typed.type, new_array.write[i], (const Variant **)&ptr, 1, ce); Variant::construct(_p->typed.type, new_array.write[i], (const Variant **)&ptr, 1, ce);
if (ce.error != Callable::CallError::CALL_OK) { if (ce.error != Callable::CallError::CALL_OK) {
ERR_FAIL_MSG("Unable to convert array index " + itos(i) + " from '" + Variant::get_type_name(src_val.get_type()) + "' to '" + Variant::get_type_name(_p->typed.type) + "'."); ERR_FAIL_V_MSG(false, "Unable to convert array index " + itos(i) + " from '" + Variant::get_type_name(src_val.get_type()) + "' to '" + Variant::get_type_name(_p->typed.type) + "'.");
} }
} else { } else {
ERR_FAIL_MSG("Unable to convert array index " + itos(i) + " from '" + Variant::get_type_name(src_val.get_type()) + "' to '" + Variant::get_type_name(_p->typed.type) + "'."); ERR_FAIL_V_MSG(false, "Unable to convert array index " + itos(i) + " from '" + Variant::get_type_name(src_val.get_type()) + "' to '" + Variant::get_type_name(_p->typed.type) + "'.");
} }
} }
@@ -180,12 +180,13 @@ void Array::_assign(const Array &p_array) {
} else if (_p->typed.can_reference(p_array._p->typed)) { //same type or compatible } else if (_p->typed.can_reference(p_array._p->typed)) { //same type or compatible
_ref(p_array); _ref(p_array);
} else { } else {
ERR_FAIL_MSG("Assignment of arrays of incompatible types."); ERR_FAIL_V_MSG(false, "Assignment of arrays of incompatible types.");
} }
return true;
} }
void Array::operator=(const Array &p_array) { void Array::operator=(const Array &p_array) {
_assign(p_array); _ref(p_array);
} }
void Array::push_back(const Variant &p_value) { void Array::push_back(const Variant &p_value) {
@@ -528,6 +529,10 @@ Array::Array(const Array &p_from, uint32_t p_type, const StringName &p_class_nam
_assign(p_from); _assign(p_from);
} }
bool Array::typed_assign(const Array &p_other) {
return _assign(p_other);
}
void Array::set_typed(uint32_t p_type, const StringName &p_class_name, const Variant &p_script) { void Array::set_typed(uint32_t p_type, const StringName &p_class_name, const Variant &p_script) {
ERR_FAIL_COND_MSG(_p->array.size() > 0, "Type can only be set when array is empty."); ERR_FAIL_COND_MSG(_p->array.size() > 0, "Type can only be set when array is empty.");
ERR_FAIL_COND_MSG(_p->refcount.get() > 1, "Type can only be set when array has no more than one user."); ERR_FAIL_COND_MSG(_p->refcount.get() > 1, "Type can only be set when array has no more than one user.");

3
core/variant/array.h
View File

@@ -48,7 +48,7 @@ class Array {
protected: protected:
Array(const Array &p_base, uint32_t p_type, const StringName &p_class_name, const Variant &p_script); Array(const Array &p_base, uint32_t p_type, const StringName &p_class_name, const Variant &p_script);
void _assign(const Array &p_array); bool _assign(const Array &p_array);
public: public:
Variant &operator[](int p_idx); Variant &operator[](int p_idx);
@@ -111,6 +111,7 @@ public:
const void *id() const; const void *id() const;
bool typed_assign(const Array &p_other);
void set_typed(uint32_t p_type, const StringName &p_class_name, const Variant &p_script); void set_typed(uint32_t p_type, const StringName &p_class_name, const Variant &p_script);
Array(const Array &p_from); Array(const Array &p_from);
Array(); Array();