This commit is contained in:
BLUELOVETH 2023-07-19 15:35:17 +08:00
parent 4fdaf56c20
commit 08238b1330
5 changed files with 162 additions and 151 deletions

View File

@ -154,7 +154,4 @@ inline bool is_both_float(PyObject* a, PyObject* b) noexcept {
inline PyObject* const PY_NULL = (PyObject*)0b000011; // tagged null
inline PyObject* const PY_OP_CALL = (PyObject*)0b100011;
inline PyObject* const PY_OP_YIELD = (PyObject*)0b110011;
#define ADD_MODULE_PLACEHOLDER(name) namespace pkpy { inline void add_module_##name(void* vm) { (void)vm; } }
} // namespace pkpy

View File

@ -1,68 +1,9 @@
#pragma once
#include "common.h"
#if PK_MODULE_RANDOM
#include <random>
#include "cffi.h"
#include "_generated.h"
namespace pkpy{
struct Random{
PY_CLASS(Random, random, Random)
std::mt19937 gen;
void add_module_random(VM* vm);
Random(){
gen.seed(std::chrono::high_resolution_clock::now().time_since_epoch().count());
}
static void _register(VM* vm, PyObject* mod, PyObject* type){
vm->bind_default_constructor<Random>(type);
vm->bind_method<1>(type, "seed", [](VM* vm, ArgsView args) {
Random& self = _CAST(Random&, args[0]);
self.gen.seed(CAST(i64, args[1]));
return vm->None;
});
vm->bind_method<2>(type, "randint", [](VM* vm, ArgsView args) {
Random& self = _CAST(Random&, args[0]);
i64 a = CAST(i64, args[1]);
i64 b = CAST(i64, args[2]);
std::uniform_int_distribution<i64> dis(a, b);
return VAR(dis(self.gen));
});
vm->bind_method<0>(type, "random", [](VM* vm, ArgsView args) {
Random& self = _CAST(Random&, args[0]);
std::uniform_real_distribution<f64> dis(0.0, 1.0);
return VAR(dis(self.gen));
});
vm->bind_method<2>(type, "uniform", [](VM* vm, ArgsView args) {
Random& self = _CAST(Random&, args[0]);
f64 a = CAST(f64, args[1]);
f64 b = CAST(f64, args[2]);
std::uniform_real_distribution<f64> dis(a, b);
return VAR(dis(self.gen));
});
}
};
inline void add_module_random(VM* vm){
PyObject* mod = vm->new_module("random");
Random::register_class(vm, mod);
CodeObject_ code = vm->compile(kPythonLibs["random"], "random.py", EXEC_MODE);
vm->_exec(code, mod);
}
} // namespace pkpy
#else
ADD_MODULE_PLACEHOLDER(random)
#endif
} // namespace pkpy

View File

