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

...

Browse Source
This commit is contained in:
blueloveTH 2023-05-03 20:52:18 +08:00
parent 744e5c20b0
commit cdbd884398
3 changed files with 99 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/frame.h
View File

@ -133,6 +133,9 @@ struct Frame {
Bytecode next_bytecode() { Bytecode next_bytecode() {
_ip = _next_ip++; _ip = _next_ip++;
#if DEBUG_EXTRA_CHECK
if(_ip >= co->codes.size()) FATAL_ERROR();
#endif
return co->codes[_ip]; return co->codes[_ip];
} }

168
src/pocketpy.h
View File

@ -27,23 +27,33 @@ inline CodeObject_ VM::compile(Str source, Str filename, CompileMode mode, bool
} }
#define BIND_NUM_ARITH_OPT(name, op) \ #define BIND_NUM_ARITH_OPT(name, op) \
_vm->_bind_methods<1>({"int","float"}, #name, [](VM* vm, ArgsView args){ \ _vm->bind_method<1>("int", #name, [](VM* vm, ArgsView args){ \
if(is_both_int(args[0], args[1])){ \ if(is_int(args[1])){ \
return VAR(_CAST(i64, args[0]) op _CAST(i64, args[1])); \ return VAR(_CAST(i64, args[0]) op _CAST(i64, args[1])); \
}else{ \ }else{ \
return VAR(vm->num_to_float(args[0]) op vm->num_to_float(args[1])); \ return VAR(vm->num_to_float(args[0]) op vm->num_to_float(args[1])); \
} \ } \
}); \
_vm->bind_method<1>("float", #name, [](VM* vm, ArgsView args){ \
return VAR(_CAST(f64, args[0]) op vm->num_to_float(args[1])); \
}); });
#define BIND_NUM_LOGICAL_OPT(name, op, is_eq) \ #define BIND_NUM_LOGICAL_OPT(name, op, is_eq) \
_vm->_bind_methods<1>({"int","float"}, #name, [](VM* vm, ArgsView args){ \ _vm->bind_method<1>("int", #name, [](VM* vm, ArgsView args){ \
if(is_both_int(args[0], args[1])) \ if(is_int(args[1])) return VAR(_CAST(i64, args[0]) op _CAST(i64, args[1])); \
return VAR(_CAST(i64, args[0]) op _CAST(i64, args[1])); \ if(is_float(args[1])) return VAR(vm->num_to_float(args[0]) op _CAST(f64, args[1])); \
if(!is_both_int_or_float(args[0], args[1])){ \ if constexpr(is_eq) return VAR(args[0] op args[1]); \
if constexpr(is_eq) return VAR(args[0] op args[1]); \ vm->TypeError("unsupported operand type(s) for " #op ); \
vm->TypeError("unsupported operand type(s) for " #op ); \ return vm->None; \
} \ }); \
return VAR(vm->num_to_float(args[0]) op vm->num_to_float(args[1])); \ _vm->bind_method<1>("float", #name, [](VM* vm, ArgsView args){ \
if(is_float(args[1])) return VAR(_CAST(f64, args[0]) op _CAST(f64, args[1])); \
if(is_int(args[1])) return VAR(_CAST(f64, args[0]) op _CAST(i64, args[1])); \
if constexpr(is_eq) return VAR(args[0] op args[1]); \
vm->TypeError("unsupported operand type(s) for " #op ); \
return vm->None; \
}); });
@ -85,6 +95,11 @@ inline void init_builtins(VM* _vm) {
return VAR(vm->isinstance(args[0], type)); return VAR(vm->isinstance(args[0], type));
}); });
_vm->bind_builtin_func<0>("globals", [](VM* vm, ArgsView args) {
PyObject* mod = vm->top_frame()->_module;
return VAR(MappingProxy(mod));
});
_vm->bind_builtin_func<1>("id", [](VM* vm, ArgsView args) { _vm->bind_builtin_func<1>("id", [](VM* vm, ArgsView args) {
PyObject* obj = args[0]; PyObject* obj = args[0];
if(is_tagged(obj)) return VAR((i64)0); if(is_tagged(obj)) return VAR((i64)0);
@ -213,13 +228,19 @@ inline void init_builtins(VM* _vm) {
_vm->bind_method<0>("NoneType", "__repr__", CPP_LAMBDA(VAR("None"))); _vm->bind_method<0>("NoneType", "__repr__", CPP_LAMBDA(VAR("None")));
_vm->bind_method<0>("NoneType", "__json__", CPP_LAMBDA(VAR("null"))); _vm->bind_method<0>("NoneType", "__json__", CPP_LAMBDA(VAR("null")));
_vm->_bind_methods<1>({"int", "float"}, "__truediv__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("int", "__truediv__", [](VM* vm, ArgsView args) {
f64 rhs = vm->num_to_float(args[1]); f64 rhs = vm->num_to_float(args[1]);
if (rhs == 0) vm->ZeroDivisionError(); if (rhs == 0) vm->ZeroDivisionError();
return VAR(vm->num_to_float(args[0]) / rhs); return VAR(_CAST(i64, args[0]) / rhs);
}); });
_vm->_bind_methods<1>({"int", "float"}, "__pow__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("float", "__truediv__", [](VM* vm, ArgsView args) {
f64 rhs = vm->num_to_float(args[1]);
if (rhs == 0) vm->ZeroDivisionError();
return VAR(_CAST(f64, args[0]) / rhs);
});
auto py_number_pow = [](VM* vm, ArgsView args) {
if(is_both_int(args[0], args[1])){ if(is_both_int(args[0], args[1])){
i64 lhs = _CAST(i64, args[0]); i64 lhs = _CAST(i64, args[0]);
i64 rhs = _CAST(i64, args[1]); i64 rhs = _CAST(i64, args[1]);
@ -236,12 +257,15 @@ inline void init_builtins(VM* _vm) {
}else{ }else{
return VAR((f64)std::pow(vm->num_to_float(args[0]), vm->num_to_float(args[1]))); return VAR((f64)std::pow(vm->num_to_float(args[0]), vm->num_to_float(args[1])));
} }
}); };
_vm->bind_method<1>("int", "__pow__", py_number_pow);
_vm->bind_method<1>("float", "__pow__", py_number_pow);
/************ PyInt ************/ /************ PyInt ************/
_vm->bind_static_method<1>("int", "__new__", [](VM* vm, ArgsView args) { _vm->bind_static_method<1>("int", "__new__", [](VM* vm, ArgsView args) {
if (is_type(args[0], vm->tp_int)) return args[0];
if (is_type(args[0], vm->tp_float)) return VAR((i64)CAST(f64, args[0])); if (is_type(args[0], vm->tp_float)) return VAR((i64)CAST(f64, args[0]));
if (is_type(args[0], vm->tp_int)) return args[0];
if (is_type(args[0], vm->tp_bool)) return VAR(_CAST(bool, args[0]) ? 1 : 0); if (is_type(args[0], vm->tp_bool)) return VAR(_CAST(bool, args[0]) ? 1 : 0);
if (is_type(args[0], vm->tp_str)) { if (is_type(args[0], vm->tp_str)) {
const Str& s = CAST(Str&, args[0]); const Str& s = CAST(Str&, args[0]);
@ -324,18 +348,18 @@ inline void init_builtins(VM* _vm) {
_vm->bind_static_method<1>("str", "__new__", CPP_LAMBDA(vm->asStr(args[0]))); _vm->bind_static_method<1>("str", "__new__", CPP_LAMBDA(vm->asStr(args[0])));
_vm->bind_method<1>("str", "__add__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("str", "__add__", [](VM* vm, ArgsView args) {
const Str& lhs = CAST(Str&, args[0]); const Str& lhs = _CAST(Str&, args[0]);
const Str& rhs = CAST(Str&, args[1]); const Str& rhs = CAST(Str&, args[1]);
return VAR(lhs + rhs); return VAR(lhs + rhs);
}); });
_vm->bind_method<0>("str", "__len__", [](VM* vm, ArgsView args) { _vm->bind_method<0>("str", "__len__", [](VM* vm, ArgsView args) {
const Str& self = CAST(Str&, args[0]); const Str& self = _CAST(Str&, args[0]);
return VAR(self.u8_length()); return VAR(self.u8_length());
}); });
_vm->bind_method<1>("str", "__contains__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("str", "__contains__", [](VM* vm, ArgsView args) {
const Str& self = CAST(Str&, args[0]); const Str& self = _CAST(Str&, args[0]);
const Str& other = CAST(Str&, args[1]); const Str& other = CAST(Str&, args[1]);
return VAR(self.index(other) != -1); return VAR(self.index(other) != -1);
}); });
@ -344,29 +368,29 @@ inline void init_builtins(VM* _vm) {
_vm->bind_method<0>("str", "__iter__", CPP_LAMBDA(vm->PyIter(StringIter(vm, args[0])))); _vm->bind_method<0>("str", "__iter__", CPP_LAMBDA(vm->PyIter(StringIter(vm, args[0]))));
_vm->bind_method<0>("str", "__repr__", [](VM* vm, ArgsView args) { _vm->bind_method<0>("str", "__repr__", [](VM* vm, ArgsView args) {
const Str& self = CAST(Str&, args[0]); const Str& self = _CAST(Str&, args[0]);
return VAR(self.escape()); return VAR(self.escape());
}); });
_vm->bind_method<0>("str", "__json__", [](VM* vm, ArgsView args) { _vm->bind_method<0>("str", "__json__", [](VM* vm, ArgsView args) {
const Str& self = CAST(Str&, args[0]); const Str& self = _CAST(Str&, args[0]);
return VAR(self.escape(false)); return VAR(self.escape(false));
}); });
_vm->bind_method<1>("str", "__eq__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("str", "__eq__", [](VM* vm, ArgsView args) {
const Str& self = CAST(Str&, args[0]); const Str& self = _CAST(Str&, args[0]);
if(!is_type(args[1], vm->tp_str)) return VAR(false); if(!is_type(args[1], vm->tp_str)) return VAR(false);
return VAR(self == CAST(Str&, args[1])); return VAR(self == CAST(Str&, args[1]));
}); });
_vm->bind_method<1>("str", "__ne__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("str", "__ne__", [](VM* vm, ArgsView args) {
const Str& self = CAST(Str&, args[0]); const Str& self = _CAST(Str&, args[0]);
if(!is_type(args[1], vm->tp_str)) return VAR(true); if(!is_type(args[1], vm->tp_str)) return VAR(true);
return VAR(self != CAST(Str&, args[1])); return VAR(self != CAST(Str&, args[1]));
}); });
_vm->bind_method<1>("str", "__getitem__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("str", "__getitem__", [](VM* vm, ArgsView args) {
const Str& self (CAST(Str&, args[0])); const Str& self = _CAST(Str&, args[0]);
if(is_type(args[1], vm->tp_slice)){ if(is_type(args[1], vm->tp_slice)){
const Slice& s = _CAST(Slice&, args[1]); const Slice& s = _CAST(Slice&, args[1]);
@ -381,20 +405,20 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<1>("str", "__gt__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("str", "__gt__", [](VM* vm, ArgsView args) {
const Str& self (CAST(Str&, args[0])); const Str& self = _CAST(Str&, args[0]);
const Str& obj (CAST(Str&, args[1])); const Str& obj = CAST(Str&, args[1]);
return VAR(self > obj); return VAR(self > obj);
}); });
_vm->bind_method<1>("str", "__lt__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("str", "__lt__", [](VM* vm, ArgsView args) {
const Str& self (CAST(Str&, args[0])); const Str& self = _CAST(Str&, args[0]);
const Str& obj (CAST(Str&, args[1])); const Str& obj = CAST(Str&, args[1]);
return VAR(self < obj); return VAR(self < obj);
}); });
_vm->bind_method<-1>("str", "replace", [](VM* vm, ArgsView args) { _vm->bind_method<-1>("str", "replace", [](VM* vm, ArgsView args) {
if(args.size() != 1+2 && args.size() != 1+3) vm->TypeError("replace() takes 2 or 3 arguments"); if(args.size() != 1+2 && args.size() != 1+3) vm->TypeError("replace() takes 2 or 3 arguments");
const Str& self = CAST(Str&, args[0]); const Str& self = _CAST(Str&, args[0]);
const Str& old = CAST(Str&, args[1]); const Str& old = CAST(Str&, args[1]);
const Str& new_ = CAST(Str&, args[2]); const Str& new_ = CAST(Str&, args[2]);
int count = args.size()==1+3 ? CAST(int, args[3]) : -1; int count = args.size()==1+3 ? CAST(int, args[3]) : -1;
@ -402,7 +426,7 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<1>("str", "index", [](VM* vm, ArgsView args) { _vm->bind_method<1>("str", "index", [](VM* vm, ArgsView args) {
const Str& self = CAST(Str&, args[0]); const Str& self = _CAST(Str&, args[0]);
const Str& sub = CAST(Str&, args[1]); const Str& sub = CAST(Str&, args[1]);
int index = self.index(sub); int index = self.index(sub);
if(index == -1) vm->ValueError("substring not found"); if(index == -1) vm->ValueError("substring not found");
@ -410,13 +434,13 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<1>("str", "startswith", [](VM* vm, ArgsView args) { _vm->bind_method<1>("str", "startswith", [](VM* vm, ArgsView args) {
const Str& self = CAST(Str&, args[0]); const Str& self = _CAST(Str&, args[0]);
const Str& prefix = CAST(Str&, args[1]); const Str& prefix = CAST(Str&, args[1]);
return VAR(self.index(prefix) == 0); return VAR(self.index(prefix) == 0);
}); });
_vm->bind_method<1>("str", "endswith", [](VM* vm, ArgsView args) { _vm->bind_method<1>("str", "endswith", [](VM* vm, ArgsView args) {
const Str& self = CAST(Str&, args[0]); const Str& self = _CAST(Str&, args[0]);
const Str& suffix = CAST(Str&, args[1]); const Str& suffix = CAST(Str&, args[1]);
int offset = self.length() - suffix.length(); int offset = self.length() - suffix.length();
if(offset < 0) return vm->False; if(offset < 0) return vm->False;
@ -425,14 +449,14 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<0>("str", "encode", [](VM* vm, ArgsView args) { _vm->bind_method<0>("str", "encode", [](VM* vm, ArgsView args) {
const Str& self = CAST(Str&, args[0]); const Str& self = _CAST(Str&, args[0]);
std::vector<char> buffer(self.length()); std::vector<char> buffer(self.length());
memcpy(buffer.data(), self.data, self.length()); memcpy(buffer.data(), self.data, self.length());
return VAR(Bytes(std::move(buffer))); return VAR(Bytes(std::move(buffer)));
}); });
_vm->bind_method<1>("str", "join", [](VM* vm, ArgsView args) { _vm->bind_method<1>("str", "join", [](VM* vm, ArgsView args) {
const Str& self = CAST(Str&, args[0]); const Str& self = _CAST(Str&, args[0]);
FastStrStream ss; FastStrStream ss;
PyObject* obj = vm->asList(args[1]); PyObject* obj = vm->asList(args[1]);
const List& list = CAST(List&, obj); const List& list = CAST(List&, obj);
@ -445,13 +469,13 @@ inline void init_builtins(VM* _vm) {
/************ PyList ************/ /************ PyList ************/
_vm->bind_method<1>("list", "append", [](VM* vm, ArgsView args) { _vm->bind_method<1>("list", "append", [](VM* vm, ArgsView args) {
List& self = CAST(List&, args[0]); List& self = _CAST(List&, args[0]);
self.push_back(args[1]); self.push_back(args[1]);
return vm->None; return vm->None;
}); });
_vm->bind_method<1>("list", "extend", [](VM* vm, ArgsView args) { _vm->bind_method<1>("list", "extend", [](VM* vm, ArgsView args) {
List& self = CAST(List&, args[0]); List& self = _CAST(List&, args[0]);
PyObject* obj = vm->asList(args[1]); PyObject* obj = vm->asList(args[1]);
const List& list = CAST(List&, obj); const List& list = CAST(List&, obj);
self.extend(list); self.extend(list);
@ -459,13 +483,13 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<0>("list", "reverse", [](VM* vm, ArgsView args) { _vm->bind_method<0>("list", "reverse", [](VM* vm, ArgsView args) {
List& self = CAST(List&, args[0]); List& self = _CAST(List&, args[0]);
std::reverse(self.begin(), self.end()); std::reverse(self.begin(), self.end());
return vm->None; return vm->None;
}); });
_vm->bind_method<1>("list", "__mul__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("list", "__mul__", [](VM* vm, ArgsView args) {
const List& self = CAST(List&, args[0]); const List& self = _CAST(List&, args[0]);
int n = CAST(int, args[1]); int n = CAST(int, args[1]);
List result; List result;
result.reserve(self.size() * n); result.reserve(self.size() * n);
@ -474,7 +498,7 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<2>("list", "insert", [](VM* vm, ArgsView args) { _vm->bind_method<2>("list", "insert", [](VM* vm, ArgsView args) {
List& self = CAST(List&, args[0]); List& self = _CAST(List&, args[0]);
int index = CAST(int, args[1]); int index = CAST(int, args[1]);
if(index < 0) index += self.size(); if(index < 0) index += self.size();
if(index < 0) index = 0; if(index < 0) index = 0;
@ -484,14 +508,14 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<0>("list", "clear", [](VM* vm, ArgsView args) { _vm->bind_method<0>("list", "clear", [](VM* vm, ArgsView args) {
CAST(List&, args[0]).clear(); _CAST(List&, args[0]).clear();
return vm->None; return vm->None;
}); });
_vm->bind_method<0>("list", "copy", CPP_LAMBDA(VAR(CAST(List, args[0])))); _vm->bind_method<0>("list", "copy", CPP_LAMBDA(VAR(_CAST(List, args[0]))));
_vm->bind_method<1>("list", "__add__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("list", "__add__", [](VM* vm, ArgsView args) {
const List& self = CAST(List&, args[0]); const List& self = _CAST(List&, args[0]);
const List& other = CAST(List&, args[1]); const List& other = CAST(List&, args[1]);
List new_list(self); // copy construct List new_list(self); // copy construct
new_list.extend(other); new_list.extend(other);
@ -499,7 +523,7 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<0>("list", "__len__", [](VM* vm, ArgsView args) { _vm->bind_method<0>("list", "__len__", [](VM* vm, ArgsView args) {
const List& self = CAST(List&, args[0]); const List& self = _CAST(List&, args[0]);
return VAR(self.size()); return VAR(self.size());
}); });
@ -508,7 +532,7 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<1>("list", "__getitem__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("list", "__getitem__", [](VM* vm, ArgsView args) {
const List& self = CAST(List&, args[0]); const List& self = _CAST(List&, args[0]);
if(is_type(args[1], vm->tp_slice)){ if(is_type(args[1], vm->tp_slice)){
const Slice& s = _CAST(Slice&, args[1]); const Slice& s = _CAST(Slice&, args[1]);
@ -525,7 +549,7 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<2>("list", "__setitem__", [](VM* vm, ArgsView args) { _vm->bind_method<2>("list", "__setitem__", [](VM* vm, ArgsView args) {
List& self = CAST(List&, args[0]); List& self = _CAST(List&, args[0]);
int index = CAST(int, args[1]); int index = CAST(int, args[1]);
index = vm->normalized_index(index, self.size()); index = vm->normalized_index(index, self.size());
self[index] = args[2]; self[index] = args[2];
@ -533,7 +557,7 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<1>("list", "__delitem__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("list", "__delitem__", [](VM* vm, ArgsView args) {
List& self = CAST(List&, args[0]); List& self = _CAST(List&, args[0]);
int index = CAST(int, args[1]); int index = CAST(int, args[1]);
index = vm->normalized_index(index, self.size()); index = vm->normalized_index(index, self.size());
self.erase(index); self.erase(index);
@ -551,7 +575,7 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<1>("tuple", "__getitem__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("tuple", "__getitem__", [](VM* vm, ArgsView args) {
const Tuple& self = CAST(Tuple&, args[0]); const Tuple& self = _CAST(Tuple&, args[0]);
if(is_type(args[1], vm->tp_slice)){ if(is_type(args[1], vm->tp_slice)){
const Slice& s = _CAST(Slice&, args[1]); const Slice& s = _CAST(Slice&, args[1]);
@ -568,7 +592,7 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<0>("tuple", "__len__", [](VM* vm, ArgsView args) { _vm->bind_method<0>("tuple", "__len__", [](VM* vm, ArgsView args) {
const Tuple& self = CAST(Tuple&, args[0]); const Tuple& self = _CAST(Tuple&, args[0]);
return VAR(self.size()); return VAR(self.size());
}); });
@ -576,17 +600,17 @@ inline void init_builtins(VM* _vm) {
_vm->bind_static_method<1>("bool", "__new__", CPP_LAMBDA(VAR(vm->asBool(args[0])))); _vm->bind_static_method<1>("bool", "__new__", CPP_LAMBDA(VAR(vm->asBool(args[0]))));
_vm->bind_method<0>("bool", "__repr__", [](VM* vm, ArgsView args) { _vm->bind_method<0>("bool", "__repr__", [](VM* vm, ArgsView args) {
bool val = CAST(bool, args[0]); bool val = _CAST(bool, args[0]);
return VAR(val ? "True" : "False"); return VAR(val ? "True" : "False");
}); });
_vm->bind_method<0>("bool", "__json__", [](VM* vm, ArgsView args) { _vm->bind_method<0>("bool", "__json__", [](VM* vm, ArgsView args) {
bool val = CAST(bool, args[0]); bool val = _CAST(bool, args[0]);
return VAR(val ? "true" : "false"); return VAR(val ? "true" : "false");
}); });
_vm->bind_method<1>("bool", "__xor__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("bool", "__xor__", [](VM* vm, ArgsView args) {
bool self = CAST(bool, args[0]); bool self = _CAST(bool, args[0]);
bool other = CAST(bool, args[1]); bool other = CAST(bool, args[1]);
return VAR(self ^ other); return VAR(self ^ other);
}); });
@ -606,14 +630,14 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<1>("bytes", "__getitem__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("bytes", "__getitem__", [](VM* vm, ArgsView args) {
const Bytes& self = CAST(Bytes&, args[0]); const Bytes& self = _CAST(Bytes&, args[0]);
int index = CAST(int, args[1]); int index = CAST(int, args[1]);
index = vm->normalized_index(index, self.size()); index = vm->normalized_index(index, self.size());
return VAR(self[index]); return VAR(self[index]);
}); });
_vm->bind_method<0>("bytes", "__repr__", [](VM* vm, ArgsView args) { _vm->bind_method<0>("bytes", "__repr__", [](VM* vm, ArgsView args) {
const Bytes& self = CAST(Bytes&, args[0]); const Bytes& self = _CAST(Bytes&, args[0]);
std::stringstream ss; std::stringstream ss;
ss << "b'"; ss << "b'";
for(int i=0; i<self.size(); i++){ for(int i=0; i<self.size(); i++){
@ -624,25 +648,25 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<0>("bytes", "__len__", [](VM* vm, ArgsView args) { _vm->bind_method<0>("bytes", "__len__", [](VM* vm, ArgsView args) {
const Bytes& self = CAST(Bytes&, args[0]); const Bytes& self = _CAST(Bytes&, args[0]);
return VAR(self.size()); return VAR(self.size());
}); });
_vm->bind_method<0>("bytes", "decode", [](VM* vm, ArgsView args) { _vm->bind_method<0>("bytes", "decode", [](VM* vm, ArgsView args) {
const Bytes& self = CAST(Bytes&, args[0]); const Bytes& self = _CAST(Bytes&, args[0]);
// TODO: check encoding is utf-8 // TODO: check encoding is utf-8
return VAR(Str(self.str())); return VAR(Str(self.str()));
}); });
_vm->bind_method<1>("bytes", "__eq__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("bytes", "__eq__", [](VM* vm, ArgsView args) {
const Bytes& self = CAST(Bytes&, args[0]); const Bytes& self = _CAST(Bytes&, args[0]);
if(!is_type(args[1], vm->tp_bytes)) return VAR(false); if(!is_type(args[1], vm->tp_bytes)) return VAR(false);
const Bytes& other = CAST(Bytes&, args[1]); const Bytes& other = CAST(Bytes&, args[1]);
return VAR(self == other); return VAR(self == other);
}); });
_vm->bind_method<1>("bytes", "__ne__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("bytes", "__ne__", [](VM* vm, ArgsView args) {
const Bytes& self = CAST(Bytes&, args[0]); const Bytes& self = _CAST(Bytes&, args[0]);
if(!is_type(args[1], vm->tp_bytes)) return VAR(true); if(!is_type(args[1], vm->tp_bytes)) return VAR(true);
const Bytes& other = CAST(Bytes&, args[1]); const Bytes& other = CAST(Bytes&, args[1]);
return VAR(self != other); return VAR(self != other);
@ -654,7 +678,7 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<0>("slice", "__repr__", [](VM* vm, ArgsView args) { _vm->bind_method<0>("slice", "__repr__", [](VM* vm, ArgsView args) {
const Slice& self = CAST(Slice&, args[0]); const Slice& self = _CAST(Slice&, args[0]);
std::stringstream ss; std::stringstream ss;
ss << "slice("; ss << "slice(";
ss << CAST(Str, vm->asRepr(self.start)) << ", "; ss << CAST(Str, vm->asRepr(self.start)) << ", ";
@ -665,21 +689,21 @@ inline void init_builtins(VM* _vm) {
/************ MappingProxy ************/ /************ MappingProxy ************/
_vm->bind_method<0>("mappingproxy", "keys", [](VM* vm, ArgsView args) { _vm->bind_method<0>("mappingproxy", "keys", [](VM* vm, ArgsView args) {
MappingProxy& self = CAST(MappingProxy&, args[0]); MappingProxy& self = _CAST(MappingProxy&, args[0]);
List keys; List keys;
for(StrName name : self.attr().keys()) keys.push_back(VAR(name.sv())); for(StrName name : self.attr().keys()) keys.push_back(VAR(name.sv()));
return VAR(std::move(keys)); return VAR(std::move(keys));
}); });
_vm->bind_method<0>("mappingproxy", "values", [](VM* vm, ArgsView args) { _vm->bind_method<0>("mappingproxy", "values", [](VM* vm, ArgsView args) {
MappingProxy& self = CAST(MappingProxy&, args[0]); MappingProxy& self = _CAST(MappingProxy&, args[0]);
List values; List values;
for(auto& item : self.attr().items()) values.push_back(item.second); for(auto& item : self.attr().items()) values.push_back(item.second);
return VAR(std::move(values)); return VAR(std::move(values));
}); });
_vm->bind_method<0>("mappingproxy", "items", [](VM* vm, ArgsView args) { _vm->bind_method<0>("mappingproxy", "items", [](VM* vm, ArgsView args) {
MappingProxy& self = CAST(MappingProxy&, args[0]); MappingProxy& self = _CAST(MappingProxy&, args[0]);
List items; List items;
for(auto& item : self.attr().items()){ for(auto& item : self.attr().items()){
PyObject* t = VAR(Tuple({VAR(item.first.sv()), item.second})); PyObject* t = VAR(Tuple({VAR(item.first.sv()), item.second}));
@ -689,12 +713,12 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<0>("mappingproxy", "__len__", [](VM* vm, ArgsView args) { _vm->bind_method<0>("mappingproxy", "__len__", [](VM* vm, ArgsView args) {
MappingProxy& self = CAST(MappingProxy&, args[0]); MappingProxy& self = _CAST(MappingProxy&, args[0]);
return VAR(self.attr().size()); return VAR(self.attr().size());
}); });
_vm->bind_method<1>("mappingproxy", "__getitem__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("mappingproxy", "__getitem__", [](VM* vm, ArgsView args) {
MappingProxy& self = CAST(MappingProxy&, args[0]); MappingProxy& self = _CAST(MappingProxy&, args[0]);
StrName key = CAST(Str&, args[1]); StrName key = CAST(Str&, args[1]);
PyObject* ret = self.attr().try_get(key); PyObject* ret = self.attr().try_get(key);
if(ret == nullptr) vm->AttributeError(key.sv()); if(ret == nullptr) vm->AttributeError(key.sv());
@ -702,7 +726,7 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<0>("mappingproxy", "__repr__", [](VM* vm, ArgsView args) { _vm->bind_method<0>("mappingproxy", "__repr__", [](VM* vm, ArgsView args) {
MappingProxy& self = CAST(MappingProxy&, args[0]); MappingProxy& self = _CAST(MappingProxy&, args[0]);
std::stringstream ss; std::stringstream ss;
ss << "mappingproxy({"; ss << "mappingproxy({";
bool first = true; bool first = true;
@ -716,7 +740,7 @@ inline void init_builtins(VM* _vm) {
}); });
_vm->bind_method<1>("mappingproxy", "__contains__", [](VM* vm, ArgsView args) { _vm->bind_method<1>("mappingproxy", "__contains__", [](VM* vm, ArgsView args) {
MappingProxy& self = CAST(MappingProxy&, args[0]); MappingProxy& self = _CAST(MappingProxy&, args[0]);
StrName key = CAST(Str&, args[1]); StrName key = CAST(Str&, args[1]);
return VAR(self.attr().contains(key)); return VAR(self.attr().contains(key));
}); });
@ -809,16 +833,16 @@ struct ReMatch {
static void _register(VM* vm, PyObject* mod, PyObject* type){ static void _register(VM* vm, PyObject* mod, PyObject* type){
vm->bind_method<-1>(type, "__init__", CPP_NOT_IMPLEMENTED()); vm->bind_method<-1>(type, "__init__", CPP_NOT_IMPLEMENTED());
vm->bind_method<0>(type, "start", CPP_LAMBDA(VAR(CAST(ReMatch&, args[0]).start))); vm->bind_method<0>(type, "start", CPP_LAMBDA(VAR(_CAST(ReMatch&, args[0]).start)));
vm->bind_method<0>(type, "end", CPP_LAMBDA(VAR(CAST(ReMatch&, args[0]).end))); vm->bind_method<0>(type, "end", CPP_LAMBDA(VAR(_CAST(ReMatch&, args[0]).end)));
vm->bind_method<0>(type, "span", [](VM* vm, ArgsView args) { vm->bind_method<0>(type, "span", [](VM* vm, ArgsView args) {
auto& self = CAST(ReMatch&, args[0]); auto& self = _CAST(ReMatch&, args[0]);
return VAR(Tuple({VAR(self.start), VAR(self.end)})); return VAR(Tuple({VAR(self.start), VAR(self.end)}));
}); });
vm->bind_method<1>(type, "group", [](VM* vm, ArgsView args) { vm->bind_method<1>(type, "group", [](VM* vm, ArgsView args) {
auto& self = CAST(ReMatch&, args[0]); auto& self = _CAST(ReMatch&, args[0]);
int index = CAST(int, args[1]); int index = CAST(int, args[1]);
index = vm->normalized_index(index, self.m.size()); index = vm->normalized_index(index, self.m.size());
return VAR(self.m[index].str()); return VAR(self.m[index].str());
@ -888,13 +912,13 @@ struct Random{
vm->bind_static_method<0>(type, "__new__", CPP_LAMBDA(VAR_T(Random))); vm->bind_static_method<0>(type, "__new__", CPP_LAMBDA(VAR_T(Random)));
vm->bind_method<1>(type, "seed", [](VM* vm, ArgsView args) { vm->bind_method<1>(type, "seed", [](VM* vm, ArgsView args) {
Random& self = CAST(Random&, args[0]); Random& self = _CAST(Random&, args[0]);
self.gen.seed(CAST(i64, args[1])); self.gen.seed(CAST(i64, args[1]));
return vm->None; return vm->None;
}); });
vm->bind_method<2>(type, "randint", [](VM* vm, ArgsView args) { vm->bind_method<2>(type, "randint", [](VM* vm, ArgsView args) {
Random& self = CAST(Random&, args[0]); Random& self = _CAST(Random&, args[0]);
i64 a = CAST(i64, args[1]); i64 a = CAST(i64, args[1]);
i64 b = CAST(i64, args[2]); i64 b = CAST(i64, args[2]);
std::uniform_int_distribution<i64> dis(a, b); std::uniform_int_distribution<i64> dis(a, b);
@ -902,13 +926,13 @@ struct Random{
}); });
vm->bind_method<0>(type, "random", [](VM* vm, ArgsView args) { vm->bind_method<0>(type, "random", [](VM* vm, ArgsView args) {
Random& self = CAST(Random&, args[0]); Random& self = _CAST(Random&, args[0]);
std::uniform_real_distribution<f64> dis(0.0, 1.0); std::uniform_real_distribution<f64> dis(0.0, 1.0);
return VAR(dis(self.gen)); return VAR(dis(self.gen));
}); });
vm->bind_method<2>(type, "uniform", [](VM* vm, ArgsView args) { vm->bind_method<2>(type, "uniform", [](VM* vm, ArgsView args) {
Random& self = CAST(Random&, args[0]); Random& self = _CAST(Random&, args[0]);
f64 a = CAST(f64, args[1]); f64 a = CAST(f64, args[1]);
f64 b = CAST(f64, args[2]); f64 b = CAST(f64, args[2]);
std::uniform_real_distribution<f64> dis(a, b); std::uniform_real_distribution<f64> dis(a, b);

5
src/vm.h
View File

@ -298,11 +298,6 @@ public:
bind_func<ARGC>(std::forward<Args>(args)...); bind_func<ARGC>(std::forward<Args>(args)...);
} }
template<int ARGC>
void _bind_methods(std::vector<Str> types, Str name, NativeFuncC fn) {
for(auto& type: types) bind_method<ARGC>(type, name, fn);
}
template<int ARGC> template<int ARGC>
void bind_builtin_func(Str name, NativeFuncC fn) { void bind_builtin_func(Str name, NativeFuncC fn) {
bind_func<ARGC>(builtins, name, fn); bind_func<ARGC>(builtins, name, fn);