Updated doc and did refactoing

dotnet · mkhamoyan · Jun 29, 2023 · May 30, 2023 · May 31, 2023 · May 31, 2023
commit 040f214c911e9f09690c86add8f17c005e3d5f6c
diff --git a/docs/design/features/globalization-hybrid-mode.md b/docs/design/features/globalization-hybrid-mode.md
@@ -408,4 +408,27 @@ Affected public APIs:
 - CompareInfo.GetSortKeyLength
 - CompareInfo.GetHashCode
 
-Apple Native API does not have an equivalent, so they throw `PlatformNotSupportedException`.
+Apple Native API does not have an equivalent, so they throw `PlatformNotSupportedException`.
+
+
+## Case change
+
+Affected public APIs:
+- TextInfo.ToLower,
+- TextInfo.ToUpper
+
+Below function are used from apple native functions:
+- [uppercaseString](https://developer.apple.com/documentation/foundation/nsstring/1409855-uppercasestring)
+- [lowercaseString](https://developer.apple.com/documentation/foundation/nsstring/1408467-lowercasestring)
+- [uppercaseStringWithLocale](https://developer.apple.com/documentation/foundation/nsstring/1413316-uppercasestringwithlocale?language=objc)
+- [lowercaseStringWithLocale](https://developer.apple.com/documentation/foundation/nsstring/1417298-lowercasestringwithlocale?language=objc)
+
+Behavioural changes compared to ICU
+
+   - Capitalizing the German letter ß (sharp S) gives SS when using Apple native functions.
+
+   - Final sigma behavior correction:
+
+     ICU-based case change does not respect final-sigma rule, but hybrid does, so "ΒΌΛΟΣ" -> "βόλος", not "βόλοσ".
+
+
diff --git a/src/libraries/System.Globalization/tests/Hybrid/System.Globalization.IOS.Tests.csproj b/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,7 +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>
diff --git a/src/libraries/System.Globalization/tests/System/Globalization/TextInfoTests.cs b/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 || PlatformDetection.IsHybridGlobalizationOnOSX) // TODO check for OSX
+                if (PlatformDetection.IsHybridGlobalizationOnBrowser || PlatformDetection.IsHybridGlobalizationOnOSX)
                 {
                     // 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" };
@@ -403,7 +403,8 @@ public static IEnumerable<object[]> ToUpper_TestData()
                 // we also don't preform.
                 // es-zed does not case to SS when uppercased.
                 yield return new object[] { cultureName, "\u00DF", "\u00DF" };
-                if (!PlatformDetection.IsHybridGlobalizationOnOSX) // TODO check for OSX
+                // Capitalizing the German letter ß (sharp S) gives SS on OSX
+                if (!PlatformDetection.IsHybridGlobalizationOnOSX)
                 {
                     yield return new object[] { cultureName, "stra\u00DFe", "STRA\u00DFE" };
                     if (!PlatformDetection.IsNlsGlobalization)

diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.OSX.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.OSX.cs
@@ -26,8 +26,8 @@ internal unsafe void ChangeCaseNative(char* src, int srcLen, char* dstBuffer, in
             else
                 result = Interop.Globalization.ChangeCaseNative(_cultureName, _cultureName.Length, src, srcLen, dstBuffer, dstBufferCapacity, toUpper);
 
-            if (result == -1)
-                throw new Exception("Exception while case changing");
+            if (result != 0)
+                throw new Exception("Exception occured while case changing");
         }
     }
 }
diff --git a/src/native/libs/System.Globalization.Native/pal_collation.m b/src/native/libs/System.Globalization.Native/pal_collation.m
@@ -279,14 +279,13 @@ int32_t GlobalizationNative_EndsWithNative(const uint16_t* localeName, int32_t l
  * 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 s const uint16_t * 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
+ * @param isError output bool set to true if an error occurs, otherwise not modified
  */
-#define Append(s, i, capacity, c, isError) UPRV_BLOCK_MACRO_BEGIN { \
+#define Append(s, i, capacity, c, isError) { \
     if((uint32_t)(c)<=0xffff) { \
         (s)[(i)++]=(uint16_t)(c); \
     } else if((uint32_t)(c)<=0x10ffff && (i)+1<(capacity)) { \
@@ -295,7 +294,7 @@ int32_t GlobalizationNative_EndsWithNative(const uint16_t* localeName, int32_t l
     } else /* c>0x10ffff or not enough space */ { \
         (isError)=true; \
     } \
-} UPRV_BLOCK_MACRO_END
+}
 
 /*
 Function:
@@ -318,10 +317,10 @@ int32_t GlobalizationNative_ChangeCaseNative(const uint16_t* localeName, int32_t
     {
         dstCodepoint = [result characterAtIndex:srcIdx];
         Append(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
+        assert(isError == false);
         srcIdx++;
-        //assert(isError == false && srcIdx == dstIdx);
     }
-    return 0;
+    return isError ? -1 : 0;
 }
 
 /*
@@ -343,10 +342,10 @@ int32_t GlobalizationNative_ChangeCaseInvariantNative(const uint16_t* lpSrc, int
     {
         dstCodepoint = [result characterAtIndex:srcIdx];
         Append(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
+        assert(isError == false);
         srcIdx++;
-        //assert(isError == false && srcIdx == dstIdx);
     }
-    return 0;
+    return isError ? -1 : 0;
 }
 
 #endif