[stdlib] Drop Unicode 8 tries in stdlib (entirely)

This drops the last vestage of Unicode 8 tries from the standard library. Switches everything over to use ICU.
apple · Aug 8, 2017 · 0b5ee16 · 0b5ee16
1 parent ffb3807
commit 0b5ee16
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 659 deletions.
diff --git a/stdlib/public/core/CMakeLists.txt b/stdlib/public/core/CMakeLists.txt
@@ -141,7 +141,6 @@ set(SWIFTLIB_ESSENTIAL
   UnavailableStringAPIs.swift.gyb
   UnicodeEncoding.swift
   UnicodeParser.swift
-  UnicodeTrie.swift.gyb
   Unmanaged.swift
   UnsafeBitMap.swift
   UnsafeBufferPointer.swift.gyb

diff --git a/stdlib/public/core/GroupInfo.json b/stdlib/public/core/GroupInfo.json
@@ -30,7 +30,6 @@
     "UnicodeEncoding.swift",
     "UnicodeParser.swift",
     "UnicodeScalar.swift",
-    "UnicodeTrie.swift",
     "UnavailableStringAPIs.swift",
     "UTFEncoding.swift",
     "UTF8.swift",

diff --git a/stdlib/public/core/StringUnicodeScalarView.swift b/stdlib/public/core/StringUnicodeScalarView.swift
@@ -445,22 +445,8 @@ extension String.UnicodeScalarView {
       return true
     }
     if !_isOnUnicodeScalarBoundary(i) { return false }
-    let precedingScalar = self[index(before: i)]
-
-    let graphemeClusterBreakProperty =
-      _UnicodeGraphemeClusterBreakPropertyTrie()
-    let segmenter = _UnicodeExtendedGraphemeClusterSegmenter()
-
-    let gcb0 = graphemeClusterBreakProperty.getPropertyRawValue(
-      precedingScalar.value)
-
-    if segmenter.isBoundaryAfter(gcb0) {
-      return true
-    }
-
-    let gcb1 = graphemeClusterBreakProperty.getPropertyRawValue(self[i].value)
-
-    return segmenter.isBoundary(gcb0, gcb1)
+    let str = String(_core)
+    return i == str.index(before: str.index(after: i))
   }
 }
 

diff --git a/stdlib/public/core/UnicodeTrie.swift.gyb b/stdlib/public/core/UnicodeTrie.swift.gyb
diff --git a/stdlib/public/stubs/CMakeLists.txt b/stdlib/public/stubs/CMakeLists.txt
@@ -5,7 +5,7 @@ set(swift_stubs_sources
     KeyPaths.cpp
     LibcShims.cpp
     Stubs.cpp
-    UnicodeExtendedGraphemeClusters.cpp.gyb)
+)
 set(swift_stubs_objc_sources
     Availability.mm
     FoundationHelpers.mm