diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-11 12:29:33 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 12:29:33 -0300 |
| commit | 0bda0fcb3e8985fe613b696761ab5f211316faf7 (patch) | |
| tree | 359747451ac186ecd81a98cbf509945fcd594d0d /core/variant_call.cpp | |
| parent | f5aadad7ae58d2eec06e7b6fff29a9ca2d035063 (diff) | |
| parent | 6ce5876c63ffd7bc21b38197c4fa89713a77ceb5 (diff) | |
| download | redot-engine-0bda0fcb3e8985fe613b696761ab5f211316faf7.tar.gz | |
Merge pull request #5148 from vnen/pr-array-find
Add Array.find(what, from) and Array.rfind(what, from)
Diffstat (limited to 'core/variant_call.cpp')
| -rw-r--r-- | core/variant_call.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/variant_call.cpp b/core/variant_call.cpp index d427a80541..cc2d15b88c 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -464,7 +464,8 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var VCALL_LOCALMEM1(Array,resize); VCALL_LOCALMEM2(Array,insert); VCALL_LOCALMEM1(Array,remove); - VCALL_LOCALMEM1R(Array,find); + VCALL_LOCALMEM2R(Array,find); + VCALL_LOCALMEM2R(Array,rfind); VCALL_LOCALMEM1R(Array,find_last); VCALL_LOCALMEM1R(Array,count); VCALL_LOCALMEM1(Array,erase); @@ -1453,7 +1454,8 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl ADDFUNC2(ARRAY,NIL,Array,insert,INT,"pos",NIL,"value",varray()); ADDFUNC1(ARRAY,NIL,Array,remove,INT,"pos",varray()); ADDFUNC1(ARRAY,NIL,Array,erase,NIL,"value",varray()); - ADDFUNC1(ARRAY,INT,Array,find,NIL,"value",varray()); + ADDFUNC2(ARRAY,INT,Array,find,NIL,"what",INT,"from",varray(0)); + ADDFUNC2(ARRAY,INT,Array,rfind,NIL,"what",INT,"from",varray(-1)); ADDFUNC1(ARRAY,INT,Array,find_last,NIL,"value",varray()); ADDFUNC1(ARRAY,INT,Array,count,NIL,"value",varray()); ADDFUNC0(ARRAY,NIL,Array,pop_back,varray()); |