Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Split graphemes and grapheme_indices into two methods#31

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.

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

Already on GitHub?Sign in to your account

Open
LunaBorowska wants to merge1 commit intounicode-rs:master
base:master
Choose a base branch
Loading
fromLunaBorowska:separate-grapheme-methods
Open
Show file tree
Hide file tree
Changes fromall commits
Commits
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
63 changes: 63 additions & 0 deletionssrc/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,44 @@ pub trait UnicodeSegmentation {
/// ```
fn graphemes<'a>(&'a self, is_extended: bool) -> Graphemes<'a>;

/// Returns an iterator over the [legacy grapheme clusters][graphemes] of `self`.
///
/// [graphemes]: http://www.unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries
///
/// [UAX#29](http://www.unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries)
/// recommends extended grapheme cluster boundaries for general processing.
#[inline]
fn legacy_graphemes<'a>(&'a self) -> Graphemes<'a> {
self.graphemes(false)
}

/// Returns an iterator over the [extended grapheme clusters][graphemes] of `self`.
///
/// [graphemes]: http://www.unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries
///
/// [UAX#29](http://www.unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries)
/// recommends extended grapheme cluster boundaries for general processing.
///
/// # Examples
///
/// ```
/// # use self::unicode_segmentation::UnicodeSegmentation;
/// let gr1 = UnicodeSegmentation::extended_graphemes("a\u{310}e\u{301}o\u{308}\u{332}")
/// .collect::<Vec<&str>>();
/// let b: &[_] = &["a\u{310}", "e\u{301}", "o\u{308}\u{332}"];
///
/// assert_eq!(&gr1[..], b);
///
/// let gr2 = UnicodeSegmentation::extended_graphemes("a\r\nb🇷🇺🇸🇹").collect::<Vec<&str>>();
/// let b: &[_] = &["a", "\r\n", "b", "🇷🇺", "🇸🇹"];
///
/// assert_eq!(&gr2[..], b);
/// ```
#[inline]
fn extended_graphemes<'a>(&'a self) -> Graphemes<'a> {
self.graphemes(true)
}

/// Returns an iterator over the grapheme clusters of `self` and their
/// byte offsets. See `graphemes()` for more information.
///
Expand All@@ -122,6 +160,31 @@ pub trait UnicodeSegmentation {
/// ```
fn grapheme_indices<'a>(&'a self, is_extended: bool) -> GraphemeIndices<'a>;

/// Returns an iterator over the legacy grapheme clusters of `self` and their
/// byte offsets. See `legacy_graphemes()` for more information.
#[inline]
fn legacy_grapheme_indices<'a>(&'a self) -> GraphemeIndices<'a> {
self.grapheme_indices(false)
}

/// Returns an iterator over the grapheme clusters of `self` and their
/// byte offsets. See `graphemes()` for more information.
///
/// # Examples
///
/// ```
/// # use self::unicode_segmentation::UnicodeSegmentation;
/// let gr_inds = UnicodeSegmentation::extended_grapheme_indices("a̐éö̲\r\n")
/// .collect::<Vec<(usize, &str)>>();
/// let b: &[_] = &[(0, "a̐"), (3, "é"), (6, "ö̲"), (11, "\r\n")];
///
/// assert_eq!(&gr_inds[..], b);
/// ```
#[inline]
fn extended_grapheme_indices<'a>(&'a self) -> GraphemeIndices<'a> {
self.grapheme_indices(true)
}

/// Returns an iterator over the words of `self`, separated on
/// [UAX#29 word boundaries](http://www.unicode.org/reports/tr29/#Word_Boundaries).
///
Expand Down
8 changes: 8 additions & 0 deletionssrc/test.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,20 +44,28 @@ fn test_graphemes() {
// test forward iterator
assert!(UnicodeSegmentation::graphemes(s, true).eq(g.iter().cloned()));
assert!(UnicodeSegmentation::graphemes(s, false).eq(g.iter().cloned()));
assert!(UnicodeSegmentation::extended_graphemes(s).eq(g.iter().cloned()));
assert!(UnicodeSegmentation::legacy_graphemes(s).eq(g.iter().cloned()));

// test reverse iterator
assert!(UnicodeSegmentation::graphemes(s, true).rev().eq(g.iter().rev().cloned()));
assert!(UnicodeSegmentation::graphemes(s, false).rev().eq(g.iter().rev().cloned()));
assert!(UnicodeSegmentation::extended_graphemes(s).rev().eq(g.iter().rev().cloned()));
assert!(UnicodeSegmentation::legacy_graphemes(s).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).eq(gt.iter().cloned()));
assert!(UnicodeSegmentation::graphemes(s, false).eq(gf.iter().cloned()));
assert!(UnicodeSegmentation::extended_graphemes(s).eq(gt.iter().cloned()));
assert!(UnicodeSegmentation::legacy_graphemes(s).eq(gf.iter().cloned()));

// test reverse iterator
assert!(UnicodeSegmentation::graphemes(s, true).rev().eq(gt.iter().rev().cloned()));
assert!(UnicodeSegmentation::graphemes(s, false).rev().eq(gf.iter().rev().cloned()));
assert!(UnicodeSegmentation::extended_graphemes(s).rev().eq(gt.iter().rev().cloned()));
assert!(UnicodeSegmentation::legacy_graphemes(s).rev().eq(gf.iter().rev().cloned()));
}

// test the indices iterators
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp