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

dictionary has_all 

(cherry picked from commit a8ebd43ab7)
This commit is contained in:
Alexander Holland 2016-04-04 18:37:43 +02:00 committed by Rémi Verschelde
parent 3a390e9b44
commit d4d810faac
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/dictionary.cpp
View File

@ -110,6 +110,16 @@ bool Dictionary::has(const Variant& p_key) const {
return _p->variant_map.has(p_key); return _p->variant_map.has(p_key);
} }
bool Dictionary::has_all(const Array& p_keys) const {
for (int i=0;i<p_keys.size();i++) {
if( !has(p_keys[i]) ) {
return false;
}
}
return true;
}
void Dictionary::erase(const Variant& p_key) { void Dictionary::erase(const Variant& p_key) {
_copy_on_write(); _copy_on_write();
_p->variant_map.erase(p_key); _p->variant_map.erase(p_key);

2
core/dictionary.h
View File

@ -69,6 +69,8 @@ public:
bool is_shared() const; bool is_shared() const;
bool has(const Variant& p_key) const; bool has(const Variant& p_key) const;
bool has_all(const Array& p_keys) const;
void erase(const Variant& p_key); void erase(const Variant& p_key);
bool operator==(const Dictionary& p_dictionary) const; bool operator==(const Dictionary& p_dictionary) const;

2
core/variant_call.cpp
View File

@ -440,6 +440,7 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var
VCALL_LOCALMEM0R(Dictionary,empty); VCALL_LOCALMEM0R(Dictionary,empty);
VCALL_LOCALMEM0(Dictionary,clear); VCALL_LOCALMEM0(Dictionary,clear);
VCALL_LOCALMEM1R(Dictionary,has); VCALL_LOCALMEM1R(Dictionary,has);
VCALL_LOCALMEM1R(Dictionary,has_all);
VCALL_LOCALMEM1(Dictionary,erase); VCALL_LOCALMEM1(Dictionary,erase);
VCALL_LOCALMEM0R(Dictionary,hash); VCALL_LOCALMEM0R(Dictionary,hash);
VCALL_LOCALMEM0R(Dictionary,keys); VCALL_LOCALMEM0R(Dictionary,keys);
@ -1423,6 +1424,7 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
ADDFUNC0(DICTIONARY,BOOL,Dictionary,empty,varray()); ADDFUNC0(DICTIONARY,BOOL,Dictionary,empty,varray());
ADDFUNC0(DICTIONARY,NIL,Dictionary,clear,varray()); ADDFUNC0(DICTIONARY,NIL,Dictionary,clear,varray());
ADDFUNC1(DICTIONARY,BOOL,Dictionary,has,NIL,"value",varray()); ADDFUNC1(DICTIONARY,BOOL,Dictionary,has,NIL,"value",varray());
ADDFUNC1(DICTIONARY,BOOL,Dictionary,has_all,ARRAY,"values",varray());
ADDFUNC1(DICTIONARY,NIL,Dictionary,erase,NIL,"value",varray()); ADDFUNC1(DICTIONARY,NIL,Dictionary,erase,NIL,"value",varray());
ADDFUNC0(DICTIONARY,INT,Dictionary,hash,varray()); ADDFUNC0(DICTIONARY,INT,Dictionary,hash,varray());
ADDFUNC0(DICTIONARY,ARRAY,Dictionary,keys,varray()); ADDFUNC0(DICTIONARY,ARRAY,Dictionary,keys,varray());