mirror of
https://github.com/pocketpy/pocketpy
synced 2025-10-21 12:00:18 +00:00
up
This commit is contained in:
parent
083cdd9e81
commit
b95417c5d8
File diff suppressed because it is too large
Load Diff
@ -1 +1 @@
|
|||||||
Subproject commit 8663b7ea6ff8e7b0bf5b15bf3f12d38b1384165b
|
Subproject commit 931154255fe0463eefde933026623d3a805c8433
|
@ -261,8 +261,7 @@ void __initializeBuiltinFunctions(VM* _vm) {
|
|||||||
|
|
||||||
#define __INT_BITWISE_OP(name,op) \
|
#define __INT_BITWISE_OP(name,op) \
|
||||||
_vm->bindMethod("int", #name, [](VM* vm, const pkpy::ArgList& args) { \
|
_vm->bindMethod("int", #name, [](VM* vm, const pkpy::ArgList& args) { \
|
||||||
if(!args[0]->is_type(vm->_tp_int) || !args[1]->is_type(vm->_tp_int)) \
|
vm->check_args_size(args, 2, true); \
|
||||||
vm->typeError("unsupported operand type(s) for " #op ); \
|
|
||||||
return vm->PyInt(vm->PyInt_AS_C(args._index(0)) op vm->PyInt_AS_C(args._index(1))); \
|
return vm->PyInt(vm->PyInt_AS_C(args._index(0)) op vm->PyInt_AS_C(args._index(1))); \
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -308,21 +307,17 @@ void __initializeBuiltinFunctions(VM* _vm) {
|
|||||||
|
|
||||||
_vm->bindMethod("float", "__json__", [](VM* vm, const pkpy::ArgList& args) {
|
_vm->bindMethod("float", "__json__", [](VM* vm, const pkpy::ArgList& args) {
|
||||||
f64 val = vm->PyFloat_AS_C(args[0]);
|
f64 val = vm->PyFloat_AS_C(args[0]);
|
||||||
if(std::isinf(val) || std::isnan(val)){
|
if(std::isinf(val) || std::isnan(val)) vm->valueError("cannot jsonify 'nan' or 'inf'");
|
||||||
vm->valueError("cannot jsonify 'nan' or 'inf'");
|
|
||||||
}
|
|
||||||
return vm->PyStr(std::to_string(val));
|
return vm->PyStr(std::to_string(val));
|
||||||
});
|
});
|
||||||
|
|
||||||
/************ PyString ************/
|
/************ PyString ************/
|
||||||
_vm->bindMethod("str", "__new__", [](VM* vm, const pkpy::ArgList& args) {
|
_vm->bindMethod("str", "__new__", [](VM* vm, const pkpy::ArgList& args) {
|
||||||
vm->check_args_size(args, 1);
|
vm->check_args_size(args, 1);
|
||||||
return vm->asStr(args[0]);
|
return vm->asStr(args._index(0));
|
||||||
});
|
});
|
||||||
|
|
||||||
_vm->bindMethod("str", "__add__", [](VM* vm, const pkpy::ArgList& args) {
|
_vm->bindMethod("str", "__add__", [](VM* vm, const pkpy::ArgList& args) {
|
||||||
if(!args[0]->is_type(vm->_tp_str) || !args[1]->is_type(vm->_tp_str))
|
|
||||||
vm->typeError("unsupported operand type(s) for " "+" );
|
|
||||||
const _Str& lhs = vm->PyStr_AS_C(args[0]);
|
const _Str& lhs = vm->PyStr_AS_C(args[0]);
|
||||||
const _Str& rhs = vm->PyStr_AS_C(args[1]);
|
const _Str& rhs = vm->PyStr_AS_C(args[1]);
|
||||||
return vm->PyStr(lhs + rhs);
|
return vm->PyStr(lhs + rhs);
|
||||||
@ -344,9 +339,7 @@ void __initializeBuiltinFunctions(VM* _vm) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
_vm->bindMethod("str", "__iter__", [](VM* vm, const pkpy::ArgList& args) {
|
_vm->bindMethod("str", "__iter__", [](VM* vm, const pkpy::ArgList& args) {
|
||||||
return vm->PyIter(
|
return vm->PyIter(pkpy::make_shared<BaseIterator, StringIterator>(vm, args[0]));
|
||||||
pkpy::make_shared<BaseIterator, StringIterator>(vm, args[0])
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
_vm->bindMethod("str", "__repr__", [](VM* vm, const pkpy::ArgList& args) {
|
_vm->bindMethod("str", "__repr__", [](VM* vm, const pkpy::ArgList& args) {
|
||||||
@ -391,22 +384,6 @@ void __initializeBuiltinFunctions(VM* _vm) {
|
|||||||
return vm->PyBool(_self < _obj);
|
return vm->PyBool(_self < _obj);
|
||||||
});
|
});
|
||||||
|
|
||||||
_vm->bindMethod("str", "upper", [](VM* vm, const pkpy::ArgList& args) {
|
|
||||||
vm->check_args_size(args, 1, true);
|
|
||||||
const _Str& _self (vm->PyStr_AS_C(args[0]));
|
|
||||||
_StrStream ss;
|
|
||||||
for(auto c : _self) ss << (char)toupper(c);
|
|
||||||
return vm->PyStr(ss.str());
|
|
||||||
});
|
|
||||||
|
|
||||||
_vm->bindMethod("str", "lower", [](VM* vm, const pkpy::ArgList& args) {
|
|
||||||
vm->check_args_size(args, 1, true);
|
|
||||||
const _Str& _self (vm->PyStr_AS_C(args[0]));
|
|
||||||
_StrStream ss;
|
|
||||||
for(auto c : _self) ss << (char)tolower(c);
|
|
||||||
return vm->PyStr(ss.str());
|
|
||||||
});
|
|
||||||
|
|
||||||
_vm->bindMethod("str", "replace", [](VM* vm, const pkpy::ArgList& args) {
|
_vm->bindMethod("str", "replace", [](VM* vm, const pkpy::ArgList& args) {
|
||||||
vm->check_args_size(args, 3, true);
|
vm->check_args_size(args, 3, true);
|
||||||
const _Str& _self = vm->PyStr_AS_C(args[0]);
|
const _Str& _self = vm->PyStr_AS_C(args[0]);
|
||||||
@ -466,7 +443,7 @@ void __initializeBuiltinFunctions(VM* _vm) {
|
|||||||
_vm->bindMethod("list", "append", [](VM* vm, const pkpy::ArgList& args) {
|
_vm->bindMethod("list", "append", [](VM* vm, const pkpy::ArgList& args) {
|
||||||
vm->check_args_size(args, 2, true);
|
vm->check_args_size(args, 2, true);
|
||||||
PyVarList& _self = vm->PyList_AS_C(args[0]);
|
PyVarList& _self = vm->PyList_AS_C(args[0]);
|
||||||
_self.push_back(args[1]);
|
_self.push_back(args._index(1));
|
||||||
return vm->None;
|
return vm->None;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -9,11 +9,12 @@ assert len(a) == 0
|
|||||||
assert len(b) == 4
|
assert len(b) == 4
|
||||||
assert b == c
|
assert b == c
|
||||||
|
|
||||||
assert ''.lower() == '' and ''.upper() == ''
|
# upper and lower not work for utf-8
|
||||||
assert 'already+lower '.lower() == 'already+lower '
|
# assert ''.lower() == '' and ''.upper() == ''
|
||||||
assert 'ALREADY+UPPER '.upper() == 'ALREADY+UPPER '
|
# assert 'already+lower '.lower() == 'already+lower '
|
||||||
assert 'tEST+InG'.lower() == 'test+ing'
|
# assert 'ALREADY+UPPER '.upper() == 'ALREADY+UPPER '
|
||||||
assert 'tEST+InG'.upper() == 'TEST+ING'
|
# assert 'tEST+InG'.lower() == 'test+ing'
|
||||||
|
# assert 'tEST+InG'.upper() == 'TEST+ING'
|
||||||
|
|
||||||
s = "football"
|
s = "football"
|
||||||
q = "abcd"
|
q = "abcd"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user