Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-23 21:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

some refactor

Browse Source
This commit is contained in:
blueloveTH 2024-05-04 20:00:36 +08:00
parent a5800f2bd6
commit 0a725eecb2
2 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/vm.cpp
View File

@ -1352,63 +1352,56 @@ void _gc_mark_namedict(NameDict* t){
void VM::bind__getitem__(Type type, PyObject* (*f)(VM*, PyObject*, PyObject*)){ void VM::bind__getitem__(Type type, PyObject* (*f)(VM*, PyObject*, PyObject*)){
_all_types[type].m__getitem__ = f; _all_types[type].m__getitem__ = f;
PyObject* nf = bind_func(type, __getitem__, 2, [](VM* vm, ArgsView args){ bind_func(type, __getitem__, 2, [](VM* vm, ArgsView args){
return lambda_get_userdata<PyObject*(*)(VM*, PyObject*, PyObject*)>(args.begin())(vm, args[0], args[1]); return lambda_get_userdata<PyObject*(*)(VM*, PyObject*, PyObject*)>(args.begin())(vm, args[0], args[1]);
}); }, f);
PK_OBJ_GET(NativeFunc, nf).set_userdata(f);
} }
void VM::bind__setitem__(Type type, void (*f)(VM*, PyObject*, PyObject*, PyObject*)){ void VM::bind__setitem__(Type type, void (*f)(VM*, PyObject*, PyObject*, PyObject*)){
_all_types[type].m__setitem__ = f; _all_types[type].m__setitem__ = f;
PyObject* nf = bind_func(type, __setitem__, 3, [](VM* vm, ArgsView args){ bind_func(type, __setitem__, 3, [](VM* vm, ArgsView args){
lambda_get_userdata<void(*)(VM* vm, PyObject*, PyObject*, PyObject*)>(args.begin())(vm, args[0], args[1], args[2]); lambda_get_userdata<void(*)(VM* vm, PyObject*, PyObject*, PyObject*)>(args.begin())(vm, args[0], args[1], args[2]);
return vm->None; return vm->None;
}); }, f);
PK_OBJ_GET(NativeFunc, nf).set_userdata(f);
} }
void VM::bind__delitem__(Type type, void (*f)(VM*, PyObject*, PyObject*)){ void VM::bind__delitem__(Type type, void (*f)(VM*, PyObject*, PyObject*)){
_all_types[type].m__delitem__ = f; _all_types[type].m__delitem__ = f;
PyObject* nf = bind_func(type, __delitem__, 2, [](VM* vm, ArgsView args){ bind_func(type, __delitem__, 2, [](VM* vm, ArgsView args){
lambda_get_userdata<void(*)(VM*, PyObject*, PyObject*)>(args.begin())(vm, args[0], args[1]); lambda_get_userdata<void(*)(VM*, PyObject*, PyObject*)>(args.begin())(vm, args[0], args[1]);
return vm->None; return vm->None;
}); }, f);
PK_OBJ_GET(NativeFunc, nf).set_userdata(f);
} }
PyObject* VM::__pack_next_retval(unsigned n){
if(n == 0) return StopIteration;
if(n == 1) return s_data.popx();
PyObject* retval = VAR(s_data.view(n).to_tuple());
s_data._sp -= n;
return retval;
}
PyObject* VM::__pack_next_retval(unsigned n){ void VM::bind__next__(Type type, unsigned (*f)(VM*, PyObject*)){
if(n == 0) return StopIteration; _all_types[type].m__next__ = f;
if(n == 1) return s_data.popx(); bind_func(type, __next__, 1, [](VM* vm, ArgsView args){
PyObject* retval = VAR(s_data.view(n).to_tuple()); int n = lambda_get_userdata<unsigned(*)(VM*, PyObject*)>(args.begin())(vm, args[0]);
s_data._sp -= n; return vm->__pack_next_retval(n);
return retval; }, f);
} }
void VM::bind__next__(Type type, unsigned (*f)(VM*, PyObject*)){ \ void VM::bind__next__(Type type, PyObject* (*f)(VM*, PyObject*)){
_all_types[type].m__next__ = f; \ bind_func(type, __next__, 1, [](VM* vm, ArgsView args){
PyObject* nf = bind_func(type, __next__, 1, [](VM* vm, ArgsView args){ \ auto f = lambda_get_userdata<PyObject*(*)(VM*, PyObject*)>(args.begin());
int n = lambda_get_userdata<unsigned(*)(VM*, PyObject*)>(args.begin())(vm, args[0]);\ return f(vm, args[0]);
return vm->__pack_next_retval(n); \ }, f);
}); \ }
PK_OBJ_GET(NativeFunc, nf).set_userdata(f); \
}
void VM::bind__next__(Type type, PyObject* (*f)(VM*, PyObject*)){
PyObject* nf = bind_func(type, __next__, 1, [](VM* vm, ArgsView args){
auto f = lambda_get_userdata<PyObject*(*)(VM*, PyObject*)>(args.begin());
return f(vm, args[0]);
});
PK_OBJ_GET(NativeFunc, nf).set_userdata(f);
}
#define BIND_UNARY_SPECIAL(name) \ #define BIND_UNARY_SPECIAL(name) \
void VM::bind##name(Type type, PyObject* (*f)(VM*, PyObject*)){ \ void VM::bind##name(Type type, PyObject* (*f)(VM*, PyObject*)){ \
_all_types[type].m##name = f; \ _all_types[type].m##name = f; \
PyObject* nf = bind_func(type, name, 1, [](VM* vm, ArgsView args){ \ bind_func(type, name, 1, [](VM* vm, ArgsView args){ \
return lambda_get_userdata<PyObject*(*)(VM*, PyObject*)>(args.begin())(vm, args[0]);\ return lambda_get_userdata<PyObject*(*)(VM*, PyObject*)>(args.begin())(vm, args[0]); \
}); \ }, f); \
PK_OBJ_GET(NativeFunc, nf).set_userdata(f); \
} }
BIND_UNARY_SPECIAL(__repr__) BIND_UNARY_SPECIAL(__repr__)
@ -1420,30 +1413,27 @@ void VM::bind__delitem__(Type type, void (*f)(VM*, PyObject*, PyObject*)){
void VM::bind__hash__(Type type, i64 (*f)(VM*, PyObject*)){ void VM::bind__hash__(Type type, i64 (*f)(VM*, PyObject*)){
_all_types[type].m__hash__ = f; _all_types[type].m__hash__ = f;
PyObject* nf = bind_func(type, __hash__, 1, [](VM* vm, ArgsView args){ bind_func(type, __hash__, 1, [](VM* vm, ArgsView args){
i64 ret = lambda_get_userdata<decltype(f)>(args.begin())(vm, args[0]); i64 ret = lambda_get_userdata<decltype(f)>(args.begin())(vm, args[0]);
return VAR(ret); return VAR(ret);
}); }, f);
PK_OBJ_GET(NativeFunc, nf).set_userdata(f);
} }
void VM::bind__len__(Type type, i64 (*f)(VM*, PyObject*)){ void VM::bind__len__(Type type, i64 (*f)(VM*, PyObject*)){
_all_types[type].m__len__ = f; _all_types[type].m__len__ = f;
PyObject* nf = bind_func(type, __len__, 1, [](VM* vm, ArgsView args){ bind_func(type, __len__, 1, [](VM* vm, ArgsView args){
i64 ret = lambda_get_userdata<decltype(f)>(args.begin())(vm, args[0]); i64 ret = lambda_get_userdata<decltype(f)>(args.begin())(vm, args[0]);
return VAR(ret); return VAR(ret);
}); }, f);
PK_OBJ_GET(NativeFunc, nf).set_userdata(f);
} }
#define BIND_BINARY_SPECIAL(name) \ #define BIND_BINARY_SPECIAL(name) \
void VM::bind##name(Type type, BinaryFuncC f){ \ void VM::bind##name(Type type, BinaryFuncC f){ \
_all_types[type].m##name = f; \ _all_types[type].m##name = f; \
PyObject* nf = bind_func(type, name, 2, [](VM* vm, ArgsView args){ \ bind_func(type, name, 2, [](VM* vm, ArgsView args){ \
return lambda_get_userdata<BinaryFuncC>(args.begin())(vm, args[0], args[1]);\ return lambda_get_userdata<BinaryFuncC>(args.begin())(vm, args[0], args[1]);\
}); \ }, f); \
PK_OBJ_GET(NativeFunc, nf).set_userdata(f); \
} }
BIND_BINARY_SPECIAL(__eq__) BIND_BINARY_SPECIAL(__eq__)

2
tests/05_list.py
View File

@ -132,3 +132,5 @@ except ValueError:
a, b = [1, 2] a, b = [1, 2]
assert a == 1 and b == 2 assert a == 1 and b == 2
assert [1, 2].__getitem__(0) == 1