shellsim 0.1.12__tar.gz → 0.1.14__tar.gz

{shellsim-0.1.12 → shellsim-0.1.14}/Cargo.lock

@@ -330,7 +330,7 @@ dependencies = [
 
 [[package]]
 name = "shellsim"
-version = "0.1.12"
+version = "0.1.14"
 dependencies = [
  "base64",
  "crc32fast",

{shellsim-0.1.12 → shellsim-0.1.14}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shellsim"
-version = "0.1.12"
+version = "0.1.14"
 edition = "2021"
 description = "In-process BusyBox-like environment for RL rollouts and agent tests"
 license = "Apache-2.0"

{shellsim-0.1.12 → shellsim-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shellsim
-Version: 0.1.12
+Version: 0.1.14
 Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: MacOS :: MacOS X

{shellsim-0.1.12 → shellsim-0.1.14}/python/native/Cargo.lock

@@ -406,7 +406,7 @@ dependencies = [
 
 [[package]]
 name = "shellsim"
-version = "0.1.12"
+version = "0.1.14"
 dependencies = [
  "base64",
  "crc32fast",
@@ -427,7 +427,7 @@ dependencies = [
 
 [[package]]
 name = "shellsim-python-bindings"
-version = "0.1.12"
+version = "0.1.14"
 dependencies = [
  "pyo3",
  "serde",

{shellsim-0.1.12 → shellsim-0.1.14}/python/native/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "shellsim-python-bindings"
-version = "0.1.12"
+version = "0.1.14"
 edition = "2021"
 description = "Python bindings for shellsim"
 license = "Apache-2.0"

{shellsim-0.1.12 → shellsim-0.1.14}/src/python/protocol.rs

@@ -20,6 +20,25 @@ pub fn display(heap: &Heap, value: &Value) -> Result<String, String> {
     if let Some((kind, message)) = exception_parts(heap, value)? {
         return Ok(if message.is_empty() { kind } else { message });
     }
+    if let Some((_, args)) = user_exception_parts(heap, value)? {
+        return match args.as_slice() {
+            [] => Ok(String::new()),
+            [only] => {
+                if let Some(value) = string_value(heap, only)? {
+                    Ok(value)
+                } else {
+                    repr(heap, only)
+                }
+            }
+            _ => {
+                let values = args
+                    .iter()
+                    .map(|value| repr(heap, value))
+                    .collect::<Result<Vec<_>, _>>()?;
+                Ok(format!("({})", values.join(", ")))
+            }
+        };
+    }
     repr(heap, value)
 }
 
@@ -100,6 +119,41 @@ pub fn exception_parts(heap: &Heap, value: &Value) -> Result<Option<(String, Str
     })
 }
 
+fn user_exception_parts(
+    heap: &Heap,
+    value: &Value,
+) -> Result<Option<(String, Vec<Value>)>, String> {
+    let Some(id) = value.object_id() else {
+        return Ok(None);
+    };
+    let Object::Instance { class, .. } = heap.get(id)? else {
+        return Ok(None);
+    };
+    let Object::Class {
+        name,
+        exception_base,
+        ..
+    } = heap.get(*class)?
+    else {
+        return Ok(None);
+    };
+    if exception_base.is_none() {
+        return Ok(None);
+    }
+    let args = if let Some(symbol) = heap.symbol_id("args") {
+        heap.attribute_by_symbol(id, symbol)?
+            .and_then(|value| value.object_id())
+            .and_then(|args| match heap.get(args).ok()? {
+                Object::Tuple(values) => Some(values.clone()),
+                _ => None,
+            })
+            .unwrap_or_default()
+    } else {
+        Vec::new()
+    };
+    Ok(Some((name.clone(), args)))
+}
+
 fn bigint_value<'a>(heap: &'a Heap, value: &Value) -> Option<&'a BigInt> {
     let id = value.object_id()?;
     match heap.get(id).ok()? {
@@ -244,6 +298,15 @@ fn render(heap: &Heap, value: &Value, active: &mut BTreeSet<ObjectId>) -> Result
             Object::Instance { class, payload, .. } => match payload {
                 InstancePayload::Int(value) => value.to_string(),
                 InstancePayload::Object => match heap.get(*class)? {
+                    Object::Class {
+                        name,
+                        exception_base: Some(_),
+                        ..
+                    } => {
+                        let (_, args) = user_exception_parts(heap, value)?
+                            .ok_or("exception instance lost its native base")?;
+                        format!("{name}({})", render_values(heap, &args, active)?.join(", "))
+                    }
                     Object::Class { name, .. } => format!("<{name} object>"),
                     _ => return Err("instance has an invalid class".into()),
                 },