merge latest from master

mattwparas · Feb 19, 2024 · d70fd51 · d70fd51
2 parents 75a739a + 649029e
commit d70fd51
Show file tree

Hide file tree

Showing 8 changed files with 813 additions and 557 deletions.
diff --git a/crates/steel-core/src/primitives.rs b/crates/steel-core/src/primitives.rs
@@ -7,7 +7,8 @@ pub mod hashsets;
 mod io;
 pub mod lists;
 pub mod meta_ops;
-pub mod nums;
+/// Implements numbers as defined in section 6.2 of the R7RS spec.
+pub mod numbers;
 pub mod ports;
 pub mod process;
 pub mod random;
@@ -40,8 +41,9 @@ pub use io::IoFunctions;
 pub use lists::UnRecoverableResult;
 pub use meta_ops::MetaOperations;
 use num::{BigInt, BigRational, Rational32, ToPrimitive};
-pub use nums::NumOperations;
-pub use nums::{add_primitive, divide_primitive, multiply_primitive, subtract_primitive};
+pub use numbers::{
+    add_primitive, divide_primitive, multiply_primitive, subtract_primitive, NumOperations,
+};
 pub use ports::port_module;
 use std::cell::RefCell;
 use std::convert::TryFrom;