Feat:recovereable error functions in scope src/cli

src/cli/mod.rs

@@ -347,7 +347,7 @@ impl ReplCli {
         // Initializes CLI config with CLI arguments as overrides
         let config = cli_config(self.config.as_ref(), Some(&cli_settings));
 
-        create_lurk_dirs().unwrap();
+        create_lurk_dirs()?;
 
         let rc = config.rc;
         let limit = config.limit;

src/cli/repl/meta_cmd.rs

@@ -531,14 +531,14 @@ where
         }
         let open = repl.store.intern_lurk_symbol("open");
         let open_expr = repl.store.list(vec![open, repl.store.num(hash)]);
-        let (args_vec, _) = repl
-            .store
-            .fetch_list(&args)
-            .expect("data must have been interned");
-        let mut expr_vec = Vec::with_capacity(args_vec.len() + 1);
-        expr_vec.push(open_expr);
-        expr_vec.extend(args_vec);
-        repl.handle_non_meta(repl.store.list(expr_vec))
+        if let Some((args_vec, _)) = repl.store.fetch_list(&args) {
+            let mut expr_vec = Vec::with_capacity(args_vec.len() + 1);
+            expr_vec.push(open_expr);
+            expr_vec.extend(args_vec);
+            repl.handle_non_meta(repl.store.list(expr_vec))
+        } else {
+            Err(anyhow!("Data must have been interned"))
+        }
     }
 
     const CALL: MetaCmd<F, C> = MetaCmd {

src/cli/repl/mod.rs

@@ -469,13 +469,15 @@ where
             self.limit,
         )?;
         let iterations = frames.len();
-        let output = frames
-            .last()
-            .expect("evaluation should return at least one frame")
-            .output
-            .clone();
-        self.evaluation = Some(Evaluation { frames, iterations });
-        Ok((output, iterations))
+
+        if let Some(last_frames) = frames.last() {
+            let output = last_frames.output.clone();
+            self.evaluation = Some(Evaluation { frames, iterations });
+            Ok((output, iterations))
+        } else {
+            // TODO: better error decs
+            Err(anyhow!("Frames is empty"))
+        }
     }
 
     fn get_comm_hash(&mut self, args: &Ptr) -> Result<&F> {
@@ -584,17 +586,19 @@ where
 
         let mut input = parser::Span::new(&input);
         loop {
-            let file_dir = file_path.parent().unwrap();
-            match self.handle_form(input, file_dir, demo) {
-                Ok(new_input) => input = new_input,
-                Err(e) => {
-                    if let Some(parser::Error::NoInput) = e.downcast_ref::<parser::Error>() {
-                        // It's ok, it just means we've hit the EOF
-                        return Ok(());
-                    } else {
+            if let Some(file_dir) = file_path.parent() {
+                match self.handle_form(input, file_dir, demo) {
+                    Ok(new_input) => input = new_input,
+                    Err(e) => {
+                        if let Some(parser::Error::NoInput) = e.downcast_ref::<parser::Error>() {
+                            // It's ok, it just means we've hit the EOF
+                            return Ok(());
+                        }
                         return Err(e);
                     }
                 }
+            } else {
+                return Err(anyhow!("Can't load parent of {}", file_path));
             }
         }
     }