Skip to content

builtin: Fix hex format of ascii #1188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
windelbouwman merged 3 commits into from
Jul 31, 2019
Merged

builtin: Fix hex format of ascii #1188

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ee80a3
builtin: Fix hex format of ascii
corona10 Jul 28, 2019
5bfa4ce
ascii: Improve test
corona10 Jul 31, 2019
fafeed1
ascii: Apply codereview
corona10 Jul 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion tests/snippets/builtin_ascii.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
assert ascii('hello world') == "'hello world'"
assert ascii('안녕 세상') == "'\\uc548\\ub155 \\uc138\\uc0c1'"
assert ascii('안녕 RustPython') == "'\\uc548\\ub155 RustPython'"
assert ascii(5) == '5'
assert ascii(5) == '5'
assert ascii(chr(0x10001)) == "'\\U00010001'"
assert ascii(chr(0x9999)) == "'\\u9999'"
assert ascii(chr(0x0A)) == "'\\n'"
9 changes: 6 additions & 3 deletions vm/src/builtins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,13 @@ fn builtin_ascii(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<String> {
let mut ascii = String::new();
for c in repr.value.chars() {
if c.is_ascii() {
ascii.push(c)
ascii.push(c);
Comment thread
corona10 marked this conversation as resolved.
Outdated
} else if (c as i64) < 0x10000 {
Comment thread
corona10 marked this conversation as resolved.
Outdated
let hex = format!("\\u{:04x}", c as i64);
ascii.push_str(&hex);
} else {
let hex = format!("\\u{:x}", c as i64);
ascii.push_str(&hex)
let hex = format!("\\U{:08x}", c as i64);
ascii.push_str(&hex);
}
}
Ok(ascii)
Expand Down