Refactored code according to recommendations from the Swift lint tool. Added a typealias for the board position.

Author: tigerpixel

PGNParser.xcodeproj/project.pbxproj

@@ -248,6 +248,7 @@
 				0C07C2BB1E525E0F00A921A8 /* Frameworks */,
 				0C07C2BC1E525E0F00A921A8 /* Headers */,
 				0C07C2BD1E525E0F00A921A8 /* Resources */,
+				0C654BEB1EA8A35200E00A6D /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -445,6 +446,22 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		0C654BEB1EA8A35200E00A6D /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		0C07C2BA1E525E0F00A921A8 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;

PGNParser/DraughtsMove.swift

@@ -9,19 +9,25 @@
 import Foundation
 import ParserCombinator
 
+/// The positions on the board conform to an interger number.
+typealias BoardPosition = Int
+
 /**
  Describes a single move performed by one player.
  */
 public struct DraughtsPieceMove {
-    
-    let from: Int
-    let to: Int
-    let hasCapture: Bool
-    
+
+    /// The starting position of the piece which should be moved.
+    let origin: BoardPosition
+    /// The resting position of the piece after the move is made.
+    let destination: BoardPosition
+    /// A flag to indicate if any opponenets pieces were captured during the move.
+    let isCapture: Bool
+
 }
 
 extension DraughtsPieceMove {
-    
+
     /**
      A constructor with the parameters in the order of draughts portable game notation.
 
@@ -34,12 +40,13 @@ extension DraughtsPieceMove {
 
      - parameter to: The location at which the piece resides after the move.
      */
-    init(from: Int, hasCapture: Bool, to: Int) {
-        self.from = from
-        self.to = to
-        self.hasCapture = hasCapture
+    init(origin: BoardPosition, isCapture: Bool, destination: BoardPosition) {
+        
+        self.origin = origin
+        self.destination = destination
+        self.isCapture = isCapture
     }
-    
+
 }
 
 /**
@@ -49,14 +56,14 @@ extension DraughtsPieceMove {
  A move in technical draughts terms refers to a round of moves by both players.
  */
 public struct DraughtsMove {
-    
+
     let white: DraughtsPieceMove
     let black: DraughtsPieceMove?
-    
+
 }
 
 extension DraughtsMove {
-    
+
     /**
      Parse the input draughts portable game notation string into an array of draughts moves.
 
@@ -67,8 +74,8 @@ extension DraughtsMove {
      - returns: A result of the parse. If successful it will contain the move objects.
      */
     public static func parse(fromPortableGameNotation notation: String) -> ParseResult<[DraughtsMove]> {
-        
+
         return DraughtsNotationParser.portableGameNotation().run(withInput: notation)
     }
-    
+
 }

PGNParser/DraughtsNotationParser.swift

@@ -13,7 +13,7 @@ import Currier
  Creates a parser to parse a description a draughts game in portable game notation to DraughtsMove objects.
  */
 struct DraughtsNotationParser {
-    
+
     /**
      Create a parser which performs the parseing of portable game notation for draughts.
 
@@ -22,28 +22,28 @@ struct DraughtsNotationParser {
      - returns: A parser which creates a list of draughts moves from a string in the correct type.
      */
     static func portableGameNotation() -> Parser<[DraughtsMove]> {
-        
+
         let singlePieceMove = curry(DraughtsPieceMove.init) <^> integerNumber
                                                             <*> lowercaseXIsTrue <|> hyphenIsFalse
                                                             <*> integerNumber
-        
+
         let moveRound = numberWithPoint *> twoPlayerTurn(singlePieceMove)
-        
+
         return moveRound.oneOrMany
     }
-    
+
     /// A parser which resolves lowercase x to a boolean true and fails on all other input strings.
-    private static let lowercaseXIsTrue = character(isEqualTo: "x").map() { _ in return true }
-    
+    private static let lowercaseXIsTrue = character(isEqualTo: "x").map { _ in return true }
+
     /// A parser which resolves a hyphen to a boolean false and fails on all other input strings.
-    private static let hyphenIsFalse = character(isEqualTo: "-").map() { _ in return false }
-    
+    private static let hyphenIsFalse = character(isEqualTo: "-").map { _ in return false }
+
     /// A parser which resolves a full stop to a success and fails on all other input strings.
     private static let fullStop = character(isEqualTo: ".")
-    
+
     /// A parser which resolves numbers followed by a fullStop and fails on all other input strings.
     private static let numberWithPoint = whitespace.zeroOneOrMany *> digit.oneOrMany *> fullStop
-    
+
     /**
      Combine a description of a single player turn into a full move with up to two player turns.
 
@@ -52,10 +52,10 @@ struct DraughtsNotationParser {
      - returns: A parser for a draughts move object describing both playes turn for a move.
      */
     private static func twoPlayerTurn(_ turn: Parser<DraughtsPieceMove>) -> Parser<DraughtsMove> {
-        
+
         let singleMove = whitespace.zeroOneOrMany *> turn
-        
+
         return curry(DraughtsMove.init) <^> singleMove <*> singleMove.optional
     }
-    
+
 }