From 4055c082176aa252970db6567657ec94045f7c49 Mon Sep 17 00:00:00 2001
From: Mark <mark@betalupi.com>
Date: Sun, 20 Aug 2023 16:33:34 -0700
Subject: [PATCH] Fixed incompatible messages when one unit is a scalar

---
 src/evaluate/operator.rs | 64 ++++++++++++++++++++++++++++++++--------
 1 file changed, 52 insertions(+), 12 deletions(-)

diff --git a/src/evaluate/operator.rs b/src/evaluate/operator.rs
index 1268554..f5fbf8a 100644
--- a/src/evaluate/operator.rs
+++ b/src/evaluate/operator.rs
@@ -75,12 +75,26 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
 			if let Expression::Quantity(la, a) = a {
 				if let Expression::Quantity(lb, b) = b {
 					if !a.unit.compatible_with(&b.unit) {
+						let a = a.convert_to_base().unit;
+						let b = b.convert_to_base().unit;
+
+						let a_s: String;
+						let b_s: String;
+						if a.unitless() {
+							a_s = String::from("scalar");
+						} else {
+							a_s = a.display(context);
+						}
+
+						if b.unitless() {
+							b_s = String::from("scalar");
+						} else {
+							b_s = b.display(context);
+						}
+
 						return Err((
 							*la + *lb + *op_loc,
-							DaisyError::IncompatibleUnits(
-								a.convert_to_base().unit.display(context),
-								b.convert_to_base().unit.display(context)
-							)
+							DaisyError::IncompatibleUnits(a_s, b_s)
 						));
 					}
 					return Ok(Some(Expression::Quantity(*la + *lb + *op_loc, a.clone() + b.clone())));
@@ -98,12 +112,24 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
 			if let Expression::Quantity(la, a) = a {
 				if let Expression::Quantity(lb, b) = b {
 					if !a.unit.compatible_with(&b.unit) {
+
+						let a_s: String;
+						let b_s: String;
+						if a.unitless() {
+							a_s = String::from("scalar");
+						} else {
+							a_s = a.display(context);
+						}
+
+						if b.unitless() {
+							b_s = String::from("scalar");
+						} else {
+							b_s = b.display(context);
+						}
+
 						return Err((
 							*la + *lb + *op_loc,
-							DaisyError::IncompatibleUnits(
-								a.convert_to_base().unit.display(context),
-								b.convert_to_base().unit.display(context)
-							)
+							DaisyError::IncompatibleUnits(a_s, b_s)
 						));
 					}
 					return Ok(Some(Expression::Quantity(*la + *lb + *op_loc, a.clone() - b.clone())));
@@ -181,12 +207,26 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
 				if let Expression::Quantity(lb, vb) = b {
 					let n = va.clone().convert_to(vb.clone());
 					if n.is_none() {
+						let va = va.convert_to_base().unit;
+						let vb = vb.convert_to_base().unit;
+
+						let a_s: String;
+						let b_s: String;
+						if va.unitless() {
+							a_s = String::from("scalar");
+						} else {
+							a_s = a.display(context);
+						}
+
+						if vb.unitless() {
+							b_s = String::from("scalar");
+						} else {
+							b_s = b.display(context);
+						}
+
 						return Err((
 							*la + *lb + *op_loc,
-							DaisyError::IncompatibleUnits(
-								va.convert_to_base().unit.display(context),
-								vb.convert_to_base().unit.display(context)
-							)
+							DaisyError::IncompatibleUnits(a_s, b_s)
 						));
 					}
 					return Ok(Some(Expression::Quantity(*la + *lb + *op_loc, n.unwrap())));