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

Syntax.Branch holds an array again.

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

2
prototype/Doubt/Diff.swift
View File

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

12
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 Branch([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(transform(x))
return .Branch(x.map(transform))
}
}
public func reduce<T>(initial: T, @noescape combine: (T, Recur) throws -> T) rethrows -> T {
switch self {
case let .Branch(x):
return try combine(initial, x)
return try x.reduce(initial, combine: combine)
default:
return initial
@ -67,7 +67,7 @@ public enum Syntax<Recur, A>: CustomDebugStringConvertible, CustomDocConvertible
case let .Leaf(n):
return Doc(n)
case let .Branch(x):
return Doc(x)
return x.map(Doc.init).joinWithSeparator(", ").bracket("[", "]")
}
}
}
@ -81,7 +81,7 @@ extension Syntax {
case let (.Leaf(l1), .Leaf(l2)):
return ifLeaf(l1, l2)
case let (.Branch(v1), .Branch(v2)):
return ifRecur(v1, v2)
return v1.count == v2.count && zip(v1, v2).lazy.map(ifRecur).reduce(true) { $0 && $1 }
default:
return false
}
@ -105,7 +105,7 @@ extension Syntax {
case let .Leaf(n):
return Hash("Leaf", ifLeaf(n))
case let .Branch(x):
return Hash("Branch", ifRecur(x))
return Hash("Branch", .Ordered(x.map(ifRecur)))
}
}
}