Public all the things (#6)

bkase · web-flow · commit 2d0370ade809 · 2017-06-07T21:50:16.000-07:00
diff --git a/Package.resolved b/Package.resolved
diff --git a/README.md b/README.md
@@ -160,7 +160,7 @@ With Swift Package Manager, put this inside your `Package.swift`:
 
 ```swift
 .Package(url: "https://github.com/bkase/DoctorPretty.git",
-         majorVersion: 0, minor: 2)
+         majorVersion: 0, minor: 3)
 ```
 
 ## How does it work?
diff --git a/Sources/Alignment.swift b/Sources/Alignment.swift
@@ -12,17 +12,17 @@ import Operadics
 // Alignment and Indentation
 extension Doc {
     /// Indent all lines of the doc by `i`
-    func indent(_ i: IndentLevel) -> Doc {
+    public func indent(_ i: IndentLevel) -> Doc {
         return (.text(spaces(i)) <> self).hang(i)
     }
     
     /// Hanging indentation
-    func hang(_ i: IndentLevel) -> Doc {
+    public func hang(_ i: IndentLevel) -> Doc {
         return (Doc.nest(i, self)).align()
     }
     
     /// Align this document with the nesting level set to the current column
-    func align() -> Doc {
+    public func align() -> Doc {
         return .column { k in
             .nesting { i in .nest(k - i, self) }
         }
diff --git a/Sources/Atoms.swift b/Sources/Atoms.swift
@@ -11,49 +11,49 @@ import Operadics
 
 extension Doc {
     /// Enclose a doc between left and right
-    func enclose(left: Doc, right: Doc) -> Doc {
+    public func enclose(left: Doc, right: Doc) -> Doc {
         return left <> self <> right
     }
     
-    var squotes: Doc {
+    public var squotes: Doc {
         return enclose(left: .squote, right: .squote)
     }
     
-    var dquotes: Doc {
+    public var dquotes: Doc {
         return enclose(left: .dquote, right: .dquote)
     }
     
-    var braces: Doc {
+    public var braces: Doc {
         return enclose(left: .lbrace, right: .rbrace)
     }
     
-    var parens: Doc {
+    public var parens: Doc {
         return enclose(left: .lparen, right: .rparen)
     }
     
-    var angles: Doc {
+    public var angles: Doc {
         return enclose(left: .langle, right: .rangle)
     }
     
-    var brackets: Doc {
+    public var brackets: Doc {
         return enclose(left: .lbracket, right: .rbracket)
     }
     
-    static let squote: Doc = .char("'")
-    static let dquote: Doc = .char("\"")
-    static let lbrace: Doc = .char("{")
-    static let rbrace: Doc = .char("}")
-    static let lparen: Doc = .char("(")
-    static let rparen: Doc = .char(")")
-    static let langle: Doc = .char("<")
-    static let rangle: Doc = .char(">")
-    static let lbracket: Doc = .char("[")
-    static let rbracket: Doc = .char("]")
-    
-    static let space: Doc = .char(" ")
-    static let dot: Doc = .char(".")
-    static let comma: Doc = .char(",")
-    static let semi: Doc = .char(";")
-    static let backslash: Doc = .char("\\")
-    static let equals: Doc = .char("=")
+    public static let squote: Doc = .char("'")
+    public static let dquote: Doc = .char("\"")
+    public static let lbrace: Doc = .char("{")
+    public static let rbrace: Doc = .char("}")
+    public static let lparen: Doc = .char("(")
+    public static let rparen: Doc = .char(")")
+    public static let langle: Doc = .char("<")
+    public static let rangle: Doc = .char(">")
+    public static let lbracket: Doc = .char("[")
+    public static let rbracket: Doc = .char("]")
+    
+    public static let space: Doc = .char(" ")
+    public static let dot: Doc = .char(".")
+    public static let comma: Doc = .char(",")
+    public static let semi: Doc = .char(";")
+    public static let backslash: Doc = .char("\\")
+    public static let equals: Doc = .char("=")
 }
diff --git a/Sources/Doc.swift b/Sources/Doc.swift
@@ -1,14 +1,14 @@
 import Swiftx
 import Operadics
 
-typealias Width = Int
+public typealias Width = Int
 // TODO: What does this int mean, really
-typealias ColumnCount = Int
-typealias IndentLevel = Int
+public typealias ColumnCount = Int
+public typealias IndentLevel = Int
 /// The ribbon width is the maximal amount of non-indentation characters on a line
-typealias RibbonWidth = Int
+public typealias RibbonWidth = Int
 
-indirect enum Doc {
+public indirect enum Doc {
     case empty
     /// Invariant: char != '\n'
     case _char(Character)
@@ -30,34 +30,34 @@ indirect enum Doc {
     case columns((ColumnCount?) -> Doc)
     case ribbon((RibbonWidth?) -> Doc)
     
-    static func char(_ c: Character) -> Doc {
+    public static func char(_ c: Character) -> Doc {
         return c == "\n" ? ._line : ._char(c)
     }
     
-    static func text(_ str: String) -> Doc {
+    public static func text(_ str: String) -> Doc {
         return str == "" ? .empty : ._text(length: str.characters.count, str)
     }
     
-    static var line: Doc {
+    public static var line: Doc {
         return .flatAlt(primary: ._line, whenFlattened: .space)
     }
     
-    static var linebreak: Doc {
+    public static var linebreak: Doc {
         return .flatAlt(primary: ._line, whenFlattened: .zero)
     }
     
-    static var hardline: Doc {
+    public static var hardline: Doc {
         return ._line
     }
     
     /// Used to specify alternative layouts
     /// `doc.grouped` removes all line breaks in `doc`. The resulting line
     /// is added if it fits on the page. If it doesn't, it's rendered as is
-    var grouped: Doc {
+    public var grouped: Doc {
         return .union(longerLines: flattened, shorterLines: self)
     }
     
-    var flattened: Doc {
+    public var flattened: Doc {
         switch self {
         case .empty: return self
         case ._char(_): return self
diff --git a/Sources/DocMonoid.swift b/Sources/DocMonoid.swift
@@ -11,10 +11,10 @@ import protocol Algebra.Additive
 import Operadics
 
 extension Doc: Additive {
-    static func <>(l: Doc, r: Doc) -> Doc {
+    public static func <>(l: Doc, r: Doc) -> Doc {
         return .concat(l, r)
     }
     
-    static var zero: Doc { return .empty }
+    public static var zero: Doc { return .empty }
 }
 
diff --git a/Sources/Enclosed.swift b/Sources/Enclosed.swift
@@ -12,10 +12,11 @@ import Operadics
 extension BidirectionalCollection where Iterator.Element == Doc, IndexDistance == Int, SubSequence.Iterator.Element == Doc {
     
     /// Intersperses punctuation inside docs
-    func punctuate(with punctuation: Doc) -> [Doc] {
+    public func punctuate(with punctuation: Doc) -> [Doc] {
         if let d = first {
-            return [d] + self.dropFirst().reduce([]) { acc, d2 in
-                acc <> [punctuation, d2]
+            return [d] + self.dropFirst().reduce([Doc]()) { t in
+                let (acc, d2) = t
+                return acc <> [punctuation, d2]
             }
         } else {
             return []
@@ -35,7 +36,7 @@ extension BidirectionalCollection where Iterator.Element == Doc, IndexDistance =
     ///         baz
     ///     ]
     /// Note: The Haskell version sticks the separator at the front
-    func enclose(left: Doc, right: Doc, separator: Doc, indent: IndentLevel) -> Doc {
+    public func enclose(left: Doc, right: Doc, separator: Doc, indent: IndentLevel) -> Doc {
         if count == 0 {
             return left <> right
         }
@@ -51,17 +52,17 @@ extension BidirectionalCollection where Iterator.Element == Doc, IndexDistance =
     }
     
     /// See @enclose
-    func list(indent: IndentLevel) -> Doc {
+    public func list(indent: IndentLevel) -> Doc {
         return enclose(left: Doc.lbracket, right: Doc.rbracket, separator: Doc.comma, indent: indent)
     }
     
     /// See @enclose
-    func tupled(indent: IndentLevel) -> Doc {
+    public func tupled(indent: IndentLevel) -> Doc {
         return enclose(left: Doc.lparen, right: Doc.rparen, separator: Doc.comma, indent: indent)
     }
     
     /// See @enclose
-    func semiBraces(indent: IndentLevel) -> Doc {
+    public func semiBraces(indent: IndentLevel) -> Doc {
         return enclose(left: Doc.lbrace, right: Doc.rbrace, separator: Doc.semi, indent: indent)
     }
 }
diff --git a/Sources/Extras.swift b/Sources/Extras.swift
@@ -8,6 +8,6 @@
 
 import Foundation
 
-func spaces(_ i: Int) -> String {
+public func spaces(_ i: Int) -> String {
     return (0..<i).map{ _ in " " }.joined()
 }
diff --git a/Sources/Fills.swift b/Sources/Fills.swift
@@ -12,16 +12,16 @@ import Operadics
 extension Doc {
     /// Render doc then fill until width == i
     /// If too large, put in a line-break and then pad
-    func fillBreak(_ i: IndentLevel) -> Doc {
+    public func fillBreak(_ i: IndentLevel) -> Doc {
         return width { w in w > i ? .nest(i, .linebreak) : .text(spaces(i - w)) }
     }
     
     /// Render doc then fill until width == i
-    func fill(_ i: IndentLevel) -> Doc {
+    public func fill(_ i: IndentLevel) -> Doc {
         return width { w in w >= i ? .zero : .text(spaces(i - w)) }
     }
     
-    func width(_ f: @escaping (IndentLevel) -> Doc) -> Doc {
+    public func width(_ f: @escaping (IndentLevel) -> Doc) -> Doc {
         return .column { k1 in self <> .column { k2 in f(k2 - k1) } }
     }
 }
diff --git a/Sources/HighLevelCombinators.swift b/Sources/HighLevelCombinators.swift
diff --git a/Sources/RenderPretty.swift b/Sources/RenderPretty.swift
diff --git a/Sources/SimpleDoc.swift b/Sources/SimpleDoc.swift

Original file line number	Diff line number	Diff line change
`@@ -12,17 +12,17 @@ import Operadics`
`12`	`12`	`// Alignment and Indentation`
`13`	`13`	`extension Doc {`
`14`	`14`	/// Indent all lines of the doc by `i`
`15`		`- func indent(_ i: IndentLevel) -> Doc {`
	`15`	`+ public func indent(_ i: IndentLevel) -> Doc {`
`16`	`16`	`return (.text(spaces(i)) <> self).hang(i)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`/// Hanging indentation`
`20`		`- func hang(_ i: IndentLevel) -> Doc {`
	`20`	`+ public func hang(_ i: IndentLevel) -> Doc {`
`21`	`21`	`return (Doc.nest(i, self)).align()`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/// Align this document with the nesting level set to the current column`
`25`		`- func align() -> Doc {`
	`25`	`+ public func align() -> Doc {`
`26`	`26`	`return .column { k in`
`27`	`27`	`.nesting { i in .nest(k - i, self) }`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,10 @@ import protocol Algebra.Additive`
`11`	`11`	`import Operadics`
`12`	`12`
`13`	`13`	`extension Doc: Additive {`
`14`		`- static func <>(l: Doc, r: Doc) -> Doc {`
	`14`	`+ public static func <>(l: Doc, r: Doc) -> Doc {`
`15`	`15`	`return .concat(l, r)`
`16`	`16`	`}`
`17`	`17`
`18`		`- static var zero: Doc { return .empty }`
	`18`	`+ public static var zero: Doc { return .empty }`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,11 @@ import Operadics`
`12`	`12`	`extension BidirectionalCollection where Iterator.Element == Doc, IndexDistance == Int, SubSequence.Iterator.Element == Doc {`
`13`	`13`
`14`	`14`	`/// Intersperses punctuation inside docs`
`15`		`- func punctuate(with punctuation: Doc) -> [Doc] {`
	`15`	`+ public func punctuate(with punctuation: Doc) -> [Doc] {`
`16`	`16`	`if let d = first {`
`17`		`- return [d] + self.dropFirst().reduce([]) { acc, d2 in`
`18`		`- acc <> [punctuation, d2]`
	`17`	`+ return [d] + self.dropFirst().reduce([Doc]()) { t in`
	`18`	`+ let (acc, d2) = t`
	`19`	`+ return acc <> [punctuation, d2]`
`19`	`20`	`}`
`20`	`21`	`} else {`
`21`	`22`	`return []`
`@@ -35,7 +36,7 @@ extension BidirectionalCollection where Iterator.Element == Doc, IndexDistance =`
`35`	`36`	`/// baz`
`36`	`37`	`/// ]`
`37`	`38`	`/// Note: The Haskell version sticks the separator at the front`
`38`		`- func enclose(left: Doc, right: Doc, separator: Doc, indent: IndentLevel) -> Doc {`
	`39`	`+ public func enclose(left: Doc, right: Doc, separator: Doc, indent: IndentLevel) -> Doc {`
`39`	`40`	`if count == 0 {`
`40`	`41`	`return left <> right`
`41`	`42`	`}`
`@@ -51,17 +52,17 @@ extension BidirectionalCollection where Iterator.Element == Doc, IndexDistance =`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`/// See @enclose`
`54`		`- func list(indent: IndentLevel) -> Doc {`
	`55`	`+ public func list(indent: IndentLevel) -> Doc {`
`55`	`56`	`return enclose(left: Doc.lbracket, right: Doc.rbracket, separator: Doc.comma, indent: indent)`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`/// See @enclose`
`59`		`- func tupled(indent: IndentLevel) -> Doc {`
	`60`	`+ public func tupled(indent: IndentLevel) -> Doc {`
`60`	`61`	`return enclose(left: Doc.lparen, right: Doc.rparen, separator: Doc.comma, indent: indent)`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`/// See @enclose`
`64`		`- func semiBraces(indent: IndentLevel) -> Doc {`
	`65`	`+ public func semiBraces(indent: IndentLevel) -> Doc {`
`65`	`66`	`return enclose(left: Doc.lbrace, right: Doc.rbrace, separator: Doc.semi, indent: indent)`
`66`	`67`	`}`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@`
`8`	`8`
`9`	`9`	`import Foundation`
`10`	`10`
`11`		`-func spaces(_ i: Int) -> String {`
	`11`	`+public func spaces(_ i: Int) -> String {`
`12`	`12`	`return (0..<i).map{ _ in " " }.joined()`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,16 +12,16 @@ import Operadics`
`12`	`12`	`extension Doc {`
`13`	`13`	`/// Render doc then fill until width == i`
`14`	`14`	`/// If too large, put in a line-break and then pad`
`15`		`- func fillBreak(_ i: IndentLevel) -> Doc {`
	`15`	`+ public func fillBreak(_ i: IndentLevel) -> Doc {`
`16`	`16`	`return width { w in w > i ? .nest(i, .linebreak) : .text(spaces(i - w)) }`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`/// Render doc then fill until width == i`
`20`		`- func fill(_ i: IndentLevel) -> Doc {`
	`20`	`+ public func fill(_ i: IndentLevel) -> Doc {`
`21`	`21`	`return width { w in w >= i ? .zero : .text(spaces(i - w)) }`
`22`	`22`	`}`
`23`	`23`
`24`		`- func width(_ f: @escaping (IndentLevel) -> Doc) -> Doc {`
	`24`	`+ public func width(_ f: @escaping (IndentLevel) -> Doc) -> Doc {`
`25`	`25`	`return .column { k1 in self <> .column { k2 in f(k2 - k1) } }`
`26`	`26`	`}`
`27`	`27`	`}`