Max
/
calculette
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Fixes priority issue

This commit is contained in:
Alexandre Stein 2022-12-09 15:18:30 +01:00
parent 8d36c71340
commit 908726e3c6
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
rust-calc/src/main.rs
View File

@ -71,14 +71,15 @@ fn parse(pattern: String) -> (Vec<Symbol>, Vec<f32>) {
(symbols, numbers) (symbols, numbers)
} }
fn calcul(symbols: Vec<Symbol>, numbers: Vec<f32>) -> f32 { fn calculation(symbols: Vec<Symbol>, numbers: Vec<f32>) -> f32 {
let mut counter = 0; let mut counter = 0;
let mut n1 = *numbers.get(0).expect("expect at least the first value"); let mut n1 = *numbers.get(0).expect("expect at least the first value");
while counter < symbols.len() { while counter < symbols.len() {
let s = symbols let s = symbols
.get(counter) .get(counter)
.expect("expect at least a symbol value"); .expect("expect at least a symbol value");
let n2 = *numbers let mut n2 = *numbers
.get(counter + 1) .get(counter + 1)
.expect("expect at least a second value"); .expect("expect at least a second value");
@ -103,10 +104,11 @@ fn calcul(symbols: Vec<Symbol>, numbers: Vec<f32>) -> f32 {
.expect("during the priority, we expect at least the first value"); .expect("during the priority, we expect at least the first value");
while counter_2 < symbols.len() { while counter_2 < symbols.len() {
let nn2 = *numbers let nn2 = *numbers
.get(counter_2) .get(counter_2 + 1)
.expect("during the priority, we expect at least the second value"); .expect("during the priority, we expect at least the second value");
if ss.priority() { if ss.priority() {
println!("next is prio: {:?}\n{nn1} and {nn2}", ss);
match ss { match ss {
Symbol::Multiply => { Symbol::Multiply => {
nn1.mul_assign(nn2); nn1.mul_assign(nn2);
@ -118,11 +120,13 @@ fn calcul(symbols: Vec<Symbol>, numbers: Vec<f32>) -> f32 {
} }
} else { } else {
counter = counter_2; counter = counter_2;
n1 = nn1; n2 = nn1;
break; break;
} }
n2 = nn1;
counter_2 += 1; counter_2 += 1;
counter = counter_2;
} }
} }
} }
@ -165,6 +169,36 @@ fn main() {
process::exit(2); process::exit(2);
} }
let res = calcul(symbols, numbers); let res = calculation(symbols, numbers);
println!("{res}"); println!("{res}");
} }
#[cfg(test)]
mod tests {
use crate::{calculation, parse};
#[test]
fn basics() {
let (s, n) = parse("2+2".to_string());
assert_eq!(calculation(s, n), 4.0);
let (s, n) = parse("4-9".to_string());
assert_eq!(calculation(s, n), -5.0);
let (s, n) = parse("7*3".to_string());
assert_eq!(calculation(s, n), 21.0);
let (s, n) = parse("9/3".to_string());
assert_eq!(calculation(s, n), 3.0);
let (s, n) = parse("15*20".to_string());
assert_ne!(calculation(s, n), 0.0);
}
#[test]
fn signs_2() {
let (s, n) = parse("2*4+4".to_string());
assert_eq!(calculation(s, n), 12.0);
let (s, n) = parse("2+2*4".to_string());
assert_eq!(calculation(s, n), 10.0);
let (s, n) = parse("30/4-9".to_string());
assert_eq!(calculation(s, n), -1.5);
}
}