Use DefaultStringInterpolation for repeated strings

JanGorman · Apr 7, 2019 · 7b8521c · 7b8521c
1 parent 1ffeeec
commit 7b8521c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 35 deletions.
diff --git a/Sources/Border.swift b/Sources/Border.swift
@@ -1,10 +1,6 @@
 //
-//  Border.swift
-//  Table
-//
 //  Created by Jan GORMAN on 28/05/2017.
 //
-//
 
 public protocol Border {
   var topBody: String { get }

diff --git a/Sources/Column.swift b/Sources/Column.swift
@@ -1,10 +1,6 @@
 //
-//  Column.swift
-//  Table
-//
 //  Created by Jan GORMAN on 28/05/2017.
 //
-//
 
 public enum Alignment {
   case left, center, right

diff --git a/Sources/Configuration.swift b/Sources/Configuration.swift
@@ -1,10 +1,6 @@
 //
-//  Configuration.swift
-//  Table
-//
 //  Created by Jan GORMAN on 28/05/2017.
 //
-//
 
 import Foundation
 

diff --git a/Sources/DefaultStringInterpolation+Table.swift b/Sources/DefaultStringInterpolation+Table.swift
@@ -0,0 +1,15 @@
+//
+//  Created by Jan Gorman on 07.04.19.
+//
+
+import Foundation
+
+extension DefaultStringInterpolation {
+
+  mutating func appendInterpolation(repeat str: String, _ count: Int) {
+    for _ in 0..<count {
+      appendInterpolation(str)
+    }
+  }
+
+}
diff --git a/Sources/String+Extensions.swift b/Sources/String+Extensions.swift
diff --git a/Sources/Table.swift b/Sources/Table.swift
@@ -66,7 +66,7 @@ public final class Table {
 
   private func align(row: String, width: Int, alignment: Alignment) -> String {
     if row.count == 0 {
-      return " ".repeated(times: width)
+      return "\(repeat: " ", width)"
     }
 
     var availableWidth = width - row.count
@@ -85,16 +85,16 @@ public final class Table {
   }
 
   private func alignLeft(row: String, availableWidth: Int) -> String {
-    return row + " ".repeated(times: availableWidth)
+    return "\(row)\(repeat: " ", availableWidth)"
   }
 
   private func alignCenter(row: String, availableWidth: Int) -> String {
     let halfWidth = availableWidth / 2
-    return " ".repeated(times: halfWidth) + row + " ".repeated(times: halfWidth)
+    return "\(repeat: " ", halfWidth)\(row)\(repeat: " ", halfWidth)"
   }
 
   private func alignRight(row: String, availableWidth: Int) -> String {
-    return " ".repeated(times: availableWidth) + row
+    return "\(repeat: " ", availableWidth)\(row)"
   }
 
   private func makeConfiguration(rows: [[String]]) -> Configuration {
@@ -132,7 +132,7 @@ public final class Table {
     return rows.map {
       $0.enumerated().map {
         let column = configuration.columns[$0]
-        return " ".repeated(times: column.paddingLeft ?? 0) + $1 + " ".repeated(times: column.paddingRight ?? 0)
+        return "\(repeat: " ", column.paddingLeft ?? 0)\($1)\(repeat: " ", column.paddingRight ?? 0)"
       }
     }
   }
@@ -172,7 +172,7 @@ public final class Table {
 
   private func drawBorder(columnWidths: [Int], body: String, join: String, left: String, right: String) -> String {
     let columns = columnWidths.map {
-      body.repeated(times: $0)
+      "\(repeat: body, $0)"
     }.joined(separator: join)
 
     return left + columns + right + "\n"