Added iterator support to Array

Author: tomfull123

binding_generator.py

@@ -909,6 +909,47 @@ def generate_builtin_class_header(builtin_api, size, used_classes, fully_used_cl
  result.append("\tvoid _ref(const Array &p_from) const;")
  result.append("\tconst Variant *ptr() const;")
  result.append("\tVariant *ptrw();")
+ result.append("""
+struct Iterator {
+_FORCE_INLINE_ Variant &operator*() const;
+_FORCE_INLINE_ Variant *operator->() const;
+_FORCE_INLINE_ Iterator &operator++();
+_FORCE_INLINE_ Iterator &operator--();
+
+_FORCE_INLINE_ bool operator==(const Iterator &b) const { return elem_ptr == b.elem_ptr; }
+_FORCE_INLINE_ bool operator!=(const Iterator &b) const { return elem_ptr != b.elem_ptr; }
+
+Iterator(Variant *p_ptr) { elem_ptr = p_ptr; }
+Iterator() {}
+Iterator(const Iterator &p_it) { elem_ptr = p_it.elem_ptr; }
+
+private:
+Variant *elem_ptr = nullptr;
+};
+
+struct ConstIterator {
+_FORCE_INLINE_ const Variant &operator*() const;
+_FORCE_INLINE_ const Variant *operator->() const;
+_FORCE_INLINE_ ConstIterator &operator++();
+_FORCE_INLINE_ ConstIterator &operator--();
+
+_FORCE_INLINE_ bool operator==(const ConstIterator &b) const { return elem_ptr == b.elem_ptr; }
+_FORCE_INLINE_ bool operator!=(const ConstIterator &b) const { return elem_ptr != b.elem_ptr; }
+
+ConstIterator(const Variant *p_ptr) { elem_ptr = p_ptr; }
+ConstIterator() {}
+ConstIterator(const ConstIterator &p_it) { elem_ptr = p_it.elem_ptr; }
+
+private:
+const Variant *elem_ptr = nullptr;
+};
+
+_FORCE_INLINE_ Iterator begin();
+_FORCE_INLINE_ Iterator end();
+
+_FORCE_INLINE_ ConstIterator begin() const;
+_FORCE_INLINE_ ConstIterator end() const;
+""")
 
  if class_name == "Dictionary":
  result.append("\tconst Variant &operator[](const Variant &p_key) const;")

include/godot_cpp/variant/variant.hpp

@@ -32,6 +32,7 @@
 
 #include <godot_cpp/core/defs.hpp>
 
+#include <godot_cpp/variant/array.hpp>
 #include <godot_cpp/variant/builtin_types.hpp>
 #include <godot_cpp/variant/variant_size.hpp>
 
@@ -357,6 +358,56 @@ String vformat(const String &p_text, const VarArgs... p_args) {
 return p_text % args_array;
 }
 
+Variant &Array::Iterator::operator*() const {
+return *elem_ptr;
+}
+
+Variant *Array::Iterator::operator->() const {
+return elem_ptr;
+}
+
+Array::Iterator &Array::Iterator::operator++() {
+elem_ptr++;
+return *this;
+}
+
+Array::Iterator &Array::Iterator::operator--() {
+elem_ptr--;
+return *this;
+}
+
+const Variant &Array::ConstIterator::operator*() const {
+return *elem_ptr;
+}
+
+const Variant *Array::ConstIterator::operator->() const {
+return elem_ptr;
+}
+
+Array::ConstIterator &Array::ConstIterator::operator++() {
+elem_ptr++;
+return *this;
+}
+
+Array::ConstIterator &Array::ConstIterator::operator--() {
+elem_ptr--;
+return *this;
+}
+
+Array::Iterator Array::begin() {
+return Array::Iterator(ptrw());
+}
+Array::Iterator Array::end() {
+return Array::Iterator(ptrw() + size());
+}
+
+Array::ConstIterator Array::begin() const {
+return Array::ConstIterator(ptr());
+}
+Array::ConstIterator Array::end() const {
+return Array::ConstIterator(ptr() + size());
+}
+
 #include <godot_cpp/variant/builtin_vararg_methods.hpp>
 
 #ifdef REAL_T_IS_DOUBLE