Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-23 20:15:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Continue building-out new numerator/denominator

Browse source
This commit is contained in:
Justin Ethier 2021-07-21 19:47:42 -07:00
parent 63b7c12ede
commit f17102178b
3 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/cyclone/runtime.h
View file

@ -526,6 +526,7 @@ object Cyc_num_cmp_va_list(void *data, int argc,
va_list ns);
void Cyc_expt(void *data, object cont, object x, object y);
void Cyc_remainder(void *data, object cont, object num1, object num2);
void Cyc_get_ratio(void *data, object cont, object n, int numerator);
object Cyc_number2string2(void *data, object cont, int argc, object n, ...);
object Cyc_integer2char(void *data, object n);
object Cyc_sum_op(void *data, common_type * x, object y);

30
runtime.c
View file

@ -8393,7 +8393,7 @@ void init_polyfills(void)
// WIP - testing numerator/denominator computation
// Code from https://stackoverflow.com/a/51142807/101258
// Return error flag
int split(double x, double *numerator, double *denominator) {
int num2ratio(double x, double *numerator, double *denominator) {
if (!isfinite(x)) {
*numerator = *denominator = 0.0;
if (x > 0.0) *numerator = 1.0;
@ -8425,3 +8425,31 @@ int split(double x, double *numerator, double *denominator) {
}
return 0;
}
void Cyc_get_ratio(void *data, object cont, object n, int numerator)
{
double d = 0.0;
Cyc_check_num(data, n);
if (obj_is_int(n)) {
d = (double)obj_obj2int(n);
} else if (type_of(n) == double_tag) {
d = double_value(n);
} else if (type_of(n) == bignum_tag) {
d = mp_get_double(&bignum_value(n));
} else {
Cyc_rt_raise2(data, "Unable to convert to ratio", n);
}
{
double numer, denom;
make_double(val, 0.0);
num2ratio(d, &numer, &denom);
if (numerator) {
double_value(&val) = numer;
} else {
double_value(&val) = denom;
}
return_closcall1(data, cont, &val);
}
}

9
scheme/base.sld
View file

@ -196,6 +196,8 @@
string->utf8
denominator
numerator
;denominator2
;numerator2
parameterize
read-bytevector
read-bytevector!
@ -1488,6 +1490,13 @@
;; Placeholders
(define (denominator n) 1)
(define (numerator n) n)
(define-c numerator2
"(void *data, int argc, closure _, object k, object n)"
" Cyc_get_ratio(data, k, n, 1);")
(define-c denominator2
"(void *data, int argc, closure _, object k, object n)"
" Cyc_get_ratio(data, k, n, 0);")
(define (quotient x y)
(truncate (/ x y)))