From 13afcd2ef6812eb800ff8235b68c0a5dc67033c8 Mon Sep 17 00:00:00 2001 From: lyon1998 Date: Sun, 17 Apr 2022 23:02:13 +0800 Subject: [PATCH] clear pikaobj.h old api, add ctypesUtils_mem api --- package/ctypes/ctypes_utils.h | 5 ++++- .../pikascript/pikascript-lib/ctypes/ctypes_utils.h | 5 ++++- src/PikaObj.h | 8 -------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/package/ctypes/ctypes_utils.h b/package/ctypes/ctypes_utils.h index 60d6edb50..92582d7ee 100644 --- a/package/ctypes/ctypes_utils.h +++ b/package/ctypes/ctypes_utils.h @@ -5,11 +5,14 @@ void ctypesUtils_setInt(PikaObj* self, int val); void ctypesUtils_setStr(PikaObj* self, char* val); void ctypesUtils_setFloat(PikaObj* self, float val); void ctypesUtils_setPtr(PikaObj* self, void* ptr); +void ctypesUtils_setMem(PikaObj* self, void* src, size_t size); int ctypesUtils_getInt(PikaObj* self); char* ctypesUtils_getStr(PikaObj* self); float ctypesUtils_getFloat(PikaObj* self); -void *ctypesUtils_getPtr(PikaObj* self); +void* ctypesUtils_getPtr(PikaObj* self); +size_t ctypesUtils_getMemSize(PikaObj* self); +void* ctypesUtils_getMem(PikaObj* self); #endif \ No newline at end of file diff --git a/port/linux/package/pikascript/pikascript-lib/ctypes/ctypes_utils.h b/port/linux/package/pikascript/pikascript-lib/ctypes/ctypes_utils.h index 60d6edb50..92582d7ee 100644 --- a/port/linux/package/pikascript/pikascript-lib/ctypes/ctypes_utils.h +++ b/port/linux/package/pikascript/pikascript-lib/ctypes/ctypes_utils.h @@ -5,11 +5,14 @@ void ctypesUtils_setInt(PikaObj* self, int val); void ctypesUtils_setStr(PikaObj* self, char* val); void ctypesUtils_setFloat(PikaObj* self, float val); void ctypesUtils_setPtr(PikaObj* self, void* ptr); +void ctypesUtils_setMem(PikaObj* self, void* src, size_t size); int ctypesUtils_getInt(PikaObj* self); char* ctypesUtils_getStr(PikaObj* self); float ctypesUtils_getFloat(PikaObj* self); -void *ctypesUtils_getPtr(PikaObj* self); +void* ctypesUtils_getPtr(PikaObj* self); +size_t ctypesUtils_getMemSize(PikaObj* self); +void* ctypesUtils_getMem(PikaObj* self); #endif \ No newline at end of file diff --git a/src/PikaObj.h b/src/PikaObj.h index 6b6e367d0..a8b47d900 100644 --- a/src/PikaObj.h +++ b/src/PikaObj.h @@ -115,14 +115,6 @@ char* obj_getStr(PikaObj* self, char* argPath); int64_t obj_getInt(PikaObj* self, char* argPath); Arg* obj_getArg(PikaObj* self, char* argPath); -// arg general operations -int32_t obj_bind(PikaObj* self, char* type, char* name, void* pointer); -int32_t obj_set(PikaObj* self, char* name, char* valStr); - -int32_t obj_bindInt(PikaObj* self, char* name, int32_t* valPtr); -int32_t obj_bindFloat(PikaObj* self, char* name, float* valPtr); -int32_t obj_bindString(PikaObj* self, char* name, char** valPtr); - char* obj_print(PikaObj* self, char* name); // args operations