Swift 2.0 ready

Author: tidwall

GoSwift.xcodeproj/project.pbxproj

@@ -104,7 +104,8 @@
 		0311F56F1B20A06F003616AD /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0630;
+				LastSwiftUpdateCheck = 0700;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "ONcast, LLC";
 				TargetAttributes = {
 					0311F5771B20A06F003616AD = {
@@ -174,6 +175,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -251,6 +253,7 @@
 				INFOPLIST_FILE = GoSwift/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.oncast.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 			};
@@ -266,6 +269,7 @@
 				INFOPLIST_FILE = GoSwift/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.oncast.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 			};

GoSwift.xcodeproj/xcshareddata/xcschemes/GoSwift.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -62,6 +62,8 @@
             ReferencedContainer = "container:GoSwift.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -71,6 +73,7 @@
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference

GoSwift/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.oncast.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

GoSwift/go.swift

@@ -11,35 +11,18 @@
 
 import Foundation
 
-public typealias Error = NSError
-extension Error : Printable, Equatable {
-    public func error() -> String {
-        return description
-    }
-    convenience public init(error : String){
-        self.init(domain: "goswift", code: -1, userInfo: [NSLocalizedDescriptionKey:error])
-    }
-    override public var description : String {
-        return localizedDescription
-    }
-}
-public func ==(lhs: Error, rhs: Error) -> Bool {
-    return lhs.description == rhs.description
-}
-private let pt_entry: @objc_block (UnsafeMutablePointer<Void>) -> UnsafeMutablePointer<Void> = { (ctx) in
+private let pt_entry: @convention(c) (UnsafeMutablePointer<Void>) -> UnsafeMutablePointer<Void> = { (ctx) in
     let np = UnsafeMutablePointer<()->()>(ctx)
     np.memory()
     np.destroy()
     np.dealloc(1)
     return nil
 }
-private var pt_entry_imp = imp_implementationWithBlock(unsafeBitCast(pt_entry, AnyObject.self))
-private let pt_entry_fp = CFunctionPointer<(UnsafeMutablePointer<Void>) -> UnsafeMutablePointer<Void>>(pt_entry_imp)
 public func dispatch_thread(block : ()->()){
     let p = UnsafeMutablePointer<()->()>.alloc(1)
     p.initialize(block)
     var t = pthread_t()
-    pthread_create(&t, nil, pt_entry_fp, p)
+    pthread_create(&t, nil, pt_entry, p)
     pthread_detach(t)
 }
 public protocol Locker {
@@ -60,7 +43,7 @@ public class Mutex : Locker {
     public func unlock(){
         pthread_mutex_unlock(&mutex)
     }
-    func lock(closure:()->()){
+    func lock(closure : ()->()){
         lock()
         closure()
         unlock()
@@ -196,7 +179,7 @@ public class Chan<T> : ChanAny {
                 cond.locker.unlock()
                 return (nil, true, false)
             }
-            var msg = msgs.removeAtIndex(0)
+            let msg = msgs.removeAtIndex(0)
             cond.broadcast()
             cond.locker.unlock()
             return (msg, true, true)
@@ -220,7 +203,7 @@ public class Chan<T> : ChanAny {
                 if msgs.count > 0 {
                     flag = true
                     mutex!.unlock()
-                    var msg = msgs.removeAtIndex(0)
+                    let msg = msgs.removeAtIndex(0)
                     cond.broadcast()
                     cond.locker.unlock()
                     return (msg, true, true)
@@ -237,7 +220,7 @@ public class Chan<T> : ChanAny {
                 return (nil, false, true)
             }
             if msgs.count > 0 {
-                var msg = msgs.removeAtIndex(0)
+                let msg = msgs.removeAtIndex(0)
                 cond.broadcast()
                 cond.locker.unlock()
                 return (msg, true, true)
@@ -257,12 +240,12 @@ public func <-<T>(l: Chan<T>, r: T?){
 }
 public prefix func <?<T>(r: Chan<T>) -> (T?, Bool){
     var flag = false
-    let (v, ok, ready) = r.receive(true, mutex: nil, flag: &flag)
+    let (v, ok, _) = r.receive(true, mutex: nil, flag: &flag)
     return (v as? T, ok)
 }
 public prefix func <-<T>(r: Chan<T>) -> T?{
     var flag = false
-    let (v, ok, ready) = r.receive(true, mutex: nil, flag: &flag)
+    let (v, _, _) = r.receive(true, mutex: nil, flag: &flag)
     return v as? T
 }
 public func close<T>(chan : Chan<T>){
@@ -281,36 +264,31 @@ private struct GoPanicError {
 }
 private class GoRoutineStack {
     var error = GoPanicError()
-    var defers : [()->()] = []
     var (jump, jumped) = (UnsafeMutablePointer<Int32>(), false)
-    var (select, cases:[(msg : Any?, ok : Bool)->()], chans:[ChanAny], defalt:(()->())?)  = (false, [], [], nil)
+    var select = false
+    var cases : [(msg : Any?, ok : Bool)->()] = []
+    var chans : [ChanAny] = []
+    var defalt : (()->())?
     init(){
         jump = UnsafeMutablePointer<Int32>(malloc(4*50))
     }
     deinit{
         free(jump)
     }
-    func unwind(){
-        for var i = defers.count - 1; i >= 0; i-- {
-            defers[i]()
-        }
-        defers = []
-    }
 }
 private class GoRoutine {
     var stack = [GoRoutineStack]()
     func $(closure:()->()){
         let s = GoRoutineStack()
         if stack.count > 0 {
-            var ls = stack.last!
+            let ls = stack.last!
             s.error = ls.error
             ls.error.what = nil
         }
         stack.append(s)
         if setjmp(s.jump) == 0{
             closure()
         }
-        s.unwind()
         stack.removeLast()
         if s.error.what != nil{
             if stack.count > 0 {
@@ -320,12 +298,6 @@ private class GoRoutine {
             }
         }
     }
-    func defer(file : StaticString = __FILE__, line : UWord = __LINE__, closure: ()->()){
-        if stack.count == 0{
-            fatalError("missing ${} context", file: file, line: line)
-        }
-        stack.last!.defers.append({self.${closure()}})
-    }
     func panic(what : AnyObject, file : StaticString = __FILE__, line : UWord = __LINE__){
         if stack.count == 0{
             fatalError("\(what)", file: file, line: line)
@@ -361,14 +333,14 @@ private class GoRoutine {
     }
     func select(file : StaticString = __FILE__, line : UWord = __LINE__, closure:()->()){
         ${
-            var s = self.stack.last!
+            let s = self.stack.last!
             s.select = true
             closure()
-            var idxs = self.randomInts(s.chans.count)
+            let idxs = self.randomInts(s.chans.count)
             if s.defalt != nil{
                 var (flag, handled) = (false, false)
                 for i in idxs {
-                    var (msg, ok, ready) = s.chans[i].receive(false, mutex: nil, flag: &flag)
+                    let (msg, ok, ready) = s.chans[i].receive(false, mutex: nil, flag: &flag)
                     if ready {
                         s.cases[i](msg: msg, ok: ok)
                         handled = true
@@ -386,21 +358,21 @@ private class GoRoutine {
                     NSThread.sleepForTimeInterval(0.05)
                 }
             } else {
-                var wg = WaitGroup()
+                let wg = WaitGroup()
                 wg.add(idxs.count)
-                var signal : (except : Int)->() = { (except) in
+                let signal : (except : Int)->() = { (except) in
                     for i in idxs {
                         if i != except {
                             s.chans[i].signal()
                         }
                     }
                 }
                 var flag = false
-                var mutex = Mutex()
+                let mutex = Mutex()
                 for i in idxs {
-                    var (c, f, ci) = (s.chans[i], s.cases[i], i)
+                    let (c, f, ci) = (s.chans[i], s.cases[i], i)
                     dispatch_thread {
-                        var (msg, ok, ready) = c.receive(true, mutex: mutex, flag: &flag)
+                        let (msg, ok, ready) = c.receive(true, mutex: mutex, flag: &flag)
                         if ready {
                             signal(except: ci)
                             f(msg: msg, ok: ok)
@@ -498,21 +470,18 @@ public func $(closure: ()->()){
 public func go(closure: ()->()){
     goapp.go(closure)
 }
-public func defer(file : StaticString = __FILE__, line : UWord = __LINE__, closure: ()->()){
-    goapp.routine().defer(file: file, line: line, closure: closure)
-}
 public func panic(what : AnyObject, file : StaticString = __FILE__, line : UWord = __LINE__){
     goapp.routine().panic(what, file: file, line: line)
 }
 public func recover(file : StaticString = __FILE__, line : UWord = __LINE__) -> AnyObject? {
-    return goapp.routine().recover(file: file, line: line)
+    return goapp.routine().recover(file, line: line)
 }
 public func select(file : StaticString = __FILE__, line : UWord = __LINE__, closure:()->()) {
-    goapp.routine().select(file: file, line: line, closure: closure)
+    goapp.routine().select(file, line: line, closure: closure)
 }
 public func _case<T>(l : Chan<T>, file : StaticString = __FILE__, line : UWord = __LINE__, closure:(msg : T?, ok : Bool)->()) {
     goapp.routine().case_(l, file: file, line: line, closure: { (msg, ok) in closure(msg: msg as? T, ok: ok) })
 }
 public func _default(file : StaticString = __FILE__, line : UWord = __LINE__, closure:()->()) {
-    goapp.routine().default_(file: file, line: line, closure: closure)
+    goapp.routine().default_(file, line: line, closure: closure)
 }

README.md

@@ -2,7 +2,7 @@
 
 Bring some of the more powerful features of Go to your iOS / Swift project such as channels, goroutines, and defers.
 
-***Note: Swift 2 now includes the builtin `defer` keyword. At the moment GoSwift is not compatible with Swift 2.*** *A new version of GoSwift is in the works.*
+**Built for Swift 2.0** For Swift 1.2 support use *v0.1.4* or earlier.
 
 ##Features
 
@@ -15,7 +15,6 @@ Bring some of the more powerful features of Go to your iOS / Swift project such
 	- Closing
 - Sync Package
 	- Mutex, Cond, Once, WaitGroup
-- Error type
 
 ##Example
 

examples/channel-buffering.swift

@@ -13,7 +13,7 @@ func main() {
 
 	// Here we `make` a channel of strings buffering up to
 	// 2 values.
-	var messages = Chan<String>(2)
+	let messages = Chan<String>(2)
 
 	// Because this channel is buffered, we can send these
 	// values into the channel without a corresponding

examples/channel-synchronization.swift

@@ -22,7 +22,7 @@ func main() {
 
 	// Start a worker goroutine, giving it the channel to
 	// notify on.
-	var done = Chan<Bool>(1)
+	let done = Chan<Bool>(1)
 	go { worker(done) }
 
 	// Block until we receive a notification from the

examples/channels.swift

@@ -11,7 +11,7 @@ func main() {
 
 	// Create a new channel with `make(chan val-type)`.
 	// Channels are typed by the values they convey.
-	var messages = Chan<String>()
+	let messages = Chan<String>()
 
 	// _Send_ a value into a channel using the `channel <-`
 	// syntax. Here we send `"ping"`  to the `messages`
@@ -21,6 +21,6 @@ func main() {
 	// The `<-channel` syntax _receives_ a value from the
 	// channel. Here we'll receive the `"ping"` message
 	// we sent above and print it out.
-	var msg = <-messages
+	let msg = <-messages
 	println(msg!)
 }

examples/closing-channels.swift

@@ -11,8 +11,8 @@
 // to a worker goroutine. When we have no more jobs for
 // the worker we'll `close` the `jobs` channel.
 func main() {
-	var jobs = Chan<Int>(5)
-	var done = Chan<Bool>()
+	let jobs = Chan<Int>(5)
+	let done = Chan<Bool>()
 
 	// Here's the worker goroutine. It repeatedly receives
 	// from `jobs` with `j, more := <-jobs`. In this
@@ -23,7 +23,7 @@ func main() {
 	// all our jobs.
 	go {
 		for ;; {
-			var (j, more) = <?jobs
+			let (j, more) = <?jobs
 			if more {
 				println("received job \(j!)")
 			} else {

examples/defer.swift

@@ -11,21 +11,14 @@
 // and then close when we're done. Here's how we could
 // do that with `defer`.
 func main() {
-	${  // ${} is required for 'defer', 'panic', 'recover'
-		// Immediately after getting a file object with
-		// `createFile`, we defer the closing of that file
-		// with `closeFile`. This will be executed at the end
-		// of the enclosing function (`main`), after
-		// `writeFile` has finished.
-		var f = createFile("/tmp/defer.txt")
-		defer { closeFile(f) }
-		writeFile(f)
-	}
+	let f = createFile("/tmp/defer.txt")
+	defer { closeFile(f) }
+	writeFile(f)
 }
 
 func createFile(p : String) -> UnsafeMutablePointer<FILE> {
 	println("creating")
-	var f = fopen(p, "wb+")
+	let f = fopen(p, "wb+")
 	if f == nil {
 		panic("file error")
 	}