@ -1,94 +1,9 @@
#pragma once
#include "common.h"
#if PK_MODULE_RE
#include "cffi.h"
namespace pkpy{
struct ReMatch {
PY_CLASS(ReMatch, re, Match)
void add_module_re(VM* vm);
i64 start;
i64 end;
std::cmatch m;
ReMatch(i64 start, i64 end, std::cmatch m) : start(start), end(end), m(m) {}
static void _register(VM* vm, PyObject* mod, PyObject* type){
vm->bind_notimplemented_constructor<ReMatch>(type);
vm->bind_method<0>(type, "start", PK_LAMBDA(VAR(_CAST(ReMatch&, args[0]).start)));
vm->bind_method<0>(type, "end", PK_LAMBDA(VAR(_CAST(ReMatch&, args[0]).end)));
vm->bind_method<0>(type, "span", [](VM* vm, ArgsView args) {
auto& self = _CAST(ReMatch&, args[0]);
return VAR(Tuple({VAR(self.start), VAR(self.end)}));
});
vm->bind_method<1>(type, "group", [](VM* vm, ArgsView args) {
auto& self = _CAST(ReMatch&, args[0]);
int index = CAST(int, args[1]);
index = vm->normalized_index(index, self.m.size());
return VAR(self.m[index].str());
});
}
};
inline PyObject* _regex_search(const Str& pattern, const Str& string, bool from_start, VM* vm){
std::regex re(pattern.begin(), pattern.end());
std::cmatch m;
if(std::regex_search(string.begin(), string.end(), m, re)){
if(from_start && m.position() != 0) return vm->None;
i64 start = string._byte_index_to_unicode(m.position());
i64 end = string._byte_index_to_unicode(m.position() + m.length());
return VAR_T(ReMatch, start, end, m);
}
return vm->None;
};
inline void add_module_re(VM* vm){
PyObject* mod = vm->new_module("re");
ReMatch::register_class(vm, mod);
vm->bind_func<2>(mod, "match", [](VM* vm, ArgsView args) {
const Str& pattern = CAST(Str&, args[0]);
const Str& string = CAST(Str&, args[1]);
return _regex_search(pattern, string, true, vm);
});
vm->bind_func<2>(mod, "search", [](VM* vm, ArgsView args) {
const Str& pattern = CAST(Str&, args[0]);
const Str& string = CAST(Str&, args[1]);
return _regex_search(pattern, string, false, vm);
});
vm->bind_func<3>(mod, "sub", [](VM* vm, ArgsView args) {
const Str& pattern = CAST(Str&, args[0]);
const Str& repl = CAST(Str&, args[1]);
const Str& string = CAST(Str&, args[2]);
std::regex re(pattern.begin(), pattern.end());
return VAR(std::regex_replace(string.str(), re, repl.str()));
});
vm->bind_func<2>(mod, "split", [](VM* vm, ArgsView args) {
const Str& pattern = CAST(Str&, args[0]);
const Str& string = CAST(Str&, args[1]);
std::regex re(pattern.begin(), pattern.end());
std::cregex_token_iterator it(string.begin(), string.end(), re, -1);
std::cregex_token_iterator end;
List vec;
for(; it != end; ++it){
vec.push_back(VAR(it->str()));
}
return VAR(vec);
});
}
} // namespace pkpy
#else
ADD_MODULE_PLACEHOLDER(re)
#endif
} // namespace pkpy

66
src/random.cpp Normal file
View File

@ -0,0 +1,66 @@
#include "pocketpy/random.h"
#if PK_MODULE_RANDOM
#include <random>
#include "pocketpy/_generated.h"
namespace pkpy{
struct Random{
PY_CLASS(Random, random, Random)
std::mt19937 gen;
Random(){
gen.seed(std::chrono::high_resolution_clock::now().time_since_epoch().count());
}
static void _register(VM* vm, PyObject* mod, PyObject* type){
vm->bind_default_constructor<Random>(type);
vm->bind_method<1>(type, "seed", [](VM* vm, ArgsView args) {
Random& self = _CAST(Random&, args[0]);
self.gen.seed(CAST(i64, args[1]));
return vm->None;
});
vm->bind_method<2>(type, "randint", [](VM* vm, ArgsView args) {
Random& self = _CAST(Random&, args[0]);
i64 a = CAST(i64, args[1]);
i64 b = CAST(i64, args[2]);
std::uniform_int_distribution<i64> dis(a, b);
return VAR(dis(self.gen));
});
vm->bind_method<0>(type, "random", [](VM* vm, ArgsView args) {
Random& self = _CAST(Random&, args[0]);
std::uniform_real_distribution<f64> dis(0.0, 1.0);
return VAR(dis(self.gen));
});
vm->bind_method<2>(type, "uniform", [](VM* vm, ArgsView args) {
Random& self = _CAST(Random&, args[0]);
f64 a = CAST(f64, args[1]);
f64 b = CAST(f64, args[2]);
std::uniform_real_distribution<f64> dis(a, b);
return VAR(dis(self.gen));
});
}
};
void add_module_random(VM* vm){
PyObject* mod = vm->new_module("random");
Random::register_class(vm, mod);
CodeObject_ code = vm->compile(kPythonLibs["random"], "random.py", EXEC_MODE);
vm->_exec(code, mod);
}
} // namespace pkpy
#else
namespace pkpy{
void add_module_random(VM* vm){ (void)vm; }
} // namespace pkpy
#endif

