Merge pull request #15 from mpurland/master

Updated Either to use latest from Swiftz
typelift · Jan 4, 2016 · e1c8fc5 · e1c8fc5
2 parents 778e088 + 3a143b7
commit e1c8fc5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 49 deletions.
diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck
diff --git a/Carthage/Checkouts/Swiftz b/Carthage/Checkouts/Swiftz
diff --git a/Tyro/EitherExt.swift b/Tyro/EitherExt.swift
@@ -25,23 +25,6 @@ public protocol EitherType {
 }
 
 extension Either : EitherType {
-    public var right : R? {
-        switch self {
-        case .Right(let r): return r
-        default: return nil
-        }
-    }
-
-    public var left : L? {
-        switch self {
-        case .Left(let l): return l
-        default: return nil
-        }
-    }
-
-    func fmap<L, RA, RB>(f : RA -> RB, e : Either<L, RA>) -> Either<L, RB> {
-        return f <^> e
-    }
 }
 
 extension Array where Element : EitherType {
@@ -90,33 +73,3 @@ extension Dictionary where Value : EitherType {
         }
     }
 }
-
-//struct EitherBuilder<L, R> {
-//    let value : R?
-//
-//    init(value v : R?) {
-//        value = v
-//    }
-//
-//    static func either(r : R?) -> EitherBuilder<L, R> {
-//        return EitherBuilder(value : r)
-//    }
-//
-//    func orThat(l : L) -> Either<L, R> {
-//        return value.maybe(Either.Left(l), onSome : { (r) -> Either<L, R> in
-//            return .Right(r)
-//        })
-//    }
-//}
-//
-//func eitherThis<L, R>(_ r : R?) -> EitherBuilder<L, R> {
-//    return EitherBuilder<L, R>.either(r)
-//}
-
-//func left<L, R>(_ left : L) -> Either<L, R> {
-//    return .Left(left)
-//}
-//
-//func right<L, R>(_ right : R) -> Either<L, R> {
-//    return .Right(right)
-//}
+12 −14		.travis.yml
+4 −1		README.md
+2 −1		SwiftCheck.podspec
+308 −1		SwiftCheck.xcodeproj/project.pbxproj
+99 −0		SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck-tvOS.xcscheme
+49 −504		SwiftCheck/Arbitrary.swift
+176 −0		SwiftCheck/CoArbitrary.swift
+2 −1		SwiftCheck/Gen.swift
+1 −1		SwiftCheck/Lattice.swift
+39 −38		SwiftCheck/Property.swift
+2 −2		SwiftCheck/Random.swift
+16 −17		SwiftCheck/Test.swift
+341 −0		SwiftCheck/WitnessedArbitrary.swift
+1 −1		SwiftCheckTests/TestSpec.swift
+44 −32		Tutorial.playground/Contents.swift
+18 −0		script/LICENSE.md
+82 −0		script/README.md
+47 −0		script/bootstrap
+173 −0		script/cibuild
+10 −0		script/schemes.awk
+25 −0		script/xctool.awk
+11 −1		.travis.yml
+3 −3		Cartfile.resolved
+1 −1		Carthage/Checkouts/Operadics
+1 −1		Carthage/Checkouts/SwiftCheck
+1 −1		Carthage/Checkouts/Swiftx
+3 −1		Swiftz.podspec
+612 −7		Swiftz.xcodeproj/project.pbxproj
+2 −2		Swiftz.xcodeproj/xcshareddata/xcschemes/Swiftz-iOS.xcscheme
+99 −0		Swiftz.xcodeproj/xcshareddata/xcschemes/Swiftz-tvOS.xcscheme
+80 −0		Swiftz.xcodeproj/xcshareddata/xcschemes/Swiftz-watchOS.xcscheme
+2 −2		Swiftz.xcodeproj/xcshareddata/xcschemes/Swiftz.xcscheme
+4 −0		Swiftz/Identity.swift
+1 −1		Swiftz/List.swift
+137 −0		Swiftz/Reader.swift
+7 −7		Swiftz/StringExt.swift
+0 −19		Swiftz/Tuple.swift
+77 −0		Swiftz/Unit.swift
+11 −0		SwiftzTests/ArrayExtSpec.swift
+13 −1		SwiftzTests/ArrowExtSpec.swift
+25 −7		SwiftzTests/DictionaryExtSpec.swift
+23 −0		SwiftzTests/FunctionSpec.swift
+32 −6		SwiftzTests/IdentitySpec.swift
+11 −0		SwiftzTests/ListSpec.swift
+8 −0		SwiftzTests/MonoidSpec.swift
+36 −0		SwiftzTests/NonEmptyListSpec.swift
+11 −0		SwiftzTests/OptionalExtSpec.swift
+29 −1		SwiftzTests/ProxySpec.swift
+82 −0		SwiftzTests/ReaderSpec.swift
+47 −0		SwiftzTests/UnitSpec.swift