Allow sqrt to downcast

clasp-developers · Sep 3, 2024 · abf2242 · abf2242
1 parent 02e6d6f
commit abf2242
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/include/clasp/core/numbers.h b/include/clasp/core/numbers.h
@@ -706,11 +706,11 @@ inline Number_sp clasp_divide(Number_sp na, Number_sp nb) { return contagion_div
 
 inline int clasp_number_compare(Number_sp x, Number_sp y) { return basic_compare(x, y); };
 
-template<typename Float> inline Number_sp _sqrt(Float f) {
+template<typename Float1, typename Float2 = Float1> inline Number_sp _sqrt(Float1 f) {
   if (std::signbit(f))
-    return Complex_O::create(make_number(Float{0.0}), make_number(std::sqrt(-f)));
+    return Complex_O::create(make_number(Float2{0.0}), make_number(static_cast<Float2>(std::sqrt(-f))));
 
-  return make_number(std::sqrt(f));
+  return make_number(static_cast<Float2>(std::sqrt(f)));
 }
 
 inline Number_sp clasp_log1(Number_sp x) {

diff --git a/src/core/numbers.cc b/src/core/numbers.cc
@@ -1768,7 +1768,7 @@ Number_sp Ratio_O::signum_() const {
   return clasp_signum(this->_numerator);
 }
 
-Number_sp Ratio_O::sqrt_() const { return _sqrt(this->as_float_()); }
+Number_sp Ratio_O::sqrt_() const { return _sqrt<double, float>(this->as_double_()); }
 
 Number_sp Ratio_O::reciprocal_() const {
   Integer_sp num = this->_numerator, denom = this->_denominator;
@@ -1894,7 +1894,7 @@ Number_sp LongFloat_O::sqrt_() const { return _sqrt(_Value); }
 
 Number_sp Complex_O::sqrt_() const { return cl__expt(this->asSmartPtr(), _lisp->plusHalf()); }
 
-Number_sp Bignum_O::sqrt_() const { return _sqrt(cast<float>()); }
+Number_sp Bignum_O::sqrt_() const { return _sqrt<double, float>(cast<double>()); }
 
 Number_sp Bignum_O::reciprocal_() const {
   if (this->minusp_())