CharUnicodeInfo.GetUnicodeCategory(int codePoint) (#15911)

* CharUnicodeInfo.GetUnicodeCategory(int codePoint)

https://github.com/dotnet/corefx/issues/26173

- renamed UnicodeCategory.InternalGetUnicodeCategory to GetUnicodeCategory
- renamed its parameter ch to codePoint
- made it public

* fix build break

Author: ufcpp

src/mscorlib/shared/System/Char.cs

@@ -853,7 +853,7 @@ public static UnicodeCategory GetUnicodeCategory(char c)
             {
                 return (GetLatin1UnicodeCategory(c));
             }
-            return CharUnicodeInfo.InternalGetUnicodeCategory(c);
+            return CharUnicodeInfo.GetUnicodeCategory((int)c);
         }
 
         public static UnicodeCategory GetUnicodeCategory(String s, int index)

src/mscorlib/shared/System/Globalization/CharUnicodeInfo.cs

@@ -276,7 +276,7 @@ public static int GetDigitValue(String s, int index)
 
         public static UnicodeCategory GetUnicodeCategory(char ch)
         {
-            return (InternalGetUnicodeCategory(ch));
+            return (GetUnicodeCategory((int)ch));
         }
 
         public static UnicodeCategory GetUnicodeCategory(String s, int index)
@@ -290,9 +290,9 @@ public static UnicodeCategory GetUnicodeCategory(String s, int index)
             return InternalGetUnicodeCategory(s, index);
         }
 
-        internal static unsafe UnicodeCategory InternalGetUnicodeCategory(int ch)
+        public static UnicodeCategory GetUnicodeCategory(int codePoint)
         {
-            return ((UnicodeCategory)InternalGetCategoryValue(ch, UNICODE_CATEGORY_OFFSET));
+            return ((UnicodeCategory)InternalGetCategoryValue(codePoint, UNICODE_CATEGORY_OFFSET));
         }
 
 
@@ -352,7 +352,7 @@ internal static UnicodeCategory InternalGetUnicodeCategory(String value, int ind
             Debug.Assert(value != null, "value can not be null");
             Debug.Assert(index < value.Length, "index < value.Length");
 
-            return (InternalGetUnicodeCategory(InternalConvertToUtf32(value, index)));
+            return (GetUnicodeCategory(InternalConvertToUtf32(value, index)));
         }
 
         internal static BidiCategory GetBidiCategory(String s, int index)
@@ -381,7 +381,7 @@ internal static UnicodeCategory InternalGetUnicodeCategory(String str, int index
             Debug.Assert(str.Length > 0, "str.Length > 0"); ;
             Debug.Assert(index >= 0 && index < str.Length, "index >= 0 && index < str.Length");
 
-            return (InternalGetUnicodeCategory(InternalConvertToUtf32(str, index, out charLength)));
+            return (GetUnicodeCategory(InternalConvertToUtf32(str, index, out charLength)));
         }
 
         internal static bool IsCombiningCategory(UnicodeCategory uc)

src/mscorlib/src/System/Globalization/CompareInfo.Unix.cs

@@ -329,7 +329,7 @@ private unsafe static bool IsSortable(char *text, int length)
                     if (index == length - 1 || !Char.IsLowSurrogate(text[index+1]))
                         return false; // unpaired surrogate
 
-                    uc = CharUnicodeInfo.InternalGetUnicodeCategory(Char.ConvertToUtf32(text[index], text[index+1]));
+                    uc = CharUnicodeInfo.GetUnicodeCategory(Char.ConvertToUtf32(text[index], text[index+1]));
                     if (uc == UnicodeCategory.PrivateUse || uc == UnicodeCategory.OtherNotAssigned)
                         return false;