92
src/re.cpp Normal file
View File

@ -0,0 +1,92 @@
#include "pocketpy/re.h"
#if PK_MODULE_RE
namespace pkpy{
struct ReMatch {
PY_CLASS(ReMatch, re, Match)
i64 start;
i64 end;
std::cmatch m;
ReMatch(i64 start, i64 end, std::cmatch m) : start(start), end(end), m(m) {}
static void _register(VM* vm, PyObject* mod, PyObject* type){
vm->bind_notimplemented_constructor<ReMatch>(type);
vm->bind_method<0>(type, "start", PK_LAMBDA(VAR(_CAST(ReMatch&, args[0]).start)));
vm->bind_method<0>(type, "end", PK_LAMBDA(VAR(_CAST(ReMatch&, args[0]).end)));
vm->bind_method<0>(type, "span", [](VM* vm, ArgsView args) {
auto& self = _CAST(ReMatch&, args[0]);
return VAR(Tuple({VAR(self.start), VAR(self.end)}));
});
vm->bind_method<1>(type, "group", [](VM* vm, ArgsView args) {
auto& self = _CAST(ReMatch&, args[0]);
int index = CAST(int, args[1]);
index = vm->normalized_index(index, self.m.size());
return VAR(self.m[index].str());
});
}
};
static PyObject* _regex_search(const Str& pattern, const Str& string, bool from_start, VM* vm){
std::regex re(pattern.begin(), pattern.end());
std::cmatch m;
if(std::regex_search(string.begin(), string.end(), m, re)){
if(from_start && m.position() != 0) return vm->None;
i64 start = string._byte_index_to_unicode(m.position());
i64 end = string._byte_index_to_unicode(m.position() + m.length());
return VAR_T(ReMatch, start, end, m);
}
return vm->None;
};
void add_module_re(VM* vm){
PyObject* mod = vm->new_module("re");
ReMatch::register_class(vm, mod);
vm->bind_func<2>(mod, "match", [](VM* vm, ArgsView args) {
const Str& pattern = CAST(Str&, args[0]);
const Str& string = CAST(Str&, args[1]);
return _regex_search(pattern, string, true, vm);
});
vm->bind_func<2>(mod, "search", [](VM* vm, ArgsView args) {
const Str& pattern = CAST(Str&, args[0]);
const Str& string = CAST(Str&, args[1]);
return _regex_search(pattern, string, false, vm);
});
vm->bind_func<3>(mod, "sub", [](VM* vm, ArgsView args) {
const Str& pattern = CAST(Str&, args[0]);
const Str& repl = CAST(Str&, args[1]);
const Str& string = CAST(Str&, args[2]);
std::regex re(pattern.begin(), pattern.end());
return VAR(std::regex_replace(string.str(), re, repl.str()));
});
vm->bind_func<2>(mod, "split", [](VM* vm, ArgsView args) {
const Str& pattern = CAST(Str&, args[0]);
const Str& string = CAST(Str&, args[1]);
std::regex re(pattern.begin(), pattern.end());
std::cregex_token_iterator it(string.begin(), string.end(), re, -1);
std::cregex_token_iterator end;
List vec;
for(; it != end; ++it){
vec.push_back(VAR(it->str()));
}
return VAR(vec);
});
}
} // namespace pkpy
#else
namespace pkpy{
void add_module_re(VM* vm){ (void)vm; }
} // namespace pkpy
#endif