Merge pull request #4 from keith/swift-4.0

Update to Swift 4.x

.travis.yml

@@ -1,4 +1,4 @@
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode9.3
 script:
   - make test

Demangler/Demangler.swift

@@ -8,7 +8,7 @@ public enum DemangleResult {
 
 public final class Demangler {
     private let ExtractFromObjCRegex = try! NSRegularExpression(pattern: "^[-+]\\[([^\\]]+)\\s+[^\\]]+\\]$",
-                                                                options: [.AnchorsMatchLines])
+                                                                options: [.anchorsMatchLines])
 
     private var internalDemangler: InternalDemangler = LibraryDemangler()
 
@@ -52,29 +52,29 @@ public final class Demangler {
      - returns: The demangled name integrated into the ObjC selector
      */
     func integrateDemangledString(intoSelector selector: String, string: String) -> String {
-        let range = NSRange(location: 0, length: selector.characters.count)
-        let matches = self.ExtractFromObjCRegex.matchesInString(selector, options: [], range: range)
+        let range = NSRange(location: 0, length: selector.utf16.count)
+        let matches = self.ExtractFromObjCRegex.matches(in: selector, options: [], range: range)
         assert(matches.count <= 1)
         assert(matches.first?.numberOfRanges == 2)
 
         let match = matches.first!
-        let matchRange = match.rangeAtIndex(1)
+        let matchRange = match.range(at: 1)
         let selectorString = selector as NSString
-        let start = selectorString.substringWithRange(NSRange(location: 0, length: matchRange.location))
+        let start = selectorString.substring(with: NSRange(location: 0, length: matchRange.location))
         let position = matchRange.location + matchRange.length
-        let end = selectorString.substringWithRange(NSRange(location: position,
+        let end = selectorString.substring(with: NSRange(location: position,
             length: selectorString.length - position))
         return "\(start)\(string)\(end)"
     }
 
     func extractMangledString(fromObjCSelector selector: String) -> (String, Bool) {
-        let range = NSRange(location: 0, length: selector.characters.count)
-        let matches = self.ExtractFromObjCRegex.matchesInString(selector, options: [], range: range)
+        let range = NSRange(location: 0, length: selector.utf16.count)
+        let matches = self.ExtractFromObjCRegex.matches(in: selector, options: [], range: range)
         assert(matches.count <= 1)
 
-        if let match = matches.first where match.numberOfRanges == 2 {
-            let range = match.rangeAtIndex(1)
-            return ((selector as NSString).substringWithRange(range), true)
+        if let match = matches.first, match.numberOfRanges == 2 {
+            let range = match.range(at: 1)
+            return ((selector as NSString).substring(with: range), true)
         }
 
         return (selector, false)
@@ -90,7 +90,7 @@ public final class Demangler {
 
      - returns: true if a demangle should be attempted
      */
-    func shouldDemangle(string string: String) -> Bool {
+    func shouldDemangle(string: String) -> Bool {
         if string.hasPrefix("__T") {
             return true
         }

Demangler/LibraryDemangler.swift

@@ -8,29 +8,29 @@ private let kDemangleLibraryPath = ("/Applications/Xcode.app/Contents/Developer/
 private let kBufferSize = 1024
 
 final class LibraryDemangler: InternalDemangler {
-    private var handle: UnsafeMutablePointer<Void> = {
+    private var handle: UnsafeMutableRawPointer = {
         return dlopen(kDemangleLibraryPath, RTLD_NOW)
     }()
 
     private lazy var internalDemangleFunction: SwiftDemangleFunction = {
         let address = dlsym(self.handle, "swift_demangle_getDemangledName")
-        return unsafeBitCast(address, SwiftDemangleFunction.self)
+        return unsafeBitCast(address, to: SwiftDemangleFunction.self)
     }()
 
-    func demangle(string string: String) -> String? {
+    func demangle(string: String) -> String? {
         let formattedString = self.removingExcessLeadingUnderscores(fromString: string)
-        let outputString = UnsafeMutablePointer<CChar>.alloc(kBufferSize)
+        let outputString = UnsafeMutablePointer<CChar>.allocate(capacity: kBufferSize)
         let resultSize = self.internalDemangleFunction(formattedString, outputString, kBufferSize)
         if resultSize > kBufferSize {
             NSLog("Attempted to demangle string with length \(resultSize) but buffer size \(kBufferSize)")
         }
 
-        return String(CString: outputString, encoding: NSUTF8StringEncoding)
+        return String(cString: outputString, encoding: .utf8)
     }
 
     private func removingExcessLeadingUnderscores(fromString string: String) -> String {
         if string.hasPrefix("__T") {
-            return String(string.characters.dropFirst())
+            return String(string.dropFirst())
         }
 
         return string

Demangler/ShellDemangler.swift

@@ -5,7 +5,7 @@ final class ShellDemangler: InternalDemangler {
         return self.output(forShellCommand: "/usr/bin/xcrun --find swift-demangle")!
     }()
 
-    func demangle(string string: String) -> String? {
+    func demangle(string: String) -> String? {
         return self.output(forShellCommand: self.demangleCommand(forString: string))
     }
 
@@ -16,8 +16,8 @@ final class ShellDemangler: InternalDemangler {
     private func output(forShellCommand command: String) -> String? {
         assert(command.split().count >= 2)
 
-        let task = NSTask()
-        let pipe = NSPipe()
+        let task = Process()
+        let pipe = Pipe()
         let components = command.split()
 
         task.launchPath = components.first
@@ -28,6 +28,6 @@ final class ShellDemangler: InternalDemangler {
         task.waitUntilExit()
 
         let data = pipe.fileHandleForReading.readDataToEndOfFile()
-        return String(data: data, encoding: NSUTF8StringEncoding)?.strip()
+        return String(data: data, encoding: .utf8)?.strip()
     }
 }

Demangler/String+Extension.swift

@@ -2,11 +2,11 @@ import Foundation
 
 extension String {
     func split() -> [String] {
-        return self.characters.split(" ").map(String.init)
+        return self.split(separator: " ").map(String.init)
     }
 
     func strip() -> String {
-        return self.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet())
+        return self.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
     }
 }
 

DemanglerTests/DemanglerTests.swift

@@ -27,7 +27,7 @@ final class DemanglerTests: XCTestCase {
 
     func testDemangleSanity() {
         let demangledResult = demangler.demangle(string: "__TFV3foo3BarCfT_S0_")
-        let expectedName = "foo.Bar.init () -> foo.Bar"
+        let expectedName = "foo.Bar.init() -> foo.Bar"
 
         XCTAssertEqual(demangledResult, DemangleResult.Success(expectedName))
     }

Swift Demangle.xcodeproj/project.pbxproj

@@ -453,6 +453,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -490,6 +491,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

Swift Demangle.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Swift Demangle/HPDocument+Extension.swift

@@ -1,6 +1,6 @@
 extension HPDocument {
-    func wait(withReason reason: String, forWork work: (document: HPDocument, file: HPDisassembledFile,
-        shouldCancel: UnsafeMutablePointer<Bool>) -> Void)
+    func wait(withReason reason: String,
+              forWork work: @escaping (HPDocument, HPDisassembledFile, UnsafeMutablePointer<Bool>) -> Void)
     {
         if self.isWaiting() {
             return self.logErrorStringMessage("Already waiting on something")
@@ -11,7 +11,7 @@ extension HPDocument {
         }
 
         var shouldCancel = false
-        self.beginToWait(reason)
+        self.begin(toWait: reason)
 
 //
 // For some reason passing a cancelBlock crashes 100%. But not if you do it via cycript :/
@@ -23,10 +23,10 @@ extension HPDocument {
 //        })
 //
 
-        dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0)) {
-            work(document: self, file: file, shouldCancel: &shouldCancel)
+        DispatchQueue.global(qos: .userInitiated).async {
+            work(self, file, &shouldCancel)
 
-            dispatch_async(dispatch_get_main_queue()) {
+            DispatchQueue.main.async {
                 self.updateStaticNames()
                 self.endWaiting()
             }

Swift Demangle/NSBundle+Extension.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-extension NSBundle {
+extension Bundle {
     var pluginVersion: String {
         return self.infoDictionary?["CFBundleShortVersionString"] as? String ?? "Unknown"
     }

Swift Demangle/SwiftDemangle+Actions.swift

@@ -9,16 +9,16 @@ private enum Action {
 extension SwiftDemangle {
     @objc
     func demangleClosestName() {
-        self.performAction(.DemangleClosest)
+        self.performAction(action: .DemangleClosest)
     }
 
     @objc
     func demangleAllProcedures() {
-        self.performAction(.DemangleAll)
+        self.performAction(action: .DemangleAll)
     }
 
     private func performAction(action: Action) {
-        let function: HPDocument -> Void
+        let function: (HPDocument) -> Void
         switch action {
         case .DemangleClosest:
             function = self.demangleClosestName
@@ -37,8 +37,8 @@ extension SwiftDemangle {
 
     private func demangleClosestName(withDocument document: HPDocument) {
         document.wait(withReason: "Demangling Closest Name") { document, file, _ in
-            let address = file.nearestNamedAddressBeforeVirtualAddress(document.currentAddress())
-            let mangledString = file.nameForVirtualAddress(address)
+            let address = file.nearestNamedAddress(beforeVirtualAddress: document.currentAddress())
+            let mangledString = file.name(forVirtualAddress: address)
             let demangleResult = self.demangler.demangle(string: mangledString)
             self.handle(demangleResult: demangleResult, forAddress: address, mangledString: mangledString,
                         file: file, document: document)
@@ -55,7 +55,7 @@ extension SwiftDemangle {
         case .Ignored(let ignoredString):
             document.logStringMessage("Ignoring '\(ignoredString)'")
         case .Failed(let failedString):
-            document.logStringMessage("Failed to demangle '\(failedString)'")
+            document.logStringMessage("Failed to demangle '\(failedString ?? "")'")
         }
     }
 }

Swift Demangle/SwiftDemangle+DemangleAll.swift

@@ -15,10 +15,10 @@ extension SwiftDemangle {
                                                     file: HPDisassembledFile,
                                                     shouldCancel: UnsafeMutablePointer<Bool>)
     {
-        let segments = file.segments()
+        let segments = file.segments() ?? []
         var procedureCount: Int?
 
-        dispatch_async(dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0)) {
+        DispatchQueue.global(qos: .default).async {
             let totalProcedureCount = segments.reduce(0) { accumulator, segment in
                 return accumulator + segment.procedures().count
             }
@@ -30,7 +30,7 @@ extension SwiftDemangle {
         var processedCount = 0
         for segment in segments {
             for procedure in segment.procedures() {
-                if shouldCancel.memory {
+                if shouldCancel.pointee {
                     let countString = procedureCount.map(String.init) ?? "Unknown"
                     return document.logErrorStringMessage(
                         "Cancelling after demangling \(processedCount) of \(countString) procedures")
@@ -45,7 +45,7 @@ extension SwiftDemangle {
                 }
 
                 let procedureAddress = procedure.entryPoint()
-                let mangledString: String? = segment.nameForVirtualAddress(procedureAddress)
+                let mangledString: String? = segment.name(forVirtualAddress: procedureAddress)
                 let demangleResult = self.demangler.demangle(string: mangledString)
                 self.handle(demangleResult: demangleResult, forAddress: procedureAddress,
                             mangledString: mangledString, file: file, document: document)
@@ -64,7 +64,7 @@ extension SwiftDemangle {
      */
     private func showAnalysisAlertAndCancel(forDocument document: HPDocument) -> Bool {
         if document.disassembledFile()?.analysisInProgress() == true {
-            let response = document.displayAlertWithMessageText("File is still being analyzed",
+            let response = document.displayAlert(withMessageText: "File is still being analyzed",
                 defaultButton: "Cancel", alternateButton: "Continue", otherButton: nil,
                 informativeText: "Would you like to demangle what has already been loaded?")
 

Swift Demangle/SwiftDemangle.swift

@@ -11,7 +11,7 @@ final class SwiftDemangle: NSObject, HopperTool {
     }
 
     func pluginUUID() -> HopperUUID {
-        return self.services.UUIDWithString("C8FAB152-90FC-4C70-9FA2-4828A2DF322F")
+        return self.services.uuid(with: "C8FAB152-90FC-4C70-9FA2-4828A2DF322F")
     }
 
     func pluginName() -> String {
@@ -23,7 +23,7 @@ final class SwiftDemangle: NSObject, HopperTool {
     }
 
     func pluginVersion() -> String {
-        return NSBundle.mainBundle().pluginVersion
+        return Bundle.main.pluginVersion
     }
 
     func pluginCopyright() -> String {
@@ -38,7 +38,7 @@ final class SwiftDemangle: NSObject, HopperTool {
         return .Plugin_Tool
     }
 
-    func toolMenuDescription() -> [[String: AnyObject]] {
+    func toolMenuDescription() -> [[String: Any]] {
         return [
             [
                 "Title": "Demangle Swift",