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

fix https://github.com/blueloveTH/pocketpy/issues/126

Browse Source
This commit is contained in:
BLUELOVETH 2023-08-07 17:21:13 +08:00
parent ebb7511e3b
commit c8b71d9223
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pocketpy.cpp
View File

@ -366,12 +366,14 @@ void init_builtins(VM* _vm) {
/************ int ************/ /************ int ************/
_vm->bind_constructor<-1>("int", [](VM* vm, ArgsView args) { _vm->bind_constructor<-1>("int", [](VM* vm, ArgsView args) {
if(args.size() == 1+0) return VAR(0); if(args.size() == 1+0) return VAR(0);
// 1 arg
if(args.size() == 1+1){ if(args.size() == 1+1){
if (is_type(args[1], vm->tp_float)) return VAR((i64)CAST(f64, args[1])); if (is_type(args[1], vm->tp_float)) return VAR((i64)CAST(f64, args[1]));
if (is_type(args[1], vm->tp_int)) return args[1]; if (is_type(args[1], vm->tp_int)) return args[1];
if (is_type(args[1], vm->tp_bool)) return VAR(_CAST(bool, args[1]) ? 1 : 0); if (is_type(args[1], vm->tp_bool)) return VAR(_CAST(bool, args[1]) ? 1 : 0);
} }
if(args.size() > 1+2) vm->TypeError("int() takes at most 2 arguments"); if(args.size() > 1+2) vm->TypeError("int() takes at most 2 arguments");
// 2 args
if (is_type(args[1], vm->tp_str)) { if (is_type(args[1], vm->tp_str)) {
int base = 10; int base = 10;
if(args.size() == 1+2) base = CAST(i64, args[2]); if(args.size() == 1+2) base = CAST(i64, args[2]);
@ -430,7 +432,10 @@ void init_builtins(VM* _vm) {
#undef INT_BITWISE_OP #undef INT_BITWISE_OP
/************ float ************/ /************ float ************/
_vm->bind_constructor<2>("float", [](VM* vm, ArgsView args) { _vm->bind_constructor<-1>("float", [](VM* vm, ArgsView args) {
if(args.size() == 1+0) return VAR(0.0);
if(args.size() > 1+1) vm->TypeError("float() takes at most 1 argument");
// 1 arg
if (is_type(args[1], vm->tp_int)) return VAR((f64)CAST(i64, args[1])); if (is_type(args[1], vm->tp_int)) return VAR((f64)CAST(i64, args[1]));
if (is_type(args[1], vm->tp_float)) return args[1]; if (is_type(args[1], vm->tp_float)) return args[1];
if (is_type(args[1], vm->tp_bool)) return VAR(_CAST(bool, args[1]) ? 1.0 : 0.0); if (is_type(args[1], vm->tp_bool)) return VAR(_CAST(bool, args[1]) ? 1.0 : 0.0);
@ -445,7 +450,7 @@ void init_builtins(VM* _vm) {
vm->ValueError("invalid literal for float(): " + s.escape()); vm->ValueError("invalid literal for float(): " + s.escape());
} }
} }
vm->TypeError("float() argument must be a int, float, bool or str"); vm->TypeError("invalid arguments for float()");
return vm->None; return vm->None;
}); });