Add VecDisplay wrapper to display Vec values

Author: vsbogd

lib/src/common/collections.rs

@@ -1,4 +1,5 @@
 use std::fmt::Display;
+use itertools::Itertools;
 
 pub trait Equality<T> {
     fn eq(a: &T, b: &T) -> bool;
@@ -288,6 +289,14 @@ impl<'a, T> Into<&'a [T]> for &'a CowArray<T> {
     }
 }
 
+pub struct VecDisplay<'a, T: 'a + Display>(pub &'a Vec<T>);
+
+impl<'a, T: 'a + Display> Display for VecDisplay<'a, T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "[{}]", self.0.iter().format(", "))
+    }
+}
+
 
 #[cfg(test)]
 mod test {

lib/src/metta/runner/stdlib/debug.rs

@@ -2,18 +2,16 @@ use crate::*;
 use crate::metta::*;
 use crate::metta::text::Tokenizer;
 use crate::space::*;
-use crate::common::collections::{Equality, DefaultEquality};
+use crate::common::collections::{VecDisplay, Equality, DefaultEquality};
 use crate::common::assert::compare_vec_no_order;
 use crate::atom::matcher::atoms_are_equivalent;
 use crate::metta::runner::stdlib::{grounded_op, atom_to_string, regex, interpret_no_error, unit_result};
 use crate::metta::runner::bool::*;
 
 use std::convert::TryInto;
-use itertools::Itertools;
-
 
 fn assert_results_equal(actual: &Vec<Atom>, expected: &Vec<Atom>) -> Result<Vec<Atom>, ExecError> {
-    let report = format!("\nExpected: [{}]\nGot: [{}]", expected.iter().format(", "), actual.iter().format(", "));
+    let report = format!("\nExpected: {}\nGot: {}", VecDisplay(expected), VecDisplay(actual));
     match compare_vec_no_order(actual.iter(), expected.iter(), DefaultEquality{}).as_display() {
         None => unit_result(),
         Some(diff) => Err(ExecError::Runtime(format!("{}\n{}", report, diff)))
@@ -115,7 +113,7 @@ impl Equality<&Atom> for AlphaEquality {
 }
 
 fn assert_alpha_equal(actual: &Vec<Atom>, expected: &Vec<Atom>) -> Result<Vec<Atom>, ExecError> {
-    let report = format!("\nExpected: [{}]\nGot: [{}]", expected.iter().format(", "), actual.iter().format(", "));
+    let report = format!("\nExpected: {}\nGot: {}", VecDisplay(expected), VecDisplay(actual));
     let res = compare_vec_no_order(actual.iter(), expected.iter(), AlphaEquality{});
     match res.as_display() {
         None => unit_result(),

repl/Cargo.toml

@@ -14,7 +14,6 @@ signal-hook = "0.3.17"
 pyo3 = { version = "0.19.2", features = ["auto-initialize"], optional = true }
 pep440_rs = { version = "0.3.11", optional = true }
 hyperon = { workspace = true, optional = true } #TODO: We can only link Hyperon directly or through Python, but not both at the same time.  The right fix is to allow HyperonPy to be built within Hyperon, See https://github.com/trueagi-io/hyperon-experimental/issues/283
-itertools = "0.13.0"
 
 [[bin]]
 name = "metta-repl"

repl/src/metta_shim.rs

@@ -37,8 +37,8 @@ pub mod metta_interface_mod {
     use pep440_rs::{parse_version_specifiers, Version};
     use pyo3::prelude::*;
     use pyo3::types::{PyTuple, PyString, PyBool, PyList, PyDict};
+    use hyperon::common::collections::VecDisplay;
     use super::{strip_quotes, exec_state_prepare, exec_state_should_break};
-    use itertools::Itertools;
 
     /// Load the hyperon module, and get the "__version__" attribute
     pub fn get_hyperonpy_version() -> Result<String, String> {
@@ -167,7 +167,7 @@ pub mod metta_interface_mod {
             Python::with_gil(|py| -> PyResult<()> {
                 for result_vec in self.result.iter() {
                     let result_vec: Vec<&PyAny> = result_vec.iter().map(|atom| atom.as_ref(py)).collect();
-                    println!("[{}]", result_vec.iter().format(", "));
+                    println!("{}", VecDisplay(&result_vec));
                 }
                 Ok(())
             }).unwrap()
@@ -319,8 +319,8 @@ pub mod metta_interface_mod {
     use hyperon::ExpressionAtom;
     use hyperon::Atom;
     use hyperon::metta::runner::{Metta, RunnerState, Environment, EnvBuilder};
+    use hyperon::common::collections::VecDisplay;
     use super::{strip_quotes, exec_state_prepare, exec_state_should_break};
-    use itertools::Itertools;
 
     pub use hyperon::metta::text::SyntaxNodeType as SyntaxNodeType;
 
@@ -420,7 +420,7 @@ pub mod metta_interface_mod {
 
         pub fn print_result(&self) {
             for result in self.result.iter() {
-                println!("[{}]", result.iter().format(", "));
+                println!("{}", VecDisplay(result));
             }
         }