diff --git a/src/obj.h b/src/obj.h index 673a55bd..4f247837 100644 --- a/src/obj.h +++ b/src/obj.h @@ -15,7 +15,6 @@ class PyObject; class CodeObject; class BasePointer; class VM; -class Frame; typedef std::shared_ptr PyVar; typedef PyVar PyVarOrNull; @@ -47,7 +46,7 @@ public: typedef std::unordered_map<_Str, PyVar> PyVarDict; typedef std::shared_ptr _Pointer; -typedef PyVar (*_CppFunc)(VM*, Frame*, PyVarList); +typedef PyVar (*_CppFunc)(VM*, PyVarList); typedef std::shared_ptr _Code; struct _Func { diff --git a/src/pocketpy.h b/src/pocketpy.h index 2c09f92d..e4f6f91e 100644 --- a/src/pocketpy.h +++ b/src/pocketpy.h @@ -6,7 +6,7 @@ #define PK_VERSION "0.2.0" #define BIND_NUM_ARITH_OPT(name, op) \ - _vm->bindMethodMulti({"int","float"}, #name, [](VM* vm, Frame* frame, PyVarList args){ \ + _vm->bindMethodMulti({"int","float"}, #name, [](VM* vm, PyVarList args){ \ if(!vm->isIntOrFloat(args[0], args[1])) \ vm->typeError("unsupported operand type(s) for " #op ); \ if(args[0]->isType(vm->_tp_int) && args[1]->isType(vm->_tp_int)){ \ @@ -17,7 +17,7 @@ }); #define BIND_NUM_LOGICAL_OPT(name, op, fallback) \ - _vm->bindMethodMulti({"int","float"}, #name, [](VM* vm, Frame* frame, PyVarList args){ \ + _vm->bindMethodMulti({"int","float"}, #name, [](VM* vm, PyVarList args){ \ if(!vm->isIntOrFloat(args[0], args[1])){ \ if constexpr(fallback) return vm->PyBool(args[0] op args[1]); \ vm->typeError("unsupported operand type(s) for " #op ); \ @@ -40,7 +40,7 @@ void __initializeBuiltinFunctions(VM* _vm) { #undef BIND_NUM_ARITH_OPT #undef BIND_NUM_LOGICAL_OPT - _vm->bindBuiltinFunc("print", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindBuiltinFunc("print", [](VM* vm, PyVarList args) { for (auto& arg : args){ _Str s = vm->PyStr_AS_C(vm->asStr(arg)) + " "; vm->_stdout(s.c_str()); @@ -49,62 +49,82 @@ void __initializeBuiltinFunctions(VM* _vm) { return vm->None; }); - _vm->bindBuiltinFunc("eval", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindBuiltinFunc("eval", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1); const _Str& expr = vm->PyStr_AS_C(args[0]); _Code code = compile(vm, expr.c_str(), "", EVAL_MODE); if(code == nullptr) return vm->None; - return vm->_exec(code, frame->_module, frame->f_locals); + return vm->_exec(code, vm->topFrame()->_module, vm->topFrame()->f_locals); }); - _vm->bindBuiltinFunc("isinstance", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindBuiltinFunc("isinstance", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 2); return vm->PyBool(vm->isInstance(args[0], args[1])); }); - _vm->bindBuiltinFunc("repr", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindBuiltinFunc("repr", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1); return vm->asRepr(args[0]); }); - _vm->bindBuiltinFunc("hash", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindBuiltinFunc("hash", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1); return vm->PyInt(vm->hash(args[0])); }); - _vm->bindBuiltinFunc("chr", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindBuiltinFunc("chr", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1); _Int i = vm->PyInt_AS_C(args[0]); if (i < 0 || i > 128) vm->valueError("chr() arg not in range(128)"); return vm->PyStr(_Str(1, (char)i)); }); - _vm->bindBuiltinFunc("ord", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindBuiltinFunc("ord", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1); _Str s = vm->PyStr_AS_C(args[0]); if (s.size() != 1) vm->typeError("ord() expected an ASCII character"); return vm->PyInt((_Int)s[0]); }); - _vm->bindBuiltinFunc("dir", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindBuiltinFunc("globals", [](VM* vm, PyVarList args) { + vm->__checkArgSize(args, 0); + const auto& d = vm->topFrame()->f_globals(); + PyVar obj = vm->call(vm->builtins->attribs["dict"], {}); + for (const auto& [k, v] : d) { + vm->call(obj, __setitem__, {vm->PyStr(k), v}); + } + return obj; + }); + + _vm->bindBuiltinFunc("locals", [](VM* vm, PyVarList args) { + vm->__checkArgSize(args, 0); + const auto& d = vm->topFrame()->f_locals; + PyVar obj = vm->call(vm->builtins->attribs["dict"], {}); + for (const auto& [k, v] : d) { + vm->call(obj, __setitem__, {vm->PyStr(k), v}); + } + return obj; + }); + + _vm->bindBuiltinFunc("dir", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1); PyVarList ret; for (auto& [k, _] : args[0]->attribs) ret.push_back(vm->PyStr(k)); return vm->PyList(ret); }); - _vm->bindMethod("object", "__repr__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("object", "__repr__", [](VM* vm, PyVarList args) { PyVar _self = args[0]; _Str s = "<" + _self->getTypeName() + " object at " + std::to_string((uintptr_t)_self.get()) + ">"; return vm->PyStr(s); }); - _vm->bindMethod("type", "__new__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("type", "__new__", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1); return args[0]->attribs[__class__]; }); - _vm->bindMethod("range", "__new__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("range", "__new__", [](VM* vm, PyVarList args) { _Range r; switch (args.size()) { case 1: r.stop = vm->PyInt_AS_C(args[0]); break; @@ -115,17 +135,17 @@ void __initializeBuiltinFunctions(VM* _vm) { return vm->PyRange(r); }); - _vm->bindMethod("range", "__iter__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("range", "__iter__", [](VM* vm, PyVarList args) { vm->__checkType(args[0], vm->_tp_range); auto iter = std::make_shared(vm, args[0]); return vm->PyIter(iter); }); - _vm->bindMethod("NoneType", "__repr__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("NoneType", "__repr__", [](VM* vm, PyVarList args) { return vm->PyStr("None"); }); - _vm->bindMethodMulti({"int", "float"}, "__truediv__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethodMulti({"int", "float"}, "__truediv__", [](VM* vm, PyVarList args) { if(!vm->isIntOrFloat(args[0], args[1])) vm->typeError("unsupported operand type(s) for " "/" ); _Float rhs = vm->numToFloat(args[1]); @@ -133,7 +153,7 @@ void __initializeBuiltinFunctions(VM* _vm) { return vm->PyFloat(vm->numToFloat(args[0]) / rhs); }); - _vm->bindMethodMulti({"int", "float"}, "__pow__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethodMulti({"int", "float"}, "__pow__", [](VM* vm, PyVarList args) { if(!vm->isIntOrFloat(args[0], args[1])) vm->typeError("unsupported operand type(s) for " "**" ); if(args[0]->isType(vm->_tp_int) && args[1]->isType(vm->_tp_int)){ @@ -144,7 +164,7 @@ void __initializeBuiltinFunctions(VM* _vm) { }); /************ PyInt ************/ - _vm->bindMethod("int", "__new__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("int", "__new__", [](VM* vm, PyVarList args) { if(args.size() == 0) return vm->PyInt(0); vm->__checkArgSize(args, 1); if (args[0]->isType(vm->_tp_int)) return args[0]; @@ -163,7 +183,7 @@ void __initializeBuiltinFunctions(VM* _vm) { return vm->None; }); - _vm->bindMethod("int", "__floordiv__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("int", "__floordiv__", [](VM* vm, PyVarList args) { if(!args[0]->isType(vm->_tp_int) || !args[1]->isType(vm->_tp_int)) vm->typeError("unsupported operand type(s) for " "//" ); _Int rhs = vm->PyInt_AS_C(args[1]); @@ -171,24 +191,24 @@ void __initializeBuiltinFunctions(VM* _vm) { return vm->PyInt(vm->PyInt_AS_C(args[0]) / rhs); }); - _vm->bindMethod("int", "__mod__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("int", "__mod__", [](VM* vm, PyVarList args) { if(!args[0]->isType(vm->_tp_int) || !args[1]->isType(vm->_tp_int)) vm->typeError("unsupported operand type(s) for " "%" ); return vm->PyInt(vm->PyInt_AS_C(args[0]) % vm->PyInt_AS_C(args[1])); }); - _vm->bindMethod("int", "__neg__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("int", "__neg__", [](VM* vm, PyVarList args) { if(!args[0]->isType(vm->_tp_int)) vm->typeError("unsupported operand type(s) for " "-" ); return vm->PyInt(-1 * vm->PyInt_AS_C(args[0])); }); - _vm->bindMethod("int", "__repr__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("int", "__repr__", [](VM* vm, PyVarList args) { return vm->PyStr(std::to_string(vm->PyInt_AS_C(args[0]))); }); /************ PyFloat ************/ - _vm->bindMethod("float", "__new__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("float", "__new__", [](VM* vm, PyVarList args) { if(args.size() == 0) return vm->PyFloat(0.0); vm->__checkArgSize(args, 1); if (args[0]->isType(vm->_tp_int)) return vm->PyFloat((_Float)vm->PyInt_AS_C(args[0])); @@ -209,11 +229,11 @@ void __initializeBuiltinFunctions(VM* _vm) { return vm->None; }); - _vm->bindMethod("float", "__neg__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("float", "__neg__", [](VM* vm, PyVarList args) { return vm->PyFloat(-1.0 * vm->PyFloat_AS_C(args[0])); }); - _vm->bindMethod("float", "__repr__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("float", "__repr__", [](VM* vm, PyVarList args) { _Float val = vm->PyFloat_AS_C(args[0]); if(std::isinf(val) || std::isnan(val)) return vm->PyStr(std::to_string(val)); _StrStream ss; @@ -224,12 +244,12 @@ void __initializeBuiltinFunctions(VM* _vm) { }); /************ PyString ************/ - _vm->bindMethod("str", "__new__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "__new__", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1); return vm->asStr(args[0]); }); - _vm->bindMethod("str", "__add__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "__add__", [](VM* vm, PyVarList args) { if(!args[0]->isType(vm->_tp_str) || !args[1]->isType(vm->_tp_str)) vm->typeError("unsupported operand type(s) for " "+" ); const _Str& lhs = vm->PyStr_AS_C(args[0]); @@ -237,39 +257,39 @@ void __initializeBuiltinFunctions(VM* _vm) { return vm->PyStr(lhs + rhs); }); - _vm->bindMethod("str", "__len__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "__len__", [](VM* vm, PyVarList args) { const _Str& _self = vm->PyStr_AS_C(args[0]); return vm->PyInt(_self.u8_length()); }); - _vm->bindMethod("str", "__contains__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "__contains__", [](VM* vm, PyVarList args) { const _Str& _self = vm->PyStr_AS_C(args[0]); const _Str& _other = vm->PyStr_AS_C(args[1]); return vm->PyBool(_self.str().find(_other.str()) != _Str::npos); }); - _vm->bindMethod("str", "__str__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "__str__", [](VM* vm, PyVarList args) { return args[0]; // str is immutable }); - _vm->bindMethod("str", "__iter__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "__iter__", [](VM* vm, PyVarList args) { auto it = std::make_shared(vm, args[0]); return vm->PyIter(it); }); - _vm->bindMethod("str", "__repr__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "__repr__", [](VM* vm, PyVarList args) { const _Str& _self = vm->PyStr_AS_C(args[0]); // we just do a simple repr here, no escaping return vm->PyStr("'" + _self.str() + "'"); }); - _vm->bindMethod("str", "__eq__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "__eq__", [](VM* vm, PyVarList args) { if(args[0]->isType(vm->_tp_str) && args[1]->isType(vm->_tp_str)) return vm->PyBool(vm->PyStr_AS_C(args[0]) == vm->PyStr_AS_C(args[1])); return vm->PyBool(args[0] == args[1]); // fallback }); - _vm->bindMethod("str", "__getitem__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "__getitem__", [](VM* vm, PyVarList args) { const _Str& _self (vm->PyStr_AS_C(args[0])); if(args[1]->isType(vm->_tp_slice)){ @@ -283,19 +303,19 @@ void __initializeBuiltinFunctions(VM* _vm) { return vm->PyStr(_self.u8_getitem(_index)); }); - _vm->bindMethod("str", "__gt__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "__gt__", [](VM* vm, PyVarList args) { const _Str& _self (vm->PyStr_AS_C(args[0])); const _Str& _obj (vm->PyStr_AS_C(args[1])); return vm->PyBool(_self > _obj); }); - _vm->bindMethod("str", "__lt__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "__lt__", [](VM* vm, PyVarList args) { const _Str& _self (vm->PyStr_AS_C(args[0])); const _Str& _obj (vm->PyStr_AS_C(args[1])); return vm->PyBool(_self < _obj); }); - _vm->bindMethod("str", "upper", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "upper", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1, true); const _Str& _self (vm->PyStr_AS_C(args[0])); _StrStream ss; @@ -303,7 +323,7 @@ void __initializeBuiltinFunctions(VM* _vm) { return vm->PyStr(ss); }); - _vm->bindMethod("str", "lower", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "lower", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1, true); const _Str& _self (vm->PyStr_AS_C(args[0])); _StrStream ss; @@ -311,7 +331,7 @@ void __initializeBuiltinFunctions(VM* _vm) { return vm->PyStr(ss); }); - _vm->bindMethod("str", "replace", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "replace", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 3, true); const _Str& _self = vm->PyStr_AS_C(args[0]); const _Str& _old = vm->PyStr_AS_C(args[1]); @@ -326,21 +346,21 @@ void __initializeBuiltinFunctions(VM* _vm) { return vm->PyStr(_copy); }); - _vm->bindMethod("str", "startswith", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "startswith", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 2, true); const _Str& _self = vm->PyStr_AS_C(args[0]); const _Str& _prefix = vm->PyStr_AS_C(args[1]); return vm->PyBool(_self.str().find(_prefix.str()) == 0); }); - _vm->bindMethod("str", "endswith", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "endswith", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 2, true); const _Str& _self = vm->PyStr_AS_C(args[0]); const _Str& _suffix = vm->PyStr_AS_C(args[1]); return vm->PyBool(_self.str().rfind(_suffix.str()) == _self.str().length() - _suffix.str().length()); }); - _vm->bindMethod("str", "join", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("str", "join", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 2, true); const _Str& _self = vm->PyStr_AS_C(args[0]); const PyVarList& _list = vm->PyList_AS_C(args[1]); @@ -353,20 +373,20 @@ void __initializeBuiltinFunctions(VM* _vm) { }); /************ PyList ************/ - _vm->bindMethod("list", "__iter__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("list", "__iter__", [](VM* vm, PyVarList args) { vm->__checkType(args[0], vm->_tp_list); auto iter = std::make_shared(vm, args[0]); return vm->PyIter(iter); }); - _vm->bindMethod("list", "append", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("list", "append", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 2, true); PyVarList& _self = vm->PyList_AS_C(args[0]); _self.push_back(args[1]); return vm->None; }); - _vm->bindMethod("list", "insert", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("list", "insert", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 3, true); PyVarList& _self = vm->PyList_AS_C(args[0]); int _index = vm->PyInt_AS_C(args[1]); @@ -375,18 +395,18 @@ void __initializeBuiltinFunctions(VM* _vm) { return vm->None; }); - _vm->bindMethod("list", "clear", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("list", "clear", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1, true); vm->PyList_AS_C(args[0]).clear(); return vm->None; }); - _vm->bindMethod("list", "copy", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("list", "copy", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1, true); return vm->PyList(vm->PyList_AS_C(args[0])); }); - _vm->bindMethod("list", "pop", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("list", "pop", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1, true); PyVarList& _self = vm->PyList_AS_C(args[0]); if(_self.empty()) vm->indexError("pop from empty list"); @@ -395,7 +415,7 @@ void __initializeBuiltinFunctions(VM* _vm) { return ret; }); - _vm->bindMethod("list", "__add__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("list", "__add__", [](VM* vm, PyVarList args) { const PyVarList& _self = vm->PyList_AS_C(args[0]); const PyVarList& _obj = vm->PyList_AS_C(args[1]); PyVarList _new_list = _self; @@ -403,12 +423,12 @@ void __initializeBuiltinFunctions(VM* _vm) { return vm->PyList(_new_list); }); - _vm->bindMethod("list", "__len__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("list", "__len__", [](VM* vm, PyVarList args) { const PyVarList& _self = vm->PyList_AS_C(args[0]); return vm->PyInt(_self.size()); }); - _vm->bindMethod("list", "__getitem__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("list", "__getitem__", [](VM* vm, PyVarList args) { const PyVarList& _self = vm->PyList_AS_C(args[0]); if(args[1]->isType(vm->_tp_slice)){ @@ -425,7 +445,7 @@ void __initializeBuiltinFunctions(VM* _vm) { return _self[_index]; }); - _vm->bindMethod("list", "__setitem__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("list", "__setitem__", [](VM* vm, PyVarList args) { PyVarList& _self = vm->PyList_AS_C(args[0]); int _index = vm->PyInt_AS_C(args[1]); _index = vm->normalizedIndex(_index, _self.size()); @@ -433,7 +453,7 @@ void __initializeBuiltinFunctions(VM* _vm) { return vm->None; }); - _vm->bindMethod("list", "__delitem__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("list", "__delitem__", [](VM* vm, PyVarList args) { PyVarList& _self = vm->PyList_AS_C(args[0]); int _index = vm->PyInt_AS_C(args[1]); _index = vm->normalizedIndex(_index, _self.size()); @@ -442,24 +462,24 @@ void __initializeBuiltinFunctions(VM* _vm) { }); /************ PyTuple ************/ - _vm->bindMethod("tuple", "__new__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("tuple", "__new__", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1); - PyVarList _list = vm->PyList_AS_C(vm->call(frame, vm->builtins->attribs["list"], args)); + PyVarList _list = vm->PyList_AS_C(vm->call(vm->builtins->attribs["list"], args)); return vm->PyTuple(_list); }); - _vm->bindMethod("tuple", "__iter__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("tuple", "__iter__", [](VM* vm, PyVarList args) { vm->__checkType(args[0], vm->_tp_tuple); auto iter = std::make_shared(vm, args[0]); return vm->PyIter(iter); }); - _vm->bindMethod("tuple", "__len__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("tuple", "__len__", [](VM* vm, PyVarList args) { const PyVarList& _self = vm->PyTuple_AS_C(args[0]); return vm->PyInt(_self.size()); }); - _vm->bindMethod("tuple", "__getitem__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("tuple", "__getitem__", [](VM* vm, PyVarList args) { const PyVarList& _self = vm->PyTuple_AS_C(args[0]); int _index = vm->PyInt_AS_C(args[1]); _index = vm->normalizedIndex(_index, _self.size()); @@ -467,12 +487,12 @@ void __initializeBuiltinFunctions(VM* _vm) { }); /************ PyBool ************/ - _vm->bindMethod("bool", "__repr__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("bool", "__repr__", [](VM* vm, PyVarList args) { bool val = vm->PyBool_AS_C(args[0]); return vm->PyStr(val ? "True" : "False"); }); - _vm->bindMethod("bool", "__eq__", [](VM* vm, Frame* frame, PyVarList args) { + _vm->bindMethod("bool", "__eq__", [](VM* vm, PyVarList args) { return vm->PyBool(args[0] == args[1]); }); } @@ -495,7 +515,7 @@ void __runCodeBuiltins(VM* vm, const char* src){ void __addModuleTime(VM* vm){ PyVar mod = vm->newModule("time"); - vm->bindFunc(mod, "time", [](VM* vm, Frame* frame, PyVarList args) { + vm->bindFunc(mod, "time", [](VM* vm, PyVarList args) { auto now = std::chrono::high_resolution_clock::now(); return vm->PyFloat(std::chrono::duration_cast(now.time_since_epoch()).count() / 1000000.0); }); @@ -503,7 +523,7 @@ void __addModuleTime(VM* vm){ void __addModuleSys(VM* vm){ PyVar mod = vm->newModule("sys"); - vm->bindFunc(mod, "getrefcount", [](VM* vm, Frame* frame, PyVarList args) { + vm->bindFunc(mod, "getrefcount", [](VM* vm, PyVarList args) { vm->__checkArgSize(args, 1); return vm->PyInt(args[0].use_count()); }); diff --git a/src/vm.h b/src/vm.h index fa237562..21c37261 100644 --- a/src/vm.h +++ b/src/vm.h @@ -103,7 +103,7 @@ private: case OP_LIST_APPEND: { PyVar obj = frame->popValue(this); PyVar list = frame->topNValue(this, -2); - fastCall(frame, list, "append", {list, obj}); + fastCall(list, "append", {list, obj}); } break; case OP_STORE_FUNCTION: { @@ -140,7 +140,7 @@ private: { PyVar rhs = frame->popValue(this); PyVar lhs = frame->popValue(this); - frame->push(fastCall(frame, lhs, BIN_SPECIAL_METHODS[byte.arg], {lhs,rhs})); + frame->push(fastCall(lhs, BIN_SPECIAL_METHODS[byte.arg], {lhs,rhs})); } break; case OP_COMPARE_OP: { @@ -148,7 +148,7 @@ private: PyVar lhs = frame->popValue(this); // for __ne__ we use the negation of __eq__ int op = byte.arg == 3 ? 2 : byte.arg; - PyVar res = fastCall(frame, lhs, CMP_SPECIAL_METHODS[op], {lhs,rhs}); + PyVar res = fastCall(lhs, CMP_SPECIAL_METHODS[op], {lhs,rhs}); if(op != byte.arg) res = PyBool(!PyBool_AS_C(res)); frame->push(res); } break; @@ -162,14 +162,14 @@ private: { PyVar rhs = frame->popValue(this); PyVar lhs = frame->popValue(this); - bool ret_c = PyBool_AS_C(call(frame, rhs, __contains__, {lhs})); + bool ret_c = PyBool_AS_C(call(rhs, __contains__, {lhs})); if(byte.arg == 1) ret_c = !ret_c; frame->push(PyBool(ret_c)); } break; case OP_UNARY_NEGATIVE: { PyVar obj = frame->popValue(this); - frame->push(call(frame, obj, __neg__, {})); + frame->push(call(obj, __neg__, {})); } break; case OP_UNARY_NOT: { @@ -202,9 +202,9 @@ private: case OP_BUILD_MAP: { PyVarList items = frame->popNValuesReversed(this, byte.arg*2); - PyVar obj = call(frame, builtins->attribs["dict"], {}); + PyVar obj = call(builtins->attribs["dict"], {}); for(int i=0; ipush(obj); } break; @@ -213,7 +213,7 @@ private: { PyVarList args = frame->popNValuesReversed(this, byte.arg); PyVar callable = frame->popValue(this); - frame->push(call(frame, callable, args)); + frame->push(call(callable, args)); } break; case OP_JUMP_ABSOLUTE: frame->jumpTo(byte.arg); break; case OP_GET_ITER: @@ -221,7 +221,7 @@ private: PyVar obj = frame->popValue(this); PyVarOrNull iter_fn = getAttr(obj, __iter__, false); if(iter_fn != nullptr){ - PyVar tmp = call(frame, iter_fn, {obj}); + PyVar tmp = call(iter_fn, {obj}); PyIter_AS_C(tmp)->var = PyPointer_AS_C(frame->__pop()); frame->push(tmp); }else{ @@ -299,13 +299,18 @@ public: PyVar asStr(const PyVar& obj){ PyVarOrNull str_fn = getAttr(obj, __str__, false); - if(str_fn != nullptr) return call(nullptr, str_fn, {}); + if(str_fn != nullptr) return call(str_fn, {}); return asRepr(obj); } + Frame* topFrame(){ + if(callstack.size() == 0) UNREACHABLE(); + return callstack.top().get(); + } + PyVar asRepr(const PyVar& obj){ if(obj->isType(_tp_type)) return PyStr("getName() + "'>"); - return call(nullptr, obj, __repr__, {}); + return call(obj, __repr__, {}); } PyVar asBool(const PyVar& obj){ @@ -316,18 +321,18 @@ public: if(tp == _tp_float) return PyBool(PyFloat_AS_C(obj) != 0.0); PyVarOrNull len_fn = getAttr(obj, "__len__", false); if(len_fn != nullptr){ - PyVar ret = call(nullptr, len_fn, {}); + PyVar ret = call(len_fn, {}); return PyBool(PyInt_AS_C(ret) > 0); } return True; } - PyVar fastCall(Frame* frame, const PyVar& obj, const _Str& name, PyVarList args){ + PyVar fastCall(const PyVar& obj, const _Str& name, PyVarList args){ PyVar cls = obj->attribs[__class__]; while(cls != None) { auto it = cls->attribs.find(name); if(it != cls->attribs.end()){ - return call(frame, it->second, args); + return call(it->second, args); } cls = cls->attribs[__base__]; } @@ -335,18 +340,18 @@ public: return nullptr; } - PyVar call(Frame* frame, PyVar callable, PyVarList args){ + PyVar call(PyVar callable, PyVarList args){ if(callable->isType(_tp_type)){ auto it = callable->attribs.find(__new__); PyVar obj; if(it != callable->attribs.end()){ - obj = call(frame, it->second, args); + obj = call(it->second, args); }else{ obj = newObject(callable, (_Int)-1); } if(obj->isType(callable)){ PyVarOrNull init_fn = getAttr(obj, __init__, false); - if (init_fn != nullptr) call(frame, init_fn, args); + if (init_fn != nullptr) call(init_fn, args); } return obj; } @@ -359,7 +364,7 @@ public: if(callable->isType(_tp_native_function)){ auto f = std::get<_CppFunc>(callable->_native); - return f(this, frame, args); + return f(this, args); } else if(callable->isType(_tp_function)){ _Func fn = PyFunction_AS_C(callable); PyVarDict locals; @@ -392,15 +397,15 @@ public: if(it_m != callable->attribs.end()){ return _exec(fn.code, it_m->second, locals); }else{ - return _exec(fn.code, frame->_module, locals); + return _exec(fn.code, topFrame()->_module, locals); } } typeError("'" + callable->getTypeName() + "' object is not callable"); return None; } - inline PyVar call(Frame* frame, const PyVar& obj, const _Str& func, PyVarList args){ - return call(frame, getAttr(obj, func), args); + inline PyVar call(const PyVar& obj, const _Str& func, PyVarList args){ + return call(getAttr(obj, func), args); } PyVar exec(const _Code& code, PyVar _module=nullptr){ @@ -770,15 +775,15 @@ void AttrPointer::del(VM* vm, Frame* frame) const{ } PyVar IndexPointer::get(VM* vm, Frame* frame) const{ - return vm->call(frame, obj, __getitem__, {index}); + return vm->call(obj, __getitem__, {index}); } void IndexPointer::set(VM* vm, Frame* frame, PyVar val) const{ - vm->call(frame, obj, __setitem__, {index, val}); + vm->call(obj, __setitem__, {index, val}); } void IndexPointer::del(VM* vm, Frame* frame) const{ - vm->call(frame, obj, __delitem__, {index}); + vm->call(obj, __delitem__, {index}); } PyVar CompoundPointer::get(VM* vm, Frame* frame) const{