From 6d94077778d6043e135640f40b09e2582d3a3064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edvard=20Th=C3=B6rnros?= Date: Sun, 10 Jan 2021 16:55:26 +0100 Subject: Fix this shit --- src/vm.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/vm.rs') diff --git a/src/vm.rs b/src/vm.rs index 92740ea..a372d0b 100644 --- a/src/vm.rs +++ b/src/vm.rs @@ -49,7 +49,7 @@ pub struct Block { name: String, file: PathBuf, ops: Vec, - last_line_offset: Option, + last_line_offset: usize, line_offsets: HashMap, } @@ -59,23 +59,22 @@ impl Block { name: String::from(name), file: file.to_owned(), ops: Vec::new(), - last_line_offset: None, + last_line_offset: 0, line_offsets: HashMap::new(), } } - pub fn add(&mut self, op: Op, token_position: Option) -> usize { + pub fn add(&mut self, op: Op, token_position: usize) -> usize { let len = self.ops.len(); if token_position != self.last_line_offset { - if let Some(token_position) = token_position { - self.line_offsets.insert(len, token_position); - } + self.line_offsets.insert(len, token_position); + self.last_line_offset = token_position; } self.ops.push(op); len } - pub fn add_from(&mut self, ops: &[Op], token_position: Option) -> usize { + pub fn add_from(&mut self, ops: &[Op], token_position: usize) -> usize { let len = self.ops.len(); for op in ops { self.add(*op, token_position); -- cgit v1.2.1