Merge pull request #642 from rben01/box-runtime-error

Boxed some `RuntimeError`s

numbat/examples/inspect.rs

@@ -103,16 +103,13 @@ fn inspect_functions_in_module(ctx: &Context, prelude_ctx: &Context, module: Str
                 if let Ok((statements, results)) =
                     example_ctx.interpret(&example_code, CodeSource::Internal)
                 {
-                    let code = extra_import + &example_code;
-
-                    //Format the example input
-                    let example_input = format!("{}", code);
+                    let example_input = extra_import + &example_code;
 
                     //Encode the example url
                     let example_url = format!(
                         "https://numbat.dev/?q={}",
                         percent_encoding::utf8_percent_encode(
-                            &code,
+                            &example_input,
                             percent_encoding::NON_ALPHANUMERIC
                         )
                     );

numbat/src/ffi/datetime.rs

@@ -85,9 +85,9 @@ fn calendar_add(
     let n = quantity_arg!(args).unsafe_value().to_f64();
 
     if n.fract() != 0.0 {
-        return Err(RuntimeError::UserError(format!(
+        return Err(Box::new(RuntimeError::UserError(format!(
             "calendar_add: requires an integer number of {unit_name}s"
-        )));
+        ))));
     }
 
     let n_i64 = n.to_i64().ok_or_else(|| {

numbat/src/ffi/functions.rs

@@ -115,9 +115,9 @@ pub(crate) fn functions() -> &'static HashMap<String, ForeignFunction> {
 }
 
 fn error(mut args: Args) -> Result<Value> {
-    Err(RuntimeError::UserError(
+    Err(Box::new(RuntimeError::UserError(
         arg!(args).unsafe_as_string().to_string(),
-    ))
+    )))
 }
 
 fn value_of(mut args: Args) -> Result<Value> {

numbat/src/ffi/lists.rs

@@ -16,7 +16,7 @@ pub fn head(mut args: Args) -> Result<Value> {
     if let Some(first) = list.head() {
         Ok(first)
     } else {
-        Err(RuntimeError::EmptyList)
+        Err(Box::new(RuntimeError::EmptyList))
     }
 }
 

numbat/src/ffi/lookup.rs

@@ -142,6 +142,8 @@ pub fn _get_chemical_element_data_raw(mut args: Args) -> Result<Value> {
             ],
         ))
     } else {
-        Err(RuntimeError::ChemicalElementNotFound(pattern.to_string()))
+        Err(Box::new(RuntimeError::ChemicalElementNotFound(
+            pattern.to_string(),
+        )))
     }
 }

numbat/src/ffi/mod.rs

@@ -20,7 +20,7 @@ type ControlFlow = std::ops::ControlFlow<RuntimeError>;
 
 pub(crate) type ArityRange = std::ops::RangeInclusive<usize>;
 
-type Result<T> = std::result::Result<T, RuntimeError>;
+type Result<T> = std::result::Result<T, Box<RuntimeError>>;
 
 pub(crate) type Args = VecDeque<Value>;
 

numbat/src/ffi/plot.rs

@@ -100,20 +100,20 @@ pub fn show(args: Args) -> Result<Value> {
     // Dynamic dispatch hack since we don't have bounded polymorphism.
     // And no real support for generics in the FFI.
     let Value::StructInstance(info, _) = args.front().unwrap() else {
-        return Err(RuntimeError::UserError(
+        return Err(Box::new(RuntimeError::UserError(
             "Unsupported argument to 'show'.".into(),
-        ));
+        )));
     };
 
     let plot = if info.name == "LinePlot" {
         line_plot(args)
     } else if info.name == "BarChart" {
         bar_chart(args)
     } else {
-        return Err(RuntimeError::UserError(format!(
+        return Err(Box::new(RuntimeError::UserError(format!(
             "Unsupported plot type: {}",
             info.name
-        )));
+        ))));
     };
 
     return_string!(owned = show_plot(plot))

numbat/src/ffi/procedures.rs

@@ -88,9 +88,9 @@ fn assert_eq(_: &mut ExecutionContext, mut args: Args, arg_spans: Vec<Span>) ->
         let rhs = arg!(args);
 
         let error = ControlFlow::Break(RuntimeError::AssertEq2Failed(AssertEq2Error {
-            span_lhs: span_lhs,
+            span_lhs,
             lhs: lhs.clone(),
-            span_rhs: span_rhs,
+            span_rhs,
             rhs: rhs.clone(),
         }));
 

numbat/src/ffi/strings.rs

@@ -40,7 +40,7 @@ pub fn ord(mut args: Args) -> Result<Value> {
     let input = string_arg!(args);
 
     if input.is_empty() {
-        return Err(RuntimeError::EmptyList);
+        return Err(Box::new(RuntimeError::EmptyList));
     }
 
     let output = input.chars().next().unwrap() as u32;

numbat/src/interpreter/mod.rs

@@ -19,6 +19,7 @@ use thiserror::Error;
 pub use crate::value::Value;
 
 #[derive(Debug, Clone, Error, PartialEq, Eq)]
+#[allow(clippy::large_enum_variant)]
 pub enum RuntimeError {
     #[error("Division by zero")]
     DivisionByZero,

numbat/src/list.rs

@@ -76,9 +76,9 @@ impl<T> NumbatList<T> {
 
     /// Return the tail of the list without the first element.
     /// Return an error if the list is empty.
-    pub fn tail(&mut self) -> Result<(), RuntimeError> {
+    pub fn tail(&mut self) -> Result<(), Box<RuntimeError>> {
         if self.is_empty() {
-            return Err(RuntimeError::EmptyList);
+            return Err(Box::new(RuntimeError::EmptyList));
         }
         if let Some(view) = &mut self.view {
             view.0 += 1;
@@ -239,7 +239,7 @@ mod test {
         assert!(list.is_empty());
         assert_eq!(alloc, Arc::as_ptr(&list.alloc));
 
-        assert_eq!(list.tail(), Err(RuntimeError::EmptyList));
+        assert_eq!(list.tail(), Err(Box::new(RuntimeError::EmptyList)));
     }
 
     #[test]