undo unnecessary changes

include/pocketpy/iter.h

@@ -4,70 +4,61 @@
 #include "common.h"
 #include "frame.h"
 
-namespace pkpy
+namespace pkpy{
-{
 
-    struct RangeIter
+struct RangeIter{
-    {
+    PY_CLASS(RangeIter, builtins, "_range_iterator")
-        PY_CLASS(RangeIter, builtins, "_range_iterator")
+    Range r;
-        Range r;
+    i64 current;
-        i64 current;
+    RangeIter(Range r) : r(r), current(r.start) {}
-        RangeIter(Range r) : r(r), current(r.start) {}
 
-        static void _register(VM *vm, PyObject *mod, PyObject *type);
+    static void _register(VM* vm, PyObject* mod, PyObject* type);
-    };
+};
 
-    struct ArrayIter
+struct ArrayIter{
-    {
+    PY_CLASS(ArrayIter, builtins, "_array_iterator")
-        PY_CLASS(ArrayIter, builtins, "_array_iterator")
+    PyObject* ref;
-        PyObject *ref;
+    PyObject** begin;
-        PyObject **begin;
+    PyObject** end;
-        PyObject **end;
+    PyObject** current;
-        PyObject **current;
 
-        ArrayIter(PyObject *ref, PyObject **begin, PyObject **end)
+    ArrayIter(PyObject* ref, PyObject** begin, PyObject** end)
-            : ref(ref), begin(begin), end(end), current(begin) {}
+        : ref(ref), begin(begin), end(end), current(begin) {}
 
-        void _gc_mark() const { PK_OBJ_MARK(ref); }
+    void _gc_mark() const{ PK_OBJ_MARK(ref); }
-        static void _register(VM *vm, PyObject *mod, PyObject *type);
+    static void _register(VM* vm, PyObject* mod, PyObject* type);
-    };
+};
 
-    struct StringIter
+struct StringIter{
-    {
+    PY_CLASS(StringIter, builtins, "_string_iterator")
-        PY_CLASS(StringIter, builtins, "_string_iterator")
+    PyObject* ref;
-        PyObject *ref;
+    Str* str;
-        Str *str;
+    int index;      // byte index
-        int index; // byte index
 
-        StringIter(PyObject *ref) : ref(ref), str(&PK_OBJ_GET(Str, ref)), index(0) {}
+    StringIter(PyObject* ref) : ref(ref), str(&PK_OBJ_GET(Str, ref)), index(0) {}
 
-        void _gc_mark() const { PK_OBJ_MARK(ref); }
+    void _gc_mark() const{ PK_OBJ_MARK(ref); }
 
-        static void _register(VM *vm, PyObject *mod, PyObject *type);
+    static void _register(VM* vm, PyObject* mod, PyObject* type);
-    };
+};
 
-    struct Generator
+struct Generator{
-    {
+    PY_CLASS(Generator, builtins, "generator")
-        PY_CLASS(Generator, builtins, "generator")
+    Frame frame;
-        Frame frame;
+    int state;      // 0,1,2
-        int state; // 0,1,2
+    List s_backup;
-        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();
-            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);
+    PyObject* next(VM* vm);
-        static void _register(VM *vm, PyObject *mod, PyObject *type);
+    static void _register(VM* vm, PyObject* mod, PyObject* type);
-    };
+};
 
 } // namespace pkpy

include/pocketpy/pocketpy.h

@@ -7,14 +7,13 @@
 #include "base64.h"
 #include "cffi.h"
 #include "linalg.h"
-#include "collections.h"
 #include "easing.h"
 #include "io.h"
 #include "vm.h"
 #include "re.h"
 #include "random.h"
 #include "bindings.h"
-
+#include "collections.h"
 
 namespace pkpy {
 
@@ -29,5 +28,4 @@ void add_module_math(VM* vm);
 void add_module_dis(VM* vm);
 void add_module_traceback(VM* vm);
 void add_module_gc(VM* vm);
-
 }   // namespace pkpy