[OSX] HybridGlobalization Implement casing functions

src/libraries/Common/src/Interop/Interop.Casing.OSX.cs

@@ -0,0 +1,16 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static partial class Globalization
+    {
+        [LibraryImport(Libraries.GlobalizationNative, EntryPoint = "GlobalizationNative_ChangeCaseNative", StringMarshalling = StringMarshalling.Utf16)]
+        internal static unsafe partial int ChangeCaseNative(string localeName, int lNameLen, char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, [MarshalAs(UnmanagedType.Bool)] bool bToUpper);
+
+        [LibraryImport(Libraries.GlobalizationNative, EntryPoint = "GlobalizationNative_ChangeCaseInvariantNative", StringMarshalling = StringMarshalling.Utf8)]
+        internal static unsafe partial int ChangeCaseInvariantNative(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, [MarshalAs(UnmanagedType.Bool)] bool bToUpper);
+    }
+}

src/libraries/System.Globalization/tests/Hybrid/System.Globalization.IOS.Tests.csproj

@@ -5,7 +5,7 @@
     <HybridGlobalization>true</HybridGlobalization>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="HybridMode.cs" />
+    <!--<Compile Include="HybridMode.cs" />
     <Compile Include="..\CultureInfo\CultureInfoNumberFormat.cs" />
     <Compile Include="..\CultureInfo\CultureInfoNames.cs" />
     <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoData.cs" />
@@ -37,6 +37,7 @@
     <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
     <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
     <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
-    <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
+    <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />-->
+    <Compile Include="..\System\Globalization\TextInfoTests.cs" />
   </ItemGroup>
 </Project>

src/libraries/System.Globalization/tests/System/Globalization/TextInfoTests.cs

@@ -274,7 +274,7 @@ public static IEnumerable<object[]> ToLower_TestData()
                 // we also don't preform.
                 // Greek Capital Letter Sigma (does not case to U+03C2 with "final sigma" rule).
                 yield return new object[] { cultureName, "\u03A3", "\u03C3" };
-                if (PlatformDetection.IsHybridGlobalizationOnBrowser)
+                if (PlatformDetection.IsHybridGlobalizationOnBrowser || PlatformDetection.IsHybridGlobalizationOnOSX) // TODO check for OSX
                 {
                     // JS is using "final sigma" rule correctly - it's costly to unify it with ICU's behavior
                     yield return new object[] { cultureName, "O\u03A3", "o\u03C2" };
@@ -402,10 +402,13 @@ public static IEnumerable<object[]> ToUpper_TestData()
                 // which is non-intuitive. In addition, there are some context sensitive mappings which
                 // we also don't preform.
                 // es-zed does not case to SS when uppercased.
-                yield return new object[] { cultureName, "\u00DF", "\u00DF" };                
-                yield return new object[] { cultureName, "stra\u00DFe", "STRA\u00DFE" };
-                if (!PlatformDetection.IsNlsGlobalization)
-                    yield return new object[] { cultureName, "st\uD801\uDC37ra\u00DFe", "ST\uD801\uDC0FRA\u00DFE" };
+                yield return new object[] { cultureName, "\u00DF", "\u00DF" };
+                if (!PlatformDetection.IsHybridGlobalizationOnOSX) // TODO check for OSX
+                {
+                    yield return new object[] { cultureName, "stra\u00DFe", "STRA\u00DFE" };
+                    if (!PlatformDetection.IsNlsGlobalization)
+                        yield return new object[] { cultureName, "st\uD801\uDC37ra\u00DFe", "ST\uD801\uDC0FRA\u00DFE" };
+                }
 
                 // Ligatures do not expand when cased.
                 yield return new object[] { cultureName, "\uFB00", "\uFB00" };

src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

@@ -389,6 +389,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Icu.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Nls.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ThaiBuddhistCalendar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TimeSpanFormat.cs" />
@@ -1273,6 +1274,9 @@
     <Compile Include="$(CommonPath)Interop\Interop.Casing.cs">
       <Link>Common\Interop\Interop.Casing.cs</Link>
     </Compile>
+    <Compile Include="$(CommonPath)Interop\Interop.Casing.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
+      <Link>Common\Interop\Interop.Casing.OSX.cs</Link>
+    </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.Collation.cs">
       <Link>Common\Interop\Interop.Collation.cs</Link>
     </Compile>

src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.OSX.cs

@@ -0,0 +1,33 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Text.Unicode;
+
+namespace System.Globalization
+{
+    public partial class TextInfo
+    {
+        internal unsafe void ChangeCaseNative(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool toUpper)
+        {
+            Debug.Assert(!GlobalizationMode.Invariant);
+            Debug.Assert(!GlobalizationMode.UseNls);
+            Debug.Assert(GlobalizationMode.Hybrid);
+            int result;
+
+            if (HasEmptyCultureName)
+                result = Interop.Globalization.ChangeCaseInvariantNative(src, srcLen, dstBuffer, dstBufferCapacity, toUpper);
+            else
+                result = Interop.Globalization.ChangeCaseNative(_cultureName, _cultureName.Length, src, srcLen, dstBuffer, dstBufferCapacity, toUpper);
+
+            if (result == -1)
+                throw new Exception("Exception while case changing");
+        }
+    }
+}

src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs

@@ -692,6 +692,12 @@ private unsafe void ChangeCaseCore(char* src, int srcLen, char* dstBuffer, int d
                 JsChangeCase(src, srcLen, dstBuffer, dstBufferCapacity, bToUpper);
                 return;
             }
+#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
+            if (GlobalizationMode.Hybrid)
+            {
+                ChangeCaseNative(src, srcLen, dstBuffer, dstBufferCapacity, bToUpper);
+                return;
+            }
 #endif
             IcuChangeCase(src, srcLen, dstBuffer, dstBufferCapacity, bToUpper);
         }

