---

yaml
---
r: 6944
b: refs/heads/master
c: eb0cdc0
h: refs/heads/master
v: v3

Author: Lenny222

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 900bc1298df011bfb094858b11cdfd8d6b01418c
+refs/heads/master: eb0cdc02e3b443fe119cb4957856a63dbd5923d4

trunk/src/libcore/char.rs

@@ -41,6 +41,26 @@ import is_alphabetic = unicode::derived_property::Alphabetic;
 import is_XID_start = unicode::derived_property::XID_Start;
 import is_XID_continue = unicode::derived_property::XID_Continue;
 
+/*
+Function: is_lowercase
+
+Indicates whether a character is in lower case, defined in terms of the
+Unicode General Category 'Ll'.
+*/
+pure fn is_lowercase(c: char) -> bool {
+    ret unicode::general_category::Ll(c);
+}
+
+/*
+Function: is_uppercase
+
+Indicates whether a character is in upper case, defined in terms of the
+Unicode General Category 'Lu'.
+*/
+pure fn is_uppercase(c: char) -> bool {
+    ret unicode::general_category::Lu(c);
+}
+
 /*
 Function: is_whitespace
 
@@ -126,4 +146,4 @@ pure fn cmp(a: char, b: char) -> int {
     ret  if b > a { -1 }
     else if b < a { 1 }
     else { 0 }
-}
+}

trunk/src/libstd/unicode.rs

@@ -152,12 +152,6 @@ mod icu {
     #[abi = "cdecl"]
     native mod libicu {
         pure fn u_hasBinaryProperty(c: UChar32, which: UProperty) -> UBool;
-        pure fn u_isdigit(c: UChar32) -> UBool;
-        pure fn u_islower(c: UChar32) -> UBool;
-        pure fn u_isspace(c: UChar32) -> UBool;
-        pure fn u_isupper(c: UChar32) -> UBool;
-        pure fn u_tolower(c: UChar32) -> UChar32;
-        pure fn u_toupper(c: UChar32) -> UChar32;
     }
 }
 
@@ -170,40 +164,3 @@ pure fn is_XID_continue(c: char) -> bool {
     ret icu::libicu::u_hasBinaryProperty(c, icu::UCHAR_XID_START)
         == icu::TRUE;
 }
-
-/*
-Function: is_digit
-
-Returns true if a character is a digit.
-*/
-pure fn is_digit(c: char) -> bool {
-    ret icu::libicu::u_isdigit(c) == icu::TRUE;
-}
-
-/*
-Function: is_lower
-
-Returns true if a character is a lowercase letter.
-*/
-pure fn is_lower(c: char) -> bool {
-    ret icu::libicu::u_islower(c) == icu::TRUE;
-}
-
-/*
-Function: is_space
-
-Returns true if a character is space.
-*/
-pure fn is_space(c: char) -> bool {
-    ret icu::libicu::u_isspace(c) == icu::TRUE;
-}
-
-/*
-Function: is_upper
-
-Returns true if a character is an uppercase letter.
-*/
-pure fn is_upper(c: char) -> bool {
-    ret icu::libicu::u_isupper(c) == icu::TRUE;
-}
-

trunk/src/test/stdtest/char.rs

@@ -3,6 +3,24 @@ import core::*;
 use std;
 import char;
 
+#[test]
+fn test_is_lowercase() {
+    assert char::is_lowercase('a');
+    assert char::is_lowercase('ö');
+    assert char::is_lowercase('ß');
+    assert !char::is_lowercase('Ü');
+    assert !char::is_lowercase('P');
+}
+
+#[test]
+fn test_is_uppercase() {
+    assert !char::is_uppercase('h');
+    assert !char::is_uppercase('ä');
+    assert !char::is_uppercase('ß');
+    assert char::is_uppercase('Ö');
+    assert char::is_uppercase('T');
+}
+
 #[test]
 fn test_is_whitespace() {
     assert char::is_whitespace(' ');

trunk/src/test/stdtest/stdtest.rc

@@ -39,10 +39,6 @@ mod test;
 mod tri;
 mod treemap;
 mod uint;
-
-#[cfg(unicode)]
-mod unicode;
-
 mod unsafe;
 mod uv;
 mod vec;