From 234ec85fc631868faa9dfc62af458dbe158367a1 Mon Sep 17 00:00:00 2001
From: blueloveTH <blueloveTH@foxmail.com>
Date: Mon, 13 Mar 2023 16:41:28 +0800
Subject: [PATCH] up

---
 src/cffi.h   | 30 +++++++++++++++---------------
 src/test.cpp |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/cffi.h b/src/cffi.h
index 444e7577..e70ddd71 100644
--- a/src/cffi.h
+++ b/src/cffi.h
@@ -223,21 +223,6 @@ struct Pointer{
             self.set(vm, args[1]);
             return vm->None;
         });
-
-        vm->bind_method<1>(type, "cast", [](VM* vm, Args& args) {
-            Pointer& self = CAST(Pointer&, args[0]);
-            const Str& name = CAST(Str&, args[1]);
-            int level = 0;
-            for(int i=name.size()-1; i>=0; i--){
-                if(name[i] == '*') level++;
-                else break;
-            }
-            if(level == 0) vm->TypeError("expect a pointer type, such as 'int*'");
-            Str type_s = name.substr(0, name.size()-level);
-            const TypeInfo* type = _type_db.get(type_s);
-            if(type == nullptr) vm->TypeError("unknown type: " + type_s.escape(true));
-            return VAR_T(Pointer, type, level, self.ptr);
-        });
     }
 
     template<typename T>
@@ -385,6 +370,21 @@ void add_module_c(VM* vm){
         return vm->None;
     });
 
+    vm->bind_func<2>(mod, "cast", [](VM* vm, Args& args) {
+        Pointer& self = CAST(Pointer&, args[0]);
+        const Str& name = CAST(Str&, args[1]);
+        int level = 0;
+        for(int i=name.size()-1; i>=0; i--){
+            if(name[i] == '*') level++;
+            else break;
+        }
+        if(level == 0) vm->TypeError("expect a pointer type, such as 'int*'");
+        Str type_s = name.substr(0, name.size()-level);
+        const TypeInfo* type = _type_db.get(type_s);
+        if(type == nullptr) vm->TypeError("unknown type: " + type_s.escape(true));
+        return VAR_T(Pointer, type, level, self.ptr);
+    });
+
     vm->bind_func<1>(mod, "sizeof", [](VM* vm, Args& args) {
         const Str& name = CAST(Str&, args[0]);
         if(name.find('*') != Str::npos) return VAR(sizeof(void*));
diff --git a/src/test.cpp b/src/test.cpp
index cd2fabb6..1f2627c2 100644
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -14,7 +14,7 @@ int main(){
 
     pkpy_vm_exec(vm, R"(
 from c import *
-p = malloc(4).cast("int*")
+p = cast(malloc(4), "int*")
 ret = f(p)
 print(p.get())          # 100
 print(ret, ret.get())   # 3.5