Refactoring

agrawal-d · Apr 11, 2024 · 333c3dd · 333c3dd
1 parent f5536f8
commit 333c3dd
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 19 deletions.
diff --git a/compiler/src/compiler.rs b/compiler/src/compiler.rs
@@ -98,7 +98,7 @@ fn get_rules() -> &'static HashMap<TokenType, ParseRule> {
         add_rule!(map, Error, None, None, Precedence::None);
         add_rule!(map, EOF, None, None, Precedence::None);
 
-        return map;
+        map
     })
 }
 
@@ -204,7 +204,7 @@ impl Compiler {
         compiler.expression();
         compiler.parser.consume(TokenType::EOF, "Expect end of expression.");
         compiler.end();
-        return Ok(compiler.compiling_chunk);
+        Ok(compiler.compiling_chunk)
     }
 
     #[cfg(not(feature = "print_code"))]
@@ -236,7 +236,7 @@ impl Compiler {
             TokenType::GreaterEqual => self.emit_bytes(Opcode::Less as u8, Opcode::Not as u8),
             TokenType::Less => self.emit_byte(Opcode::Less as u8),
             TokenType::LessEqual => self.emit_bytes(Opcode::Greater as u8, Opcode::Not as u8),
-            _ => return,
+            _ => (),
         }
     }
 
@@ -245,7 +245,7 @@ impl Compiler {
             TokenType::False => self.emit_byte(Opcode::False as u8),
             TokenType::Nil => self.emit_byte(Opcode::Nil as u8),
             TokenType::True => self.emit_byte(Opcode::True as u8),
-            _ => return,
+            _ => (),
         }
     }
 
@@ -276,7 +276,7 @@ impl Compiler {
         match operator_type {
             TokenType::Minus => self.emit_byte(Opcode::Negate as u8),
             TokenType::Bang => self.emit_byte(Opcode::Not as u8),
-            _ => return,
+            _ => (),
         }
     }
 

diff --git a/compiler/src/lib.rs b/compiler/src/lib.rs
@@ -19,14 +19,14 @@ static LOGGER: OnceLock<Logger> = OnceLock::new();
 #[macro_export]
 macro_rules! xprint {
     ($($arg:tt)*) => {
-        (crate::LOGGER.get().expect("Compiler not initialized").print_fn)(format!($($arg)*))
+        ($crate::LOGGER.get().expect("Compiler not initialized").print_fn)(format!($($arg)*))
     }
 }
 
 #[macro_export]
 macro_rules! xprintln {
     ($($arg:tt)*) => {
-        (crate::LOGGER.get().expect("Compiler not initialized").println_fn)(format!($($arg)*))
+        ($crate::LOGGER.get().expect("Compiler not initialized").println_fn)(format!($($arg)*))
     }
 }
 

diff --git a/compiler/src/scanner.rs b/compiler/src/scanner.rs
@@ -14,6 +14,12 @@ pub struct Token {
     pub line: usize,
 }
 
+impl Default for Token {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Token {
     pub fn new() -> Token {
         Token {

diff --git a/compiler/src/value.rs b/compiler/src/value.rs
@@ -31,12 +31,14 @@ pub fn print_value(&self, value: Value) {
 
 use Value::*;
 
-pub fn values_equal(a: Value, b: Value) -> bool {
-    match (a, b) {
-        (Number(a), Number(b)) => a == b,
-        (Bool(a), Bool(b)) => a == b,
-        (XString(a), XString(b)) => a.as_ref() == b.as_ref(),
-        (Nil, Nil) => true,
-        _ => false,
+impl PartialEq<Value> for Value {
+    fn eq(&self, other: &Value) -> bool {
+        match (self, other) {
+            (Number(a), Number(b)) => a == b,
+            (Bool(a), Bool(b)) => a == b,
+            (XString(a), XString(b)) => a.as_ref() == b.as_ref(),
+            (Nil, Nil) => true,
+            _ => false,
+        }
     }
 }
diff --git a/compiler/src/vm.rs b/compiler/src/vm.rs
@@ -1,10 +1,7 @@
 use crate::{
     chunk::Chunk,
     common::Opcode,
-    value::{
-        values_equal,
-        Value::{self, *},
-    },
+    value::Value::{self, *},
     xprintln,
 };
 use anyhow::*;
@@ -147,7 +144,7 @@ impl Vm {
                 Opcode::Equal => {
                     let a = vm.pop()?;
                     let b = vm.pop()?;
-                    vm.stack.push(Bool(values_equal(a, b)))
+                    vm.stack.push(Bool(a == b))
                 }
                 Opcode::Greater => binop!(vm, Bool, >),
                 Opcode::Less => binop!(vm, Bool, <),