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

Replace the spread function with an extension method.

Browse Source
This commit is contained in:
Rob Rix 2015-09-28 22:53:15 -04:00
parent 28d66524bf
commit d0b6617ce6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
prototype/Doubt/Doc.swift
View File

@ -68,10 +68,6 @@ public enum Doc: CustomDocConvertible, Equatable {
return group(Concat(Text(l), Concat(Nest(2, Concat(Line, x)), Concat(Line, Text(r)))))
}
public static func spread<C: CollectionType where C.Generator.Element == Doc>(docs: C) -> Doc {
return docs.fold(<+>)
}
public static func stack<C: CollectionType where C.Generator.Element == Doc>(docs: C) -> Doc {
return docs.fold(</>)
}
@ -118,6 +114,11 @@ extension SequenceType where Generator.Element == Doc {
}
return fold(Stream(sequence: self))
}
public func spread() -> Doc {
return fold(<+>)
}
public func joinWithSeparator(separator: String) -> Doc {
return fold {
$0 <> .Text(separator) <+> $1

2
prototype/Doubt/Syntax.swift
View File

@ -194,7 +194,7 @@ public enum Syntax<Payload>: CustomDebugStringConvertible, CustomDocConvertible
.stack(body.map(Doc.init))
].fold(<>)
case let .Assign(n, v):
return .spread([ .Text(n), .Text("="), Doc(v) ])
return [ .Text(n), .Text("="), Doc(v) ].spread()
case let .Variable(n):
return .Text(n)
case let .Literal(s):