Change sqrt of ArbInt to produce an ArbInt no matter the value.

softdevteam · Nov 1, 2019 · c832923 · c832923
1 parent 5debb2a
commit c832923
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/lang_tests/int29.som b/lang_tests/int29.som
@@ -5,14 +5,14 @@ VM:
     Integer
     Integer
     Double
-    Double
+    Integer
 "
 
 int29 = (
     run = (
         (4 sqrt class) println.
         ((1 << 200) sqrt class) println.
         (3 sqrt class) println.
-        ((1 << 103) sqrt class) println.
+        ((1 << 199) sqrt class) println.
     )
 )
diff --git a/src/lib/vm/objects/integers.rs b/src/lib/vm/objects/integers.rs
@@ -16,8 +16,8 @@
 use std::convert::TryFrom;
 
 use abgc_derive::GcLayout;
-use num_bigint::{BigInt, ToBigInt};
-use num_traits::{FromPrimitive, ToPrimitive};
+use num_bigint::BigInt;
+use num_traits::{FromPrimitive, ToPrimitive, Zero};
 
 use crate::vm::{
     core::{VMError, VM},
@@ -156,22 +156,10 @@ impl Obj for ArbInt {
     }
 
     fn sqrt(&self, vm: &VM) -> Result<Val, Box<VMError>> {
-        if let Some(result) = self.val.to_f64() {
-            if result < 0.0 {
-                Err(Box::new(VMError::DomainError))
-            } else {
-                let root = result.sqrt();
-                if root.round() == root {
-                    match root.to_bigint() {
-                        Some(i) => ArbInt::new(vm, i),
-                        None => Err(Box::new(VMError::DomainError)),
-                    }
-                } else {
-                    Ok(Double::new(vm, root))
-                }
-            }
+        if self.val < Zero::zero() {
+            Err(Box::new(VMError::DomainError))
         } else {
-            Err(Box::new(VMError::CantRepresentAsDouble))
+            ArbInt::new(vm, self.val.sqrt())
         }
     }