Implement native numeric scalar properties

Author: Azoy

stdlib/public/SwiftShims/UnicodeData.h

@@ -67,6 +67,12 @@ __swift_uint8_t _swift_stdlib_getGraphemeBreakProperty(__swift_uint32_t scalar);
 SWIFT_RUNTIME_STDLIB_INTERNAL
 __swift_uint64_t _swift_stdlib_getBinaryProperties(__swift_uint32_t scalar);
 
+SWIFT_RUNTIME_STDLIB_INTERNAL
+__swift_uint8_t _swift_stdlib_getNumericType(__swift_uint32_t scalar);
+
+SWIFT_RUNTIME_STDLIB_INTERNAL
+double _swift_stdlib_getNumericValue(__swift_uint32_t scalar);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

stdlib/public/SwiftShims/UnicodeShims.h

@@ -264,16 +264,6 @@ typedef enum __swift_stdlib_UCharNameChoice {
 #endif
 } __swift_stdlib_UCharNameChoice;
 
-typedef enum __swift_stdlib_UNumericType {
-  __swift_stdlib_U_NT_NONE,
-  __swift_stdlib_U_NT_DECIMAL,
-  __swift_stdlib_U_NT_DIGIT,
-  __swift_stdlib_U_NT_NUMERIC,
-#ifndef U_HIDE_DEPRECATED_API
-  __swift_stdlib_U_NT_COUNT
-#endif
-} __swift_stdlib_UNumericType;
-
 typedef struct __swift_stdlib_UBreakIterator __swift_stdlib_UBreakIterator;
 typedef struct __swift_stdlib_UText __swift_stdlib_UText;
 typedef __swift_int8_t __swift_stdlib_UBool;
@@ -325,9 +315,6 @@ __swift_int32_t __swift_stdlib_u_strToUpper(
     const __swift_stdlib_UChar *src, __swift_int32_t srcLength,
     const char *_Nullable locale, __swift_stdlib_UErrorCode *pErrorCode);
 
-SWIFT_RUNTIME_STDLIB_API
-double __swift_stdlib_u_getNumericValue(__swift_stdlib_UChar32 c);
-
 
 #ifdef __cplusplus
 } // extern "C"

stdlib/public/core/UnicodeScalarProperties.swift

@@ -1437,16 +1437,6 @@ extension Unicode {
     /// meet the requirements of `decimal` will have numeric type `numeric`,
     /// and programs can treat `digit` and `numeric` equivalently.
     case numeric
-
-    internal init?(rawValue: __swift_stdlib_UNumericType) {
-      switch rawValue {
-      case __swift_stdlib_U_NT_NONE: return nil
-      case __swift_stdlib_U_NT_DECIMAL: self = .decimal
-      case __swift_stdlib_U_NT_DIGIT: self = .digit
-      case __swift_stdlib_U_NT_NUMERIC: self = .numeric
-      default: fatalError("Unknown numeric type \(rawValue)")
-      }
-    }
   }
 }
 
@@ -1470,11 +1460,18 @@ extension Unicode.Scalar.Properties {
   /// This property corresponds to the "Numeric_Type" property in the
   /// [Unicode Standard](http://www.unicode.org/versions/latest/).
   public var numericType: Unicode.NumericType? {
-    let rawValue = __swift_stdlib_UNumericType(
-      __swift_stdlib_UNumericType.RawValue(
-      __swift_stdlib_u_getIntPropertyValue(
-        icuValue, __swift_stdlib_UCHAR_NUMERIC_TYPE)))
-    return Unicode.NumericType(rawValue: rawValue)
+    let rawValue = _swift_stdlib_getNumericType(_scalar.value)
+
+    switch rawValue {
+    case 0:
+      return .numeric
+    case 1:
+      return .digit
+    case 2:
+      return .decimal
+    default:
+      return nil
+    }
   }
 
   /// The numeric value of the scalar.
@@ -1494,8 +1491,10 @@ extension Unicode.Scalar.Properties {
   /// This property corresponds to the "Numeric_Value" property in the [Unicode
   /// Standard](http://www.unicode.org/versions/latest/).
   public var numericValue: Double? {
-    let icuNoNumericValue: Double = -123456789
-    let result = __swift_stdlib_u_getNumericValue(icuValue)
-    return result != icuNoNumericValue ? result : nil
+    guard numericType != nil else {
+      return nil
+    }
+
+    return _swift_stdlib_getNumericValue(_scalar.value)
   }
 }

stdlib/public/stubs/UnicodeScalarProps.cpp

@@ -45,7 +45,6 @@ int32_t u_strToTitle(UChar *, int32_t, const UChar *, int32_t,
                      UBreakIterator *, const char *, UErrorCode *);
 int32_t u_strToUpper(UChar *, int32_t, const UChar *, int32_t, const char *,
                      UErrorCode *);
-double u_getNumericValue(UChar32);
 }
 
 #else
@@ -177,11 +176,6 @@ __swift_int32_t __swift_stdlib_u_strToUpper(
                       locale, ptr_cast<UErrorCode>(pErrorCode));
 }
 
-double __swift_stdlib_u_getNumericValue(__swift_stdlib_UChar32 c) {
-  return u_getNumericValue(c);
-}
-
-
 // Force an autolink with ICU
 #if defined(__MACH__)
 asm(".linker_option \"-licucore\"\n");