Merge branch 'master' into restrict-comparisons-by-category

Conflicts:
	prototype/Doubt.xcodeproj/project.pbxproj

prototype/Doubt.xcodeproj/project.pbxproj

@@ -29,7 +29,6 @@
 		D4413FEF1BB06D4C00E3C3C1 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4413FEE1BB06D4C00E3C3C1 /* Dictionary.swift */; };
 		D4413FF11BB08FDC00E3C3C1 /* JSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4413FF01BB08FDC00E3C3C1 /* JSON.swift */; };
 		D45A36C91BBC667D00BE3DDE /* Categorizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D45A36C81BBC667D00BE3DDE /* Categorizable.swift */; settings = {ASSET_TAGS = (); }; };
-		D49FCBC21BBEF2C600C5E9C3 /* Fix.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49FCBC11BBEF2C600C5E9C3 /* Fix.swift */; settings = {ASSET_TAGS = (); }; };
 		D49FCBC41BBEF98E00C5E9C3 /* Free.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49FCBC31BBEF98E00C5E9C3 /* Free.swift */; settings = {ASSET_TAGS = (); }; };
 		D49FCBC61BBF214300C5E9C3 /* Patch.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49FCBC51BBF214300C5E9C3 /* Patch.swift */; settings = {ASSET_TAGS = (); }; };
 		D49FCBC81BBF2C4300C5E9C3 /* Algorithm.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49FCBC71BBF2C4300C5E9C3 /* Algorithm.swift */; settings = {ASSET_TAGS = (); }; };
@@ -39,7 +38,6 @@
 		D4AAE5471B5AE2D0004E581F /* Optional.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4AAE53C1B5AE2D0004E581F /* Optional.swift */; };
 		D4AAE5491B5AE2D0004E581F /* StringLiteralConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4AAE53E1B5AE2D0004E581F /* StringLiteralConvertible.swift */; };
 		D4AAE54A1B5AE2D0004E581F /* Syntax.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4AAE53F1B5AE2D0004E581F /* Syntax.swift */; };
-		D4D7F3171BBB22E500AAB0C0 /* Hash.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4D7F3161BBB22E500AAB0C0 /* Hash.swift */; settings = {ASSET_TAGS = (); }; };
 		D4DF96ED1BC46B630040F41F /* SES.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4DF96EC1BC46B630040F41F /* SES.swift */; settings = {ASSET_TAGS = (); }; };
 		D4DF970A1BC5DF800040F41F /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4DF97091BC5DF800040F41F /* main.swift */; settings = {ASSET_TAGS = (); }; };
 		D4DF970C1BC5DF9E0040F41F /* BoundsCheckedArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = D435B7521BB31BBC000902F6 /* BoundsCheckedArray.swift */; settings = {ASSET_TAGS = (); }; };
@@ -72,7 +70,6 @@
 		D4413FEE1BB06D4C00E3C3C1 /* Dictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = "<group>"; };
 		D4413FF01BB08FDC00E3C3C1 /* JSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSON.swift; sourceTree = "<group>"; };
 		D45A36C81BBC667D00BE3DDE /* Categorizable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Categorizable.swift; sourceTree = "<group>"; };
-		D49FCBC11BBEF2C600C5E9C3 /* Fix.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Fix.swift; sourceTree = "<group>"; };
 		D49FCBC31BBEF98E00C5E9C3 /* Free.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Free.swift; sourceTree = "<group>"; };
 		D49FCBC51BBF214300C5E9C3 /* Patch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Patch.swift; sourceTree = "<group>"; };
 		D49FCBC71BBF2C4300C5E9C3 /* Algorithm.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Algorithm.swift; sourceTree = "<group>"; };
@@ -85,7 +82,6 @@
 		D4AAE53C1B5AE2D0004E581F /* Optional.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Optional.swift; sourceTree = "<group>"; };
 		D4AAE53E1B5AE2D0004E581F /* StringLiteralConvertible.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringLiteralConvertible.swift; sourceTree = "<group>"; };
 		D4AAE53F1B5AE2D0004E581F /* Syntax.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Syntax.swift; sourceTree = "<group>"; };
-		D4D7F3161BBB22E500AAB0C0 /* Hash.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Hash.swift; sourceTree = "<group>"; };
 		D4DF96EC1BC46B630040F41F /* SES.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SES.swift; sourceTree = "<group>"; };
 		D4DF96F01BC54C970040F41F /* Doubt.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = Doubt.modulemap; sourceTree = "<group>"; };
 		D4DF96FB1BC5DF050040F41F /* doubt-json.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "doubt-json.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -163,9 +159,7 @@
 				D4413FEE1BB06D4C00E3C3C1 /* Dictionary.swift */,
 				D4413FF01BB08FDC00E3C3C1 /* JSON.swift */,
 				D40B89C31BC319070078E098 /* Matrix.swift */,
