pogmommy/worf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix shift in math mode

Browse source
This commit is contained in:
Alexander Mohr 2025-07-01 16:55:49 +02:00
parent 19b2379ff0
commit 899e19591a
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
worf/src/lib/modes/math.rs
View file

@ -71,6 +71,7 @@ enum Token {
Power, Power,
} }
#[derive(Debug)]
enum Value { enum Value {
Int(i64), Int(i64),
Float(f64), Float(f64),
@ -120,21 +121,18 @@ fn tokenize(expr: &str) -> Result<VecDeque<Token>, String> {
if i + 1 < chars.len() { if i + 1 < chars.len() {
match &expr[i..=i + 1] { match &expr[i..=i + 1] {
"<<" => { "<<" => {
insert_implicit_multiplication(&mut tokens, last_token.as_ref());
tokens.push_back(Token::ShiftLeft); tokens.push_back(Token::ShiftLeft);
last_token = Some(Token::ShiftLeft); last_token = Some(Token::ShiftLeft);
i += 2; i += 2;
continue; continue;
} }
">>" => { ">>" => {
insert_implicit_multiplication(&mut tokens, last_token.as_ref());
tokens.push_back(Token::ShiftRight); tokens.push_back(Token::ShiftRight);
last_token = Some(Token::ShiftRight); last_token = Some(Token::ShiftRight);
i += 2; i += 2;
continue; continue;
} }
"**" => { "**" => {
insert_implicit_multiplication(&mut tokens, last_token.as_ref());
tokens.push_back(Token::Power); tokens.push_back(Token::Power);
last_token = Some(Token::Power); last_token = Some(Token::Power);
i += 2; i += 2;
@ -309,16 +307,22 @@ fn eval_expr(tokens: &mut VecDeque<Token>) -> Result<Value, String> {
} }
} }
// Final reduction: check if there are enough values for the remaining operators
if !ops.is_empty() && values.len() < 2 {
return Err(format!(
"Not enough values for the remaining operators (values: {values:?}, ops: {ops:?})",
));
}
while let Some(op) = ops.pop() { while let Some(op) = ops.pop() {
if let Token::Op('(') = op { if let Token::Op('(') = op {
return Err("Mismatched parentheses".to_owned()); return Err("Mismatched parentheses".to_owned());
} }
let b = values let b = values.pop().ok_or_else(|| {
.pop() format!("Missing right operand in final evaluation (values: {values:?}, ops: {ops:?})",)
.ok_or("Missing right operand in final evaluation")?; })?;
let a = values let a = values.pop().ok_or_else(|| {
.pop() format!("Missing left operand in final evaluation (values: {values:?}, ops: {ops:?})",)
.ok_or("Missing left operand in final evaluation")?; })?;
values.push(apply_op(&a, &b, &op)); values.push(apply_op(&a, &b, &op));
} }