1 files changed, 80 insertions, 27 deletions

diff --git a/core/array.cpp b/core/array.cpp
index fef0fcbb40..b9c8f543da 100644
--- a/core/array.cpp
+++ b/core/array.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -36,7 +36,6 @@ struct ArrayPrivate {
 
 	SafeRefCount refcount;
 	Vector<Variant> array;
-	bool shared;
 };
 
 void Array::_ref(const Array& p_from) const {
@@ -54,20 +53,9 @@ void Array::_ref(const Array& p_from) const {
 
 	_unref();
 
-	if (_fp->shared) {
+	_p = p_from._p;
 
-		_p = p_from._p;
 
-	} else {
-
-		_p = memnew( ArrayPrivate );
-		_p->shared=false;
-		_p->refcount.init();
-		_p->array=_fp->array;
-
-		if (_fp->refcount.unref())
-			memdelete(_fp);
-	}
 }
 
 void Array::_unref() const {
@@ -106,10 +94,6 @@ void Array::clear() {
 	_p->array.clear();
 }
 
-bool Array::is_shared() const {
-
-    return _p->shared;
-}
 
 bool Array::operator==(const Array& p_array) const {
 
@@ -150,9 +134,68 @@ void Array::erase(const Variant& p_value) {
 	_p->array.erase(p_value);
 }
 
-int Array::find(const Variant& p_value) const {
+Variant Array::front() const {
+	ERR_FAIL_COND_V(_p->array.size() == 0, Variant());
+	return operator[](0);
+}
+
+Variant Array::back() const {
+	ERR_FAIL_COND_V(_p->array.size() == 0, Variant());
+	return operator[](_p->array.size() - 1);
+}
+
+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::rfind(const Variant& p_value, int p_from) const {
+
+	if (_p->array.size() == 0)
+		return -1;
+
+	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;
+		};
+	};
+
+	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)
+		return 0;
+
+	int amount=0;
+	for (int i=0; i<_p->array.size(); i++) {
+
+		if(_p->array[i] == p_value){
+			amount++;
+		};
+	};
+
+	return amount;
+}
+
+bool Array::has(const Variant& p_value) const {
+	return _p->array.find(p_value, 0) != -1;
 }
 
 void Array::remove(int p_pos) {
@@ -227,16 +270,26 @@ void Array::push_front(const Variant& p_value) {
 	_p->array.insert(0,p_value);
 }
 
-void Array::pop_back(){
+Variant Array::pop_back(){
 
-	if (!_p->array.empty())
-		_p->array.resize( _p->array.size() -1 );
+	if (!_p->array.empty()) {
+		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);
+		return ret;
+	}
+	return Variant();
 
 }
 
@@ -247,11 +300,11 @@ Array::Array(const Array& p_from) {
 	_ref(p_from);
 
 }
-Array::Array(bool p_shared) {
+Array::Array() {
 
 	_p = memnew( ArrayPrivate );
 	_p->refcount.init();
-	_p->shared=p_shared;
+
 }
 Array::~Array() {