Skip to content

Commit

Permalink
[dynpmc] rational cast FLOATVAL to double later
Browse files Browse the repository at this point in the history 
try to keep precision until we call the GMP function, which
can handle the enhanced precision cases better
  • Loading branch information
Reini Urban committed Nov 21, 2014
1 parent 7d875cb commit 824e711
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 22 deletions.
1 change: 1 addition & 0 deletions ChangeLog
View file
Expand Up @@ -5,6 +5,7 @@
+ Fixed Memory_Block prolog access in --gc inf #1136
+ Added MEMORY_DEBUG tracing to --gc inf and ms2, added
GC validation to ms2.
+ Fix bignum.i_substract and i_multiply #1144
- Build
- Documentation
- Tests
Expand Down
44 changes: 22 additions & 22 deletions src/dynpmc/rational.pmc
View file
Expand Up @@ -92,21 +92,21 @@ static void rat_add_integer(PARROT_INTERP, PMC *self, int value) {

/*

=item C<static void rat_add_float(PARROT_INTERP, PMC *self, double value)>
=item C<static void rat_add_float(PARROT_INTERP, PMC *self, FLOATVAL value)>

Adds a float "value" to a Rational-PMC in-place. "value" is first converted to a
rational using GMPs mpq_set_d-function. This is meant to be exact.

=cut

*/
static void rat_add_float(PARROT_INTERP, PMC *self, double value) {
static void rat_add_float(PARROT_INTERP, PMC *self, FLOATVAL value) {
#ifdef PARROT_HAS_GMP
mpq_t t;
UNUSED(interp)

mpq_init(t);
mpq_set_d(t, value);
mpq_set_d(t, (double) value);
mpq_add(RT(self), RT(self), t);
mpq_clear(t);
#else
Expand Down Expand Up @@ -138,14 +138,14 @@ static void rat_multiply_integer(PARROT_INTERP, PMC *self, int value) {

/*

=item C<static void rat_multiply_float(PARROT_INTERP, PMC *self, double value)>
=item C<static void rat_multiply_float(PARROT_INTERP, PMC *self, FLOATVAL value)>

Multiplies a Rational-PMC with a float "value" in-place.

=cut

*/
static void rat_multiply_float(PARROT_INTERP, PMC *self, double value) {
static void rat_multiply_float(PARROT_INTERP, PMC *self, FLOATVAL value) {
#ifdef PARROT_HAS_GMP
mpq_t t;
UNUSED(interp)
Expand Down Expand Up @@ -188,14 +188,14 @@ static void rat_divide_integer(PARROT_INTERP, PMC *self, int value) {

/*

=item C<static void rat_divide_float(PARROT_INTERP, PMC *self, double value)>
=item C<static void rat_divide_float(PARROT_INTERP, PMC *self, FLOATVAL value)>

Divides a Rational-PMC through a float "value" in-place.

=cut

*/
static void rat_divide_float(PARROT_INTERP, PMC *self, double value) {
static void rat_divide_float(PARROT_INTERP, PMC *self, FLOATVAL value) {
#ifdef PARROT_HAS_GMP
mpq_t t;
UNUSED(interp)
Expand Down Expand Up @@ -576,7 +576,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.
}

MULTI void i_add(Float value) {
rat_add_float(INTERP, SELF, (double) VTABLE_get_number(INTERP, value));
rat_add_float(INTERP, SELF, VTABLE_get_number(INTERP, value));
}

MULTI void i_add(Rational value) {
Expand Down Expand Up @@ -631,7 +631,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.
*/
VTABLE PMC *add_float(FLOATVAL value, PMC* dest) {
dest = STATICSELF.clone();
rat_add_float(INTERP, dest, (double) value);
rat_add_float(INTERP, dest, value);
return dest;
}

Expand All @@ -643,7 +643,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.

*/
VTABLE void i_add_float(FLOATVAL value) {
rat_add_float(INTERP, SELF, (double) value);
rat_add_float(INTERP, SELF, value);
}

/*
Expand All @@ -661,7 +661,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.

MULTI PMC *subtract(Float value, PMC* dest) {
dest = STATICSELF.clone();
rat_add_float(INTERP, dest, - ((double) VTABLE_get_number(INTERP, value)));
rat_add_float(INTERP, dest, - VTABLE_get_number(INTERP, value));
return dest;
}

Expand Down Expand Up @@ -698,7 +698,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.
}

MULTI void i_subtract(Float value) {
rat_add_float(INTERP, SELF, - ((double) VTABLE_get_number(INTERP, value)));
rat_add_float(INTERP, SELF, - VTABLE_get_number(INTERP, value));
}

MULTI void i_subtract(Rational value) {
Expand Down Expand Up @@ -753,7 +753,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.
*/
VTABLE PMC *subtract_float(FLOATVAL value, PMC* dest) {
dest = STATICSELF.clone();
rat_add_float(INTERP, dest, -((double) value));
rat_add_float(INTERP, dest, - value);
return dest;
}

Expand All @@ -765,7 +765,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.

*/
VTABLE void i_subtract_float(FLOATVAL value) {
rat_add_float(INTERP, SELF, -((double) value));
rat_add_float(INTERP, SELF, - value);
}

/*
Expand All @@ -783,7 +783,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.

MULTI PMC *multiply(Float value, PMC* dest) {
dest = STATICSELF.clone();
rat_multiply_float(INTERP, dest, (double) VTABLE_get_number(INTERP, value));
rat_multiply_float(INTERP, dest, VTABLE_get_number(INTERP, value));
return dest;
}

Expand Down Expand Up @@ -820,7 +820,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.
}

MULTI void i_multiply(Float value) {
rat_multiply_float(INTERP, SELF, (double) VTABLE_get_number(INTERP, value));
rat_multiply_float(INTERP, SELF, VTABLE_get_number(INTERP, value));
}

MULTI void i_multiply(Rational value) {
Expand Down Expand Up @@ -875,7 +875,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.
*/
VTABLE PMC *multiply_float(FLOATVAL value, PMC* dest) {
dest = STATICSELF.clone();
rat_multiply_float(INTERP, dest, (double) value);
rat_multiply_float(INTERP, dest, value);
return dest;
}

Expand All @@ -887,7 +887,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.

*/
VTABLE void i_multiply_float(FLOATVAL value) {
rat_multiply_float(INTERP, SELF, (double) value);
rat_multiply_float(INTERP, SELF, value);
}

/*
Expand All @@ -905,7 +905,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.

MULTI PMC *divide(Float value, PMC* dest) {
dest = STATICSELF.clone();
rat_divide_float(INTERP, dest, (double) VTABLE_get_number(INTERP, value));
rat_divide_float(INTERP, dest, VTABLE_get_number(INTERP, value));
return dest;
}

Expand Down Expand Up @@ -942,7 +942,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.
}

MULTI void i_divide(Float value) {
rat_divide_float(INTERP, SELF, (double) VTABLE_get_number(INTERP, value));
rat_divide_float(INTERP, SELF, VTABLE_get_number(INTERP, value));
}

MULTI void i_divide(Rational value) {
Expand Down Expand Up @@ -997,7 +997,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.
*/
VTABLE PMC *divide_float(FLOATVAL value, PMC* dest) {
dest = STATICSELF.clone();
rat_divide_float(INTERP, dest, (double) value);
rat_divide_float(INTERP, dest, value);
return dest;
}

Expand All @@ -1009,7 +1009,7 @@ Adds Integer-, Float- or Rational-PMCs to SELF and stores them in dest.

*/
VTABLE void i_divide_float(FLOATVAL value) {
rat_divide_float(INTERP, SELF, (double) value);
rat_divide_float(INTERP, SELF, value);
}

/*
Expand Down

0 comments on commit 824e711

Please sign in to comment.