kuroko-lang/kuroko
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixup int(str) which should default to base 10, and throw exceptions

Browse Source
This commit is contained in:
K. Lange 2022-06-29 14:47:48 +09:00
parent 0d28885009
commit a354c4a2c1
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/obj_long.c
View File

@ -1175,8 +1175,12 @@ KRK_METHOD(long,__init__,{
} else if (IS_BOOLEAN(argv[1])) {
make_long(AS_BOOLEAN(argv[1]),self);
} else if (IS_STRING(argv[1])) {
/* XXX This should probably work like int(...) does and default to base 10... and take a base at all... */
if (krk_long_parse_string(AS_CSTRING(argv[1]),self->value,0,AS_STRING(argv[1])->length)) {
return krk_runtimeError(vm.exceptions->valueError, "invalid literal for long() with base 0: '%s'", AS_CSTRING(argv[1]));
krk_push(argv[1]);
KrkValue repred = krk_callDirect(vm.baseClasses->strClass->_reprer, 1);
return krk_runtimeError(vm.exceptions->valueError, "invalid literal for long() with base " PRIkrk_int "%s%s",
(krk_integer_type)0, IS_STRING(repred) ? ": " : "", IS_STRING(repred) ? AS_CSTRING(repred) : "");
}
} else if (IS_long(argv[1])) {
krk_long_init_copy(self->value,AS_long(argv[1])->value);

16
src/obj_numeric.c
View File

@ -20,7 +20,21 @@ FUNC_SIG(int,__init__) {
if (argc < 2) return INTEGER_VAL(0);
if (IS_BOOLEAN(argv[1])) return INTEGER_VAL(AS_INTEGER(argv[1]));
if (IS_INTEGER(argv[1])) return argv[1];
if (IS_STRING(argv[1])) return krk_string_int(argc-1,&argv[1],0);
if (IS_STRING(argv[1])) {
krk_integer_type _base = 10;
if (argc > 2) {
CHECK_ARG(2,int,krk_integer_type,base);
_base = base;
}
KrkValue result = krk_parse_int(AS_CSTRING(argv[1]), AS_STRING(argv[1])->length, _base);
if (IS_NONE(result)) {
krk_push(argv[1]);
KrkValue repred = krk_callDirect(vm.baseClasses->strClass->_reprer, 1);
return krk_runtimeError(vm.exceptions->valueError, "invalid literal for int() with base " PRIkrk_int "%s%s",
_base, IS_STRING(repred) ? ": " : "", IS_STRING(repred) ? AS_CSTRING(repred) : "");
}
return result;
}
if (IS_FLOATING(argv[1])) return INTEGER_VAL(AS_FLOATING(argv[1]));
if (IS_BOOLEAN(argv[1])) return INTEGER_VAL(AS_BOOLEAN(argv[1]));
return krk_runtimeError(vm.exceptions->typeError, "%s() argument must be a string or a number, not '%s'", "int", krk_typeName(argv[1]));