Fix unctrl_lower casemapping

murarth · murarth · commit a22c25cf39ba · 2018-09-04T12:31:45.000-07:00
* `unctrl_lower` no longer transforms symbol characters; e.g. `]` to `}`
diff --git a/src/chars.rs b/src/chars.rs
@@ -123,16 +123,14 @@ pub fn unctrl(c: char) -> char {
     ((c as u8) | CTRL_BIT) as char
 }
 
-const CASE_BIT: u8 = 0x20;
-
 /// Returns the lowercase character corresponding to the given control character.
 pub fn unctrl_lower(c: char) -> char {
-    ((c as u8) | CTRL_BIT | CASE_BIT) as char
+    unctrl(c).to_ascii_lowercase()
 }
 
 #[cfg(test)]
 mod test {
-    use super::{ctrl, unctrl, escape_sequence, parse_char_name};
+    use super::{ctrl, unctrl, unctrl_lower, escape_sequence, parse_char_name};
 
     #[test]
     fn test_ctrl() {
@@ -147,6 +145,12 @@ mod test {
         assert_eq!(unctrl('\r'), 'M');
     }
 
+    #[test]
+    fn test_unctrl() {
+        assert_eq!(unctrl('\x1d'), ']');
+        assert_eq!(unctrl_lower('\x1d'), ']');
+    }
+
     #[test]
     fn test_escape() {
         assert_eq!(escape_sequence("\x1b\x7f"), r"\e\C-?");
