diff --git a/src/formatting.rs b/src/formatting.rs index b157564..eb097c0 100644 --- a/src/formatting.rs +++ b/src/formatting.rs @@ -2,9 +2,7 @@ use rug::Float; use crate::nodes::{self, Error}; -pub const MAX_DIGITS: usize = 10; - -pub fn pretty_eval(mut input: String) -> Result { +pub fn pretty_eval(mut input: String, max_digits: usize) -> Result { // no need to remove the characters here, // as we ignore the them in all other logic already let should_add_back_alignment = input.contains('&'); @@ -21,7 +19,7 @@ pub fn pretty_eval(mut input: String) -> Result { let result = nodes::eval(&input)?; let display_digits = get_significant_digits(&result) - .min(MAX_DIGITS) + .min(max_digits) .max(if result >= 1000 || result < 1 { 1 } else if result >= 100 { @@ -51,20 +49,20 @@ pub fn pretty_eval(mut input: String) -> Result { } #[test] fn test_character_readdition() { - assert_eq!(pretty_eval(" = 11".into()).unwrap(), " = 11"); - assert_eq!(pretty_eval(" &= 11".into()).unwrap(), " & = 11"); - assert_eq!(pretty_eval(" & 11".into()).unwrap(), " & 11"); - assert_eq!(pretty_eval(" & 11 \\".into()).unwrap(), " & 11 \\"); + assert_eq!(pretty_eval(" = 11".into(), 10).unwrap(), " = 11"); + assert_eq!(pretty_eval(" &= 11".into(), 10).unwrap(), " & = 11"); + assert_eq!(pretty_eval(" & 11".into(), 10).unwrap(), " & 11"); + assert_eq!(pretty_eval(" & 11 \\".into(), 10).unwrap(), " & 11 \\"); } #[test] fn test_basic_up_to_999() { - assert_eq!(pretty_eval("1".into()).unwrap(), "1"); - assert_eq!(pretty_eval("10".into()).unwrap(), "10"); - assert_eq!(pretty_eval("100".into()).unwrap(), "100"); - assert_eq!(pretty_eval("999".into()).unwrap(), "999"); - assert_eq!(pretty_eval("1000".into()).unwrap(), "1 * 10^3"); + assert_eq!(pretty_eval("1".into(), 10).unwrap(), "1"); + assert_eq!(pretty_eval("10".into(), 10).unwrap(), "10"); + assert_eq!(pretty_eval("100".into(), 10).unwrap(), "100"); + assert_eq!(pretty_eval("999".into(), 10).unwrap(), "999"); + assert_eq!(pretty_eval("1000".into(), 10).unwrap(), "1 * 10^3"); - assert_eq!(pretty_eval("11.111111".into()).unwrap(), "11.111111"); + assert_eq!(pretty_eval("11.111111".into(), 10).unwrap(), "11.111111"); } pub fn get_significant_digits(n: &Float) -> usize { diff --git a/src/main.rs b/src/main.rs index 32f04a3..dc19a05 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,8 +4,7 @@ use std::{ process::ExitCode, }; -mod formatting; -mod nodes; +use tylc as lib; fn main() -> ExitCode { let input = match env::args().skip(1).rev().reduce(|x, a| a + &x) { @@ -17,7 +16,7 @@ fn main() -> ExitCode { } }; - match formatting::pretty_eval(input) { + match lib::formatting::pretty_eval(input, 10) { Ok(s) => println!("{s}"), Err(e) => { diff --git a/src/nodes/parse.rs b/src/nodes/parse.rs index 22a0518..4a20221 100644 --- a/src/nodes/parse.rs +++ b/src/nodes/parse.rs @@ -1,9 +1,9 @@ use core::f64; use std::str::FromStr; -use rug::{Float, float::ParseFloatError, ops::CompleteRound}; +use rug::{Float, float::ParseFloatError}; -use crate::nodes::{Function, Node, Nodes, Operator, PREC}; +use crate::nodes::{Function, Node, Nodes, Operator}; impl Node { fn from_name(s: &str) -> Result { @@ -124,15 +124,10 @@ impl FromStr for Nodes { && !(c == 'e' && filtered_string.chars().nth(i + 1).is_some_and(|c| c == '-')) && !(c == '-' && filtered_string.chars().nth(i - 1).is_some_and(|c| c == 'e')) { - nodes.push(Node::Number( - Float::parse(&filtered_string[start_index..i]) - .map_err(|e| { - Error::NumberParsing( - filtered_string[start_index..i].to_owned(), - e, - ) - })? - .complete(PREC), + nodes.push(Node::from( + Float::parse(&filtered_string[start_index..i]).map_err(|e| { + Error::NumberParsing(filtered_string[start_index..i].to_owned(), e) + })?, )); state = ParsingState::Start; @@ -182,12 +177,10 @@ impl FromStr for Nodes { if matches!(nodes.last(), Some(Node::ParenthesisEnd)) { nodes.push(Node::Operator(Default::default())); } - nodes.push(Node::Number( - Float::parse(&filtered_string[start_index..i]) - .map_err(|e| { - Error::NumberParsing(filtered_string[start_index..i].to_owned(), e) - })? - .complete(PREC), + nodes.push(Node::from( + Float::parse(&filtered_string[start_index..i]).map_err(|e| { + Error::NumberParsing(filtered_string[start_index..i].to_owned(), e) + })?, )); } }