fix: attempted to fix out of bounds error

xNaCly · Apr 2, 2023 · 3b4d96e · 3b4d96e
1 parent 66169a6
commit 3b4d96e
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/src/parser.rs b/src/parser.rs
@@ -34,24 +34,17 @@ impl Parser {
     }
 
     fn peek(&self) -> char {
-        if !self.at_end() {
-            return self.input.chars().nth(self.pos + 1).expect("couldn't peek");
-        }
-        '\0'
+        self.input.chars().nth(self.pos + 1).unwrap_or('\0')
     }
 
     fn peek_equals(&self, character: char) -> bool {
         self.peek() == character
     }
 
     fn advance(&mut self) {
-        if !self.at_end() || self.pos + 1 <= self.input.len() {
+        if !self.at_end() && self.pos + 1 <= self.input.len() {
             self.pos += 1;
-            self.current_char = self
-                .input
-                .chars()
-                .nth(self.pos)
-                .expect("could not get next character");
+            self.current_char = self.input.chars().nth(self.pos).unwrap_or('\0');
             self.line_pos += 1;
         }
     }