Custom PartialEq impl for numbers and support for comparisons of di…

…fferent units

core/src/ast.rs

@@ -474,7 +474,12 @@ pub(crate) fn evaluate<I: Interrupt>(
 			let lhs = evaluate(*a, scope.clone(), attrs, context, int)?;
 			let rhs = evaluate(*b, scope.clone(), attrs, context, int)?;
 
-			Value::Bool(if is_equals { lhs == rhs } else { lhs != rhs })
+			if let (Value::Num(l), Value::Num(r)) = (&lhs, &rhs) {
+				let a = l.clone().sub(*r.clone(), int)?;
+				Value::Bool(if is_equals { a.is_zero() } else { !a.is_zero() })
+			} else {
+				Value::Bool(if is_equals { lhs == rhs } else { lhs != rhs })
+			}
 		}
 	})
 }

core/src/num/unit.rs

@@ -25,7 +25,7 @@ use unit_exponent::UnitExponent;
 
 use super::Exact;
 
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone, Eq)]
 #[allow(clippy::pedantic)]
 pub(crate) struct Value {
 	#[allow(clippy::struct_field_names)]
@@ -37,6 +37,12 @@ pub(crate) struct Value {
 	simplifiable: bool,
 }
 
+impl PartialEq for Value {
+	fn eq(&self, other: &Self) -> bool {
+		self.value == other.value && self.unit == other.unit
+	}
+}
+
 impl Value {
 	pub(crate) fn serialize(&self, write: &mut impl io::Write) -> FResult<()> {
 		self.value.serialize(write)?;

core/tests/integration_tests.rs

@@ -5880,4 +5880,5 @@ fn test_equality() {
 	test_eval("1 + 2 != 4", "true");
 	test_eval("true == false", "false");
 	test_eval("true != false", "true");
+	test_eval("2m == 200cm", "true");
 }