Underscore the script APIs

forgot underscore part 2

add build rules back in for right now

indents

Author: Azoy

stdlib/public/StringProcessing/CMakeLists.txt

@@ -15,7 +15,9 @@ set(swift_string_processing_link_libraries
   swift_RegexParser)
 
 file(GLOB_RECURSE _STRING_PROCESSING_SOURCES
-  "${EXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR}/Sources/_StringProcessing/*.swift")
+  "${EXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR}/Sources/_StringProcessing/*.swift"
+  "${EXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR}/Sources/_CUnicode/*.h"
+  "${EXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR}/Sources/_CUnicode/*.c")
 set(STRING_PROCESSING_SOURCES)
 foreach(source ${_STRING_PROCESSING_SOURCES})
   file(TO_CMAKE_PATH "${source}" source)

stdlib/public/core/UnicodeSPI.swift

@@ -133,7 +133,7 @@ extension Substring {
 extension Unicode.Scalar.Properties {
   @_spi(_Unicode)
   @available(SwiftStdlib 5.7, *)
-  public var script: UInt8 {
+  public var _script: UInt8 {
     let rawValue = _swift_stdlib_getScript(_scalar.value)
 
     _internalInvariant(rawValue != .max, "Unknown script rawValue")
@@ -143,23 +143,23 @@ extension Unicode.Scalar.Properties {
 
   @_spi(_Unicode)
   @available(SwiftStdlib 5.7, *)
-  public var scriptExtensions: [UInt8] {
+  public var _scriptExtensions: [UInt8] {
     var count: UInt8 = 0
     let pointer = _swift_stdlib_getScriptExtensions(_scalar.value, &count)
 
     guard let pointer = pointer else {
-      return [script]
+      return [_script]
     }
 
     var result: [UInt8] = []
     result.reserveCapacity(Int(count))
 
     for i in 0 ..< count {
-      let script = pointer[Int(i)]
+      let rawValue = pointer[Int(i)]
 
-      _internalInvariant(script != .max, "Unknown script rawValue")
+      _internalInvariant(rawValue != .max, "Unknown script rawValue")
 
-      result.append(script)
+      result.append(rawValue)
     }
 
     return result

stdlib/public/stubs/Unicode/UnicodeScalarProps.cpp

@@ -490,7 +490,7 @@ __swift_uint8_t _swift_stdlib_getScript(__swift_uint32_t scalar) {
 
 SWIFT_RUNTIME_STDLIB_INTERNAL
 const __swift_uint8_t *_swift_stdlib_getScriptExtensions(__swift_uint32_t scalar,
-                                                      __swift_uint8_t *count) {
+                                                       __swift_uint8_t *count) {
 #if !SWIFT_STDLIB_ENABLE_UNICODE_DATA
   swift::swift_abortDisabledUnicodeSupport();
 #else