Add libunicode; move unicode functions from core
- created new crate, libunicode, below libstd
- split Char trait into Char (libcore) and UnicodeChar (libunicode)
- Unicode-aware functions now live in libunicode
- is_alphabetic, is_XID_start, is_XID_continue, is_lowercase,
is_uppercase, is_whitespace, is_alphanumeric, is_control,
is_digit, to_uppercase, to_lowercase
- added width method in UnicodeChar trait
- determines printed width of character in columns, or None if it is
a non-NULL control character
- takes a boolean argument indicating whether the present context is
CJK or not (characters with 'A'mbiguous widths are double-wide in
CJK contexts, single-wide otherwise)
- split StrSlice into StrSlice (libcore) and UnicodeStrSlice
(libunicode)
- functionality formerly in StrSlice that relied upon Unicode
functionality from Char is now in UnicodeStrSlice
- words, is_whitespace, is_alphanumeric, trim, trim_left, trim_right
- also moved Words type alias into libunicode because words method is
in UnicodeStrSlice
- unified Unicode tables from libcollections, libcore, and libregex into
libunicode
- updated unicode.py in src/etc to generate aforementioned tables
- generated new tables based on latest Unicode data
- added UnicodeChar and UnicodeStrSlice traits to prelude
- libunicode is now the collection point for the std::char module,
combining the libunicode functionality with the Char functionality
from libcore
- thus, moved doc comment for char from core::char to unicode::char
- libcollections remains the collection point for std::str
The Unicode-aware functions that previously lived in the Char and
StrSlice traits are no longer available to programs that only use
libcore. To regain use of these methods, include the libunicode crate
and use the UnicodeChar and/or UnicodeStrSlice traits:
extern crate unicode;
use unicode::UnicodeChar;
use unicode::UnicodeStrSlice;
use unicode::Words; // if you want to use the words() method
NOTE: this does *not* impact programs that use libstd, since UnicodeChar
and UnicodeStrSlice have been added to the prelude.
closes #15224
[breaking-change]
2014-06-30 16:04:10 -05:00
|
|
|
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
|
|
|
/*!
|
|
|
|
Functions for computing canonical and compatible decompositions
|
|
|
|
for Unicode characters.
|
|
|
|
*/
|
|
|
|
|
|
|
|
use core::option::{Option, Some, None};
|
|
|
|
use core::slice::ImmutableVector;
|
|
|
|
use tables::normalization::{canonical_table, compatibility_table};
|
|
|
|
|
|
|
|
fn bsearch_table(c: char, r: &'static [(char, &'static [char])]) -> Option<&'static [char]> {
|
|
|
|
use core::cmp::{Equal, Less, Greater};
|
|
|
|
match r.bsearch(|&(val, _)| {
|
|
|
|
if c == val { Equal }
|
|
|
|
else if val < c { Less }
|
|
|
|
else { Greater }
|
|
|
|
}) {
|
|
|
|
Some(idx) => {
|
|
|
|
let (_, result) = r[idx];
|
|
|
|
Some(result)
|
|
|
|
}
|
|
|
|
None => None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Compute canonical Unicode decomposition for character
|
|
|
|
pub fn decompose_canonical(c: char, i: |char|) { d(c, i, false); }
|
|
|
|
|
|
|
|
/// Compute canonical or compatible Unicode decomposition for character
|
|
|
|
pub fn decompose_compatible(c: char, i: |char|) { d(c, i, true); }
|
|
|
|
|
|
|
|
fn d(c: char, i: |char|, k: bool) {
|
2014-07-21 22:54:28 -05:00
|
|
|
#[cfg(stage0)]
|
Add libunicode; move unicode functions from core
- created new crate, libunicode, below libstd
- split Char trait into Char (libcore) and UnicodeChar (libunicode)
- Unicode-aware functions now live in libunicode
- is_alphabetic, is_XID_start, is_XID_continue, is_lowercase,
is_uppercase, is_whitespace, is_alphanumeric, is_control,
is_digit, to_uppercase, to_lowercase
- added width method in UnicodeChar trait
- determines printed width of character in columns, or None if it is
a non-NULL control character
- takes a boolean argument indicating whether the present context is
CJK or not (characters with 'A'mbiguous widths are double-wide in
CJK contexts, single-wide otherwise)
- split StrSlice into StrSlice (libcore) and UnicodeStrSlice
(libunicode)
- functionality formerly in StrSlice that relied upon Unicode
functionality from Char is now in UnicodeStrSlice
- words, is_whitespace, is_alphanumeric, trim, trim_left, trim_right
- also moved Words type alias into libunicode because words method is
in UnicodeStrSlice
- unified Unicode tables from libcollections, libcore, and libregex into
libunicode
- updated unicode.py in src/etc to generate aforementioned tables
- generated new tables based on latest Unicode data
- added UnicodeChar and UnicodeStrSlice traits to prelude
- libunicode is now the collection point for the std::char module,
combining the libunicode functionality with the Char functionality
from libcore
- thus, moved doc comment for char from core::char to unicode::char
- libcollections remains the collection point for std::str
The Unicode-aware functions that previously lived in the Char and
StrSlice traits are no longer available to programs that only use
libcore. To regain use of these methods, include the libunicode crate
and use the UnicodeChar and/or UnicodeStrSlice traits:
extern crate unicode;
use unicode::UnicodeChar;
use unicode::UnicodeStrSlice;
use unicode::Words; // if you want to use the words() method
NOTE: this does *not* impact programs that use libstd, since UnicodeChar
and UnicodeStrSlice have been added to the prelude.
closes #15224
[breaking-change]
2014-06-30 16:04:10 -05:00
|
|
|
use core::iter::Iterator;
|
|
|
|
|
|
|
|
// 7-bit ASCII never decomposes
|
|
|
|
if c <= '\x7f' { i(c); return; }
|
|
|
|
|
|
|
|
// Perform decomposition for Hangul
|
|
|
|
if (c as u32) >= S_BASE && (c as u32) < (S_BASE + S_COUNT) {
|
|
|
|
decompose_hangul(c, i);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// First check the canonical decompositions
|
|
|
|
match bsearch_table(c, canonical_table) {
|
|
|
|
Some(canon) => {
|
|
|
|
for x in canon.iter() {
|
|
|
|
d(*x, |b| i(b), k);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
None => ()
|
|
|
|
}
|
|
|
|
|
|
|
|
// Bottom out if we're not doing compat.
|
|
|
|
if !k { i(c); return; }
|
|
|
|
|
|
|
|
// Then check the compatibility decompositions
|
|
|
|
match bsearch_table(c, compatibility_table) {
|
|
|
|
Some(compat) => {
|
|
|
|
for x in compat.iter() {
|
|
|
|
d(*x, |b| i(b), k);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
None => ()
|
|
|
|
}
|
|
|
|
|
|
|
|
// Finally bottom out.
|
|
|
|
i(c);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Constants from Unicode 6.3.0 Section 3.12 Conjoining Jamo Behavior
|
|
|
|
static S_BASE: u32 = 0xAC00;
|
|
|
|
static L_BASE: u32 = 0x1100;
|
|
|
|
static V_BASE: u32 = 0x1161;
|
|
|
|
static T_BASE: u32 = 0x11A7;
|
|
|
|
static L_COUNT: u32 = 19;
|
|
|
|
static V_COUNT: u32 = 21;
|
|
|
|
static T_COUNT: u32 = 28;
|
|
|
|
static N_COUNT: u32 = (V_COUNT * T_COUNT);
|
|
|
|
static S_COUNT: u32 = (L_COUNT * N_COUNT);
|
|
|
|
|
|
|
|
// Decompose a precomposed Hangul syllable
|
|
|
|
fn decompose_hangul(s: char, f: |char|) {
|
|
|
|
use core::mem::transmute;
|
|
|
|
|
|
|
|
let si = s as u32 - S_BASE;
|
|
|
|
|
|
|
|
let li = si / N_COUNT;
|
|
|
|
unsafe {
|
|
|
|
f(transmute(L_BASE + li));
|
|
|
|
|
|
|
|
let vi = (si % N_COUNT) / T_COUNT;
|
|
|
|
f(transmute(V_BASE + vi));
|
|
|
|
|
|
|
|
let ti = si % T_COUNT;
|
|
|
|
if ti > 0 {
|
|
|
|
f(transmute(T_BASE + ti));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|