github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-29 18:06:14 +03:00
Code Issues Projects Releases Wiki Activity

Layout is private.

Browse Source
This commit is contained in:
Rob Rix 2015-09-28 22:59:24 -04:00
parent 61bb6cff93
commit cfc92283db
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
prototype/Doubt/Doc.swift
View File

@ -1,9 +1,9 @@
public enum Layout: CustomStringConvertible, Equatable {
private enum Layout: CustomStringConvertible, Equatable {
case Empty
indirect case Text(String, Layout)
indirect case Line(Int, Layout)
public init(width: Int, placed: Int, alternatives: Stream<(Int, Doc)>) {
init(width: Int, placed: Int, alternatives: Stream<(Int, Doc)>) {
switch alternatives {
case .Nil:
self = .Empty
@ -22,7 +22,7 @@ public enum Layout: CustomStringConvertible, Equatable {
}
}
public var description: String {
var description: String {
switch self {
case .Empty:
return ""
@ -33,7 +33,7 @@ public enum Layout: CustomStringConvertible, Equatable {
}
}
public func fits(width: Int) -> Bool {
func fits(width: Int) -> Bool {
guard width >= 0 else { return false }
switch self {
case .Empty, .Line:
@ -43,11 +43,25 @@ public enum Layout: CustomStringConvertible, Equatable {
}
}
public static func better(width: Int, _ placed: Int, _ x: Layout, _ y: Layout) -> Layout {
static func better(width: Int, _ placed: Int, _ x: Layout, _ y: Layout) -> Layout {
return x.fits(width - placed) ? x : y
}
}
private func == (left: Layout, right: Layout) -> Bool {
switch (left, right) {
case (.Empty, .Empty):
return true
case let (.Text(a, x), .Text(b, y)):
return a == b && x == y
case let (.Line(i, x), .Line(j, y)):
return i == j && x == y
default:
return false
}
}
public enum Doc: CustomDocConvertible, Equatable {
case Empty
indirect case Concat(Doc, Doc)
@ -90,7 +104,7 @@ public enum Doc: CustomDocConvertible, Equatable {
return best(width).description
}
public func best(width: Int, placed: Int = 0) -> Layout {
private func best(width: Int, placed: Int = 0) -> Layout {
return Layout(width: width, placed: placed, alternatives: .pure((0, self)))
}

13
prototype/Doubt/Equatable.swift
View File

@ -42,19 +42,6 @@ public func == (left: Diff, right: Diff) -> Bool {
}
}
public func == (left: Layout, right: Layout) -> Bool {
switch (left, right) {
case (.Empty, .Empty):
return true
case let (.Text(a, x), .Text(b, y)):
return a == b && x == y
case let (.Line(i, x), .Line(j, y)):
return i == j && x == y
default:
return false
}
}
public func == (left: Doc, right: Doc) -> Bool {
switch (left, right) {
case (.Empty, .Empty), (.Line, .Line):