mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

Fix str.expandtab() for newlines

Browse Source
This commit is contained in:
Jeong YunWon
2020-03-11 04:52:35 +09:00
parent 199c75bbb4
commit 6cb8b665a2
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/string_tests.py
View File

@@ -327,8 +327,6 @@ class BaseTest:
self.checkequal('HELLO', 'HELLO', 'upper')
self.checkraises(TypeError, 'hello', 'upper', 42)
# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_expandtabs(self):
self.checkequal('abc\rab def\ng hi', 'abc\rab\tdef\ng\thi',
'expandtabs')

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

@@ -184,6 +184,12 @@ struct SplitLineArgs {
keepends: OptionalArg<bool>,
}
#[derive(FromArgs)]
struct ExpandtabsArgs {
#[pyarg(positional_or_keyword, optional = true)]
tabsize: OptionalArg<usize>,
}
#[pyimpl(flags(BASETYPE))]
impl PyString {
#[pyslot]
@@ -1079,21 +1085,28 @@ impl PyString {
}
#[pymethod]
fn expandtabs(&self, tab_stop: OptionalArg<usize>) -> String {
let tab_stop = tab_stop.into_option().unwrap_or(8 as usize);
fn expandtabs(&self, args: ExpandtabsArgs) -> String {
let tab_stop = args.tabsize.unwrap_or(8);
let mut expanded_str = String::with_capacity(self.value.len());
let mut tab_size = tab_stop;
let mut col_count = 0 as usize;
for ch in self.value.chars() {
// 0x0009 is tab
if ch == 0x0009 as char {
let num_spaces = tab_size - col_count;
col_count += num_spaces;
let expand = " ".repeat(num_spaces);
expanded_str.push_str(&expand);
} else {
expanded_str.push(ch);
col_count += 1;
match ch {
'\t' => {
let num_spaces = tab_size - col_count;
col_count += num_spaces;
let expand = " ".repeat(num_spaces);
expanded_str.push_str(&expand);
}
'\r' | '\n' => {
expanded_str.push(ch);
col_count = 0;
tab_size = 0;
}
_ => {
expanded_str.push(ch);
col_count += 1;
}
}
if col_count >= tab_size {
tab_size += tab_stop;