From 269d5704202d29d1f367abfb2df44fa19997fd18 Mon Sep 17 00:00:00 2001 From: George Marques Date: Fri, 10 Jun 2016 14:57:56 -0300 Subject: Add 'from' argument to Array.find() --- core/array.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/array.cpp') diff --git a/core/array.cpp b/core/array.cpp index 1d283a14aa..146e56b7f8 100644 --- a/core/array.cpp +++ b/core/array.cpp @@ -150,9 +150,9 @@ void Array::erase(const Variant& p_value) { _p->array.erase(p_value); } -int Array::find(const Variant& p_value) const { +int Array::find(const Variant& p_value, int p_from) const { - return _p->array.find(p_value); + return _p->array.find(p_value, p_from); } int Array::find_last(const Variant& p_value) const { -- cgit v1.2.3 From 46b6bb9dc49a7b187a7bf6e19e5da732a5656e19 Mon Sep 17 00:00:00 2001 From: George Marques Date: Fri, 10 Jun 2016 17:28:09 -0300 Subject: Add 'rfind' function to Array --- core/array.cpp | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'core/array.cpp') diff --git a/core/array.cpp b/core/array.cpp index 146e56b7f8..bb8e527304 100644 --- a/core/array.cpp +++ b/core/array.cpp @@ -155,12 +155,21 @@ int Array::find(const Variant& p_value, int p_from) const { return _p->array.find(p_value, p_from); } -int Array::find_last(const Variant& p_value) const { +int Array::rfind(const Variant& p_value, int p_from) const { - if(_p->array.size() == 0) + if (_p->array.size() == 0) return -1; - for (int i=_p->array.size()-1; i>=0; i--) { + if (p_from < 0) { + // Relative offset from the end + p_from = _p->array.size() + p_from; + } + if (p_from < 0 || p_from >= _p->array.size()) { + // Limit to array boundaries + p_from = _p->array.size() - 1; + } + + for (int i=p_from; i>=0; i--) { if(_p->array[i] == p_value){ return i; @@ -170,6 +179,11 @@ int Array::find_last(const Variant& p_value) const { return -1; } +int Array::find_last(const Variant& p_value) const { + + return rfind(p_value); +} + int Array::count(const Variant& p_value) const { if(_p->array.size() == 0) -- cgit v1.2.3