Code review

Author: Keavon

libraries/math-parser/Cargo.toml

@@ -12,7 +12,7 @@ thiserror = "2.0"
 lazy_static = "1.5"
 num-complex = "0.4"
 log = { workspace = true }
-chumsky = {version = "0.10",default-features = false, features = ["std"]}
+chumsky = { version = "0.10", default-features = false, features = ["std"] }
 
 [dev-dependencies]
 criterion = "0.5"

libraries/math-parser/src/constants.rs

@@ -1,11 +1,8 @@
-use std::{
-	collections::HashMap,
-	f64::consts::{LN_2, PI},
-};
-
 use crate::value::{Number, Value};
 use lazy_static::lazy_static;
 use num_complex::{Complex, ComplexFloat};
+use std::collections::HashMap;
+use std::f64::consts::{LN_2, PI};
 
 type FunctionImplementation = Box<dyn Fn(&[Value]) -> Option<Value> + Send + Sync>;
 lazy_static! {

libraries/math-parser/src/executer.rs

@@ -3,7 +3,6 @@ use crate::constants::DEFAULT_FUNCTIONS;
 use crate::context::{EvalContext, FunctionProvider, ValueProvider};
 use crate::value::{Number, Value};
 use num_complex::Complex;
-
 use thiserror::Error;
 
 #[derive(Debug, Error)]

libraries/math-parser/src/lib.rs

@@ -85,8 +85,11 @@ mod tests {
 	}
 
 	test_end_to_end! {
-		// Basic arithmetic and units
+		// Basic arithmetic
 		infix_addition: "5 + 5" => 10.,
+		infix_subtraction_units: "5 - 3" => 2.,
+		infix_multiplication_units: "4 * 4" => 16.,
+		infix_division_units: "8/2" => 4.,
 
 		// Order of operations
 		order_of_operations_negative_prefix: "-10 + 5" => -5.,

libraries/math-parser/src/parser.rs

@@ -52,8 +52,8 @@ pub fn chumsky_parser<'a>() -> impl Parser<'a, &'a str, Node, chumsky::extra::Er
 			just("e").map(|_| Node::Lit(Literal::Float(std::f64::consts::E))),
 			just("phi").or(just("φ")).map(|_| Node::Lit(Literal::Float(1.618_033_988_75))),
 			just("inf").or(just("∞")).map(|_| Node::Lit(Literal::Float(f64::INFINITY))),
-			just("i").map(|_| Node::Lit(Literal::Complex(Complex::new(0.0, 1.0)))), // Assuming Complex impl
-			just("G").map(|_| Node::Lit(Literal::Float(9.80665))),                  // gravity
+			just("i").map(|_| Node::Lit(Literal::Complex(Complex::new(0.0, 1.0)))), // Assuming `Complex` impl
+			just("G").map(|_| Node::Lit(Literal::Float(9.80665))),                  // Standard gravity on Earth
 		));
 
 		let ident = text::ident().padded();

libraries/math-parser/src/value.rs

@@ -62,10 +62,7 @@ impl Number {
 					BinaryOp::Div => lhs / rhs,
 					BinaryOp::Pow => lhs.powf(rhs),
 					BinaryOp::Leq => (lhs <= rhs) as u8 as f64,
-					BinaryOp::Lt => {
-						println!("{lhs} < {rhs}: {}", (lhs < rhs) as u8);
-						(lhs < rhs) as u8 as f64
-					}
+					BinaryOp::Lt => (lhs < rhs) as u8 as f64,
 					BinaryOp::Geq => (lhs >= rhs) as u8 as f64,
 					BinaryOp::Gt => (lhs > rhs) as u8 as f64,
 					BinaryOp::Eq => (lhs == rhs) as u8 as f64,