seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Requesting for dictionary keys also respects insertion order, closes #9161

Browse Source
This commit is contained in:
Juan Linietsky
2017-07-23 12:23:18 -03:00
parent 9e483604a5
commit cf286ed287
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/dictionary.cpp
View File

@ -200,6 +200,7 @@ uint32_t Dictionary::hash() const {
Array Dictionary::keys() const { Array Dictionary::keys() const {
#if 0
Array karr; Array karr;
karr.resize(size()); karr.resize(size());
const Variant *K = NULL; const Variant *K = NULL;
@ -208,6 +209,26 @@ Array Dictionary::keys() const {
karr[idx++] = (*K); karr[idx++] = (*K);
} }
return karr; return karr;
#else
Array varr;
varr.resize(size());
if (_p->variant_map.empty())
return varr;
int count = _p->variant_map.size();
const HashMap<Variant, DictionaryPrivate::Data, _DictionaryVariantHash>::Pair **pairs = (const HashMap<Variant, DictionaryPrivate::Data, _DictionaryVariantHash>::Pair **)alloca(count * sizeof(HashMap<Variant, DictionaryPrivate::Data, _DictionaryVariantHash>::Pair *));
_p->variant_map.get_key_value_ptr_array(pairs);
SortArray<const HashMap<Variant, DictionaryPrivate::Data, _DictionaryVariantHash>::Pair *, DictionaryPrivateSort> sort;
sort.sort(pairs, count);
for (int i = 0; i < count; i++) {
varr[i] = pairs[i]->key;
}
return varr;
#endif
} }
Array Dictionary::values() const { Array Dictionary::values() const {