src/native/libs/System.Globalization.Native/entrypoints.c

@@ -69,6 +69,8 @@ static const Entry s_globalizationNative[] =
     DllImportEntry(GlobalizationNative_IndexOfNative)
     DllImportEntry(GlobalizationNative_StartsWithNative)
     DllImportEntry(GlobalizationNative_EndsWithNative)
+    DllImportEntry(GlobalizationNative_ChangeCaseNative)
+    DllImportEntry(GlobalizationNative_ChangeCaseInvariantNative)
 #endif
 };
 

src/native/libs/System.Globalization.Native/pal_casing.h

@@ -23,3 +23,19 @@ PALEXPORT void GlobalizationNative_ChangeCaseTurkish(const UChar* lpSrc,
                                                      int32_t bToUpper);
 
 PALEXPORT void GlobalizationNative_InitOrdinalCasingPage(int32_t pageNumber, UChar* pTarget);
+
+#ifdef __APPLE__
+PALEXPORT int32_t GlobalizationNative_ChangeCaseNative(const uint16_t* localeName,
+                                                       int32_t lNameLength,
+                                                       const uint16_t* lpSrc,
+                                                       int32_t cwSrcLength,
+                                                       uint16_t* lpDst,
+                                                       int32_t cwDstLength,
+                                                       int32_t bToUpper);
+
+PALEXPORT int32_t GlobalizationNative_ChangeCaseInvariantNative(const uint16_t* lpSrc,
+                                                               int32_t cwSrcLength,
+                                                               uint16_t* lpDst,
+                                                               int32_t cwDstLength,
+                                                               int32_t bToUpper);
+#endif

src/native/libs/System.Globalization.Native/pal_collation.m

@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include "pal_locale_internal.h"
 #include "pal_collation.h"
+#include "pal_casing.h"
 
 #import <Foundation/Foundation.h>
 
@@ -269,4 +270,83 @@ int32_t GlobalizationNative_EndsWithNative(const uint16_t* localeName, int32_t l
     return result == NSOrderedSame ? 1 : 0;
 }
 
