Skip to content

Fix state of reverse iterator after ZWJ #17

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
merged 2 commits into from
Feb 6, 2017
Merged

Fix state of reverse iterator after ZWJ #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e53004
Use Iterator::eq in tests
mbrubeck Feb 6, 2017
3d593f8
Fix state of reverse iterator after ZWJ
mbrubeck Feb 6, 2017
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
4 changes: 2 additions & 2 deletions src/grapheme.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,8 @@ impl<'a> DoubleEndedIterator for Graphemes<'a> {
take_curr = false;
break;
},
Zwj => match cat { // char to right is (GAZ|EBG)
gr::GC_ZWJ => continue, // rule GB11: ZWJ x (GAZ|EBG)
Zwj => match cat { // char to right is (GAZ|EBG)
gr::GC_ZWJ => FindExtend, // rule GB11: ZWJ x (GAZ|EBG)
_ => {
take_curr = false;
break;
Expand Down
40 changes: 15 additions & 25 deletions src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,40 +30,30 @@ fn test_graphemes() {
&["\u{600}", "\u{20}", "\u{20}"]),
];

for &(s, g) in TEST_SAME {
pub const EXTRA_SAME: &'static [(&'static str, &'static [&'static str])] = &[
// family emoji (more than two emoji joined by ZWJ)
("\u{1f468}\u{200d}\u{1f467}\u{200d}\u{1f466}",
&["\u{1f468}\u{200d}\u{1f467}\u{200d}\u{1f466}"]),
];

for &(s, g) in TEST_SAME.iter().chain(EXTRA_SAME) {
// test forward iterator
assert!(UnicodeSegmentation::graphemes(s, true)
.zip(g.iter().cloned())
.all(|(a,b)| a == b));
assert!(UnicodeSegmentation::graphemes(s, false)
.zip(g.iter().cloned())
.all(|(a,b)| a == b));
assert!(UnicodeSegmentation::graphemes(s, true).eq(g.iter().cloned()));
assert!(UnicodeSegmentation::graphemes(s, false).eq(g.iter().cloned()));

// test reverse iterator
assert!(UnicodeSegmentation::graphemes(s, true).rev()
.zip(g.iter().rev().cloned())
.all(|(a,b)| a == b));
assert!(UnicodeSegmentation::graphemes(s, false).rev()
.zip(g.iter().rev().cloned())
.all(|(a,b)| a == b));
assert!(UnicodeSegmentation::graphemes(s, true).rev().eq(g.iter().rev().cloned()));
assert!(UnicodeSegmentation::graphemes(s, false).rev().eq(g.iter().rev().cloned()));
}

for &(s, gt, gf) in TEST_DIFF.iter().chain(EXTRA_DIFF) {
// test forward iterator
assert!(UnicodeSegmentation::graphemes(s, true)
.zip(gt.iter().cloned())
.all(|(a,b)| a == b), "{:?}", s);
assert!(UnicodeSegmentation::graphemes(s, false)
.zip(gf.iter().cloned())
.all(|(a,b)| a == b));
assert!(UnicodeSegmentation::graphemes(s, true).eq(gt.iter().cloned()));
assert!(UnicodeSegmentation::graphemes(s, false).eq(gf.iter().cloned()));

// test reverse iterator
assert!(UnicodeSegmentation::graphemes(s, true).rev()
.zip(gt.iter().rev().cloned())
.all(|(a,b)| a == b));
assert!(UnicodeSegmentation::graphemes(s, false).rev()
.zip(gf.iter().rev().cloned())
.all(|(a,b)| a == b));
assert!(UnicodeSegmentation::graphemes(s, true).rev().eq(gt.iter().rev().cloned()));
assert!(UnicodeSegmentation::graphemes(s, false).rev().eq(gf.iter().rev().cloned()));
}

// test the indices iterators
Expand Down