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

Fix Array and Dictionary id() and dictionary test bug

Browse source
This commit is contained in:
cdemirer 2021-12-30 13:14:09 +08:00
parent 9f058674ac
commit e2ed9d13eb
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/variant/array.cpp
View file

@ -627,7 +627,7 @@ Variant Array::max() const {
} }
const void *Array::id() const { const void *Array::id() const {
return _p->array.ptr(); return _p;
} }
Array::Array(const Array &p_from, uint32_t p_type, const StringName &p_class_name, const Variant &p_script) { Array::Array(const Array &p_from, uint32_t p_type, const StringName &p_class_name, const Variant &p_script) {

2
core/variant/dictionary.cpp
View file

@ -350,7 +350,7 @@ void Dictionary::operator=(const Dictionary &p_dictionary) {
} }
const void *Dictionary::id() const { const void *Dictionary::id() const {
return _p->variant_map.id(); return _p;
} }
Dictionary::Dictionary(const Dictionary &p_from) { Dictionary::Dictionary(const Dictionary &p_from) {

2
tests/core/variant/test_dictionary.h
View file

@ -196,7 +196,7 @@ TEST_CASE("[Dictionary] Duplicate dictionary") {
Dictionary shallow_d = d.duplicate(false); Dictionary shallow_d = d.duplicate(false);
CHECK_MESSAGE(shallow_d.id() != d.id(), "Should create a new array"); CHECK_MESSAGE(shallow_d.id() != d.id(), "Should create a new array");
CHECK_MESSAGE(Dictionary(shallow_d[1]).id() == Dictionary(d[1]).id(), "Should keep nested dictionary"); CHECK_MESSAGE(Dictionary(shallow_d[1]).id() == Dictionary(d[1]).id(), "Should keep nested dictionary");
CHECK_MESSAGE(Array(shallow_d[2]).id() == Array(d[2]).id(), "Should keep nested array"); CHECK_MESSAGE(Array(shallow_d[k2]).id() == Array(d[k2]).id(), "Should keep nested array");
CHECK_EQ(shallow_d, d); CHECK_EQ(shallow_d, d);
shallow_d[0] = 0; shallow_d[0] = 0;
CHECK_NE(shallow_d, d); CHECK_NE(shallow_d, d);