+/**
+ * Append a code point to a string, overwriting 1 or 2 code units.
+ * The offset points to the current end of the string contents
+ * and is advanced (post-increment).
+ * "Safe" macro, checks for a valid code point.
+ * If a surrogate pair is written, checks for sufficient space in the string.
+ * If the code point is not valid or a trail surrogate does not fit,
+ * then isError is set to true.
+ *
+ * @param s const UChar * string buffer
+ * @param i string offset, must be i<capacity
+ * @param capacity size of the string buffer
+ * @param c code point to append
+ * @param isError output UBool set to true if an error occurs, otherwise not modified
+ * @stable ICU 2.4
+ */
+#define Append(s, i, capacity, c, isError) UPRV_BLOCK_MACRO_BEGIN { \
+    if((uint32_t)(c)<=0xffff) { \
+        (s)[(i)++]=(uint16_t)(c); \
+    } else if((uint32_t)(c)<=0x10ffff && (i)+1<(capacity)) { \
+        (s)[(i)++]=(uint16_t)(((c)>>10)+0xd7c0); \
+        (s)[(i)++]=(uint16_t)(((c)&0x3ff)|0xdc00); \
+    } else /* c>0x10ffff or not enough space */ { \
+        (isError)=true; \
+    } \
+} UPRV_BLOCK_MACRO_END
+
+/*
+Function:
+ChangeCaseNative
+
+Returns upper or lower casing of a string, taking into account the specified locale.
+*/
+int32_t GlobalizationNative_ChangeCaseNative(const uint16_t* localeName, int32_t lNameLength,
+                                                 const uint16_t* lpSrc, int32_t cwSrcLength, uint16_t* lpDst, int32_t cwDstLength, int32_t bToUpper)
+{
+    NSLocale *currentLocale = GetCurrentLocale(localeName, lNameLength);
+    NSString *source = [NSString stringWithCharacters: lpSrc length: cwSrcLength];
+    NSString *result = bToUpper ? [source uppercaseStringWithLocale:currentLocale] : [source lowercaseStringWithLocale:currentLocale];
+
+    int32_t srcIdx = 0, dstIdx = 0, isError = false;
+    uint16_t dstCodepoint;
+    if (result.length > cwDstLength)
+        result = source;
+    while (srcIdx < result.length)
+    {
+        dstCodepoint = [result characterAtIndex:srcIdx];
+        Append(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
+        srcIdx++;
+        //assert(isError == false && srcIdx == dstIdx);
+    }
+    return 0;
+}
+
+/*
+Function:
+ChangeCaseInvariantNative
+
+Returns upper or lower casing of a string.
+*/
+int32_t GlobalizationNative_ChangeCaseInvariantNative(const uint16_t* lpSrc, int32_t cwSrcLength, uint16_t* lpDst, int32_t cwDstLength, int32_t bToUpper)
+{
+    NSString *source = [NSString stringWithCharacters: lpSrc length: cwSrcLength];
+    NSString *result = bToUpper ? source.uppercaseString : source.lowercaseString;
+
+    int32_t srcIdx = 0, dstIdx = 0, isError = false;
+    uint16_t dstCodepoint;
+    if (result.length > cwDstLength)
+        result = source;
+    while (srcIdx < cwSrcLength)
+    {
+        dstCodepoint = [result characterAtIndex:srcIdx];
+        Append(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
+        srcIdx++;
+        //assert(isError == false && srcIdx == dstIdx);
+    }
+    return 0;
+}
+
 #endif

src/native/libs/System.Globalization.Native/pal_locale.m

@@ -459,7 +459,7 @@ int32_t GlobalizationNative_GetLocaleInfoIntNative(const char* localeName, Local
         }        
         case LocaleNumber_ReadingLayout:
         {
-            NSLocaleLanguageDirection langDir = [NSLocale characterDirectionForLanguage:[[NSLocale currentLocale] objectForKey:NSLocaleLanguageCode]];
+            NSLocaleLanguageDirection langDir = [NSLocale characterDirectionForLanguage:[currentLocale objectForKey:NSLocaleLanguageCode]];
             //  0 - Left to right (such as en-US)
             //  1 - Right to left (such as arabic locales)
             value = NSLocaleLanguageDirectionRightToLeft == langDir ? 1 : 0;