change dependency from num-bigint to malachite-bigint (RustPython#4952)

Author: qingshi163

Cargo.lock

@@ -29,11 +29,11 @@ rustpython-pylib = { path = "pylib" }
 rustpython-stdlib = { path = "stdlib" }
 rustpython-doc = { git = "https://github.com/RustPython/__doc__", branch = "main" }
 
-rustpython-literal = { git = "https://github.com/RustPython/Parser.git", rev = "fdec727f8068c882f99a47f0439572a71fd98b28" }
-rustpython-parser-core = { git = "https://github.com/RustPython/Parser.git", rev = "fdec727f8068c882f99a47f0439572a71fd98b28" }
-rustpython-parser = { git = "https://github.com/RustPython/Parser.git", rev = "fdec727f8068c882f99a47f0439572a71fd98b28" }
-rustpython-ast = { git = "https://github.com/RustPython/Parser.git", rev = "fdec727f8068c882f99a47f0439572a71fd98b28" }
-rustpython-format = { git = "https://github.com/RustPython/Parser.git", rev = "fdec727f8068c882f99a47f0439572a71fd98b28" }
+rustpython-literal = { git = "https://github.com/RustPython/Parser.git", rev = "b2f95e284852cb25d6e510c127260d03573d9f0c" }
+rustpython-parser-core = { git = "https://github.com/RustPython/Parser.git", rev = "b2f95e284852cb25d6e510c127260d03573d9f0c" }
+rustpython-parser = { git = "https://github.com/RustPython/Parser.git", rev = "b2f95e284852cb25d6e510c127260d03573d9f0c" }
+rustpython-ast = { git = "https://github.com/RustPython/Parser.git", rev = "b2f95e284852cb25d6e510c127260d03573d9f0c" }
+rustpython-format = { git = "https://github.com/RustPython/Parser.git", rev = "b2f95e284852cb25d6e510c127260d03573d9f0c" }
 # rustpython-literal = { path = "../RustPython-parser/literal" }
 # rustpython-parser-core = { path = "../RustPython-parser/core" }
 # rustpython-parser = { path = "../RustPython-parser/parser" }
@@ -58,10 +58,11 @@ itertools = "0.10.3"
 libc = "0.2.133"
 log = "0.4.16"
 nix = "0.26"
+malachite-bigint = { version = "0.1.0" }
+malachite-q = "0.3.2"
+malachite-base = "0.3.2"
 num-complex = "0.4.0"
-num-bigint = "0.4.3"
 num-integer = "0.1.44"
-num-rational = "0.4.0"
 num-traits = "0.2"
 num_enum = "0.5.7"
 once_cell = "1.13"

Cargo.toml

@@ -19,7 +19,10 @@ bstr = { workspace = true }
 cfg-if = { workspace = true }
 itertools = { workspace = true }
 libc = { workspace = true }
-num-bigint = { workspace = true }
+malachite-bigint = { workspace = true }
+malachite-q = { workspace = true }
+malachite-base = { workspace = true }
+num-complex = { workspace = true }
 num-traits = { workspace = true }
 once_cell = { workspace = true }
 parking_lot = { workspace = true, optional = true }

common/Cargo.toml

@@ -1,4 +1,4 @@
-use num_bigint::{BigInt, ToBigInt};
+use malachite_bigint::{BigInt, ToBigInt};
 use num_traits::{Float, Signed, ToPrimitive, Zero};
 use std::f64;
 
@@ -20,7 +20,7 @@ pub fn ufrexp(value: f64) -> (f64, i32) {
 /// # Examples
 ///
 /// ```
-/// use num_bigint::BigInt;
+/// use malachite_bigint::BigInt;
 /// use rustpython_common::float_ops::eq_int;
 /// let a = 1.0f64;
 /// let b = BigInt::from(1);

common/src/float_ops.rs

@@ -1,4 +1,4 @@
-use num_bigint::BigInt;
+use malachite_bigint::BigInt;
 use num_traits::ToPrimitive;
 use siphasher::sip::SipHasher24;
 use std::hash::{BuildHasher, Hash, Hasher};

common/src/hash.rs

@@ -1,6 +1,34 @@
 use bstr::ByteSlice;
-use num_bigint::{BigInt, BigUint, Sign};
-use num_traits::{ToPrimitive, Zero};
+use malachite_base::{num::conversion::traits::RoundingInto, rounding_modes::RoundingMode};
+use malachite_bigint::{BigInt, BigUint, Sign};
+use malachite_q::Rational;
+use num_traits::{One, ToPrimitive, Zero};
+
+pub fn true_div(numerator: &BigInt, denominator: &BigInt) -> f64 {
+    let val: f64 = Rational::from_integers_ref(numerator.into(), denominator.into())
+        .rounding_into(RoundingMode::Nearest);
+
+    if val == f64::MAX || val == f64::MIN {
+        // FIXME: not possible for available ratio?
+        return f64::INFINITY;
+    }
+    val
+}
+
+pub fn float_to_ratio(value: f64) -> Option<(BigInt, BigInt)> {
+    let sign = match std::cmp::PartialOrd::partial_cmp(&value, &0.0)? {
+        std::cmp::Ordering::Less => Sign::Minus,
+        std::cmp::Ordering::Equal => return Some((BigInt::zero(), BigInt::one())),
+        std::cmp::Ordering::Greater => Sign::Plus,
+    };
+    Rational::try_from(value).ok().map(|x| {
+        let (numer, denom) = x.into_numerator_and_denominator();
+        (
+            BigInt::from_biguint(sign, numer.into()),
+            BigUint::from(denom).into(),
+        )
+    })
+}
 
 pub fn bytes_to_int(lit: &[u8], mut base: u32) -> Option<BigInt> {
     // split sign

common/src/int.rs

@@ -2942,10 +2942,10 @@ impl ToU32 for usize {
 mod tests {
     use super::*;
     use rustpython_parser as parser;
-    use rustpython_parser_core::source_code::SourceLocator;
+    use rustpython_parser_core::source_code::LinearLocator;
 
     fn compile_exec(source: &str) -> CodeObject {
-        let mut locator: SourceLocator = SourceLocator::new(source);
+        let mut locator: LinearLocator = LinearLocator::new(source);
         use rustpython_parser::ast::fold::Fold;
         let mut compiler: Compiler = Compiler::new(
             CompileOpts::default(),

compiler/codegen/src/compile.rs

@@ -12,7 +12,7 @@ rustpython-parser-core = { workspace = true }
 
 bitflags = { workspace = true }
 itertools = { workspace = true }
-num-bigint = { workspace = true }
+malachite-bigint = { workspace = true }
 num-complex = { workspace = true }
 serde = { version = "1.0.133", optional = true, default-features = false, features = ["derive"] }
 

compiler/core/Cargo.toml

@@ -3,7 +3,7 @@
 
 use bitflags::bitflags;
 use itertools::Itertools;
-use num_bigint::BigInt;
+use malachite_bigint::BigInt;
 use num_complex::Complex64;
 use rustpython_parser_core::source_code::{OneIndexed, SourceLocation};
 use std::marker::PhantomData;

compiler/core/src/bytecode.rs

@@ -1,5 +1,5 @@
 use crate::bytecode::*;
-use num_bigint::{BigInt, Sign};
+use malachite_bigint::{BigInt, Sign};
 use num_complex::Complex64;
 use rustpython_parser_core::source_code::{OneIndexed, SourceLocation};
 use std::convert::Infallible;