Merge pull request #15 from CodaFi/testing-plus-plus

Testing Plus Plus

Author: CodaFi

.gitignore

@@ -16,6 +16,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+Carthage/
 
 # CocoaPods
 #

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "Carthage/Checkouts/Swiftz"]
 	path = Carthage/Checkouts/Swiftz
 	url = https://github.com/typelift/Swiftz.git
+[submodule "Carthage/Checkouts/SwiftCheck"]
+	path = Carthage/Checkouts/SwiftCheck
+	url = https://github.com/typelift/SwiftCheck.git

Cartfile.private

@@ -1 +1,2 @@
 github "typelift/Swiftz"
+github "typelift/SwiftCheck"

Cartfile.resolved

@@ -1 +1,2 @@
-github "typelift/Swiftz" "v0.2.3"
+github "typelift/SwiftCheck" "v0.2.6"
+github "typelift/Swiftz" "v0.2.4"

Carthage/Checkouts/SwiftCheck

@@ -6,8 +6,6 @@
 //  Copyright (c) 2014 TypeLift. All rights reserved.
 //
 
-import Swiftz
-
 /// QSem is a simple quanitity semaphore (read: counting semaphore) that aquires and releases
 /// resources in increments of 1.  The semaphore keeps track of blocked threads with MVar<()>'s.
 /// When a thread becomes unblocked, the semaphore simply fills the MVar with a ().  Threads can

Carthage/Checkouts/Swiftz

@@ -35,7 +35,7 @@ public struct SVar<A> {
 	/// Creates a new SVar containing the supplied value.
 	public init(initial : A){
 		let v = MVar<A>(initial: initial)
-		self.init(MVar(initial: (0, v)))
+		self.init(MVar(initial: (1, v)))
 	}
 
 	/// Empties the reciever.
@@ -70,7 +70,7 @@ public struct SVar<A> {
 			self.svar.put(s)
 		default:
 			val.put(v)
-			self.svar.put(min(1, readers), val)
+			self.svar.put(min(1, readers + 1), val)
 		}
 	}