Skip to content
Permalink
Browse files

Tweaks and fixes

  • Loading branch information...
Michael Gray
Michael Gray committed Oct 6, 2015
1 parent dfaf9d1 commit 9dfe1afff8fd8ad496ba45902f0e20fdd43add32
@@ -0,0 +1,5 @@
//: Playground - noun: a place where people can play
import Cocoa

var str = "Hello, playground"
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<playground version='5.0' target-platform='osx'>
<timeline fileName='timeline.xctimeline'/>
</playground>
@@ -0,0 +1,6 @@
//: Playground - noun: a place where people can play
import Cocoa
import FutureKit
import ReactiveCocoa

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<playground version='5.0' target-platform='osx' requires-full-environment='true'>
<timeline fileName='timeline.xctimeline'/>
</playground>
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Timeline
version = "3.0">
<TimelineItems>
</TimelineItems>
</Timeline>

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -4,20 +4,45 @@

},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"B521A9A43F2D8C0BFE65948465239FE1301DA81F" : 0,
"D7744383E5C9C0C45D8C588E6B2B0519A19147E0" : 0,
"95DE17A5219F9963BFC5201C57F75BD96CB46948" : 0
"D0725CAC6FF2D66F2C83C2C48DC12106D42DAA64" : 0,
"956D2B21DD155C49504BB67697A67F7C5351A353" : 0,
"95438028B10BBB846574013D29F154A00556A9D1" : 0,
"E084C86B03F81D63323C9E7510697EA528A758C7" : 0,
"51B210D0D41486D3ADD6940D57E4480BBD4DE4C5" : 0,
"95DE17A5219F9963BFC5201C57F75BD96CB46948" : 0,
"B521A9A43F2D8C0BFE65948465239FE1301DA81F" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "FF5802C3-18A7-4E47-BA33-3E8D19BD8989",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"B521A9A43F2D8C0BFE65948465239FE1301DA81F" : "ios-cover-pages\/Carthage\/Checkouts\/EasyMapping\/",
"D7744383E5C9C0C45D8C588E6B2B0519A19147E0" : "ios-cover-pages\/",
"95DE17A5219F9963BFC5201C57F75BD96CB46948" : "FutureKit"
"D0725CAC6FF2D66F2C83C2C48DC12106D42DAA64" : "ReactiveCocoa\/Carthage\/Checkouts\/Quick\/",
"956D2B21DD155C49504BB67697A67F7C5351A353" : "ReactiveCocoa\/Carthage\/Checkouts\/Result\/",
"95438028B10BBB846574013D29F154A00556A9D1" : "ReactiveCocoa\/Carthage\/Checkouts\/Nimble\/",
"E084C86B03F81D63323C9E7510697EA528A758C7" : "ReactiveCocoa\/Carthage\/Checkouts\/xcconfigs\/",
"51B210D0D41486D3ADD6940D57E4480BBD4DE4C5" : "ReactiveCocoa\/",
"95DE17A5219F9963BFC5201C57F75BD96CB46948" : "FutureKit",
"B521A9A43F2D8C0BFE65948465239FE1301DA81F" : "ios-cover-pages\/Carthage\/Checkouts\/EasyMapping\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "FutureKit",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "FutureKit.xcworkspace",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:mishagray\/ReactiveCocoa.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "51B210D0D41486D3ADD6940D57E4480BBD4DE4C5"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Quick\/Nimble.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "95438028B10BBB846574013D29F154A00556A9D1"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mishagray\/Result.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "956D2B21DD155C49504BB67697A67F7C5351A353"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/FutureKit\/FutureKit.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
@@ -28,10 +53,20 @@
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "B521A9A43F2D8C0BFE65948465239FE1301DA81F"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Quick\/Quick.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D0725CAC6FF2D66F2C83C2C48DC12106D42DAA64"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "ssh:\/\/stash.nyc.squarespace.net:7999\/mobile\/ios-cover-pages.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D7744383E5C9C0C45D8C588E6B2B0519A19147E0"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/jspahrsummers\/xcconfigs.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "E084C86B03F81D63323C9E7510697EA528A758C7"
}
]
}
@@ -446,12 +446,7 @@ public class Future<T> : FutureProtocol{
this is used as the internal storage for `var completion`
it is not thread-safe to read this directly. use `var synchObject`
*/
private final var __result : FutureResult<T>? {
didSet(c) {
if (c != nil) {
}
}
}
private final var __result : FutureResult<T>?

// private final let lock = NSObject()
@@ -33,9 +33,6 @@ public class Promise<T> {

public var future : Future<T>




public init() {
self.future = Future<T>()
}
@@ -57,6 +54,9 @@ public class Promise<T> {
public final func completeWithFail(errorMessage : String) {
self.future.completeWith(Completion<T>(failWithErrorMessage: errorMessage))
}
public final func completeWithErrorMessage(errorMessage : String) {
self.future.completeWith(Completion<T>(failWithErrorMessage: errorMessage))
}

public final func completeWithException(e : NSException) {
self.future.completeWith(Completion<T>(exception: e))
Oops, something went wrong.

0 comments on commit 9dfe1af

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.