Merge pull request #99 from AluVM/v0.11

Release version 0.11 beta

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "aluvm"
 description = "Functional registry-based RISC virtual machine"
-version = "0.11.0-beta.1"
+version = "0.11.0-beta.2"
 authors = ["Dr Maxim Orlovsky <[email protected]>"]
 repository = "https://github.com/aluvm/rust-aluvm"
 homepage = "https://aluvm.org"

src/data/byte_str.rs

@@ -216,7 +216,32 @@ impl Display for ByteStr {
             // 4)..].to_hex())
         } else if let Ok(s) = String::from_utf8(vec) {
             f.write_str("\"")?;
-            f.write_str(&s)?;
+            let mut ctl = false;
+            for c in s.chars() {
+                let v = c as u32;
+                if c.is_control() || v <= 0x21 || v >= 0x7F {
+                    if !ctl {
+                        f.write_str("\x1B[2;3m<\x1B[1m")?;
+                        ctl = true;
+                    }
+                    if v <= 0xFF {
+                        write!(f, "{v:02X}")?;
+                    } else if v <= 0xFFFF {
+                        write!(f, "{v:04X}")?;
+                    } else {
+                        write!(f, "{v:08X}")?;
+                    }
+                } else {
+                    if ctl {
+                        f.write_str("\x1B[2m>\x1B[1;23m")?;
+                        ctl = false;
+                    }
+                    f.write_char(c)?;
+                }
+            }
+            if ctl {
+                f.write_str("\x1B[2m>\x1B[1;23m")?;
+            }
             f.write_str("\"")
         } else {
             f.write_str(&self.as_ref().to_hex())

src/data/mod.rs

@@ -34,3 +34,34 @@ pub use byte_str::ByteStr;
 pub use number::{
     FloatLayout, IntLayout, Layout, LiteralParseError, MaybeNumber, Number, NumberLayout, Step,
 };
+
+/// Value which can be extracted from any register.
+#[allow(clippy::large_enum_variant)]
+#[derive(Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug, From)]
+pub enum RegValue {
+    /// Value extracted from numerical registers
+    #[from]
+    #[from(Number)]
+    Number(MaybeNumber),
+
+    /// Value extracted from string register
+    #[from]
+    #[from(ByteStr)]
+    String(Option<ByteStr>),
+}
+
+mod display {
+    use core::fmt::{self, Display, Formatter};
+
+    use super::*;
+
+    impl Display for RegValue {
+        fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+            match self {
+                RegValue::Number(n) => Display::fmt(n, f),
+                RegValue::String(Some(s)) => Display::fmt(s, f),
+                RegValue::String(None) => f.write_str("~"),
+            }
+        }
+    }
+}