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:12455924e150823ea2e340ad59db08d9720edad0
Branches Tags
electria:main
..
compare: electria:2d6f03c28ca8719992f43fe69d744fd8012ff0ce
Branches Tags
electria:main
1 changed files with 19 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/formatting.rs
View file

@ -3,7 +3,15 @@ use rug::Float;
use crate::nodes::{self, Error}; use crate::nodes::{self, Error};
pub fn pretty_eval(input: &str, max_digits: usize) -> Result<String, Error> { pub fn pretty_eval(input: &str, max_digits: usize) -> Result<String, Error> {
let (prefix, deliminator, input) = input.rsplit_once_any(&["plus.minus ", "& ", "= "]); let (prefix, deliminator, input) = input
.rsplit_once('=')
.map(|(p, i)| (p, "= ", i))
.unwrap_or_else(|| {
input
.rsplit_once('&')
.map(|(p, i)| (p, "& ", i))
.unwrap_or(("", "", input))
});
// no need to remove the character here, // no need to remove the character here,
// as we ignore it in all other logic already // as we ignore it in all other logic already
@ -31,26 +39,6 @@ pub fn pretty_eval(input: &str, max_digits: usize) -> Result<String, Error> {
.replace('e', " * 10^")) .replace('e', " * 10^"))
} }
trait StrExt {
fn rsplit_once_any<'a>(
&'a self,
delimiters: &[&'static str],
) -> (&'a str, &'static str, &'a str);
}
impl StrExt for str {
fn rsplit_once_any<'a>(
&'a self,
delimiters: &[&'static str],
) -> (&'a str, &'static str, &'a str) {
for delimiter in delimiters {
if let Some((prefix, suffix)) = self.rsplit_once(delimiter) {
return (prefix, delimiter, suffix);
}
}
return ("", "", self);
}
}
pub fn get_significant_digits(n: &Float) -> usize { pub fn get_significant_digits(n: &Float) -> usize {
let raw_string = n.to_string().replace('.', ""); let raw_string = n.to_string().replace('.', "");
@ -87,36 +75,27 @@ pub fn get_significant_digits(n: &Float) -> usize {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
const MAX_DIGITS: usize = 10;
fn eval(s: &str) -> Float { fn eval(s: &str) -> Float {
crate::nodes::eval(s).unwrap() crate::nodes::eval(s).unwrap()
} }
#[test] #[test]
fn character_readdition() { fn character_readdition() {
assert_eq!(pretty_eval(" = 11", MAX_DIGITS).unwrap(), " = 11"); assert_eq!(pretty_eval(" = 11", 10).unwrap(), " = 11");
assert_eq!(pretty_eval(" &= 11", MAX_DIGITS).unwrap(), " &= 11"); assert_eq!(pretty_eval(" &= 11", 10).unwrap(), " &= 11");
assert_eq!(pretty_eval(" & 11", MAX_DIGITS).unwrap(), " & 11"); assert_eq!(pretty_eval(" & 11", 10).unwrap(), " & 11");
assert_eq!(pretty_eval(" & 11 \\", MAX_DIGITS).unwrap(), " & 11 \\"); assert_eq!(pretty_eval(" & 11 \\", 10).unwrap(), " & 11 \\");
} }
#[test] #[test]
fn basic_output_up_to_999() { fn basic_output_up_to_999() {
assert_eq!(pretty_eval("1", MAX_DIGITS).unwrap(), "1"); assert_eq!(pretty_eval("1", 10).unwrap(), "1");
assert_eq!(pretty_eval("10", MAX_DIGITS).unwrap(), "10"); assert_eq!(pretty_eval("10", 10).unwrap(), "10");
assert_eq!(pretty_eval("100", MAX_DIGITS).unwrap(), "100"); assert_eq!(pretty_eval("100", 10).unwrap(), "100");
assert_eq!(pretty_eval("999", MAX_DIGITS).unwrap(), "999"); assert_eq!(pretty_eval("999", 10).unwrap(), "999");
assert_eq!(pretty_eval("1000", MAX_DIGITS).unwrap(), "1 * 10^3"); assert_eq!(pretty_eval("1000", 10).unwrap(), "1 * 10^3");
assert_eq!(pretty_eval("11.111111", MAX_DIGITS).unwrap(), "11.111111"); assert_eq!(pretty_eval("11.111111", 10).unwrap(), "11.111111");
}
#[test]
fn plus_minus() {
assert_eq!(
pretty_eval("y & = plus.minus sqrt(15.5) \\", MAX_DIGITS).unwrap(),
"y & = plus.minus 3.937003937 \\"
);
} }
#[test] #[test]