asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Array) pop_front, pop_back return values

Browse source 
pop_front, pop_back now return values instead of `void`. Things
I didn't know how to properly implement:

1. pop_front & pop_back shows in the help menu Object as return value.
   I know this is incorrect but if not Object than what? Cause it
   can't be void. It needs to be a generic type that includes all the
   Array types
This commit is contained in:
Răzvan Cosmin Rădulescu 2016-08-27 17:33:45 +02:00
parent c40ab446c9
commit 1a7aae7443
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/array.cpp
View file

@ -276,16 +276,26 @@ void Array::push_front(const Variant& p_value) {
_p->array.insert(0,p_value); _p->array.insert(0,p_value);
} }
void Array::pop_back(){ Variant Array::pop_back(){
if (!_p->array.empty()) if (!_p->array.empty()) {
_p->array.resize( _p->array.size() -1 ); int n = _p->array.size() - 1;
Variant ret = _p->array.get(n);
_p->array.resize(n);
return ret;
}
return Variant();
} }
void Array::pop_front(){
if (!_p->array.empty()) Variant Array::pop_front(){
if (!_p->array.empty()) {
Variant ret = _p->array.get(0);
_p->array.remove(0); _p->array.remove(0);
return ret;
}
return Variant();
} }

4
core/array.h
View file

@ -80,8 +80,8 @@ public:
void erase(const Variant& p_value); void erase(const Variant& p_value);
void push_front(const Variant& p_value); void push_front(const Variant& p_value);
void pop_back(); Variant pop_back();
void pop_front(); Variant pop_front();
Array(const Array& p_from); Array(const Array& p_from);
Array(bool p_shared=false); Array(bool p_shared=false);

4
core/variant_call.cpp
View file

@ -464,8 +464,8 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var
VCALL_LOCALMEM0R(Array,hash); VCALL_LOCALMEM0R(Array,hash);
VCALL_LOCALMEM1(Array,push_back); VCALL_LOCALMEM1(Array,push_back);
VCALL_LOCALMEM1(Array,push_front); VCALL_LOCALMEM1(Array,push_front);
VCALL_LOCALMEM0(Array,pop_back); VCALL_LOCALMEM0R(Array,pop_back);
VCALL_LOCALMEM0(Array,pop_front); VCALL_LOCALMEM0R(Array,pop_front);
VCALL_LOCALMEM1(Array,append); VCALL_LOCALMEM1(Array,append);
VCALL_LOCALMEM1(Array,resize); VCALL_LOCALMEM1(Array,resize);
VCALL_LOCALMEM2(Array,insert); VCALL_LOCALMEM2(Array,insert);