Mark/daisy
1
1
Fork 0
mirror of https://github.com/rm-dr/daisy synced 2026-04-01 17:56:31 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added terminal color detection

Browse Source 
Added configuration
Cleaned up context args
This commit is contained in:
Mark
2023-08-17 10:10:38 -07:00
parent fc4c28543f
commit e0ca8be79f
11 changed files with 282 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/evaluate/operator.rs
View File

@@ -78,8 +78,8 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
return Err((
*la + *lb + *op_loc,
DaisyError::IncompatibleUnits(
a.convert_to_base().unit.to_string(),
b.convert_to_base().unit.to_string()
a.convert_to_base().unit.display(context),
b.convert_to_base().unit.display(context)
)
));
}
@@ -101,8 +101,8 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
return Err((
*la + *lb + *op_loc,
DaisyError::IncompatibleUnits(
a.convert_to_base().unit.to_string(),
b.convert_to_base().unit.to_string()
a.convert_to_base().unit.display(context),
b.convert_to_base().unit.display(context)
)
));
}
@@ -179,8 +179,8 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
return Err((
*la + *lb + *op_loc,
DaisyError::IncompatibleUnits(
va.convert_to_base().unit.to_string(),
vb.convert_to_base().unit.to_string()
va.convert_to_base().unit.display(context),
vb.convert_to_base().unit.display(context)
)
));
}