mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-12-27 17:00:27 +00:00
Code Issues 1 Releases Wiki Activity

Allow wrap around on u64.

Browse Source 
This lets some math work as expected.
This commit is contained in:
Calvin Rose 2021-01-09 12:43:33 -06:00
parent 444e630783
commit 5b05da65f0
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/core/inttypes.c
View File

@ -134,7 +134,7 @@ int64_t janet_unwrap_s64(Janet x) {
break; break;
} }
} }
janet_panic("bad s64 initializer"); janet_panicf("bad s64 initializer: %t", x);
return 0; return 0;
} }
@ -144,7 +144,9 @@ uint64_t janet_unwrap_u64(Janet x) {
break; break;
case JANET_NUMBER : { case JANET_NUMBER : {
double dbl = janet_unwrap_number(x); double dbl = janet_unwrap_number(x);
if ((dbl >= 0) && (dbl <= MAX_INT_IN_DBL)) /* Allow negative values to be cast to "wrap around".
* This let's addition and subtraction work as expected. */
if (fabs(dbl) <= MAX_INT_IN_DBL)
return (uint64_t)dbl; return (uint64_t)dbl;
break; break;
} }
@ -163,7 +165,7 @@ uint64_t janet_unwrap_u64(Janet x) {
break; break;
} }
} }
janet_panic("bad u64 initializer"); janet_panicf("bad u64 initializer: %t", x);
return 0; return 0;
} }
@ -197,15 +199,14 @@ static Janet cfun_it_u64_new(int32_t argc, Janet *argv) {
return janet_wrap_u64(janet_unwrap_u64(argv[0])); return janet_wrap_u64(janet_unwrap_u64(argv[0]));
} }
// Code to support polymorphic comparison. /*
// * Code to support polymorphic comparison.
// int/u64 and int/s64 support a "compare" method that allows * int/u64 and int/s64 support a "compare" method that allows
// comparison to each other, and to Janet numbers, using the * comparison to each other, and to Janet numbers, using the
// "compare" "compare<" ... functions. * "compare" "compare<" ... functions.
// * In the following code explicit casts are sometimes used to help
// In the following code explicit casts are sometimes used to help * make it clear when int/float conversions are happening.
// make it clear when int/float conversions are happening. */
//
static int compare_double_double(double x, double y) { static int compare_double_double(double x, double y) {
return (x < y) ? -1 : ((x > y) ? 1 : 0); return (x < y) ? -1 : ((x > y) ? 1 : 0);
} }
@ -242,7 +243,6 @@ static int compare_uint64_double(uint64_t x, double y) {
} }
} }
static Janet cfun_it_s64_compare(int32_t argc, Janet *argv) { static Janet cfun_it_s64_compare(int32_t argc, Janet *argv) {
janet_fixarity(argc, 2); janet_fixarity(argc, 2);
if (janet_is_int(argv[0]) != JANET_INT_S64) if (janet_is_int(argv[0]) != JANET_INT_S64)