diff options
| author | kobewi <kobewi4e@gmail.com> | 2022-09-08 18:14:10 +0200 |
|---|---|---|
| committer | kobewi <kobewi4e@gmail.com> | 2024-03-06 14:49:35 +0100 |
| commit | eb0a624902cc3136358bd1b69ae84e575f73a881 (patch) | |
| tree | 7133506f3d86b31352ac78f2ead2cf0789e311e8 /core/variant | |
| parent | 9b94c80e9aff2a4f363ae6d8e2bbe837aa5876bc (diff) | |
| download | redot-engine-eb0a624902cc3136358bd1b69ae84e575f73a881.tar.gz | |
Allow returning Dictionary after merging
Diffstat (limited to 'core/variant')
| -rw-r--r-- | core/variant/dictionary.cpp | 7 | ||||
| -rw-r--r-- | core/variant/dictionary.h | 1 | ||||
| -rw-r--r-- | core/variant/variant_call.cpp | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/core/variant/dictionary.cpp b/core/variant/dictionary.cpp index 9f65a73c6f..7416101d51 100644 --- a/core/variant/dictionary.cpp +++ b/core/variant/dictionary.cpp @@ -249,6 +249,7 @@ void Dictionary::clear() { } void Dictionary::merge(const Dictionary &p_dictionary, bool p_overwrite) { + ERR_FAIL_COND_MSG(_p->read_only, "Dictionary is in read-only state."); for (const KeyValue<Variant, Variant> &E : p_dictionary._p->variant_map) { if (p_overwrite || !has(E.key)) { operator[](E.key) = E.value; @@ -256,6 +257,12 @@ void Dictionary::merge(const Dictionary &p_dictionary, bool p_overwrite) { } } +Dictionary Dictionary::merged(const Dictionary &p_dictionary, bool p_overwrite) const { + Dictionary ret = duplicate(); + ret.merge(p_dictionary, p_overwrite); + return ret; +} + void Dictionary::_unref() const { ERR_FAIL_NULL(_p); if (_p->refcount.unref()) { diff --git a/core/variant/dictionary.h b/core/variant/dictionary.h index f94a0da80a..67178ee7b7 100644 --- a/core/variant/dictionary.h +++ b/core/variant/dictionary.h @@ -64,6 +64,7 @@ public: bool is_empty() const; void clear(); void merge(const Dictionary &p_dictionary, bool p_overwrite = false); + Dictionary merged(const Dictionary &p_dictionary, bool p_overwrite = false) const; bool has(const Variant &p_key) const; bool has_all(const Array &p_keys) const; diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp index 543ee1135f..060ea007ff 100644 --- a/core/variant/variant_call.cpp +++ b/core/variant/variant_call.cpp @@ -2205,6 +2205,7 @@ static void _register_variant_builtin_methods() { bind_method(Dictionary, is_empty, sarray(), varray()); bind_method(Dictionary, clear, sarray(), varray()); bind_method(Dictionary, merge, sarray("dictionary", "overwrite"), varray(false)); + bind_method(Dictionary, merged, sarray("dictionary", "overwrite"), varray(false)); bind_method(Dictionary, has, sarray("key"), varray()); bind_method(Dictionary, has_all, sarray("keys"), varray()); bind_method(Dictionary, find_key, sarray("value"), varray()); |