From aa676d380b50421d607ac7699e6168b5332322c1 Mon Sep 17 00:00:00 2001 From: lyon Date: Thu, 28 Apr 2022 00:49:40 +0800 Subject: [PATCH] format --- package/PikaStdLib/PikaStdData_Dict.c | 2 +- package/PikaStdLib/PikaStdData_List.c | 2 +- package/PikaStdLib/PikaStdData_String.c | 2 +- .../pikascript/pikascript-lib/PikaStdLib/PikaStdData_Dict.c | 2 +- .../pikascript/pikascript-lib/PikaStdLib/PikaStdData_List.c | 2 +- .../pikascript/pikascript-lib/PikaStdLib/PikaStdData_String.c | 2 +- port/linux/test/gc-test.cpp | 2 +- src/PikaObj.c | 4 ++-- src/PikaObj.h | 4 ++-- src/PikaVM.c | 2 +- src/dataArgs.c | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package/PikaStdLib/PikaStdData_Dict.c b/package/PikaStdLib/PikaStdData_Dict.c index 9e2db13d4..f8a6f7e3b 100644 --- a/package/PikaStdLib/PikaStdData_Dict.c +++ b/package/PikaStdLib/PikaStdData_Dict.c @@ -23,7 +23,7 @@ void PikaStdData_Dict_remove(PikaObj* self, char* key) { Arg* PikaStdData_Dict___iter__(PikaObj* self) { obj_setInt(self, "__iter_i", 0); - return arg_setRefObj(NULL, "", self); + return arg_setRef(NULL, "", self); } Arg* PikaStdData_Dict___next__(PikaObj* self) { diff --git a/package/PikaStdLib/PikaStdData_List.c b/package/PikaStdLib/PikaStdData_List.c index 4786f2913..2b3c01d54 100644 --- a/package/PikaStdLib/PikaStdData_List.c +++ b/package/PikaStdLib/PikaStdData_List.c @@ -41,7 +41,7 @@ void PikaStdData_List_set(PikaObj* self, Arg* arg, int i) { Arg* PikaStdData_List___iter__(PikaObj* self) { obj_setInt(self, "__iter_i", 0); - return arg_setRefObj(NULL, "", self); + return arg_setRef(NULL, "", self); } Arg* PikaStdData_List___next__(PikaObj* self) { diff --git a/package/PikaStdLib/PikaStdData_String.c b/package/PikaStdLib/PikaStdData_String.c index b82e697ec..d796e3ebe 100644 --- a/package/PikaStdLib/PikaStdData_String.c +++ b/package/PikaStdLib/PikaStdData_String.c @@ -2,7 +2,7 @@ Arg* PikaStdData_String___iter__(PikaObj* self) { obj_setInt(self, "__iter_i", 0); - return arg_setRefObj(NULL, "", self); + return arg_setRef(NULL, "", self); } void PikaStdData_String_set(PikaObj* self, char* s) { diff --git a/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_Dict.c b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_Dict.c index 9e2db13d4..f8a6f7e3b 100644 --- a/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_Dict.c +++ b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_Dict.c @@ -23,7 +23,7 @@ void PikaStdData_Dict_remove(PikaObj* self, char* key) { Arg* PikaStdData_Dict___iter__(PikaObj* self) { obj_setInt(self, "__iter_i", 0); - return arg_setRefObj(NULL, "", self); + return arg_setRef(NULL, "", self); } Arg* PikaStdData_Dict___next__(PikaObj* self) { diff --git a/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_List.c b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_List.c index 4786f2913..2b3c01d54 100644 --- a/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_List.c +++ b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_List.c @@ -41,7 +41,7 @@ void PikaStdData_List_set(PikaObj* self, Arg* arg, int i) { Arg* PikaStdData_List___iter__(PikaObj* self) { obj_setInt(self, "__iter_i", 0); - return arg_setRefObj(NULL, "", self); + return arg_setRef(NULL, "", self); } Arg* PikaStdData_List___next__(PikaObj* self) { diff --git a/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_String.c b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_String.c index b82e697ec..d796e3ebe 100644 --- a/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_String.c +++ b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_String.c @@ -2,7 +2,7 @@ Arg* PikaStdData_String___iter__(PikaObj* self) { obj_setInt(self, "__iter_i", 0); - return arg_setRefObj(NULL, "", self); + return arg_setRef(NULL, "", self); } void PikaStdData_String_set(PikaObj* self, char* s) { diff --git a/port/linux/test/gc-test.cpp b/port/linux/test/gc-test.cpp index d65ab4761..3a87cc741 100644 --- a/port/linux/test/gc-test.cpp +++ b/port/linux/test/gc-test.cpp @@ -14,7 +14,7 @@ extern "C" { TEST(gc, root) { PikaObj* root = newRootObj((char*)"root", New_PikaMain); EXPECT_EQ(obj_refcntNow(root), 1); - Arg* refArg = arg_setRefObj(NULL, (char*)"", root); + Arg* refArg = arg_setRef(NULL, (char*)"", root); EXPECT_EQ(obj_refcntNow(root), 2); arg_deinit(refArg); EXPECT_EQ(obj_refcntNow(root), 1); diff --git a/src/PikaObj.c b/src/PikaObj.c index 22baa6626..ede7f34bb 100644 --- a/src/PikaObj.c +++ b/src/PikaObj.c @@ -881,12 +881,12 @@ int obj_refcntNow(PikaObj* self) { return obj_getInt(self, "_refcnt"); } -Arg* arg_setRefObj(Arg* self, char* name, PikaObj* obj) { +Arg* arg_setRef(Arg* self, char* name, PikaObj* obj) { obj_refcntInc(obj); return arg_setPtr(self, name, ARG_TYPE_OBJECT, obj); } -Arg* arg_setWeakRefObj(Arg* self, char* name, PikaObj* obj) { +Arg* arg_setWeakRef(Arg* self, char* name, PikaObj* obj) { return arg_setPtr(self, name, ARG_TYPE_OBJECT, obj); } diff --git a/src/PikaObj.h b/src/PikaObj.h index bf20bb5bc..aaa32652f 100644 --- a/src/PikaObj.h +++ b/src/PikaObj.h @@ -229,8 +229,8 @@ void obj_refcntInc(PikaObj* self); void obj_refcntDec(PikaObj* self); int obj_refcntNow(PikaObj* self); PikaObj* NewObjDirect(NewFun newObjFun); -Arg* arg_setRefObj(Arg* self, char* name, PikaObj* obj); -Arg* arg_setWeakRefObj(Arg* self, char* name, PikaObj* obj); +Arg* arg_setRef(Arg* self, char* name, PikaObj* obj); +Arg* arg_setWeakRef(Arg* self, char* name, PikaObj* obj); PikaObj* obj_importModuleWithByteCodeFrame(PikaObj* self, char* name, diff --git a/src/PikaVM.c b/src/PikaVM.c index 0cc6749fc..8664e9534 100644 --- a/src/PikaVM.c +++ b/src/PikaVM.c @@ -276,7 +276,7 @@ static void VMState_loadArgsFromMethodArg(VMState* vs, /* load 'self' as the first arg when call object method */ if (method_type == ARG_TYPE_METHOD_OBJECT) { - Arg* call_arg = arg_setRefObj(NULL, "self", method_host_obj); + Arg* call_arg = arg_setRef(NULL, "self", method_host_obj); args_setArg(args, call_arg); } exit: diff --git a/src/dataArgs.c b/src/dataArgs.c index 6ed55b522..be6f59ea9 100644 --- a/src/dataArgs.c +++ b/src/dataArgs.c @@ -70,7 +70,7 @@ int32_t args_setPtr(Args* self, char* name, void* argPointer) { int32_t args_setRefObj(Args* self, char* name, void* argPointer) { int32_t errCode = 0; Arg* argNew = New_arg(NULL); - argNew = arg_setRefObj(argNew, name, argPointer); + argNew = arg_setRef(argNew, name, argPointer); args_setArg(self, argNew); return errCode; }