Skip to content

Implement str iterator support #1171

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
coolreader18 merged 4 commits into from
Jul 24, 2019
Merged

Implement str iterator support #1171

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db8eb7b
Implement str.__iter__ and str.__next__
mpajkowski Jul 23, 2019
6aeec34
Add tests for str.__iter__ and str.__next__
mpajkowski Jul 23, 2019
0e033ad
Add str.__reversed__ method
mpajkowski Jul 24, 2019
1f59532
Silent clippy with allowing range_plus_one
mpajkowski Jul 24, 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
Prev Previous commit
Silent clippy with allowing range_plus_one 
PySliceableSequence trait methods require Range<usize>
as arguments
  • Loading branch information
@mpajkowski
mpajkowski committed Jul 24, 2019
commit 1f59532f8221e13f8df164814fc45b1917af7b28
8 changes: 7 additions & 1 deletion vm/src/obj/objstr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,11 @@ impl PyStringIterator {
let pos = self.position.get();

if pos < self.string.value.chars().count() {
let value = self.string.value.do_slice(pos..pos + 1);
self.position.set(self.position.get() + 1);

#[allow(clippy::range_plus_one)]
let value = self.string.value.do_slice(pos..pos + 1);

value.into_pyobject(vm)
} else {
Err(objiter::new_stop_iteration(vm))
Expand Down Expand Up @@ -145,7 +148,10 @@ impl PyStringReverseIterator {
fn next(&self, vm: &VirtualMachine) -> PyResult {
if self.position.get() > 0 {
let position: usize = self.position.get() - 1;

#[allow(clippy::range_plus_one)]
let value = self.string.value.do_slice(position..position + 1);

self.position.set(position);
value.into_pyobject(vm)
} else {
Expand Down