up

scripts/run_tests.py

@@ -1,8 +1,11 @@
 import os
+import sys
 
 def test_file(filepath):
-    return os.system("./pocketpy " + filepath) == 0
-    #return os.system("python3 " + filepath) == 0
+    if sys.platform == 'win32':
+        return os.system("pocketpy.exe " + filepath) == 0
+    else:
+        return os.system("./pocketpy " + filepath) == 0
 
 def test_dir(path):
     has_error = False

src/safestl.h

@@ -128,6 +128,15 @@ namespace pkpy {
             return ret;
         }
 
+        ArgList move_extended_self(const PyVar& self){
+            static_assert(std::is_standard_layout_v<PyVar>);
+            pkpy::ArgList ret(size()+1);
+            ret[0] = self;
+            memcpy(ret._args+1, _args, sizeof(PyVar)*size());
+            memset(_args, 0, sizeof(PyVar)*size());
+            return ret;
+        }
+
         ~ArgList(){
             __tryRelease();
         }

src/vm.h

@@ -449,12 +449,14 @@ public:
         const PyVar* callable = &_callable;
         if((*callable)->is_type(_tp_bounded_method)){
             auto& bm = PyBoundedMethod_AS_C((*callable));
+            callable = &bm.method;      // get unbound method
+
             // TODO: avoid insertion here, bad performance
-            pkpy::ArgList new_args(args.size()+1);
-            new_args[0] = bm.obj;
-            for(int i=0; i<args.size(); i++) new_args[i+1] = args[i];
-            callable = &bm.method;
-            args = std::move(new_args);
+            // pkpy::ArgList new_args(args.size()+1);
+            // new_args[0] = bm.obj;
+            // for(int i=0; i<args.size(); i++) new_args[i+1] = args[i];
+            // args = std::move(new_args);
+            args = args.move_extended_self(bm.obj);
         }
         
         if((*callable)->is_type(_tp_native_function)){