diff --git a/src/formatting.rs b/src/formatting.rs index eb097c0..d229d54 100644 --- a/src/formatting.rs +++ b/src/formatting.rs @@ -49,20 +49,20 @@ pub fn pretty_eval(mut input: String, max_digits: usize) -> Result usize { diff --git a/src/main.rs b/src/main.rs index dc19a05..aace0d9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,8 @@ use std::{ process::ExitCode, }; -use tylc as lib; +mod formatting; +mod nodes; fn main() -> ExitCode { let input = match env::args().skip(1).rev().reduce(|x, a| a + &x) { @@ -16,7 +17,7 @@ fn main() -> ExitCode { } }; - match lib::formatting::pretty_eval(input, 10) { + match formatting::pretty_eval(input, 10) { Ok(s) => println!("{s}"), Err(e) => { diff --git a/src/nodes/parse.rs b/src/nodes/parse.rs index 4a20221..22a0518 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}; +use rug::{Float, float::ParseFloatError, ops::CompleteRound}; -use crate::nodes::{Function, Node, Nodes, Operator}; +use crate::nodes::{Function, Node, Nodes, Operator, PREC}; impl Node { fn from_name(s: &str) -> Result { @@ -124,10 +124,15 @@ 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::from( - Float::parse(&filtered_string[start_index..i]).map_err(|e| { - Error::NumberParsing(filtered_string[start_index..i].to_owned(), 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), )); state = ParsingState::Start; @@ -177,10 +182,12 @@ impl FromStr for Nodes { if matches!(nodes.last(), Some(Node::ParenthesisEnd)) { nodes.push(Node::Operator(Default::default())); } - nodes.push(Node::from( - Float::parse(&filtered_string[start_index..i]).map_err(|e| { - Error::NumberParsing(filtered_string[start_index..i].to_owned(), 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), )); } }