types: Fixes librasn#146

Nicceboy · Aug 21, 2023 · b989bc4 · b989bc4
1 parent a7a00c7
commit b989bc4
Showing 1 changed file with 31 additions and 15 deletions.
diff --git a/src/types/strings/visible.rs b/src/types/strings/visible.rs
@@ -2,36 +2,52 @@ use super::*;
 
 use alloc::{borrow::ToOwned, boxed::Box, string::String, vec::Vec};
 
-/// An string which contains the characters defined in the ISO 646
-/// character set.
+/// A string which contains a subset of the ISO 646 character set.
+/// Type **should be** constructed by using `try_from` or `from` methods.
+///
+/// This type is restricted to allow only the graphically visible characters and space character (0x20),
+/// which is defined in X.680 (02/2021), Section 41, Table 8.
+///
+/// Should contain registration 6. set from ISO International Register of Coded Character Sets and SPACE character.
+/// Graphical restrictions (registration 6.) are defined freely and publicly in sister standard ITU-T T.50, section 6.4.
 #[derive(Debug, Default, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
+#[allow(clippy::module_name_repetitions)]
 pub struct VisibleString(Vec<u8>);
 
 impl VisibleString {
+    /// Create a new `VisibleString` from ISO 646 bytes (also known as US-ASCII/IA5/IRA5).
+    ///
+    /// # Errors
+    ///
+    /// Error of type `InvalidIso646Bytes` is raised if the restriction is not met.
     pub fn from_iso646_bytes(bytes: &[u8]) -> Result<Self, InvalidIso646Bytes> {
-        if !bytes.iter().all(|byte| byte & 0x80 == 0) {
-            Err(InvalidIso646Bytes)
-        } else {
+        if bytes
+            .iter()
+            .all(|byte| Self::CHARACTER_SET.contains(&u32::from(*byte)))
+        {
+            dbg!(&bytes);
             Ok(Self(bytes.to_owned()))
+        } else {
+            Err(InvalidIso646Bytes)
         }
     }
-
+    /// Converts the `VisibleString` into ISO 646 bytes (also known as US-ASCII/IA5/IRA5).
+    #[must_use]
     pub fn as_iso646_bytes(&self) -> &[u8] {
         &self.0
     }
 }
 
 impl StaticPermittedAlphabet for VisibleString {
+    /// Includes Space (0x20) and all graphically visible characters (0x21-0x7E).
     const CHARACTER_SET: &'static [u32] = &[
-        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
-        0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D,
-        0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C,
-        0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,
-        0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A,
-        0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
-        0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
-        0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-        0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F,
+        0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E,
+        0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D,
+        0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C,
+        0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B,
+        0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A,
+        0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
+        0x7A, 0x7B, 0x7C, 0x7D, 0x7E,
     ];
 
     fn chars(&self) -> Box<dyn Iterator<Item = u32> + '_> {