Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-01-29 17:22:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix __getitem__ without __len__

Browse Source
This commit is contained in:
lyon 2023-05-24 00:51:13 +08:00
parent 75fcb060d1
commit 3a9e5d68c8
5 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
port/linux/.vscode/launch.json vendored
View File

@ -24,7 +24,7 @@
// "--gtest_filter=lua.eval" // "--gtest_filter=lua.eval"
// "--gtest_filter=eventloop.once1" // "--gtest_filter=eventloop.once1"
// "--gtest_filter=parser.fn_fn" // "--gtest_filter=parser.fn_fn"
// "--gtest_filter=builtin.isinstance" "--gtest_filter=builtin.getitem"
// "--gtest_filter=except.isinstance" // "--gtest_filter=except.isinstance"
// "--gtest_filter=VM.run_def_add" // "--gtest_filter=VM.run_def_add"
// "--gtest_filter=parser.slice_fn" // "--gtest_filter=parser.slice_fn"

11
src/PikaObj.c
View File

@ -1235,7 +1235,7 @@ exit:
return err; return err;
} }
int32_t obj_isArgExist(PikaObj* self, char* argPath) { pika_bool obj_isArgExist(PikaObj* self, char* argPath) {
if (NULL == argPath) { if (NULL == argPath) {
return 0; return 0;
} }
@ -1259,6 +1259,15 @@ exit:
return res; return res;
} }
pika_bool obj_isMethodExist(PikaObj* self, char* method) {
Arg* arg = obj_getMethodArg(self, method);
if (NULL == arg) {
return pika_false;
}
arg_deinit(arg);
return pika_true;
}
VMParameters* obj_run(PikaObj* self, char* cmd) { VMParameters* obj_run(PikaObj* self, char* cmd) {
return pikaVM_run(self, cmd); return pikaVM_run(self, cmd);
} }

3
src/PikaObj.h
View File

@ -280,7 +280,8 @@ int32_t class_defineRunTimeConstructor(PikaObj* self,
ByteCodeFrame* bytecode_frame); ByteCodeFrame* bytecode_frame);
int32_t obj_removeArg(PikaObj* self, char* argPath); int32_t obj_removeArg(PikaObj* self, char* argPath);
int32_t obj_isArgExist(PikaObj* self, char* argPath); pika_bool obj_isArgExist(PikaObj* self, char* argPath);
pika_bool obj_isMethodExist(PikaObj* self, char* method);
PikaObj* obj_newObjFromConstructor(PikaObj* self, PikaObj* obj_newObjFromConstructor(PikaObj* self,
char* name, char* name,
NewFun newClassFun); NewFun newClassFun);

21
src/PikaVM.c
View File

@ -533,6 +533,9 @@ static int _obj_getLen(PikaObj* self) {
0x00, 0x5f, 0x5f, 0x6c, 0x65, 0x6e, 0x5f, 0x5f, 0x00, 0x00, 0x5f, 0x5f, 0x6c, 0x65, 0x6e, 0x5f, 0x5f, 0x00,
0x40, 0x6c, 0x00, /* const pool */ 0x40, 0x6c, 0x00, /* const pool */
}; };
if (!obj_isMethodExist(self, "__len__")) {
return -1;
}
pikaVM_runByteCode(self, bytes); pikaVM_runByteCode(self, bytes);
int len = obj_getInt(self, "@l"); int len = obj_getInt(self, "@l");
obj_removeArg(self, "@l"); obj_removeArg(self, "@l");
@ -609,15 +612,17 @@ Arg* _vm_get(VMState* vm, PikaObj* self, Arg* aKey, Arg* aObj) {
iIndex = arg_getInt(aKey); iIndex = arg_getInt(aKey);
} }
if (iIndex < 0) { if (iLen != -1) {
iIndex += iLen; if (iIndex < 0) {
arg_setInt(aKey, "", iIndex); iIndex += iLen;
} arg_setInt(aKey, "", iIndex);
}
if (iIndex >= iLen) { if (iIndex >= iLen) {
VMState_setErrorCode(vm, PIKA_RES_ERR_OUT_OF_RANGE); VMState_setErrorCode(vm, PIKA_RES_ERR_OUT_OF_RANGE);
pika_platform_printf("IndexError: index out of range\r\n"); pika_platform_printf("IndexError: index out of range\r\n");
return arg_newNone(); return arg_newNone();
}
} }
if (ARG_TYPE_STRING == eType) { if (ARG_TYPE_STRING == eType) {

10
test/python/builtin/getitem.py Normal file
View File

@ -0,0 +1,10 @@
class Test:
def __getitem__(self, key):
return key
t = Test()
assert t[1] == 1
assert t['a'] == 'a'
print("PASS")