Changed visibility from package to interal

2024-06-26 22:46:58 +02:00
parent 78a4737015
commit bc145da022
12 changed files with 208 additions and 110 deletions
--- a/Sources/Engine/Pieces/Bishop.swift
+++ b/Sources/Engine/Pieces/Bishop.swift
@@ -1,31 +1,40 @@
-package class Bishop: Piece {
-	package weak var board: Board?
-	package var kind: Kind = .Bishop
+internal final class Bishop: Piece, DiagonalMoves {
+	internal weak var board: Board?
+	internal var kind: Kind = .Bishop

-	package var unicodeRepresentation: String {
+	internal var unicodeRepresentation: String {
 		return color == .Black ? "♝" : "♗"
 	}
-	package var color: Color
+	internal var color: Color

-	package var position: Square.Position
+	internal var position: Square.Position

-	package var pseudoLegalPositions: [Square.Position] {
-		return []
+	internal var pseudoLegalPositions: [Square.Position] {
+		return getDiagonalMoves(from: position)
 	}

-	package var legalPositions: [Square.Position] {
-		return pseudoLegalPositions.filter { isLegal(pos: $0) }
+	internal var legalPositions: [Square.Position] {
+		return pseudoLegalPositions.filter { isLegal(on: $0) }
 	}

-	package func move(dst: Square.Position) -> Bool {
+	internal func move(to dst: Square.Position) -> Bool {
 		return false
 	}

-	package func isLegal(pos: Square.Position) -> Bool {
-		return false
+	internal func isLegal(on pos: Square.Position) -> Bool {
+		if let board = board, let s = board[pos] {
+			if let p = s.piece {
+				if p.color == color { return false }
+				if p.kind == .King {
+					// TODO: Notify board of check
+					return false
+				}
+			}
+		}
+		return true
 	}

-	package init(color: Color, on position: Square.Position) {
+	internal init(color: Color, on position: Square.Position) {
 		self.color = color
 		self.position = position
 	}
--- a/Sources/Engine/Pieces/CommonMoves.swift
+++ b/Sources/Engine/Pieces/CommonMoves.swift
@@ -0,0 +1,19 @@
+internal protocol DiagonalMoves {
+    func getDiagonalMoves(from pos: Square.Position) -> [Square.Position]
+}
+
+extension DiagonalMoves {
+    func getDiagonalMoves(from pos: Square.Position) -> [Square.Position] {
+        return []
+    }
+}
+
+internal protocol LinearMoves {
+    func getLinearMoves(from pos: Square.Position) -> [Square.Position]
+}
+
+extension LinearMoves {
+    func getLinearMoves(from pos: Square.Position) -> [Square.Position] {
+        return []
+    }
+}
--- a/Sources/Engine/Pieces/King.swift
+++ b/Sources/Engine/Pieces/King.swift
@@ -1,31 +1,41 @@
-package class King: Piece {
-	package weak var board: Board?
-	package var kind: Kind = .King
+internal final class King: Piece {
+	internal weak var board: Board?
+	internal var kind: Kind = .King

-	package var unicodeRepresentation: String {
+	internal var unicodeRepresentation: String {
 		return color == .Black ? "♛" : "♕"
 	}
-	package var color: Color
+	internal var color: Color

-	package var position: Square.Position
+	internal var position: Square.Position

-	package var pseudoLegalPositions: [Square.Position] {
+	internal var pseudoLegalPositions: [Square.Position] {
 		return []
 	}

-	package var legalPositions: [Square.Position] {
-		return pseudoLegalPositions.filter { isLegal(pos: $0) }
+	internal var legalPositions: [Square.Position] {
+		return pseudoLegalPositions.filter { isLegal(on: $0) }
 	}

-	package func move(dst: Square.Position) -> Bool {
+	internal func move(to dst: Square.Position) -> Bool {
 		return false
 	}

-	package func isLegal(pos: Square.Position) -> Bool {
-		return false
+	internal func isLegal(on pos: Square.Position) -> Bool {
+		if let board = board, let s = board[pos] {
+			if let p = s.piece {
+				if p.color == color { return false }
+				if p.kind == .King {
+					// TODO: Notify board of check
+					return false
+				}
+			}
+
+		}
+		return true
 	}

-	package init(color: Color, on position: Square.Position) {
+	internal init(color: Color, on position: Square.Position) {
 		self.color = color
 		self.position = position
 	}
--- a/Sources/Engine/Pieces/Knight.swift
+++ b/Sources/Engine/Pieces/Knight.swift
@@ -1,31 +1,54 @@
-package class Knight: Piece {
-	package weak var board: Board?
-	package var kind: Kind = .Knight
+internal final class Knight: Piece {
+	internal weak var board: Board?
+	internal var kind: Kind = .Knight

-	package var unicodeRepresentation: String {
+	internal var unicodeRepresentation: String {
 		return color == .Black ? "♞" : "♘"
 	}
-	package var color: Color
+	internal var color: Color

-	package var position: Square.Position
+	internal var position: Square.Position

-	package var pseudoLegalPositions: [Square.Position] {
-		return []
+	internal var pseudoLegalPositions: [Square.Position] {
+		let directions: [Square.Position] = [
+			.init(file: position.file + 1, rank: position.rank + 2),
+			.init(file: position.file - 1, rank: position.rank + 2),
+			.init(file: position.file + 1, rank: position.rank - 2),
+			.init(file: position.file - 1, rank: position.rank - 2),
+			.init(file: position.file + 2, rank: position.rank + 1),
+			.init(file: position.file - 2, rank: position.rank + 1),
+			.init(file: position.file + 2, rank: position.rank - 1),
+			.init(file: position.file - 2, rank: position.rank - 1)
+		]
+		return directions.filter {
+			let index = $0.index
+			return index < 0 || index > 63
+		}
 	}

-	package var legalPositions: [Square.Position] {
-		return pseudoLegalPositions.filter { isLegal(pos: $0) }
+	internal var legalPositions: [Square.Position] {
+		return pseudoLegalPositions.filter { isLegal(on: $0) }
 	}

-	package func move(dst: Square.Position) -> Bool {
+	internal func move(to dst: Square.Position) -> Bool {
 		return false
 	}

-	package func isLegal(pos: Square.Position) -> Bool {
-		return false
+	internal func isLegal(on pos: Square.Position) -> Bool {
+		if let board = board, let s = board[pos] {
+			if let p = s.piece {
+				if p.color == color { return false }
+				if p.kind == .King {
+					// TODO: Notify board of check
+					return false
+				}
+			}
+
+		}
+		return true
 	}

-	package init(color: Color, on position: Square.Position) {
+	internal init(color: Color, on position: Square.Position) {
 		self.color = color
 		self.position = position
 	}
--- a/Sources/Engine/Pieces/Pawn.swift
+++ b/Sources/Engine/Pieces/Pawn.swift
@@ -1,20 +1,32 @@
-package class Pawn: Piece {
-	package var kind: Kind = .Pawn
-	package weak var board: Board?
-	package var color: Color
-	package var position: Square.Position
-	package var pseudoLegalPositions: [Square.Position] {
-		return []
+internal final class Pawn: Piece {
+	internal var kind: Kind = .Pawn
+	internal weak var board: Board?
+	internal var color: Color
+	internal var position: Square.Position
+	internal var pseudoLegalPositions: [Square.Position] {
+		let sign: Int8 = color == .Black ? -1 : 1
+		let rank = Int8(position.rank)
+		let directions: [Square.Position] = [
+			.init(file: position.file, rank: rank + 1 * sign),
+			.init(file: position.file, rank: rank + 2 * sign),
+			.init(file: position.file + 1, rank: rank + 1 * sign),
+			.init(file: position.file - 1, rank: rank + 1 * sign)
+		]
+		// TODO: Handle en passant
+		return directions.filter { 
+			let index = $0.index
+			return index < 1 || index > 63
+		}
 	}
-	package var legalPositions: [Square.Position] {
-		return pseudoLegalPositions.filter { isLegal(pos: $0) }
+	internal var legalPositions: [Square.Position] {
+		pseudoLegalPositions.filter { isLegal(on: $0) }
 	}

-	package var unicodeRepresentation: String {
-		return color == .Black ? "♟" : "♙"
+	internal var unicodeRepresentation: String {
+		color == .Black ? "♟" : "♙"
 	}

-	package func move(dst: Square.Position) -> Bool {
+	internal func move(to dst: Square.Position) -> Bool {
 		guard board != nil else {
 			return false
 		}
@@ -33,18 +45,22 @@ package class Pawn: Piece {
 		return true
 	}

-	package func isLegal(pos: Square.Position) -> Bool {
+	internal func isLegal(on pos: Square.Position) -> Bool {
 		// TODO: Handle "En-Passant"
 		if let board = board, let s = board[pos] {
 			if let p = s.piece {
 				if p.color == color { return false }
+				if p.kind == .King {
+					// TODO: Notify board of check
+					return false
+				}
 			}

 		}
 		return true
 	}

-	package init(
+	internal init(
 		color: Color, on position: Square.Position
 	) {
 		self.color = color
--- a/Sources/Engine/Pieces/Piece.swift
+++ b/Sources/Engine/Pieces/Piece.swift
@@ -1,7 +1,7 @@
-public enum Kind: String, CaseIterable {
+internal enum Kind: String, CaseIterable {
 	case Pawn, Knight, Bishop, Rook, Queen, King

-	public var value: Int8 {
+	internal var value: Int8 {
 		switch self {
 		case .Pawn: 1
 		case .Bishop: 3
@@ -12,7 +12,7 @@ public enum Kind: String, CaseIterable {
 		}
 	}

-	public static subscript(_ c: Character) -> (Self, Color)? {
+	internal static subscript(_ c: Character) -> (Self, Color)? {
 		let v = c.uppercased()

 		guard
@@ -39,7 +39,7 @@ public enum Kind: String, CaseIterable {
 	}
 }

-public protocol Piece {
+internal protocol Piece {
 	var board: Board? { get }
 	var color: Color { get }
 	var unicodeRepresentation: String { get }
@@ -47,6 +47,6 @@ public protocol Piece {
 	var position: Square.Position { get }
 	var pseudoLegalPositions: [Square.Position] { get }
 	var legalPositions: [Square.Position] { get }
-	func move(dst: Square.Position) -> Bool
-	func isLegal(pos: Square.Position) -> Bool
+	func move(to dst: Square.Position) -> Bool
+	func isLegal(on pos: Square.Position) -> Bool
 }
--- a/Sources/Engine/Pieces/Queen.swift
+++ b/Sources/Engine/Pieces/Queen.swift
@@ -1,31 +1,42 @@
-package class Queen: Piece {
-	package weak var board: Board?
-	package var kind: Kind = .Queen
+internal final class Queen: Piece, LinearMoves, DiagonalMoves {
+	internal weak var board: Board?
+	internal var kind: Kind = .Queen

-	package var unicodeRepresentation: String {
+	internal var unicodeRepresentation: String {
 		return color == .Black ? "♛" : "♕"
 	}
-	package var color: Color
+	internal var color: Color

-	package var position: Square.Position
+	internal var position: Square.Position

-	package var pseudoLegalPositions: [Square.Position] {
-		return []
+	internal var pseudoLegalPositions: [Square.Position] {
+		return getDiagonalMoves(from: position) + getLinearMoves(from: position)
 	}

-	package var legalPositions: [Square.Position] {
-		return pseudoLegalPositions.filter { isLegal(pos: $0) }
+	internal var legalPositions: [Square.Position] {
+		return pseudoLegalPositions.filter { isLegal(on: $0) }
 	}

-	package func move(dst: Square.Position) -> Bool {
+	internal func move(to dst: Square.Position) -> Bool {
+		
 		return false
 	}

-	package func isLegal(pos: Square.Position) -> Bool {
-		return false
+	internal func isLegal(on pos: Square.Position) -> Bool {
+		if let board = board, let s = board[pos] {
+			if let p = s.piece {
+				if p.color == color { return false }
+				if p.kind == .King {
+					// TODO: Notify board of check
+					return false
+				}
+			}
+
+		}
+		return true
 	}

-	package init(color: Color, on position: Square.Position) {
+	internal init(color: Color, on position: Square.Position) {
 		self.color = color
 		self.position = position
 	}
--- a/Sources/Engine/Pieces/Rook.swift
+++ b/Sources/Engine/Pieces/Rook.swift
@@ -1,31 +1,41 @@
-package class Rook: Piece {
-	package weak var board: Board?
-	package var kind: Kind = .Rook
+internal final class Rook: Piece, LinearMoves {
+	internal weak var board: Board?
+	internal var kind: Kind = .Rook

-	package var unicodeRepresentation: String {
+	internal var unicodeRepresentation: String {
 		return color == .Black ? "♜" : "♖"
 	}
-	package var color: Color
+	internal var color: Color

-	package var position: Square.Position
+	internal var position: Square.Position

-	package var pseudoLegalPositions: [Square.Position] {
-		return []
+	internal var pseudoLegalPositions: [Square.Position] {
+		return getLinearMoves(from: position)
 	}

-	package var legalPositions: [Square.Position] {
-		return pseudoLegalPositions.filter { isLegal(pos: $0) }
+	internal var legalPositions: [Square.Position] {
+		return pseudoLegalPositions.filter { isLegal(on: $0) }
 	}

-	package func move(dst: Square.Position) -> Bool {
+	internal func move(to dst: Square.Position) -> Bool {
 		return false
 	}

-	package func isLegal(pos: Square.Position) -> Bool {
-		return false
+	internal func isLegal(on pos: Square.Position) -> Bool {
+		if let board = board, let s = board[pos] {
+			if let p = s.piece {
+				if p.color == color { return false }
+				if p.kind == .King {
+					// TODO: Notify board of check
+					return false
+				}
+			}
+
+		}
+		return true
 	}

-	package init(color: Color, on position: Square.Position) {
+	internal init(color: Color, on position: Square.Position) {
 		self.color = color
 		self.position = position
 	}