src/eval.rs

@@ -20,16 +20,12 @@ impl Evaluator {
                 }
             },
             Expr::Binary { op, left, right } => {
-                let lhs = self.eval_expr(*left);
-                let rhs = self.eval_expr(*right);
-                
                 match op {
-                    BinaryOp::Add => lhs + rhs,
+                    BinaryOp::Add => self.eval_expr(*left) + self.eval_expr(*right),
-                    BinaryOp::Sub => lhs - rhs,
+                    BinaryOp::Sub => self.eval_expr(*left) - self.eval_expr(*right),
-                    BinaryOp::Mul => lhs * rhs,
+                    BinaryOp::Mul => self.eval_expr(*left) * self.eval_expr(*right),
-                    BinaryOp::Div => lhs / rhs,
+                    BinaryOp::Div => self.eval_expr(*left) / self.eval_expr(*right),
-                    BinaryOp::Mod => lhs % rhs,
+                    BinaryOp::Mod => self.eval_expr(*left) % self.eval_expr(*right)
-                    BinaryOp::Exp => lhs.pow(rhs as u32) // probably shouldn't cast like that
                 }
             },
             expr => panic!("can't eval expression: {expr:?}")

src/expr.rs

@@ -4,8 +4,7 @@ pub enum BinaryOp {
     Sub,
     Mul,
     Div,
-    Mod,
+    Mod
-    Exp
 }
 
 #[derive(Debug, Clone)]
@@ -15,15 +14,14 @@ pub enum UnaryOp {
 
 pub fn prefix_bp(op: &UnaryOp) -> u8 {
     match op {
-        UnaryOp::Neg => 7
+        UnaryOp::Neg => 5
     }
 }
 
 pub fn infix_bp(op: &BinaryOp) -> (u8, u8) {
     match op {
         BinaryOp::Add | BinaryOp::Sub => (1, 2),
-        BinaryOp::Mul | BinaryOp::Div | BinaryOp::Mod => (3, 4),
+        BinaryOp::Mul | BinaryOp::Div | BinaryOp::Mod => (3, 4)
-        BinaryOp::Exp => (5, 6)
     }
 }
 

src/lexer.rs

@@ -59,7 +59,6 @@ impl Lexer {
             Some(b'*') => {self.advance(); Some(Token::Asterisk)},
             Some(b'/') => {self.advance(); Some(Token::Slash)},
             Some(b'%') => {self.advance(); Some(Token::Percent)},
-            Some(b'^') => {self.advance(); Some(Token::Caret)},
 
             Some(b'(') => {self.advance(); Some(Token::LParen)},
             Some(b')') => {self.advance(); Some(Token::RParen)},

src/parser.rs

@@ -69,7 +69,6 @@ impl Parser {
                 Some(Token::Asterisk) => BinaryOp::Mul,
                 Some(Token::Slash) => BinaryOp::Div,
                 Some(Token::Percent) => BinaryOp::Mod,
-                Some(Token::Caret) => BinaryOp::Exp,
                 _ => break
             };
 

src/token.rs

@@ -9,7 +9,6 @@ pub enum Token {
     Asterisk,
     Slash,
     Percent,
-    Caret,
 
     // Parentheses
     LParen,