Remove Halt error

Author: ajeetdsouza

src/error.rs

@@ -16,8 +16,6 @@ pub type ErrorS = Spanned<Error>;
 pub enum Error {
     #[error("AttributeError: {0}")]
     AttributeError(AttributeError),
-    #[error("")]
-    Halt,
     #[error("IOError: {0}")]
     IoError(IoError),
     #[error("NameError: {0}")]
@@ -34,7 +32,6 @@ impl AsDiagnostic for Error {
     fn as_diagnostic(&self, span: &Span) -> Diagnostic<()> {
         match self {
             Error::AttributeError(e) => e.as_diagnostic(span),
-            Error::Halt => unreachable!(),
             Error::IoError(e) => e.as_diagnostic(span),
             Error::NameError(e) => e.as_diagnostic(span),
             Error::OverflowError(e) => e.as_diagnostic(span),

src/lib.rs

@@ -1,4 +1,4 @@
-#![allow(incomplete_features)]
+#![allow(dangerous_implicit_autorefs, incomplete_features)]
 #![feature(explicit_tail_calls)]
 
 pub mod cmd;

src/vm/mod.rs

@@ -123,10 +123,7 @@ impl<'a> VM<'a> {
         self.source.push('\n');
 
         let function = Compiler::compile(source, offset, &mut self.gc)?;
-        match self.run_function(function) {
-            Ok(()) | Err((Error::Halt, _)) => Ok(()),
-            Err(e) => Err(vec![e]),
-        }
+        self.run_function(function).map_err(|e| vec![e])
     }
 
     fn run_function(&mut self, function: *mut ObjectFunction) -> Result<()> {
@@ -272,15 +269,15 @@ impl<'a> VM<'a> {
 
     fn op_get_upvalue(&mut self, ip: &mut *const u8) -> Result<()> {
         let upvalue_idx = Self::read_u8(ip) as usize;
-        let object = *unsafe { (&(*self.frame.closure).upvalues).get_unchecked(upvalue_idx) };
+        let object = *unsafe { (*self.frame.closure).upvalues.get_unchecked(upvalue_idx) };
         let value = unsafe { *(*object).location };
         self.push(value);
         become self.dispatch(ip)
     }
 
     fn op_set_upvalue(&mut self, ip: &mut *const u8) -> Result<()> {
         let upvalue_idx = Self::read_u8(ip) as usize;
-        let object = *unsafe { (&(*self.frame.closure).upvalues).get_unchecked(upvalue_idx) };
+        let object = *unsafe { (*self.frame.closure).upvalues.get_unchecked(upvalue_idx) };
         let value = unsafe { (*object).location };
         unsafe { *value = *self.peek(0) };
         become self.dispatch(ip)
@@ -566,7 +563,7 @@ impl<'a> VM<'a> {
                 let location = unsafe { self.frame.stack.add(upvalue_idx) };
                 self.capture_upvalue(location)
             } else {
-                *unsafe { (&(*self.frame.closure).upvalues).get_unchecked(upvalue_idx) }
+                *unsafe { (*self.frame.closure).upvalues.get_unchecked(upvalue_idx) }
             };
             upvalues.push(upvalue);
         }
@@ -595,7 +592,7 @@ impl<'a> VM<'a> {
                 self.push(value);
                 become self.dispatch(ip)
             }
-            None => Err((Error::Halt, 0..0)),
+            None => Ok(()),
         }
     }
 
@@ -811,7 +808,7 @@ impl<'a> VM<'a> {
     fn read_value(&self, ip: &mut *const u8) -> Value {
         let constant_idx = Self::read_u8(ip) as usize;
         let function = unsafe { (*self.frame.closure).function };
-        *unsafe { (&(*function).chunk.constants).get_unchecked(constant_idx) }
+        *unsafe { (*function).chunk.constants.get_unchecked(constant_idx) }
     }
 
     /// Pushes a [`Value`] to the stack.

src/vm/vecmap.rs

@@ -71,6 +71,10 @@ impl<K: Eq + Hash, V, S: BuildHasher + Default> VecMap<K, V, S> {
             Self::Map(map) => map.len(),
         }
     }
+
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
 }
 
 pub enum VecMapIter<'a, K, V> {