Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-09 22:49:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

cpython compatible "".__repr__

Browse Source 
Fixes #1390
This commit is contained in:
Timur
2019-10-05 01:17:17 +03:00
parent 311b53d275
commit 70fb3f69ef
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/snippets/strings.py
View File

@@ -311,3 +311,10 @@ assert index_str[0] == 'R'
assert index_str[-1] == 'n'
assert_raises(TypeError, lambda: index_str['a'])
assert chr(9).__repr__() == "'\\t'"
assert chr(99).__repr__() == "'c'"
assert chr(999).__repr__() == "'ϧ'"
assert chr(9999).__repr__() == "'✏'"
assert chr(99999).__repr__() == "'𘚟'"
assert chr(999999).__repr__() == "'\\U000f423f'"

34
vm/src/obj/objstr.rs
View File

@@ -318,16 +318,36 @@ impl PyString {
formatted.push('\\');
formatted.push(c);
} else if c == '\n' {
formatted.push('\\');
formatted.push('n');
formatted.push_str("\\n")
} else if c == '\t' {
formatted.push('\\');
formatted.push('t');
formatted.push_str("\\t");
} else if c == '\r' {
formatted.push('\\');
formatted.push('r');
} else {
formatted.push_str("\\r");
} else if c < ' ' || c as u32 == 0x7F {
formatted.push_str(&format!("\\x{:02x}", c as u32));
} else if c.is_ascii() {
formatted.push(c);
} else if c.is_other() || c.is_separator() {
// According to python following categories aren't printable:
// * Cc (Other, Control)
// * Cf (Other, Format)
// * Cs (Other, Surrogate)
// * Co (Other, Private Use)
// * Cn (Other, Not Assigned)
// * Zl Separator, Line ('\u2028', LINE SEPARATOR)
// * Zp Separator, Paragraph ('\u2029', PARAGRAPH SEPARATOR)
// * Zs (Separator, Space) other than ASCII space('\x20').
let code = c as u32;
let escaped = if code < 0xff {
format!("\\U{:02x}", code)
} else if code < 0xffff {
format!("\\U{:04x}", code)
} else {
format!("\\U{:08x}", code)
};
formatted.push_str(&escaped);
} else {
formatted.push(c)
}
}
formatted.push(quote_char);