This commit is contained in:
lyon 2022-04-28 00:49:40 +08:00
parent 09e396fa39
commit aa676d380b
11 changed files with 13 additions and 13 deletions

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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);

View File

@ -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);
}

View File

@ -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,

View File

@ -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:

View File

@ -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;
}