Swift 5 (#11)

dastrobu · web-flow · commit 20cc9b9581a9 · 2019-04-06T11:56:51.000+02:00
* updated travis to build with swift 5.

* fixed compiler warnings from swift 5.
diff --git a/Sources/ArgTree.swift b/Sources/ArgTree.swift
@@ -173,12 +173,12 @@ internal func parseTree(arguments: [String],
 
 /** extension to support collection protocols for parsers */
 public extension ArgTree {
-    public var indices: CountableRange<Int> {
+    var indices: CountableRange<Int> {
         return parsers.indices
 
     }
 
-    public subscript(bounds: Range<Int>) -> ArraySlice<Parser> {
+    subscript(bounds: Range<Int>) -> ArraySlice<Parser> {
         get {
             return parsers[bounds]
         }
@@ -187,7 +187,7 @@ public extension ArgTree {
         }
     }
 
-    public subscript(position: Int) -> Parser {
+    subscript(position: Int) -> Parser {
         get {
             return parsers[position]
         }
@@ -196,45 +196,45 @@ public extension ArgTree {
         }
     }
 
-    public var startIndex: Int {
+    var startIndex: Int {
         return parsers.startIndex
     }
 
-    public var endIndex: Int {
+    var endIndex: Int {
         return parsers.endIndex
     }
 
-    public func append(_ parser: Parser) {
+    func append(_ parser: Parser) {
         parsers.append(parser)
     }
 
-    public func insert(_ parser: Parser, at i: Int) {
+    func insert(_ parser: Parser, at i: Int) {
         parsers.insert(parser, at: i)
     }
 
-    public func insert(contentsOf parsers: Parser, at i: Int) {
+    func insert(contentsOf parsers: Parser, at i: Int) {
         self.parsers.insert(parsers, at: i)
     }
 
     @discardableResult
-    public func remove(at i: Int) -> Parser {
+    func remove(at i: Int) -> Parser {
         return parsers.remove(at: i)
     }
 
-    public func removeSubrange(_ bounds: Range<Int>) {
+    func removeSubrange(_ bounds: Range<Int>) {
         parsers.removeSubrange(bounds)
     }
 
     @discardableResult
-    public func removeFirst() -> Parser {
+    func removeFirst() -> Parser {
         return parsers.removeFirst()
     }
 
-    public func removeFirst(_ n: Int) {
+    func removeFirst(_ n: Int) {
         parsers.removeFirst(n)
     }
 
-    public func removeAll(keepingCapacity keepCapacity: Bool = false) {
+    func removeAll(keepingCapacity keepCapacity: Bool = false) {
         parsers.removeAll()
     }
 
diff --git a/Sources/parsers/Command.swift b/Sources/parsers/Command.swift
@@ -108,12 +108,12 @@ open class Command: ValueParser<Bool>, ParserNode {
 
 /** extension to support collection protocols for parsers */
 public extension Command {
-    public var indices: CountableRange<Int> {
+    var indices: CountableRange<Int> {
         return parsers.indices
 
     }
 
-    public subscript(bounds: Range<Int>) -> ArraySlice<Parser> {
+    subscript(bounds: Range<Int>) -> ArraySlice<Parser> {
         get {
             return parsers[bounds]
         }
@@ -122,7 +122,7 @@ public extension Command {
         }
     }
 
-    public subscript(position: Int) -> Parser {
+    subscript(position: Int) -> Parser {
         get {
             return parsers[position]
         }
@@ -131,44 +131,44 @@ public extension Command {
         }
     }
 
-    public var startIndex: Int {
+    var startIndex: Int {
         return parsers.startIndex
     }
 
-    public var endIndex: Int {
+    var endIndex: Int {
         return parsers.endIndex
     }
 
-    public func append(_ parser: Parser) {
+    func append(_ parser: Parser) {
         parsers.append(parser)
     }
 
-    public func insert(_ parser: Parser, at i: Int) {
+    func insert(_ parser: Parser, at i: Int) {
         parsers.insert(parser, at: i)
     }
 
-    public func insert(contentsOf parsers: Parser, at i: Int) {
+    func insert(contentsOf parsers: Parser, at i: Int) {
         self.parsers.insert(parsers, at: i)
     }
 
-    public func remove(at i: Int) -> Parser {
+    func remove(at i: Int) -> Parser {
         return parsers.remove(at: i)
     }
 
-    public func removeSubrange(_ bounds: Range<Int>) {
+    func removeSubrange(_ bounds: Range<Int>) {
         parsers.removeSubrange(bounds)
     }
 
     @discardableResult
-    public func removeFirst() -> Parser {
+    func removeFirst() -> Parser {
         return parsers.removeFirst()
     }
 
-    public func removeFirst(_ n: Int) {
+    func removeFirst(_ n: Int) {
         parsers.removeFirst(n)
     }
 
-    public func removeAll(keepingCapacity keepCapacity: Bool = false) {
+    func removeAll(keepingCapacity keepCapacity: Bool = false) {
         parsers.removeAll()
     }
 
diff --git a/Sources/parsers/MultiFlag.swift b/Sources/parsers/MultiFlag.swift
@@ -84,12 +84,12 @@ public class MultiFlag: Parser, ParserNode, ParsePathSegment {
 
 /** extension to support collection protocols for parsers */
 public extension MultiFlag {
-    public var indices: CountableRange<Int> {
+    var indices: CountableRange<Int> {
         return parsers.indices
 
     }
 
-    public subscript(bounds: Range<Int>) -> ArraySlice<Parser> {
+    subscript(bounds: Range<Int>) -> ArraySlice<Parser> {
         get {
             return parsers[bounds]
         }
@@ -98,7 +98,7 @@ public extension MultiFlag {
         }
     }
 
-    public subscript(position: Int) -> Parser {
+    subscript(position: Int) -> Parser {
         get {
             return parsers[position]
         }
@@ -107,43 +107,43 @@ public extension MultiFlag {
         }
     }
 
-    public var startIndex: Int {
+    var startIndex: Int {
         return parsers.startIndex
     }
 
-    public var endIndex: Int {
+    var endIndex: Int {
         return parsers.endIndex
     }
 
-    public func append(_ parser: Parser) {
+    func append(_ parser: Parser) {
         parsers.append(parser)
     }
 
-    public func insert(_ parser: Parser, at i: Int) {
+    func insert(_ parser: Parser, at i: Int) {
         parsers.insert(parser, at: i)
     }
 
-    public func insert(contentsOf parsers: Parser, at i: Int) {
+    func insert(contentsOf parsers: Parser, at i: Int) {
         self.parsers.insert(parsers, at: i)
     }
 
-    public func remove(at i: Int) -> Parser {
+    func remove(at i: Int) -> Parser {
         return parsers.remove(at: i)
     }
 
-    public func removeSubrange(_ bounds: Range<Int>) {
+    func removeSubrange(_ bounds: Range<Int>) {
         parsers.removeSubrange(bounds)
     }
 
-    public func removeFirst() -> Parser {
+    func removeFirst() -> Parser {
         return parsers.removeFirst()
     }
 
-    public func removeFirst(_ n: Int) {
+    func removeFirst(_ n: Int) {
         parsers.removeFirst(n)
     }
 
-    public func removeAll(keepingCapacity keepCapacity: Bool = false) {
+    func removeAll(keepingCapacity keepCapacity: Bool = false) {
         parsers.removeAll()
     }
 

Original file line number	Diff line number	Diff line change
`@@ -173,12 +173,12 @@ internal func parseTree(arguments: [String],`
`173`	`173`
`174`	`174`	`/** extension to support collection protocols for parsers */`
`175`	`175`	`public extension ArgTree {`
`176`		`- public var indices: CountableRange<Int> {`
	`176`	`+ var indices: CountableRange<Int> {`
`177`	`177`	`return parsers.indices`
`178`	`178`
`179`	`179`	`}`
`180`	`180`
`181`		`- public subscript(bounds: Range<Int>) -> ArraySlice<Parser> {`
	`181`	`+ subscript(bounds: Range<Int>) -> ArraySlice<Parser> {`
`182`	`182`	`get {`
`183`	`183`	`return parsers[bounds]`
`184`	`184`	`}`
`@@ -187,7 +187,7 @@ public extension ArgTree {`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`
`190`		`- public subscript(position: Int) -> Parser {`
	`190`	`+ subscript(position: Int) -> Parser {`
`191`	`191`	`get {`
`192`	`192`	`return parsers[position]`
`193`	`193`	`}`
`@@ -196,45 +196,45 @@ public extension ArgTree {`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`
`199`		`- public var startIndex: Int {`
	`199`	`+ var startIndex: Int {`
`200`	`200`	`return parsers.startIndex`
`201`	`201`	`}`
`202`	`202`
`203`		`- public var endIndex: Int {`
	`203`	`+ var endIndex: Int {`
`204`	`204`	`return parsers.endIndex`
`205`	`205`	`}`
`206`	`206`
`207`		`- public func append(_ parser: Parser) {`
	`207`	`+ func append(_ parser: Parser) {`
`208`	`208`	`parsers.append(parser)`
`209`	`209`	`}`
`210`	`210`
`211`		`- public func insert(_ parser: Parser, at i: Int) {`
	`211`	`+ func insert(_ parser: Parser, at i: Int) {`
`212`	`212`	`parsers.insert(parser, at: i)`
`213`	`213`	`}`
`214`	`214`
`215`		`- public func insert(contentsOf parsers: Parser, at i: Int) {`
	`215`	`+ func insert(contentsOf parsers: Parser, at i: Int) {`
`216`	`216`	`self.parsers.insert(parsers, at: i)`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`@discardableResult`
`220`		`- public func remove(at i: Int) -> Parser {`
	`220`	`+ func remove(at i: Int) -> Parser {`
`221`	`221`	`return parsers.remove(at: i)`
`222`	`222`	`}`
`223`	`223`
`224`		`- public func removeSubrange(_ bounds: Range<Int>) {`
	`224`	`+ func removeSubrange(_ bounds: Range<Int>) {`
`225`	`225`	`parsers.removeSubrange(bounds)`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`@discardableResult`
`229`		`- public func removeFirst() -> Parser {`
	`229`	`+ func removeFirst() -> Parser {`
`230`	`230`	`return parsers.removeFirst()`
`231`	`231`	`}`
`232`	`232`
`233`		`- public func removeFirst(_ n: Int) {`
	`233`	`+ func removeFirst(_ n: Int) {`
`234`	`234`	`parsers.removeFirst(n)`
`235`	`235`	`}`
`236`	`236`
`237`		`- public func removeAll(keepingCapacity keepCapacity: Bool = false) {`
	`237`	`+ func removeAll(keepingCapacity keepCapacity: Bool = false) {`
`238`	`238`	`parsers.removeAll()`
`239`	`239`	`}`
`240`	`240`
Original file line number	Diff line number	Diff line change
`@@ -108,12 +108,12 @@ open class Command: ValueParser<Bool>, ParserNode {`
`108`	`108`
`109`	`109`	`/** extension to support collection protocols for parsers */`
`110`	`110`	`public extension Command {`
`111`		`- public var indices: CountableRange<Int> {`
	`111`	`+ var indices: CountableRange<Int> {`
`112`	`112`	`return parsers.indices`
`113`	`113`
`114`	`114`	`}`
`115`	`115`
`116`		`- public subscript(bounds: Range<Int>) -> ArraySlice<Parser> {`
	`116`	`+ subscript(bounds: Range<Int>) -> ArraySlice<Parser> {`
`117`	`117`	`get {`
`118`	`118`	`return parsers[bounds]`
`119`	`119`	`}`
`@@ -122,7 +122,7 @@ public extension Command {`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`- public subscript(position: Int) -> Parser {`
	`125`	`+ subscript(position: Int) -> Parser {`
`126`	`126`	`get {`
`127`	`127`	`return parsers[position]`
`128`	`128`	`}`
`@@ -131,44 +131,44 @@ public extension Command {`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`134`		`- public var startIndex: Int {`
	`134`	`+ var startIndex: Int {`
`135`	`135`	`return parsers.startIndex`
`136`	`136`	`}`
`137`	`137`
`138`		`- public var endIndex: Int {`
	`138`	`+ var endIndex: Int {`
`139`	`139`	`return parsers.endIndex`
`140`	`140`	`}`
`141`	`141`
`142`		`- public func append(_ parser: Parser) {`
	`142`	`+ func append(_ parser: Parser) {`
`143`	`143`	`parsers.append(parser)`
`144`	`144`	`}`
`145`	`145`
`146`		`- public func insert(_ parser: Parser, at i: Int) {`
	`146`	`+ func insert(_ parser: Parser, at i: Int) {`
`147`	`147`	`parsers.insert(parser, at: i)`
`148`	`148`	`}`
`149`	`149`
`150`		`- public func insert(contentsOf parsers: Parser, at i: Int) {`
	`150`	`+ func insert(contentsOf parsers: Parser, at i: Int) {`
`151`	`151`	`self.parsers.insert(parsers, at: i)`
`152`	`152`	`}`
`153`	`153`
`154`		`- public func remove(at i: Int) -> Parser {`
	`154`	`+ func remove(at i: Int) -> Parser {`
`155`	`155`	`return parsers.remove(at: i)`
`156`	`156`	`}`
`157`	`157`
`158`		`- public func removeSubrange(_ bounds: Range<Int>) {`
	`158`	`+ func removeSubrange(_ bounds: Range<Int>) {`
`159`	`159`	`parsers.removeSubrange(bounds)`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`@discardableResult`
`163`		`- public func removeFirst() -> Parser {`
	`163`	`+ func removeFirst() -> Parser {`
`164`	`164`	`return parsers.removeFirst()`
`165`	`165`	`}`
`166`	`166`
`167`		`- public func removeFirst(_ n: Int) {`
	`167`	`+ func removeFirst(_ n: Int) {`
`168`	`168`	`parsers.removeFirst(n)`
`169`	`169`	`}`
`170`	`170`
`171`		`- public func removeAll(keepingCapacity keepCapacity: Bool = false) {`
	`171`	`+ func removeAll(keepingCapacity keepCapacity: Bool = false) {`
`172`	`172`	`parsers.removeAll()`
`173`	`173`	`}`
`174`	`174`
Original file line number	Diff line number	Diff line change
`@@ -84,12 +84,12 @@ public class MultiFlag: Parser, ParserNode, ParsePathSegment {`
`84`	`84`
`85`	`85`	`/** extension to support collection protocols for parsers */`
`86`	`86`	`public extension MultiFlag {`
`87`		`- public var indices: CountableRange<Int> {`
	`87`	`+ var indices: CountableRange<Int> {`
`88`	`88`	`return parsers.indices`
`89`	`89`
`90`	`90`	`}`
`91`	`91`
`92`		`- public subscript(bounds: Range<Int>) -> ArraySlice<Parser> {`
	`92`	`+ subscript(bounds: Range<Int>) -> ArraySlice<Parser> {`
`93`	`93`	`get {`
`94`	`94`	`return parsers[bounds]`
`95`	`95`	`}`
`@@ -98,7 +98,7 @@ public extension MultiFlag {`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`- public subscript(position: Int) -> Parser {`
	`101`	`+ subscript(position: Int) -> Parser {`
`102`	`102`	`get {`
`103`	`103`	`return parsers[position]`
`104`	`104`	`}`
`@@ -107,43 +107,43 @@ public extension MultiFlag {`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`- public var startIndex: Int {`
	`110`	`+ var startIndex: Int {`
`111`	`111`	`return parsers.startIndex`
`112`	`112`	`}`
`113`	`113`
`114`		`- public var endIndex: Int {`
	`114`	`+ var endIndex: Int {`
`115`	`115`	`return parsers.endIndex`
`116`	`116`	`}`
`117`	`117`
`118`		`- public func append(_ parser: Parser) {`
	`118`	`+ func append(_ parser: Parser) {`
`119`	`119`	`parsers.append(parser)`
`120`	`120`	`}`
`121`	`121`
`122`		`- public func insert(_ parser: Parser, at i: Int) {`
	`122`	`+ func insert(_ parser: Parser, at i: Int) {`
`123`	`123`	`parsers.insert(parser, at: i)`
`124`	`124`	`}`
`125`	`125`
`126`		`- public func insert(contentsOf parsers: Parser, at i: Int) {`
	`126`	`+ func insert(contentsOf parsers: Parser, at i: Int) {`
`127`	`127`	`self.parsers.insert(parsers, at: i)`
`128`	`128`	`}`
`129`	`129`
`130`		`- public func remove(at i: Int) -> Parser {`
	`130`	`+ func remove(at i: Int) -> Parser {`
`131`	`131`	`return parsers.remove(at: i)`
`132`	`132`	`}`
`133`	`133`
`134`		`- public func removeSubrange(_ bounds: Range<Int>) {`
	`134`	`+ func removeSubrange(_ bounds: Range<Int>) {`
`135`	`135`	`parsers.removeSubrange(bounds)`
`136`	`136`	`}`
`137`	`137`
`138`		`- public func removeFirst() -> Parser {`
	`138`	`+ func removeFirst() -> Parser {`
`139`	`139`	`return parsers.removeFirst()`
`140`	`140`	`}`
`141`	`141`
`142`		`- public func removeFirst(_ n: Int) {`
	`142`	`+ func removeFirst(_ n: Int) {`
`143`	`143`	`parsers.removeFirst(n)`
`144`	`144`	`}`
`145`	`145`
`146`		`- public func removeAll(keepingCapacity keepCapacity: Bool = false) {`
	`146`	`+ func removeAll(keepingCapacity keepCapacity: Bool = false) {`
`147`	`147`	`parsers.removeAll()`
`148`	`148`	`}`
`149`	`149`