github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-02 02:08:48 +03:00
Code Issues Projects Releases Wiki Activity

Rename Branch to Indexed.

Browse Source
This commit is contained in:
Rob Rix 2015-10-02 17:12:49 -04:00
parent 395fa8446f
commit 7c69de54bc
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
prototype/Doubt/Diff.swift
View File

@ -105,8 +105,8 @@ public enum Diff: Comparable, CustomDebugStringConvertible, CustomDocConvertible
case let (.Leaf(v1), .Leaf(v2)) where v1 == v2:
self = .Copy(.Leaf(v2))
case let (.Branch(v1), .Branch(v2)):
self = .Copy(.Branch(Diff.diff(v1, v2)))
case let (.Indexed(v1), .Indexed(v2)):
self = .Copy(.Indexed(Diff.diff(v1, v2)))
default:
self = .Patch(a, b)

18
prototype/Doubt/Syntax.swift
View File

@ -32,21 +32,21 @@ public func == <A: Equatable> (left: Term<A>, right: Term<A>) -> Bool {
/// A node in a syntax tree. Expressed algebraically to enable representation of both normal syntax trees and their diffs.
public enum Syntax<Recur, A>: CustomDebugStringConvertible, CustomDocConvertible {
case Leaf(A)
case Branch([Recur])
case Indexed([Recur])
public func map<T>(@noescape transform: Recur -> T) -> Syntax<T, A> {
switch self {
case let .Leaf(n):
return .Leaf(n)
case let .Branch(x):
return .Branch(x.map(transform))
case let .Indexed(x):
return .Indexed(x.map(transform))
}
}
// fixme: 🔥
public func reduce<T>(initial: T, @noescape combine: (T, Recur) throws -> T) rethrows -> T {
switch self {
case let .Branch(x):
case let .Indexed(x):
return try x.reduce(initial, combine: combine)
default:
@ -58,7 +58,7 @@ public enum Syntax<Recur, A>: CustomDebugStringConvertible, CustomDocConvertible
switch self {
case let .Leaf(n):
return ".Leaf(\(n))"
case let .Branch(x):
case let .Indexed(x):
return ".Branch(\(String(reflecting: x)))"
}
}
@ -67,7 +67,7 @@ public enum Syntax<Recur, A>: CustomDebugStringConvertible, CustomDocConvertible
switch self {
case let .Leaf(n):
return Doc(n)
case let .Branch(x):
case let .Indexed(x):
return x.map(Doc.init).joinWithSeparator(", ").bracket("[", "]")
}
}
@ -81,7 +81,7 @@ extension Syntax {
switch (left, right) {
case let (.Leaf(l1), .Leaf(l2)):
return ifLeaf(l1, l2)
case let (.Branch(v1), .Branch(v2)):
case let (.Indexed(v1), .Indexed(v2)):
return v1.count == v2.count && zip(v1, v2).lazy.map(ifRecur).reduce(true) { $0 && $1 }
default:
return false
@ -105,8 +105,8 @@ extension Syntax {
switch self {
case let .Leaf(n):
return Hash("Leaf", ifLeaf(n))
case let .Branch(x):
return Hash("Branch", .Ordered(x.map(ifRecur)))
case let .Indexed(x):
return Hash("Indexed", .Ordered(x.map(ifRecur)))
}
}
}