Merge branch 'main' of https://github.com/valadaptive/ntsc-rs into main

valadaptive · Oct 20, 2024 · 76166cb · 76166cb
2 parents 2069a88 + 804bbad
commit 76166cb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/gui/Cargo.toml b/crates/gui/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gui"
-version = "0.8.0"
+version = "0.8.1"
 edition = "2021"
 default-run = "ntsc-rs-standalone"
 license = "GPL-3.0"

diff --git a/crates/gui/about.json b/crates/gui/about.json
diff --git a/crates/gui/src/expression_parser.rs b/crates/gui/src/expression_parser.rs
@@ -120,22 +120,25 @@ fn eval_expr(lexer: &mut LexerWrapper, min_binding_power: usize) -> Result<f64,
             }
             Ok(res)
         }
-        Some(Token::Number(value)) => Ok(value),
+        Some(Token::Number(value)) => {
+            lexer.advance()?;
+            Ok(value)
+        }
         Some(Token::Plus) => {
+            lexer.advance()?;
             let inner_value = eval_expr(lexer, prefix_binding_power(&Token::Plus))?;
             // unary plus does nothing
             Ok(inner_value)
         }
         Some(Token::Minus) => {
+            lexer.advance()?;
             let inner_value = eval_expr(lexer, prefix_binding_power(&Token::Minus))?;
             // unary negation
             Ok(-inner_value)
         }
         _ => Err(ParseError::new("Invalid left-hand side")),
     }?;
 
-    lexer.advance()?;
-
     loop {
         let op = match lexer.cur {
             Some(token) => match token {