-				D4D7F3161BBB22E500AAB0C0 /* Hash.swift */,
 				D45A36C81BBC667D00BE3DDE /* Categorizable.swift */,
-				D49FCBC11BBEF2C600C5E9C3 /* Fix.swift */,
 				D49FCBC31BBEF98E00C5E9C3 /* Free.swift */,
 				D42F097B1BCE914A00B95610 /* Cofree.swift */,
 				D49FCBC51BBF214300C5E9C3 /* Patch.swift */,
@@ -349,7 +343,6 @@
 			files = (
 				D4AAE5471B5AE2D0004E581F /* Optional.swift in Sources */,
 				D4413FEF1BB06D4C00E3C3C1 /* Dictionary.swift in Sources */,
-				D4D7F3171BBB22E500AAB0C0 /* Hash.swift in Sources */,
 				D42F097E1BCEAEDA00B95610 /* Operation.swift in Sources */,
 				D45A36C91BBC667D00BE3DDE /* Categorizable.swift in Sources */,
 				D4DF96ED1BC46B630040F41F /* SES.swift in Sources */,

prototype/Doubt/Cofree.swift

@@ -85,21 +85,6 @@ public func == <A: Equatable, B: Equatable> (left: Cofree<A, B>, right: Cofree<A
 }
 
 
-// MARK: - Hashing
-
-extension Cofree {
-	public func hash(annotation annotation: B -> Hash, leaf: A -> Hash) -> Hash {
-		return .Ordered([ annotation(extract), unwrap.hash(ifLeaf: leaf, ifRecur: { $0.hash(annotation: annotation, leaf: leaf) }) ])
-	}
-}
-
-extension Cofree where A: Hashable, B: Hashable {
-	public var hash: Hash {
-		return hash(annotation: Hash.init, leaf: Hash.init)
-	}
-}
-
-
 // MARK: - JSON
 
 extension Cofree {

prototype/Doubt/Free.swift

@@ -148,22 +148,6 @@ public func == <Term: TermType where Term.LeafType: Equatable> (left: Free<Term.
 }
 
 
-// MARK: - Hashing
-
-extension Free {
-	public func hash(ifPure ifPure: B -> Hash, ifRoll: A -> Hash) -> Hash {
-		return analysis(ifPure: ifPure, ifRoll: { $0.hash(ifLeaf: ifRoll, ifRecur: { $0.hash(ifPure: ifPure, ifRoll: ifRoll) }) })
-	}
-}
-
-
-extension Free where A: Hashable, B: Hashable {
-	public var hash: Hash {
-		return hash(ifPure: Hash.init, ifRoll: Hash.init)
-	}
-}
-
-
 // MARK: - JSON
 
 extension Free {

prototype/Doubt/Hash.swift

@@ -1,108 +0,0 @@
-/// An algebraic representation of a non-cryptographic hash.
-public enum Hash: AlgebraicHashable {
-	/// An ordered sequence of sub-hashes to mix.
-	case Ordered([Hash])
-
-	/// An unordered collection of sub-hashes to mix. These will be mixed with an associative, commutative operation.
-	case Unordered([Hash])
-
-	/// A label, e.g. for an enum case or a dictionary key.
-	case Label(String)
-
-	/// The embedding of a raw hash value into an algebraic hash.
-	case Raw(Int)
-
-	/// The empty hash.
-	///
-	/// This is the right and left unit for Unordered.
-	case Empty
-
-	public init(_ label: String, _ hashes: Hash...) {
-		self = .Ordered([ Hash(label) ] + hashes)
-	}
-
-	public init(_ string: String) {
-		self = .Label(string)
-	}
-
-	public init(_ raw: Int) {
-		self = .Raw(raw)
-	}
-
-	public init<A: AlgebraicHashable>(_ hashable: A) {
-		self = hashable.hash
-	}
-
-	public init<A: Hashable>(_ hashable: A) {
-		self = .Raw(hashable.hashValue)
-	}
-
-
-	public var hash: Hash {
-		return self
-	}
-
-	public var hashValue: Int {
-		switch self {
-		case let .Ordered(s):
-			// Bob Jenkins’ one-at-a-time hash: https://en.wikipedia.org/wiki/Jenkins_hash_function
-			var hash = 0
-			for each in s {
-				hash += each.hashValue
-				hash += hash << 10
-				hash ^= hash >> 6
-			}
-			hash += hash << 3
-			hash ^= hash >> 11
-			hash += hash << 15
-			return hash
-		case let .Unordered(s):
-			return s.lazy.map { $0.hashValue }.reduce(0, combine: +)
-		case let .Label(s):
-			return s.hashValue
-		case let .Raw(i):
-			return i.hashValue
-		case .Empty:
-			return 0
-		}
-	}
-}
-
-public func == (left: Hash, right: Hash) -> Bool {
-	switch (left, right) {
-	case let (.Ordered(a), .Ordered(b)):
-		return a == b
-	case let (.Unordered(a), .Unordered(b)):
-		return a == b
-	case let (.Label(a), .Label(b)):
-		return a == b
-	case let (.Raw(a), .Raw(b)):
-		return a == b
-	case (.Empty, .Empty):
-		return true
-	default:
-		return false
-	}
-}
-
-public protocol AlgebraicHashable: Hashable {
-	var hash: Hash { get }
-}
-
-extension AlgebraicHashable {
-	public var hashValue: Int {
-		return hash.hashValue
-	}
-}
-
-extension RawRepresentable where RawValue: Hashable {
-	public var hash: Hash {
-		return Hash(rawValue)
-	}
-}
-
-extension RawRepresentable where RawValue: AlgebraicHashable {
-	public var hash: Hash {
-		return Hash(rawValue)
-	}
-}

prototype/Doubt/Patch.swift

@@ -53,18 +53,6 @@ extension Patch {
 }
 
 
-// MARK: - Hashing
-
-extension Patch {
-	public func hash(param: A -> Hash) -> Hash {
-		return Hash.Ordered([
-			state.before.map(param) ?? Hash.Empty,
-			state.after.map(param) ?? Hash.Empty
-		])
-	}
-}
-
-
 // MARK: - JSON
 
 extension Patch {

prototype/Doubt/Syntax.swift

@@ -71,28 +71,6 @@ public func == <F: Equatable, A: Equatable> (left: Syntax<F, A>, right: Syntax<F
 }
 
 
-// MARK: - Hashing
-
-extension Syntax {
-	public func hash(ifLeaf ifLeaf: A -> Hash, ifRecur: Recur -> Hash) -> Hash {
-		switch self {
-		case let .Leaf(n):
-			return Hash("Leaf", ifLeaf(n))
-		case let .Indexed(x):
-			return Hash("Indexed", .Ordered(x.map(ifRecur)))
-		case let .Keyed(d):
-			return Hash("Keyed", .Ordered(d.keys.sort().map { Hash($0, ifRecur(d[$0]!)) }))
-		}
-	}
-}
-
-extension Syntax where Recur: Hashable, A: Hashable {
-	public var hash: Hash {
-		return hash(ifLeaf: Hash.init, ifRecur: Hash.init)
-	}
-}
-
-
 // MARK: - JSON
 
 extension Syntax {