electria/tylc
Watch
1
0
Fork
You've already forked tylc
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: electria:d6b9d7a407cde7a314be3cd94b87e9fc9119d237
Branches Tags
electria:main
..
compare: electria:2db19e7a463f27a743945ed91028cf8a706bdd9e
Branches Tags
electria:main
Author SHA1 Message Date
electria
2db19e7a46
 		feat: allow changing max_digits for pretty_eval 2026-10-04 16:27:34 -07:00
3 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/formatting.rs
View file

@ -49,20 +49,20 @@ pub fn pretty_eval(mut input: String, max_digits: usize) -> Result<String, Error
} }
#[test] #[test]
fn test_character_readdition() { fn test_character_readdition() {
assert_eq!(pretty_eval(" = 11".into(), 10).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()).unwrap(), " & = 11");
assert_eq!(pretty_eval(" & 11".into(), 10).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()).unwrap(), " & 11 \\");
} }
#[test] #[test]
fn test_basic_up_to_999() { fn test_basic_up_to_999() {
assert_eq!(pretty_eval("1".into(), 10).unwrap(), "1"); assert_eq!(pretty_eval("1".into()).unwrap(), "1");
assert_eq!(pretty_eval("10".into(), 10).unwrap(), "10"); assert_eq!(pretty_eval("10".into()).unwrap(), "10");
assert_eq!(pretty_eval("100".into(), 10).unwrap(), "100"); assert_eq!(pretty_eval("100".into()).unwrap(), "100");
assert_eq!(pretty_eval("999".into(), 10).unwrap(), "999"); assert_eq!(pretty_eval("999".into()).unwrap(), "999");
assert_eq!(pretty_eval("1000".into(), 10).unwrap(), "1 * 10^3"); assert_eq!(pretty_eval("1000".into()).unwrap(), "1 * 10^3");
assert_eq!(pretty_eval("11.111111".into(), 10).unwrap(), "11.111111"); assert_eq!(pretty_eval("11.111111".into()).unwrap(), "11.111111");
} }
pub fn get_significant_digits(n: &Float) -> usize { pub fn get_significant_digits(n: &Float) -> usize {

5
src/main.rs
View file

@ -4,7 +4,8 @@ use std::{
process::ExitCode, process::ExitCode,
}; };
use tylc as lib; mod formatting;
mod nodes;
fn main() -> ExitCode { fn main() -> ExitCode {
let input = match env::args().skip(1).rev().reduce(|x, a| a + &x) { 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}"), Ok(s) => println!("{s}"),
Err(e) => { Err(e) => {

25
src/nodes/parse.rs
View file

@ -1,9 +1,9 @@
use core::f64; use core::f64;
use std::str::FromStr; 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 { impl Node {
fn from_name(s: &str) -> Result<Self, String> { fn from_name(s: &str) -> Result<Self, String> {
@ -124,10 +124,15 @@ impl FromStr for Nodes {
&& !(c == 'e' && filtered_string.chars().nth(i + 1).is_some_and(|c| c == '-')) && !(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')) && !(c == '-' && filtered_string.chars().nth(i - 1).is_some_and(|c| c == 'e'))
{ {
nodes.push(Node::from( nodes.push(Node::Number(
Float::parse(&filtered_string[start_index..i]).map_err(|e| { Float::parse(&filtered_string[start_index..i])
Error::NumberParsing(filtered_string[start_index..i].to_owned(), e) .map_err(|e| {
})?, Error::NumberParsing(
filtered_string[start_index..i].to_owned(),
e,
)
})?
.complete(PREC),
)); ));
state = ParsingState::Start; state = ParsingState::Start;
@ -177,10 +182,12 @@ impl FromStr for Nodes {
if matches!(nodes.last(), Some(Node::ParenthesisEnd)) { if matches!(nodes.last(), Some(Node::ParenthesisEnd)) {
nodes.push(Node::Operator(Default::default())); nodes.push(Node::Operator(Default::default()));
} }
nodes.push(Node::from( nodes.push(Node::Number(
Float::parse(&filtered_string[start_index..i]).map_err(|e| { Float::parse(&filtered_string[start_index..i])
.map_err(|e| {
Error::NumberParsing(filtered_string[start_index..i].to_owned(), e) Error::NumberParsing(filtered_string[start_index..i].to_owned(), e)
})?, })?
.complete(PREC),
)); ));
} }
} }