added more tests, called __init__ from pickle, added reverse iterator option

include/pocketpy/iter.h

@@ -4,9 +4,11 @@
 #include "common.h"
 #include "frame.h"
 
-namespace pkpy{
+namespace pkpy
+{
 
-struct RangeIter{
+    struct RangeIter
+    {
         PY_CLASS(RangeIter, builtins, "_range_iterator")
         Range r;
         i64 current;
@@ -15,7 +17,8 @@ struct RangeIter{
         static void _register(VM *vm, PyObject *mod, PyObject *type);
     };
 
-struct ArrayIter{
+    struct ArrayIter
+    {
         PY_CLASS(ArrayIter, builtins, "_array_iterator")
         PyObject *ref;
         PyObject **begin;
@@ -29,22 +32,36 @@ struct ArrayIter{
         static void _register(VM *vm, PyObject *mod, PyObject *type);
     };
 
-struct PyDequeIter{
+    struct PyDequeIter
+    {
         // Iterator for the deque type
         PY_CLASS(PyDequeIter, builtins, "_deque_iterator")
         PyObject *ref;
+        bool is_reversed;
         std::deque<PyObject *>::iterator begin;
         std::deque<PyObject *>::iterator end;
         std::deque<PyObject *>::iterator current;
+        std::deque<PyObject *>::reverse_iterator rbegin;
+        std::deque<PyObject *>::reverse_iterator rend;
+        std::deque<PyObject *>::reverse_iterator rcurrent;
 
         PyDequeIter(PyObject *ref, std::deque<PyObject *>::iterator begin, std::deque<PyObject *>::iterator end)
-        : ref(ref), begin(begin), end(end), current(begin) {}
+            : ref(ref), begin(begin), end(end), current(begin)
+        {
+            this->is_reversed = false;
+        }
+        PyDequeIter(PyObject *ref, std::deque<PyObject *>::reverse_iterator rbegin, std::deque<PyObject *>::reverse_iterator rend)
+            : ref(ref), rbegin(rbegin), rend(rend), rcurrent(rbegin)
+        {
+            this->is_reversed = true;
+        }
 
         void _gc_mark() const { PK_OBJ_MARK(ref); }
         static void _register(VM *vm, PyObject *mod, PyObject *type);
     };
 
-struct StringIter{
+    struct StringIter
+    {
         PY_CLASS(StringIter, builtins, "_string_iterator")
         PyObject *ref;
         Str *str;
@@ -57,19 +74,24 @@ struct StringIter{
         static void _register(VM *vm, PyObject *mod, PyObject *type);
     };
 
-struct Generator{
+    struct Generator
+    {
         PY_CLASS(Generator, builtins, "generator")
         Frame frame;
         int state; // 0,1,2
         List s_backup;
 
-    Generator(Frame&& frame, ArgsView buffer): frame(std::move(frame)), state(0) {
+        Generator(Frame &&frame, ArgsView buffer) : frame(std::move(frame)), state(0)
-        for(PyObject* obj: buffer) s_backup.push_back(obj);
+        {
+            for (PyObject *obj : buffer)
+                s_backup.push_back(obj);
         }
 
-    void _gc_mark() const{
+        void _gc_mark() const
+        {
             frame._gc_mark();
-        for(PyObject* obj: s_backup) PK_OBJ_MARK(obj);
+            for (PyObject *obj : s_backup)
+                PK_OBJ_MARK(obj);
         }
 
         PyObject *next(VM *vm);

python/pickle.py

@@ -152,8 +152,13 @@ class _Unpickler:
         if newargs is not None:
             newargs = [self.unwrap(i) for i in newargs]
             inst = new_f(cls, *newargs)
+            if inst.__init__ is not None: # should be called with args if exists
+                inst.__init__(*newargs)
         else:
             inst = new_f(cls)
+            if inst.__init__ is not None:
+                inst.__init__()    # no args
+
         self.tag(index, inst)
         # restore state
         if state is not None:

src/iter.cpp

@@ -34,10 +34,18 @@ namespace pkpy{
         vm->bind__iter__(PK_OBJ_GET(Type, type), [](VM* vm, PyObject* obj){ return obj; });
         vm->bind__next__(PK_OBJ_GET(Type, type), [](VM* vm, PyObject* obj){
             PyDequeIter& self = _CAST(PyDequeIter&, obj);
+            if(self.is_reversed){
+                if(self.rcurrent == self.rend) return vm->StopIteration;
+                PyObject* ret = *self.rcurrent;
+                ++self.rcurrent;
+                return ret;
+            }
+            else{
                 if(self.current == self.end) return vm->StopIteration;
                 PyObject* ret = *self.current;
                 ++self.current;
                 return ret;
+            }
         });
     }