github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-11-28 10:15:55 +03:00
Code Issues Projects Releases Wiki Activity

Diff is defined over Term<Info>.

Browse Source 
This enables diffs to operate on categorized Terms.
This commit is contained in:
Rob Rix 2015-09-30 16:05:39 -04:00
parent 84eeba6111
commit 5dd80cb0ce
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
prototype/Doubt/Diff.swift
View File

@ -1,16 +1,16 @@
public enum Diff: Comparable, CustomDebugStringConvertible, CustomDocConvertible {
case Patch(Term<String>, Term<String>)
indirect case Copy(Syntax<Diff, String>)
case Patch(Term<Info>, Term<Info>)
indirect case Copy(Syntax<Diff, Info>)
public static func Insert(term: Term<String>) -> Diff {
public static func Insert(term: Term<Info>) -> Diff {
return .Patch(.Empty, term)
}
public static func Delete(term: Term<String>) -> Diff {
public static func Delete(term: Term<Info>) -> Diff {
return .Patch(term, .Empty)
}
public init(_ term: Term<String>) {
public init(_ term: Term<Info>) {
switch term {
case let .Roll(s):
self = .Copy(s.map(Diff.init))
@ -45,7 +45,7 @@ public enum Diff: Comparable, CustomDebugStringConvertible, CustomDocConvertible
}
}
public init(_ a: Term<String>, _ b: Term<String>) {
public init(_ a: Term<Info>, _ b: Term<Info>) {
if a == b {
self = Diff(b)
return
@ -62,7 +62,7 @@ public enum Diff: Comparable, CustomDebugStringConvertible, CustomDocConvertible
}
}
public static func diff<C1: CollectionType, C2: CollectionType where C1.Index : RandomAccessIndexType, C1.Generator.Element == Term<String>, C2.Index : RandomAccessIndexType, C2.Generator.Element == Term<String>>(a: C1, _ b: C2) -> [Diff] {
public static func diff<C1: CollectionType, C2: CollectionType where C1.Index : RandomAccessIndexType, C1.Generator.Element == Term<Info>, C2.Index : RandomAccessIndexType, C2.Generator.Element == Term<Info>>(a: C1, _ b: C2) -> [Diff] {
func magnitude(diffs: Stream<(Diff, Int)>) -> Int {
// return diffs.first?.magnitude ?? 0
return diffs.map { $1 }.reduce(0, combine: +)
@ -74,7 +74,7 @@ public enum Diff: Comparable, CustomDebugStringConvertible, CustomDocConvertible
})
}
func diff(a: Stream<Term<String>>, _ b: Stream<Term<String>>) -> Stream<(Diff, Int)> {
func diff(a: Stream<Term<Info>>, _ b: Stream<Term<Info>>) -> Stream<(Diff, Int)> {
switch (a, b) {
case (.Nil, .Nil):
return .Nil

8
prototype/DoubtTests/DiffTests.swift
View File

@ -33,10 +33,10 @@ final class DiffTests: XCTestCase {
}
}
private let a = Term(.Leaf("a"))
private let b = Term(.Leaf("b"))
private let c = Term(.Leaf("c"))
private let d = Term(.Leaf("d"))
private let a: Term<Info> = Term(.Leaf(.Literal("a", [])))
private let b: Term<Info> = Term(.Leaf(.Literal("b", [])))
private let c: Term<Info> = Term(.Leaf(.Literal("c", [])))
private let d: Term<Info> = Term(.Leaf(.Literal("d", [])))
import Doubt
import XCTest

2
prototype/DoubtTests/SwiftTests.swift
View File

@ -9,7 +9,7 @@ final class SwiftTests: XCTestCase {
let structure = Structure(file: file)
let dictionary = toAnyObject(structure.dictionary)
print(JSON(object: dictionary).map { Term<String>(path: path, JSON: $0) })
// print(JSON(object: dictionary).map { Term<String>(path: path, JSON: $0) })
}
}

2
prototype/doubt-swift/main.swift
View File

@ -102,6 +102,6 @@ extension Term where A: StringConvertible {
}
}
if let a = arguments[1].flatMap(Term<String>.init), b = arguments[2].flatMap(Term<String>.init) {
if let a = arguments[1].flatMap(Term<Info>.init), b = arguments[2].flatMap(Term<Info>.init) {
print(String(reflecting: Diff(a, b)))
}